diff options
| -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) |
