From patchwork Wed Jul 8 21:51:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Barnett X-Patchwork-Id: 493174 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 B624B1402C3 for ; Thu, 9 Jul 2015 07:51:10 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 884C0A426A; Wed, 8 Jul 2015 21:51:09 +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 2kVIzPKzbBmu; Wed, 8 Jul 2015 21:51:05 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id B1729A420D; Wed, 8 Jul 2015 21:51:05 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 679051C224F for ; Wed, 8 Jul 2015 21:51:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 635EEA420A for ; Wed, 8 Jul 2015 21:51:04 +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 EMUW6TUAyKgN for ; Wed, 8 Jul 2015 21:51:03 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from da1vs02.rockwellcollins.com (da1vs02.rockwellcollins.com [205.175.227.29]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 8914FA4205 for ; Wed, 8 Jul 2015 21:51:03 +0000 (UTC) Received: from ofwda1n02.rockwellcollins.com (HELO crulimr02.rockwellcollins.com) ([205.175.227.14]) by da1vs02.rockwellcollins.com with ESMTP; 08 Jul 2015 16:51:02 -0500 X-Received: from largo.rockwellcollins.com (unknown [192.168.140.76]) by crulimr02.rockwellcollins.com (Postfix) with ESMTP id 4ABCA6051C; Wed, 8 Jul 2015 16:51:02 -0500 (CDT) From: Ryan Barnett To: buildroot@buildroot.org Date: Wed, 8 Jul 2015 16:51:00 -0500 Message-Id: <1436392260-55786-1-git-send-email-ryan.barnett@rockwellcollins.com> X-Mailer: git-send-email 1.9.1 Cc: Ryan Barnett Subject: [Buildroot] [PATCH v2 1/1] e2fsprogs: remove busybox tune2fs when installing full version 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" Currently, busybox installs a version of tune2fs in /sbin/ while e2fsprogs installs at /usr/sbin/. This causes issues if a user is expecting the to use the full version from a prompt via 'tune2fs' since busybox's tune2fs will be found first from the default path search. Fix this by removing the busybox version of tune2fs when a user has selected the option to install tune2fs from e2fsprogs. Signed-off-by: Ryan Barnett Reviewed-by: Baruch Siach --- Changes v1 -> v2: - add condition depenencies on busybox (suggested by Baruch) --- package/e2fsprogs/e2fsprogs.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index e0c4ee2..e6a5027 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -36,7 +36,8 @@ ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) E2FSPROGS_CONF_ENV += LIBS=-lintl endif -E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux +E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux \ + $(if $(BR2_PACKAGE_BUSYBOX),busybox) E2FSPROGS_MAKE_OPTS = \ LDCONFIG=true @@ -102,7 +103,11 @@ ifeq ($(BR2_PACKAGE_E2FSPROGS_E2FSCK),y) E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_E2FSCK_SYMLINKS endif +# Remove busybox tune2fs and e2label since that will take precedence full version define E2FSPROGS_TARGET_TUNE2FS_SYMLINK + $(if $(BR2_PACKAGE_BUSYBOX), \ + rm -f $(TARGET_DIR)/sbin/tune2fs; \ + rm -f $(TARGET_DIR)/sbin/e2label;) ln -sf e2label $(TARGET_DIR)/usr/sbin/tune2fs endef