summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYacine Belkadi2012-11-19 09:13:34 +0100
committerYacine Belkadi2012-12-11 15:52:15 +0100
commita0801c0c279d8e9cbd17c087787ef30a73178884 (patch)
tree5dea08d8aca386a678b27740d0e22f6bf7a6fd1b
parent66f5675601496bca1d996fdb727340e922a9f9bd (diff)
cleo/buildroot/pkg/busybox.mk: fix dependencies for custom version, closes #3513
In the case of a custom busybox version (source directory), the dependency on the creation of the $(BUSYBOX_DIR) was incorrect (The "build_dir" was always re-made). As a result, some parts of busybox were unnecessarily rebuilt and the "install" target was unnecessarily re-made. Fix that by using a dummy file "$(BUSYBOX_DIR)/.dir".
-rw-r--r--cleopatre/buildroot/package/busybox/busybox.mk10
1 files changed, 5 insertions, 5 deletions
diff --git a/cleopatre/buildroot/package/busybox/busybox.mk b/cleopatre/buildroot/package/busybox/busybox.mk
index f85d389c2f..a727806a80 100644
--- a/cleopatre/buildroot/package/busybox/busybox.mk
+++ b/cleopatre/buildroot/package/busybox/busybox.mk
@@ -14,7 +14,7 @@ ifeq ($(BR2_BUSYBOX_VERSION_CUSTOM),y)
BUSYBOX_DIR:=$(PROJECT_BUILD_DIR)/busybox-custom
BUSYBOX_MAKE_DIRS:= $(strip $(subst ",,$(BR2_BUSYBOX_VERSION_CUSTOM_SRC_DIR))) O=$(BUSYBOX_DIR)
BUSYBOX_TARGET_BIN_PREREQ:=FORCE
-BUSYBOX_TARGET_CONFIG_PREREQ:=build_dir
+BUSYBOX_TARGET_CONFIG_PREREQ:=$(BUSYBOX_DIR)/.dir
BUSYBOX_TARGET_SOURCE:=
else # BR2_BUSYBOX_VERSION_CUSTOM
@@ -49,12 +49,12 @@ endif
$(DL_DIR)/$(BUSYBOX_SOURCE):
$(WGET) -P $(DL_DIR) $(BUSYBOX_SITE)/$(BUSYBOX_SOURCE)
-# This target is used for custom busybox versions.
-build_dir: | $(BUSYBOX_DIR)
-
$(BUSYBOX_DIR):
mkdir $@
+$(BUSYBOX_DIR)/.dir: | $(BUSYBOX_DIR)
+ touch $@
+
$(BUSYBOX_DIR)/.unpacked: $(DL_DIR)/$(BUSYBOX_SOURCE)
$(BUSYBOX_UNZIP) $(DL_DIR)/$(BUSYBOX_SOURCE) | tar -C $(PROJECT_BUILD_DIR) $(TAR_OPTIONS) -
touch $@
@@ -172,7 +172,7 @@ busybox-dirclean:
FORCE:
-.PHONY: build_dir busybox-clean FORCE
+.PHONY: busybox-clean FORCE
#############################################################
#