From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 16 Mar 2013 01:25:42 +0000 (+0000)
Subject: busybox: fix disabling /sbin/init and logread if procd is used as init
X-Git-Tag: reboot~10910
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e3bdc13980dea05f9cd0fbd24cd0229c531c6e02;p=openwrt%2Fstaging%2Fjogo.git

busybox: fix disabling /sbin/init and logread if procd is used as init

SVN-Revision: 36054
---

diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index f4553c0ffe..ed58fabcfd 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))