From patchwork Sun Jul 12 15:17:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Hadjinlian X-Patchwork-Id: 494130 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 3E0311402E2 for ; Mon, 13 Jul 2015 01:18:07 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=eD6zBZbz; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id DEAB2A2ECF; Sun, 12 Jul 2015 15:18:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id v55jmUU6Lu2l; Sun, 12 Jul 2015 15:18:05 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 15BD6A2EC5; Sun, 12 Jul 2015 15:18:05 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id A5C1B1C2286 for ; Sun, 12 Jul 2015 15:18:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id A119F332A9 for ; Sun, 12 Jul 2015 15:18:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JSgXaC9PfEOa for ; Sun, 12 Jul 2015 15:18:03 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f175.google.com (mail-wi0-f175.google.com [209.85.212.175]) by silver.osuosl.org (Postfix) with ESMTPS id B7F2F332AA for ; Sun, 12 Jul 2015 15:18:02 +0000 (UTC) Received: by wiga1 with SMTP id a1so49114123wig.0 for ; Sun, 12 Jul 2015 08:18:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=vUNrTNm8YDCjZKayQ/mhtp1fgdoc8YtT9jfnby3XWBc=; b=eD6zBZbz6aWL1PXXPqVXLGhHD9mKa6PitgdAwC/U9pj3s/dm58zmQelZ1uM31SRWWz Mz3VcVFEP9P6A7YD8utEf45Pbdw5XkkDq4uggGGMeoovuZ0a+wLsj2WhxmGrBjgcZBx9 /3d/7rpik5B6/+wup2w6L3pUIpWdr4g+Arj2eMgHVrDthuf8QqvimOIl0bE7QLAUkQFg E8ujdQ4/Kpr3M9idBIpAjVIERBCVetHAVoA68IhWM2K1Ma8uPGoFTUm3NLd7gjV0U9Xi EiyJ62y2mea9GY5h5rNCON89vURMJXQFh5/RiInVcABr/gjUC9o/f9s0DXCI9R5KPaqg 9D3g== X-Received: by 10.194.178.201 with SMTP id da9mr57171719wjc.139.1436714281310; Sun, 12 Jul 2015 08:18:01 -0700 (PDT) Received: from cerise.home (AToulouse-657-1-1031-128.w92-134.abo.wanadoo.fr. [92.134.9.128]) by smtp.gmail.com with ESMTPSA id d5sm9241492wiz.24.2015.07.12.08.18.00 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 12 Jul 2015 08:18:00 -0700 (PDT) From: Maxime Hadjinlian To: buildroot@buildroot.org Date: Sun, 12 Jul 2015 17:17:58 +0200 Message-Id: <1436714278-19902-1-git-send-email-maxime.hadjinlian@gmail.com> X-Mailer: git-send-email 2.1.4 Subject: [Buildroot] [PATCH] package: Remove shell completion at finalize stage X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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: Maxime Hadjinlian --- Makefile | 6 ++++++ package/kmod/kmod.mk | 4 ---- package/systemd/systemd.mk | 8 -------- package/util-linux/util-linux.mk | 6 ------ 4 files changed, 6 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index b1bcf78..b1017fb 100644 --- a/Makefile +++ b/Makefile @@ -556,6 +556,12 @@ target-finalize: $(PACKAGES) ifneq ($(BR2_PACKAGE_GDB),y) rm -rf $(TARGET_DIR)/usr/share/gdb endif +ifneq ($(BR2_PACKAGE_BASH),y) + rm -rf $(TARGET_DIR)/usr/share/zsh +endif +ifneq ($(BR2_PACKAGE_ZSH),y) + rm -rf $(TARGET_DIR)/usr/share/bash-completion +endif rm -rf $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/man rm -rf $(TARGET_DIR)/usr/info $(TARGET_DIR)/usr/share/info rm -rf $(TARGET_DIR)/usr/doc $(TARGET_DIR)/usr/share/doc diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk index 98d9998..ae09330 100644 --- a/package/kmod/kmod.mk +++ b/package/kmod/kmod.mk @@ -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 diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 7eb7abe..5c9effa 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -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 diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 3ca147a..a44a45e 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -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