diff options
| author | Matt Weber <matthew.weber@rockwellcollins.com> | 2017-04-13 22:20:47 -0500 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-04-14 10:56:08 +0200 |
| commit | 33c72344a8686a136c1da6a056ed6c0945bbf8b7 (patch) | |
| tree | 637e2e16e2c03b871a73da8569ca33a80d2ab981 | |
| parent | e9b95f0cd02bd7f2dafc26d658c137554249bf75 (diff) | |
| download | buildroot-33c72344a8686a136c1da6a056ed6c0945bbf8b7.tar.gz buildroot-33c72344a8686a136c1da6a056ed6c0945bbf8b7.zip | |
busybox: preserve ncurses progs/tools
The ncurses package installs a full version of clear and reset(tset)
tools. Preserve these by disabling the options in the busybox config
file. This removes the need for ncurses to depend on busybox for solely
ordering of target install.
This commit resolves the following python circular dependency with python.
busybox -> libselinux -> python3 -> ncurses -> busybox
Fixes:
http://autobuild.buildroot.net/results/db1/db1e6f3054092fc5576ccab8e04a3b9d74ca9a8c/
Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
[Thomas: minor tweaks.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | package/busybox/busybox.mk | 12 | ||||
| -rw-r--r-- | package/ncurses/ncurses.mk | 5 |
2 files changed, 12 insertions, 5 deletions
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index f9dacc70ad..9d9fcc24d1 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -148,6 +148,17 @@ 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 \ @@ -229,6 +240,7 @@ define BUSYBOX_KCONFIG_FIXUP_CMDS $(BUSYBOX_SET_WATCHDOG) $(BUSYBOX_SET_SELINUX) $(BUSYBOX_MUSL_TWEAKS) + $(BUSYBOX_DISABLE_NCURSES_PROGS) endef define BUSYBOX_CONFIGURE_CMDS diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index 68c77ac61f..2b99d3f538 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -29,11 +29,6 @@ NCURSES_CONF_OPTS = \ $(if $(BR2_PACKAGE_NCURSES_TARGET_PROGS),,--without-progs) \ --without-manpages -# Install after busybox for the full-blown versions -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -NCURSES_DEPENDENCIES += busybox -endif - ifeq ($(BR2_STATIC_LIBS),y) NCURSES_CONF_OPTS += --without-shared --with-normal else ifeq ($(BR2_SHARED_LIBS),y) |
