From abdc39bcb0be09f0fcb27e7ea3a2ce40ef903c95 Mon Sep 17 00:00:00 2001 From: Yacine Belkadi Date: Fri, 4 May 2012 15:34:13 +0200 Subject: cleo/buildroot/pkg/busybox/makefile: split .patched into .patched1 and .patched2, refs #3085 In the makefile of the busybox package, ".patched" indicates that: - changes due to the .config file have been applied to the sources - patches have been applied. As a preparation for upcomming changes, we need to dissociate these two operations. If the sources are already patched, only the part regarding the .config file needs to be done. This commits splits ".patched" into ".patched1" and ".patched2". --- cleopatre/buildroot/package/busybox/busybox.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'cleopatre/buildroot') diff --git a/cleopatre/buildroot/package/busybox/busybox.mk b/cleopatre/buildroot/package/busybox/busybox.mk index f939ea4ffd..e7c042c936 100644 --- a/cleopatre/buildroot/package/busybox/busybox.mk +++ b/cleopatre/buildroot/package/busybox/busybox.mk @@ -32,11 +32,14 @@ $(BUSYBOX_DIR)/.unpacked: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_UNZIP) $(DL_DIR)/$(BUSYBOX_SOURCE) | tar -C $(PROJECT_BUILD_DIR) $(TAR_OPTIONS) - touch $@ -$(BUSYBOX_DIR)/.patched: $(BUSYBOX_DIR)/.unpacked +$(BUSYBOX_DIR)/.patched1: $(BUSYBOX_DIR)/.unpacked ifeq ($(BR2_PACKAGE_SYSKLOGD),y) # if we have external syslogd, force busybox to use it $(SED) "/#include.*busybox\.h/a#define CONFIG_SYSLOGD" $(BUSYBOX_DIR)/init/init.c endif + touch $@ + +$(BUSYBOX_DIR)/.patched2: $(BUSYBOX_DIR)/.patched1 # Allow busybox patches. ifeq ($(BR2_PACKAGE_BUSYBOX_SNAPSHOT),y) toolchain/patch-kernel.sh $(BUSYBOX_DIR) package/busybox busybox.\*.patch @@ -45,7 +48,7 @@ else endif touch $@ -$(BUSYBOX_DIR)/.configured: $(BUSYBOX_DIR)/.patched $(BUSYBOX_CONFIG_FILE) +$(BUSYBOX_DIR)/.configured: $(BUSYBOX_DIR)/.patched2 $(BUSYBOX_CONFIG_FILE) cp -f $(BUSYBOX_CONFIG_FILE) $(BUSYBOX_DIR)/.config $(SED) s,^CONFIG_PREFIX=.*,CONFIG_PREFIX=\"$(TARGET_DIR)\", \ $(BUSYBOX_DIR)/.config -- cgit v1.2.3