busybox: fix disabling /sbin/init and logread if procd is used as init
SVN-Revision: 36054
This commit is contained in:
parent
132a54f646
commit
e3bdc13980
|
@ -62,7 +62,7 @@ endef
|
||||||
define Build/Configure
|
define Build/Configure
|
||||||
rm -f $(PKG_BUILD_DIR)/.configured*
|
rm -f $(PKG_BUILD_DIR)/.configured*
|
||||||
grep 'CONFIG_BUSYBOX_' $(TOPDIR)/.config | sed -e "s,\\(# \)\\?CONFIG_BUSYBOX_\\(.*\\),\\1\\2,g" > $(PKG_BUILD_DIR)/.config
|
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)" \
|
CC="$(TARGET_CC)" \
|
||||||
CROSS_COMPILE="$(TARGET_CROSS)" \
|
CROSS_COMPILE="$(TARGET_CROSS)" \
|
||||||
KBUILD_HAVE_NLS=no \
|
KBUILD_HAVE_NLS=no \
|
||||||
|
@ -113,7 +113,6 @@ define Package/busybox/install
|
||||||
$(INSTALL_BIN) ./files/$$$$tmp $(1)/etc/init.d/$$$$tmp; \
|
$(INSTALL_BIN) ./files/$$$$tmp $(1)/etc/init.d/$$$$tmp; \
|
||||||
done
|
done
|
||||||
-rm -rf $(1)/lib64
|
-rm -rf $(1)/lib64
|
||||||
$(if $(CONFIG_PROCD_INIT),rm -f $(1)/sbin/init $(1)/sbin/logread)
|
|
||||||
endef
|
endef
|
||||||
|
|
||||||
$(eval $(call BuildPackage,busybox))
|
$(eval $(call BuildPackage,busybox))
|
||||||
|
|
Loading…
Reference in New Issue