summaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-03-16 01:25:42 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-03-16 01:25:42 +0000
commit331bb19bb022f15780cdf3e5b6e24b688e85db06 (patch)
tree0b9b020556bd83212385687cd32ca9bced722136 /package
parent881571899255438afc9bec4451babdad84f0da3a (diff)
busybox: fix disabling /sbin/init and logread if procd is used as init
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36054 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/busybox/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index f4553c0ff..ed58fabcf 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -62,7 +62,7 @@ endef
define Build/Configure
rm -f $(PKG_BUILD_DIR)/.configured*
grep 'CONFIG_BUSYBOX_' $(TOPDIR)/.config | sed -e "s,\\(# \)\\?CONFIG_BUSYBOX_\\(.*\\),\\1\\2,g" > $(PKG_BUILD_DIR)/.config
- yes '' | $(MAKE) -C $(PKG_BUILD_DIR) \
+ yes 'n' | $(MAKE) -C $(PKG_BUILD_DIR) \
CC="$(TARGET_CC)" \
CROSS_COMPILE="$(TARGET_CROSS)" \
KBUILD_HAVE_NLS=no \
@@ -113,7 +113,6 @@ define Package/busybox/install
$(INSTALL_BIN) ./files/$$$$tmp $(1)/etc/init.d/$$$$tmp; \
done
-rm -rf $(1)/lib64
- $(if $(CONFIG_PROCD_INIT),rm -f $(1)/sbin/init $(1)/sbin/logread)
endef
$(eval $(call BuildPackage,busybox))