From patchwork Fri Nov 18 15:24:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Hadjinlian X-Patchwork-Id: 696634 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tL1yM4J3Cz9t10 for ; Sat, 19 Nov 2016 02:24:59 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="j0tGxh+x"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 2A2CC2FBCF; Fri, 18 Nov 2016 15:24:57 +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 cTW++uv9P0pD; Fri, 18 Nov 2016 15:24:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 584152FA64; Fri, 18 Nov 2016 15:24:43 +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 4C2651C0314 for ; Fri, 18 Nov 2016 15:24:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4B41F87EDC for ; Fri, 18 Nov 2016 15:24:39 +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 218tcmVnIuXR for ; Fri, 18 Nov 2016 15:24:38 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by whitealder.osuosl.org (Postfix) with ESMTPS id 80EE387318 for ; Fri, 18 Nov 2016 15:24:38 +0000 (UTC) Received: by mail-wm0-f67.google.com with SMTP id u144so7258397wmu.0 for ; Fri, 18 Nov 2016 07:24:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=KnBkv1nTO42pxCekrEfj2cUbtWbf57CmQfAwZdOSTiQ=; b=j0tGxh+x+BE0TB62HGFetYeR2TLUaFTu9LrqRv/lw9Pgq9TgIm9UxOzBud9vbWdubT 0vgsw9CkG75xGZ1Me5GA0Q2FJe5jEPFGPXxsQrJ1/E6iDO2671mQeVr+rJp9wHL9/lyV gSVd2Pm/Efz2OnpcWxUdLWG1mtkcCwviqLDkxs3N41ODk7smI+FC/jKNJrkEepxUSaxb YWubtLtWjs4HtQz60rIF3FwsKDhpI/FyZI2/xkeco09oic+VOYK1MfVaaepLQNjFOvF8 JoFYHwYqj2zlg3QOtNg1bQSlI5Ewxsn5Hs1SNdFSKS56YnBZuEueuztQKE3SekfcJkDR ooEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=KnBkv1nTO42pxCekrEfj2cUbtWbf57CmQfAwZdOSTiQ=; b=ZVeo62qMm5a3RsHD6UGF11KWwwg/GlHIHOt7kDr8cywxhxo5C0iXBZwDr93+ZssLJD 5YJzh3MpMyz8FlIXddui7fexC41QGTODFw6xrUjpgy+pHTvJ+uO4PvvShvbNReEogw3k wZTv2hGtv7ZBY0tZHuDPKXa3iwPwVveSIMtrcycIu+TcLum2kW/UV93dlRyAWfHZqaqG 7F29+v9CosT19Sv1wCMdpa40RMIBuMc6M0Yk9JPT9QuSm5FM72NrfcPziphK8GvGQmRZ rWDWkMPApqkyQuhM2MZbQIdWVnpEgnPnjsNv3NDCDEA579rpGKf1dchTnx5IByXxfQWM qYog== X-Gm-Message-State: AKaTC032NUW1afdvh77zcohL74YF0v8JKeH9ReKu3LowkrccKmBhMPuNBUmelBxxa+S5rg== X-Received: by 10.28.182.4 with SMTP id g4mr765361wmf.15.1479482676767; Fri, 18 Nov 2016 07:24:36 -0800 (PST) Received: from localhost.localdomain ([88.191.165.76]) by smtp.gmail.com with ESMTPSA id l2sm9397228wji.7.2016.11.18.07.24.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Nov 2016 07:24:36 -0800 (PST) From: Maxime Hadjinlian To: buildroot@buildroot.org Date: Fri, 18 Nov 2016 16:24:27 +0100 Message-Id: <20161118152427.16515-2-maxime.hadjinlian@gmail.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161118152427.16515-1-maxime.hadjinlian@gmail.com> References: <20161118152427.16515-1-maxime.hadjinlian@gmail.com> Subject: [Buildroot] [PATCH 2/2] e2fsprogs: keep util-linux's fsck if chosen 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" Since e2fsprogs depends on util-linux, it's build after it. It means that if you want the fsck wrapper from util-linux (which is better maintained and you are sure that it's compatible with systemd) and you want e2fsck, it won't work. Because of the merge of /usr/bin and /bin, we end up deleting the fsck from util-linux. This makes an attempt at fixing the issues. Signed-off-by: Maxime Hadjinlian --- I am cleary not satisfied by the way I handled that, I am not even sure it works in all cases. I can't spend much more time on this right now, so I need advice/help from the community to fix that in a proper/generic manner. --- package/e2fsprogs/e2fsprogs.mk | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index b01336a..97efc9f 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -75,7 +75,11 @@ E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_E2LABEL) += usr/sbin/e2label E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_E2UNDO) += usr/sbin/e2undo E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_E4DEFRAG) += usr/sbin/e4defrag E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_FILEFRAG) += usr/sbin/filefrag +# don't delete util-linux's fsck if it was selected by the user, especially +# since e2fsprogs depend's on util-linux. +ifeq ($(BR2_PACKAGE_UTIL_LINUX_FSCK),) E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_FSCK) += usr/sbin/fsck +endif E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_LOGSAVE) += usr/sbin/logsave E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_LSATTR) += usr/bin/lsattr E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_MKE2FS) += usr/sbin/mke2fs @@ -135,11 +139,17 @@ E2FSPROGS_DEPENDENCIES += busybox define E2FSPROGS_REMOVE_BUSYBOX_APPLETS $(RM) -f $(TARGET_DIR)/bin/chattr $(RM) -f $(TARGET_DIR)/bin/lsattr - $(RM) -f $(TARGET_DIR)/sbin/fsck $(RM) -f $(TARGET_DIR)/sbin/tune2fs $(RM) -f $(TARGET_DIR)/sbin/e2label endef E2FSPROGS_PRE_INSTALL_TARGET_HOOKS += E2FSPROGS_REMOVE_BUSYBOX_APPLETS + +# don't delete util-linux's fsck if it was selected by the user, especially +# since e2fsprogs depend's on util-linux. +# It's especially true with the merged /usr when you want to use systemd. +ifeq ($(BR2_PACKAGE_UTIL_LINUX_FSCK),) + E2FSPROGS_REMOVE_BUSYBOX_APPLETS += $(RM) -f $(TARGET_DIR)/sbin/fsck +endif endif define E2FSPROGS_TARGET_TUNE2FS_SYMLINK