From patchwork Sat Jun 11 16:15:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Bark X-Patchwork-Id: 634084 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]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rRkgH1GMFz9sDC for ; Sun, 12 Jun 2016 02:16:11 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=barkynet-com.20150623.gappssmtp.com header.i=@barkynet-com.20150623.gappssmtp.com header.b=gkUlnRuR; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id AB9ECC089A; Sat, 11 Jun 2016 16:16: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 X-cUGl_eIZPj; Sat, 11 Jun 2016 16:16:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 84AB9C0885; Sat, 11 Jun 2016 16:16:07 +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 618DE1C1178 for ; Sat, 11 Jun 2016 16:16:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5DC0DC087C for ; Sat, 11 Jun 2016 16:16:06 +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 02lbpTrjYXe8 for ; Sat, 11 Jun 2016 16:16:05 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 8BBD4C0882 for ; Sat, 11 Jun 2016 16:16:05 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id m124so5144034wme.3 for ; Sat, 11 Jun 2016 09:16:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=barkynet-com.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id; bh=IzFm0ZfV3P6K5ZrGGiSfU3F0kXac1ZVJcst7QnANBGY=; b=gkUlnRuRij18IM6zvYeCMdOyGfPIe5nPxKW07/4Uux2MB84jFtipVXBEBJHrzrrLck XxqdUMbciAEkKdwlF2DRUhW8UF3GJNOajwqlUKTQm+UH/DEbn+ixO1QhG7WjkeMAaHYt 9MDfGSrr2Zjm248+ArT+VrnrBQU1uHHY5FRExdxTafcqZwZaX0CG9UMdsEdZrFro9Oop MBVvqsu+QOXn5w27V1bWRZnj+K/U7I3y7tsSmsf3otdEPI22w0pDs0iSifakut0a1nTI mrLwnLfWm4Phqyjr/RdgeLOmm8hIWKoR9NvWlmjK9Eoi+u6ydIro6O9hByl2JT7haEnb E/8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=IzFm0ZfV3P6K5ZrGGiSfU3F0kXac1ZVJcst7QnANBGY=; b=dM8M3StMrANQt7Xj/hY0OoEzZCTs25fzq7FQsDFaKSi30cIyc36M9ZeZAFSXLteHJN aMpjFu5oz8q8kZ68s+OfFGmFoZaJwoF5JTVDsJLv169ZDHJt8FuMpLr376hNch25GJ4H FDvi2fva27gs43GyGWQ+5SblpkSsJb5xfeCHRhhXAFLtJLTf+GYKR3k8uJXj23kA32HK ZSNAMiPze+x3FKkPot4w/mu3HGGy6oUuybEsYR/es4fkEZUDtJS9FtDUrSjyIGFsCSA7 bSVrAbHq+t3mGU57pFKffDB2wyAqS9FZC77V5h4jaZliImarjxicTa03ElHutLo8PxCD RfbQ== X-Gm-Message-State: ALyK8tJrsKAP/qOIuj2qmGXRbERSyqdRtWYjyo42Uz7NamCZpkQUClHm8iGYP8AeMJf6Zw== X-Received: by 10.28.167.69 with SMTP id q66mr1761787wme.100.1465661763849; Sat, 11 Jun 2016 09:16:03 -0700 (PDT) Received: from mail.home.barkynet.com (barkynet.plus.com. [80.229.219.126]) by smtp.gmail.com with ESMTPSA id m7sm4796442wma.10.2016.06.11.09.16.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 11 Jun 2016 09:16:03 -0700 (PDT) Received: from krusty.home.barkynet.com (krusty.home.barkynet.com [192.168.1.10]) by mail.home.barkynet.com (Postfix) with ESMTP id 1B4341E90E; Sat, 11 Jun 2016 17:16:01 +0100 (BST) Received: by krusty.home.barkynet.com (Postfix, from userid 10000) id 27BE46C1255; Sat, 11 Jun 2016 17:16:01 +0100 (BST) From: Martin Bark To: buildroot@buildroot.org Date: Sat, 11 Jun 2016 17:15:56 +0100 Message-Id: <1465661756-11389-1-git-send-email-martin@barkynet.com> X-Mailer: git-send-email 2.7.4 Subject: [Buildroot] [PATCH 1/1] package/e2fsprogs: fix fsck when using systemd 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" Commit a93fc34 modified e2fsprogs to symlink /usr/sbin/fsck to /sbin/fsck to keep systemd happy. However, later on commit c5bd8af6 has forced /usr/sbin to be a symlink to /sbin when using systemd. This means fsck gets destroyed as a symlink to itself when using systemd or when setting BR2_ROOTFS_MERGED_USR. Since commit c5bd8af6 obsoletes commit a93fc34 revert the changes from commit a93fc34 to solve the issue. Signed-off-by: Martin Bark Acked-by: "Yann E. MORIN" --- package/e2fsprogs/e2fsprogs.mk | 9 --------- 1 file changed, 9 deletions(-) diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index 5ba9278..7aa0285 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -155,14 +155,5 @@ ifeq ($(BR2_PACKAGE_E2FSPROGS_TUNE2FS),y) E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_TUNE2FS_SYMLINK endif -# systemd really wants to have fsck in /sbin -define E2FSPROGS_TARGET_FSCK_SYMLINK - ln -sf ../usr/sbin/fsck $(TARGET_DIR)/sbin/fsck -endef - -ifeq ($(BR2_PACKAGE_E2FSPROGS_FSCK),y) -E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_FSCK_SYMLINK -endif - $(eval $(autotools-package)) $(eval $(host-autotools-package))