[Buildroot] [PATCH] busybox: no need to disable clear and reset

Matthew Weber matthew.weber at rockwellcollins.com
Tue Apr 25 01:44:48 UTC 2017


Arnout,

On Mon, Apr 24, 2017 at 3:13 PM, Arnout Vandecappelle (Essensium/Mind)
<arnout at mind.be> wrote:
> Removing clear and reset from the busybox config when the ncurses tools
> are enabled is not really needed.
>
> Since commit 802bff9c42, the busybox install will not overwrite
> existing programs. Therefore, the tools will be installed correctly
> regardless of the order of the build:
> - if busybox is built first, the clear and reset apps are installed,
>   but they will be overwritten by ncurses;
> - if ncurses is built first, it will install the clear and reset apps,
>   and busybox will no longer install them.
>
> We prefer not to modify the busybox configuration when not strictly
> necessary, because it is surprising for the user that his configuration
> is not applied. Clearly, it's not ideal that busybox is configured with
> redundant apps, but if the user wants to shrink it, it's possible to
> provide a custom config.
>
> This partially reverts commit 33c72344a8686a136c1da6a056ed6c0945bbf8b7.
>

Verified with a the BR default config doing a clean make all for each case.

Tested-by: Matt Weber  <matthew.weber at rockwellcollins.com>


> Cc: Matthew Weber <matthew.weber at rockwellcollins.com>
> Cc: Danomi Manchego <danomimanchego123 at gmail.com>
> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout at mind.be>
> ---
>  package/busybox/busybox.mk | 12 ------------
>  1 file changed, 12 deletions(-)
>
> diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
> index 689830e7f8..a536ed2953 100644
> --- a/package/busybox/busybox.mk
> +++ b/package/busybox/busybox.mk
> @@ -148,17 +148,6 @@ define BUSYBOX_MUSL_TWEAKS
>  endef
>  endif
>
> -ifeq ($(BR2_PACKAGE_NCURSES_TARGET_PROGS),y)
> -# Ncurses package overlaps:
> -#     /usr/bin/clear
> -#     /usr/bin/reset -> /usr/bin/tset (symlink)
> -#
> -define BUSYBOX_DISABLE_NCURSES_PROGS
> -       $(call KCONFIG_DISABLE_OPT,CONFIG_CLEAR,$(BUSYBOX_BUILD_CONFIG))
> -       $(call KCONFIG_DISABLE_OPT,CONFIG_RESET,$(BUSYBOX_BUILD_CONFIG))
> -endef
> -endif
> -
>  define BUSYBOX_INSTALL_UDHCPC_SCRIPT
>         if grep -q CONFIG_UDHCPC=y $(@D)/.config; then \
>                 $(INSTALL) -m 0755 -D package/busybox/udhcpc.script \
> @@ -240,7 +229,6 @@ define BUSYBOX_KCONFIG_FIXUP_CMDS
>         $(BUSYBOX_SET_WATCHDOG)
>         $(BUSYBOX_SET_SELINUX)
>         $(BUSYBOX_MUSL_TWEAKS)
> -       $(BUSYBOX_DISABLE_NCURSES_PROGS)
>  endef
>
>  define BUSYBOX_CONFIGURE_CMDS
> --
> 2.11.0
>



-- 
Matthew L Weber / Pr Software Engineer
Airborne Information Systems / Security Systems and Software / Secure Platforms
MS 131-100, C Ave NE, Cedar Rapids, IA, 52498, USA
www.rockwellcollins.com

Note: Any Export License Required Information and License Restricted
Third Party Intellectual Property (TPIP) content must be encrypted and
sent to matthew.weber at corp.rockwellcollins.com.


More information about the buildroot mailing list