Commit 76d1c729 authored by Maxime Hadjinlian's avatar Maxime Hadjinlian Committed by Thomas Petazzoni
Browse files

package: Remove shell completion at finalize stage 



Instead of doing a removal of the completion file package per package,
do it all at the finalize stage so it's done once and for all.

Note: This fixes an issue with systemd where passing a --bashcompletiondir
or --zshcompletiondir would be evaluated to '.' by the autotools macro.
This would create a 'target./' directory.

Signed-off-by: default avatarMaxime Hadjinlian <maxime.hadjinlian@gmail.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 470cd0dc

Makefile

+6 −0
Original line number Diff line number Diff line
@@ -555,6 +555,12 @@ target-finalize: $(PACKAGES) 
	find $(TARGET_DIR)/usr/lib \( -name '*.a' -o -name '*.la' \) -print0 | xargs -0 rm -f

ifneq ($(BR2_PACKAGE_GDB),y)

	rm -rf $(TARGET_DIR)/usr/share/gdb

endif

ifneq ($(BR2_PACKAGE_BASH),y)

	rm -rf $(TARGET_DIR)/usr/share/bash-completion

endif

ifneq ($(BR2_PACKAGE_ZSH),y)

	rm -rf $(TARGET_DIR)/usr/share/zsh

endif

	rm -rf $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/man

	rm -rf $(TARGET_DIR)/usr/info $(TARGET_DIR)/usr/share/info

package/kmod/kmod.mk

+0 −4
Original line number Diff line number Diff line
@@ -59,10 +59,6 @@ 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

package/systemd/systemd.mk

+0 −8
Original line number Diff line number Diff line
@@ -123,14 +123,6 @@ 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

package/util-linux/util-linux.mk

+0 −6
Original line number Diff line number Diff line
@@ -26,12 +26,6 @@ UTIL_LINUX_CONF_OPTS += \ 
	--disable-makeinstall-chown \

	--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