From patchwork Thu Feb 11 20:39:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Knight X-Patchwork-Id: 582037 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 32431140BAB for ; Fri, 12 Feb 2016 07:39:46 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 45C448AEDF; Thu, 11 Feb 2016 20:39:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 22KgZVcxemqH; Thu, 11 Feb 2016 20:39:42 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 158618A53A; Thu, 11 Feb 2016 20:39:42 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 9EF1B1C10E7 for ; Thu, 11 Feb 2016 20:39:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 91B4387193 for ; Thu, 11 Feb 2016 20:39:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VgGnP9q28rus for ; Thu, 11 Feb 2016 20:39:39 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from secvs01.rockwellcollins.com (secvs01.rockwellcollins.com [205.175.225.240]) by whitealder.osuosl.org (Postfix) with ESMTPS id 3B08486E7A for ; Thu, 11 Feb 2016 20:39:39 +0000 (UTC) Received: from unknown (HELO crulimr01.rockwellcollins.com) ([131.198.26.129]) by secvs01.rockwellcollins.com with ESMTP; 11 Feb 2016 14:39:38 -0600 X-Received: from jdknight-PC.rccalab.inside (unknown [192.168.162.69]) by crulimr01.rockwellcollins.com (Postfix) with ESMTP id 27311600DE; Thu, 11 Feb 2016 14:39:38 -0600 (CST) From: James Knight To: buildroot@busybox.net Date: Thu, 11 Feb 2016 15:39:33 -0500 Message-Id: <1455223174-5204-1-git-send-email-james.knight@rockwellcollins.com> X-Mailer: git-send-email 2.6.4.windows.1 Cc: Zheng Yi , James Knight Subject: [Buildroot] [PATCH 1/2] e2fsprogs: remove findfs option 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" The e2fsprogs package's findfs option provides no capabilities. When the option is selected, a symbolic link is generated from findfs to e2label; however, e2label will not handle findfs since the respective code is explicitly disabled when `--disable-libblkid` is passed in. At this time, the e2fsprogs package only supports findfs capabilities when building its "private blkid library". Note that the `--disable-libblkid` configuration argument must remain to prevent conflicts with util-linux's libblkid and an e2fsprogs- generated variant (see e1ffc2f791b336339909c90559b7db40b455f172). Since e2fsprogs cannot provide findfs capabilities, the option is being removed in this change. A following change will be introduced to include util-linux's findfs utility. Signed-off-by: James Knight Cc: Zheng Yi --- package/e2fsprogs/Config.in | 5 ----- package/e2fsprogs/e2fsprogs.mk | 9 --------- 2 files changed, 14 deletions(-) diff --git a/package/e2fsprogs/Config.in b/package/e2fsprogs/Config.in index ad33983..ac3eae7 100644 --- a/package/e2fsprogs/Config.in +++ b/package/e2fsprogs/Config.in @@ -59,11 +59,6 @@ config BR2_PACKAGE_E2FSPROGS_FILEFRAG bool "filefrag" default y -config BR2_PACKAGE_E2FSPROGS_FINDFS - bool "findfs" - default y - select BR2_PACKAGE_E2FSPROGS_E2LABEL - config BR2_PACKAGE_E2FSPROGS_FSCK bool "fsck" default y diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index 4b81b44..3de4cd4 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -74,7 +74,6 @@ E2FSPROGS_TXTTARGETS_ = \ usr/sbin/mkfs.ext4dev \ usr/sbin/fsck.ext[234] \ usr/sbin/fsck.ext4dev \ - usr/sbin/findfs \ usr/sbin/tune2fs define E2FSPROGS_TARGET_REMOVE_UNNEEDED @@ -137,14 +136,6 @@ ifeq ($(BR2_PACKAGE_E2FSPROGS_TUNE2FS),y) E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_TUNE2FS_SYMLINK endif -define E2FSPROGS_TARGET_FINDFS_SYMLINK - ln -sf e2label $(TARGET_DIR)/usr/sbin/findfs -endef - -ifeq ($(BR2_PACKAGE_E2FSPROGS_FINDFS),y) -E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_FINDFS_SYMLINK -endif - # systemd really wants to have fsck in /sbin define E2FSPROGS_TARGET_FSCK_SYMLINK ln -sf ../usr/sbin/fsck $(TARGET_DIR)/sbin/fsck