package: install bash-completion files only with bash
package/systemd, package/kmod, package/util-linux: don't install bash-completion files if bash is not selected to be installed. Otherwise, install bash-completion files. package/systemd: don't install zsh-completion files is zsh is not selected to be installed. Otherwise, install zsh-completion files. package/util-linux: don't install empty /usr/share/bash-completion/completions directory if bash is not going to be installed, and install bash-completion files if bash is selected to be installed. Signed-off-by: Maxim Mikityanskiy <maxtram95@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
parent
afac57162f
commit
10e6284b70
@ -64,6 +64,10 @@ else
|
||||
KMOD_CONF_OPTS += --disable-tools
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_BASH),)
|
||||
KMOD_CONF_OPTS += --with-bashcompletiondir=
|
||||
endif
|
||||
|
||||
# We only install depmod, since that's the only tool used for the
|
||||
# host.
|
||||
define HOST_KMOD_INSTALL_TOOLS
|
||||
|
@ -133,6 +133,14 @@ else
|
||||
SYSTEMD_CONF_OPTS += --disable-smack
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_BASH),)
|
||||
SYSTEMD_CONF_OPTS += --with-bashcompletiondir=
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ZSH),)
|
||||
SYSTEMD_CONF_OPTS += --with-zshcompletiondir=
|
||||
endif
|
||||
|
||||
# mq_getattr needs -lrt
|
||||
SYSTEMD_MAKE_OPTS += LIBS=-lrt
|
||||
SYSTEMD_MAKE_OPTS += LDFLAGS+=-ldl
|
||||
|
@ -21,9 +21,14 @@ UTIL_LINUX_CONF_ENV = scanf_cv_type_modifier=no
|
||||
UTIL_LINUX_CONF_OPTS += \
|
||||
--disable-rpath \
|
||||
--disable-makeinstall-chown \
|
||||
--disable-bash-completion \
|
||||
--without-python
|
||||
|
||||
ifeq ($(BR2_PACKAGE_BASH),)
|
||||
UTIL_LINUX_CONF_OPTS += \
|
||||
--disable-bash-completion \
|
||||
--with-bashcompletiondir=
|
||||
endif
|
||||
|
||||
# We don't want the host-busybox dependency to be added automatically
|
||||
HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user