mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 22:11:59 -09:00
Code Issues Packages Projects Releases Wiki Activity

package: install bash-completion files only with bash

Browse Source 
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:
Maxim Mikityanskiy
2015-01-19 18:14:02 +02:00
committed by Thomas Petazzoni
parent afac57162f
commit 10e6284b70
3 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package/kmod/kmod.mk
View File

@@ -64,6 +64,10 @@ else
KMOD_CONF_OPTS += --disable-tools KMOD_CONF_OPTS += --disable-tools
endif endif
ifeq ($(BR2_PACKAGE_BASH),)
KMOD_CONF_OPTS += --with-bashcompletiondir=
endif
# We only install depmod, since that's the only tool used for the # We only install depmod, since that's the only tool used for the
# host. # host.
define HOST_KMOD_INSTALL_TOOLS define HOST_KMOD_INSTALL_TOOLS

8
package/systemd/systemd.mk
View File

@@ -133,6 +133,14 @@ else
SYSTEMD_CONF_OPTS += --disable-smack SYSTEMD_CONF_OPTS += --disable-smack
endif 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 # mq_getattr needs -lrt
SYSTEMD_MAKE_OPTS += LIBS=-lrt SYSTEMD_MAKE_OPTS += LIBS=-lrt
SYSTEMD_MAKE_OPTS += LDFLAGS+=-ldl SYSTEMD_MAKE_OPTS += LDFLAGS+=-ldl

7
package/util-linux/util-linux.mk
View File

@@ -21,9 +21,14 @@ UTIL_LINUX_CONF_ENV = scanf_cv_type_modifier=no
UTIL_LINUX_CONF_OPTS += \ UTIL_LINUX_CONF_OPTS += \
--disable-rpath \ --disable-rpath \
--disable-makeinstall-chown \ --disable-makeinstall-chown \
--disable-bash-completion \
--without-python --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 # We don't want the host-busybox dependency to be added automatically
HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf