summaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2007-01-31 14:21:08 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2007-01-31 14:21:08 +0000
commit57769372515927160cbfeb94562d8b42ecf89b62 (patch)
tree671cf54d65d4b1715d1cd9129cec4557d53164db /package
parent47857d95ce034d397d74c94ede556f4c5dba9f62 (diff)
downloadbuildroot-novena-57769372515927160cbfeb94562d8b42ecf89b62.tar.gz
buildroot-novena-57769372515927160cbfeb94562d8b42ecf89b62.zip
- fix patch application. Use busybox-$(VER)-\*.patch for versions and busybox.\*.patch for snapshot
Diffstat (limited to 'package')
-rw-r--r--package/busybox/busybox.mk10
1 files changed, 7 insertions, 3 deletions
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 48778e671..74e19c140 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -58,8 +58,12 @@ ifeq ($(BR2_PACKAGE_SYSKLOGD),y)
$(SED) "/#include.*busybox\.h/a#define CONFIG_SYSLOGD" $(BUSYBOX_DIR)/init/init.c
endif
# Allow busybox patches.
- toolchain/patch-kernel.sh $(BUSYBOX_DIR) package/busybox busybox-$(BUSYBOX_VER)\*.patch
- touch $(BUSYBOX_DIR)/.unpacked
+ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y)
+ toolchain/patch-kernel.sh $(BUSYBOX_DIR) package/busybox busybox.\*.patch
+else
+ toolchain/patch-kernel.sh $(BUSYBOX_DIR) package/busybox busybox-$(BUSYBOX_VER)-\*.patch
+endif
+ touch $@
$(BUSYBOX_DIR)/.configured: $(BUSYBOX_DIR)/.unpacked $(BUSYBOX_CONFIG_FILE)
cp -f $(BUSYBOX_CONFIG_FILE) $(BUSYBOX_DIR)/.config
@@ -95,7 +99,7 @@ else
endif
yes "" | $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
CROSS="$(TARGET_CROSS)" -C $(BUSYBOX_DIR) oldconfig
- touch $(BUSYBOX_DIR)/.configured
+ touch $@
$(BUSYBOX_DIR)/busybox: $(BUSYBOX_DIR)/.configured