Skip to content
Snippets Groups Projects
Commit 16b84af0 authored by John Crispin's avatar John Crispin
Browse files

make init and logread depend on !PROCD_INIT


Signed-off-by: default avatarJohn Crispin <blogic@openwrt.org>

SVN-Revision: 36005
parent fce3dedd
No related branches found
No related tags found
No related merge requests found
...@@ -17,6 +17,7 @@ PKG_SOURCE_URL:=http://www.busybox.net/downloads \ ...@@ -17,6 +17,7 @@ PKG_SOURCE_URL:=http://www.busybox.net/downloads \
http://distfiles.gentoo.org/distfiles/ http://distfiles.gentoo.org/distfiles/
PKG_MD5SUM:=9c0cae5a0379228e7b55e5b29528df8e PKG_MD5SUM:=9c0cae5a0379228e7b55e5b29528df8e
PKG_CONFIG_DEPENDS:=CONFIG_PROCD_INIT
PKG_BUILD_DEPENDS:=BUSYBOX_CONFIG_FEATURE_HAVE_RPC:librpc PKG_BUILD_DEPENDS:=BUSYBOX_CONFIG_FEATURE_HAVE_RPC:librpc
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
...@@ -112,6 +113,7 @@ define Package/busybox/install ...@@ -112,6 +113,7 @@ 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))
...@@ -73,6 +73,7 @@ config BUSYBOX_CONFIG_INIT ...@@ -73,6 +73,7 @@ config BUSYBOX_CONFIG_INIT
bool "init" bool "init"
default y default y
select BUSYBOX_CONFIG_FEATURE_SYSLOG select BUSYBOX_CONFIG_FEATURE_SYSLOG
depends on !PROCD_INIT
help help
init is the first program run when the system boots. init is the first program run when the system boots.
......
...@@ -96,7 +96,7 @@ config BUSYBOX_CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE ...@@ -96,7 +96,7 @@ config BUSYBOX_CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE
config BUSYBOX_CONFIG_LOGREAD config BUSYBOX_CONFIG_LOGREAD
bool "logread" bool "logread"
default y default y
depends on BUSYBOX_CONFIG_FEATURE_IPC_SYSLOG depends on BUSYBOX_CONFIG_FEATURE_IPC_SYSLOG && !PROCD_INIT
help help
If you enabled Circular Buffer support, you almost If you enabled Circular Buffer support, you almost
certainly want to enable this feature as well. This certainly want to enable this feature as well. This
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment