From mboxrd@z Thu Jan 1 00:00:00 1970 From: Baruch Siach Date: Thu, 20 Apr 2017 07:00:19 +0300 Subject: [Buildroot] [PATCH 1/1] busybox: ncurses progs equiv as default In-Reply-To: <1492654408-25342-1-git-send-email-matthew.weber@rockwellcollins.com> References: <1492654408-25342-1-git-send-email-matthew.weber@rockwellcollins.com> Message-ID: <20170420040019.bjfwlwaknjvrj33c@tarshish> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net Hi Matt, On Wed, Apr 19, 2017 at 09:13:28PM -0500, Matt Weber wrote: > By default, enable the busybox equivalents of the ncurses > clear and reset if ncurses progs are not enabled. Our default busybox.config enables these applets. If the user chooses to disable them in a custom config, why should we force them back on? baruch > Signed-off-by: Matthew Weber > --- > package/busybox/busybox.mk | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk > index 9d9fcc2..56ec939 100644 > --- a/package/busybox/busybox.mk > +++ b/package/busybox/busybox.mk > @@ -153,10 +153,15 @@ ifeq ($(BR2_PACKAGE_NCURSES_TARGET_PROGS),y) > # /usr/bin/clear > # /usr/bin/reset -> /usr/bin/tset (symlink) > # > -define BUSYBOX_DISABLE_NCURSES_PROGS > +define BUSYBOX_NCURSES_PROGS > $(call KCONFIG_DISABLE_OPT,CONFIG_CLEAR,$(BUSYBOX_BUILD_CONFIG)) > $(call KCONFIG_DISABLE_OPT,CONFIG_RESET,$(BUSYBOX_BUILD_CONFIG)) > endef > +else > +define BUSYBOX_NCURSES_PROGS > + $(call KCONFIG_ENABLE_OPT,CONFIG_CLEAR,$(BUSYBOX_BUILD_CONFIG)) > + $(call KCONFIG_ENABLE_OPT,CONFIG_RESET,$(BUSYBOX_BUILD_CONFIG)) > +endef > endif > > define BUSYBOX_INSTALL_UDHCPC_SCRIPT > @@ -240,7 +245,7 @@ define BUSYBOX_KCONFIG_FIXUP_CMDS > $(BUSYBOX_SET_WATCHDOG) > $(BUSYBOX_SET_SELINUX) > $(BUSYBOX_MUSL_TWEAKS) > - $(BUSYBOX_DISABLE_NCURSES_PROGS) > + $(BUSYBOX_NCURSES_PROGS) > endef > > define BUSYBOX_CONFIGURE_CMDS -- http://baruch.siach.name/blog/ ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -