Changeset 36005


Ignore:
Timestamp:
2013-03-13T19:11:31+01:00 (5 years ago)
Author:
blogic
Message:

[busybox] make init and logread depend on !PROCD_INIT

Signed-off-by: John Crispin <blogic@…>

Location:
trunk/package/busybox
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/package/busybox/Makefile

    r35239 r36005  
    1818PKG_MD5SUM:=9c0cae5a0379228e7b55e5b29528df8e 
    1919 
     20PKG_CONFIG_DEPENDS:=CONFIG_PROCD_INIT 
    2021PKG_BUILD_DEPENDS:=BUSYBOX_CONFIG_FEATURE_HAVE_RPC:librpc 
    2122PKG_BUILD_PARALLEL:=1 
    … …  
    113114        done 
    114115        -rm -rf $(1)/lib64 
     116        $(if $(CONFIG_PROCD_INIT),rm -f $(1)/sbin/init $(1)/sbin/logread) 
    115117endef 
    116118 

  • trunk/package/busybox/config/init/Config.in

    r29510 r36005  
    7474        default y 
    7575        select BUSYBOX_CONFIG_FEATURE_SYSLOG 
     76        depends on !PROCD_INIT 
    7677        help 
    7778          init is the first program run when the system boots. 

  • trunk/package/busybox/config/sysklogd/Config.in

    r28513 r36005  
    9797        bool "logread" 
    9898        default y 
    99         depends on BUSYBOX_CONFIG_FEATURE_IPC_SYSLOG 
     99        depends on BUSYBOX_CONFIG_FEATURE_IPC_SYSLOG && !PROCD_INIT 
    100100        help 
    101101          If you enabled Circular Buffer support, you almost 
Note: See TracChangeset for help on using the changeset viewer.