[OE-core] [PATCH] busybox: enable httpd su install

Paul Eggleton paul.eggleton at linux.intel.com
Wed Jun 17 09:00:00 UTC 2015


Hi Li,

On Wednesday 17 June 2015 16:48:01 Li xin wrote:
> Signed-off-by: Li Xin <lixin.fnst at cn.fujitsu.com>
> ---
>  meta/recipes-core/busybox/busybox.inc       |  1 +
>  meta/recipes-core/busybox/busybox/defconfig | 53
> +++++++++++++++-------------- 2 files changed, 28 insertions(+), 26
> deletions(-)
> 
> diff --git a/meta/recipes-core/busybox/busybox.inc
> b/meta/recipes-core/busybox/busybox.inc index 0769d92..3886457 100644
> --- a/meta/recipes-core/busybox/busybox.inc
> +++ b/meta/recipes-core/busybox/busybox.inc
> @@ -39,6 +39,7 @@ INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd"
> 
>  SYSTEMD_PACKAGES = "${PN}-syslog"
>  SYSTEMD_SERVICE_${PN}-syslog = "busybox-syslog.service"
> +SYSTEMD_AUTO_ENABLE_${PN}-syslog = "disable"
> 
>  CONFFILES_${PN}-syslog = "${sysconfdir}/syslog-startup.conf.${BPN}"
>  CONFFILES_${PN}-mdev = "${sysconfdir}/mdev.conf"
> diff --git a/meta/recipes-core/busybox/busybox/defconfig
> b/meta/recipes-core/busybox/busybox/defconfig index c200ee0..667928b 100644
> --- a/meta/recipes-core/busybox/busybox/defconfig
> +++ b/meta/recipes-core/busybox/busybox/defconfig
> @@ -227,8 +227,8 @@ CONFIG_FALSE=y
>  # CONFIG_FSYNC is not set
>  CONFIG_HEAD=y
>  # CONFIG_FEATURE_FANCY_HEAD is not set
> -# CONFIG_INSTALL is not set
> -# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
> +CONFIG_INSTALL=y
> +CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
>  CONFIG_LN=y
>  CONFIG_LOGNAME=y
>  CONFIG_LS=y
> @@ -431,15 +431,15 @@ CONFIG_XARGS=y
>  CONFIG_HALT=y
>  # CONFIG_FEATURE_CALL_TELINIT is not set
>  CONFIG_TELINIT_PATH=""
> -# CONFIG_INIT is not set
> -# CONFIG_FEATURE_USE_INITTAB is not set
> -# CONFIG_FEATURE_KILL_REMOVED is not set
> +CONFIG_INIT=y
> +CONFIG_FEATURE_USE_INITTAB=y
> +CONFIG_FEATURE_KILL_REMOVED=y
>  CONFIG_FEATURE_KILL_DELAY=0
> -# CONFIG_FEATURE_INIT_SCTTY is not set
> +CONFIG_FEATURE_INIT_SCTTY=y
>  # CONFIG_FEATURE_INIT_SYSLOG is not set
> -# CONFIG_FEATURE_EXTRA_QUIET is not set
> -# CONFIG_FEATURE_INIT_COREDUMPS is not set
> -# CONFIG_FEATURE_INITRD is not set
> +CONFIG_FEATURE_EXTRA_QUIET=y
> +CONFIG_FEATURE_INIT_COREDUMPS=y
> +CONFIG_FEATURE_INITRD=y
>  CONFIG_INIT_TERMINAL_TYPE=""
>  CONFIG_MESG=y
>  # CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set
> @@ -477,7 +477,7 @@ CONFIG_LAST_SYSTEM_ID=999
>  # CONFIG_CRYPTPW is not set
>  # CONFIG_CHPASSWD is not set
>  CONFIG_FEATURE_DEFAULT_PASSWD_ALGO=""
> -# CONFIG_SU is not set
> +CONFIG_SU=y
>  # CONFIG_FEATURE_SU_SYSLOG is not set
>  # CONFIG_FEATURE_SU_CHECKS_SHELLS is not set
>  # CONFIG_SULOGIN is not set
> @@ -752,19 +752,20 @@ CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
>  # CONFIG_FTPPUT is not set
>  # CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
>  CONFIG_HOSTNAME=y
> -# CONFIG_HTTPD is not set
> -# CONFIG_FEATURE_HTTPD_RANGES is not set
> -# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
> -# CONFIG_FEATURE_HTTPD_SETUID is not set
> -# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
> -# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
> -# CONFIG_FEATURE_HTTPD_CGI is not set
> -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
> -# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
> -# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
> -# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
> -# CONFIG_FEATURE_HTTPD_PROXY is not set
> -# CONFIG_FEATURE_HTTPD_GZIP is not set
> +CONFIG_HTTPD=y
> +CONFIG_FEATURE_HTTPD_RANGES=y
> +CONFIG_FEATURE_HTTPD_USE_SENDFILE=y
> +CONFIG_FEATURE_HTTPD_SETUID=y
> +CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
> +CONFIG_FEATURE_HTTPD_AUTH_MD5=y
> +CONFIG_FEATURE_HTTPD_CGI=y
> +CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y
> +CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y
> +CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y
> +CONFIG_FEATURE_HTTPD_ERROR_PAGES=y
> +CONFIG_FEATURE_HTTPD_PROXY=y
> +CONFIG_FEATURE_HTTPD_GZIP=y
> +
>  CONFIG_IFCONFIG=y
>  CONFIG_FEATURE_IFCONFIG_STATUS=y
>  # CONFIG_FEATURE_IFCONFIG_SLIP is not set
> @@ -802,9 +803,9 @@ CONFIG_FEATURE_IP_TUNNEL=y
>  # CONFIG_IPROUTE is not set
>  # CONFIG_IPTUNNEL is not set
>  # CONFIG_IPRULE is not set
> -# CONFIG_IPCALC is not set
> -# CONFIG_FEATURE_IPCALC_FANCY is not set
> -# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
> +CONFIG_IPCALC=y
> +CONFIG_FEATURE_IPCALC_FANCY=y
> +CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y
>  CONFIG_NETSTAT=y
>  # CONFIG_FEATURE_NETSTAT_WIDE is not set
>  # CONFIG_FEATURE_NETSTAT_PRG is not set

There are several problems with this patch:

1) It does far more than just what the shortlog mentions

2) There isn't a proper commit message explaining why we need to enable these 
options in the core as opposed to those options being enabled with a bbappend 
in your custom layer. This turns on so many options that I very much doubt we 
can accept this patch unless there is very good justification for turning all 
of them on by default.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre



More information about the Openembedded-core mailing list