hurricos/openwrt-mirror
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2025-11-03 22:44:27 -05:00
Code Issues Projects Releases Wiki Activity

make init and logread depend on !PROCD_INIT

Browse Source 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 36005
This commit is contained in:
John Crispin 2013-03-13 18:11:31 +00:00
parent fce3deddff
commit 16b84af05e
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/busybox/Makefile
View File

@ -17,6 +17,7 @@ PKG_SOURCE_URL:=http://www.busybox.net/downloads \
http://distfiles.gentoo.org/distfiles/
PKG_MD5SUM:=9c0cae5a0379228e7b55e5b29528df8e
PKG_CONFIG_DEPENDS:=CONFIG_PROCD_INIT
PKG_BUILD_DEPENDS:=BUSYBOX_CONFIG_FEATURE_HAVE_RPC:librpc
PKG_BUILD_PARALLEL:=1
@ -112,6 +113,7 @@ 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))

1
package/busybox/config/init/Config.in
View File

@ -73,6 +73,7 @@ config BUSYBOX_CONFIG_INIT
bool "init"
default y
select BUSYBOX_CONFIG_FEATURE_SYSLOG
depends on !PROCD_INIT
help
init is the first program run when the system boots.

2
package/busybox/config/sysklogd/Config.in
View File

@ -96,7 +96,7 @@ config BUSYBOX_CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE
config BUSYBOX_CONFIG_LOGREAD
bool "logread"
default y
depends on BUSYBOX_CONFIG_FEATURE_IPC_SYSLOG
depends on BUSYBOX_CONFIG_FEATURE_IPC_SYSLOG && !PROCD_INIT
help
If you enabled Circular Buffer support, you almost
certainly want to enable this feature as well. This