From patchwork Sun Jan 14 14:17:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 860449 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="qG0B1xer"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zKJVN6tXRz9sR8 for ; Mon, 15 Jan 2018 01:18:04 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6601988617; Sun, 14 Jan 2018 14:18:03 +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 2MnDk8h-7WIh; Sun, 14 Jan 2018 14:18:00 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 468948868B; Sun, 14 Jan 2018 14:17:59 +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 432221C14DD for ; Sun, 14 Jan 2018 14:17:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3EC6987A4B for ; Sun, 14 Jan 2018 14:17:53 +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 V7TAmD59OfLK for ; Sun, 14 Jan 2018 14:17:52 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 8E39787982 for ; Sun, 14 Jan 2018 14:17:52 +0000 (UTC) Received: by mail-wr0-f195.google.com with SMTP id z48so9235533wrz.6 for ; Sun, 14 Jan 2018 06:17:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=iKR2ZtjDnHA97CbLWvkp2pW9sCknbxw4RPjih08B1bE=; b=qG0B1xerNZiiUnIAJI7zeyJvG/Dskc5UvZnfYQlHeWDXpy4R20lyCkj+H6XoD+EPJB KyuqK1l3tbdfVQ+FeDKzxitMC8RzpehJpVMy1e2yh3uNDTFpWmnRSp4OAPL5bhYc6+3e vy4Fq68E7Us4ecsl0fGTU6VVgTeiV4uPGVeOC+V01j/i6HtuqqjxnR4J9yqRSG02gclG 6x8ictDkFY1QjciggcvGnxmncqamQMb2Vwikhlxv+KOpN+TFZmLS9f63F7nvF9uiqbSu w4Jxf/aT3yB93LR8pDwq/AyHtBwAOxMHf3s2HSTuctJVEojvShTJHp8/97dVSjFu7Tnw uHlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=iKR2ZtjDnHA97CbLWvkp2pW9sCknbxw4RPjih08B1bE=; b=eWDOKWDIR/tvFSkLA7KOVqzKNkUrUs1rkthOuaLV30HWtjIBEh4SCOFyfNhJwZbBAM 7BOu1Im0wSiWeTvXJACA1VU6kJru+s3EvB3u6ETlv30vmfLAK6VL5sYc3aJqfFiFZP2K BieY3coNMn4svReYNyPAO8AUvf7HZ79+/WBApc8fhR57Gu+s7L/AAXDgmz7GDt1Z8GpA y6RdYmS16CiqtFmctb2VkUFcY92rkWFOEUgW7XdR9gcHYKK+mGtM+HFoa6WsLvyxCPXX aNqkggrz4FB8gPXA31Gqi2qoaxfzeffrQ4+2DydaT3gf8agaHJLjWwHwi1EeGOuWf0yf IhAg== X-Gm-Message-State: AKwxyteNI1lh3qSJc83GESOXdqF7gFXYNP68eBrUcjA1M3wmN2bG9Cjq 3aJKp1kQjSgGGO6iYnBy9K3ESg== X-Google-Smtp-Source: ACJfBotz1aymP6yKD4a8LlJQDnpcUbolzWhUZKRxu4My4gxRRq9Me2VD8o3aI6Rc14i9b57sdGklGw== X-Received: by 10.223.152.103 with SMTP id v94mr19596613wrb.233.1515939470902; Sun, 14 Jan 2018 06:17:50 -0800 (PST) Received: from localhost.localdomain (2a01cb088610730095116638271b1e6e.ipv6.abo.wanadoo.fr. [2a01:cb08:8610:7300:9511:6638:271b:1e6e]) by smtp.gmail.com with ESMTPSA id d63sm3260179wmd.9.2018.01.14.06.17.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 14 Jan 2018 06:17:49 -0800 (PST) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sun, 14 Jan 2018 15:17:08 +0100 Message-Id: <561feacf4e1aec169b41164f874a2bfa22a5bd38.1515939400.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: Subject: [Buildroot] [PATCH 12/17] fs: new intermediate rootfs-common to gather common dependencies X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Petazzoni , "Yann E. MORIN" MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Before we can create an intermediate tarball for all filesystems, we nedd to move the common dependencies needed to generate that intermediate tarball, rather than levae those dependencies to each filesystem. So, we introduce rootfs-common, which gathers all those common dependencies. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle --- fs/common.mk | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/fs/common.mk b/fs/common.mk index 363798bb20..3505a32e5d 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -34,6 +34,24 @@ ROOTFS_DEVICE_TABLES = $(call qstrip,$(BR2_ROOTFS_DEVICE_TABLE) \ USERS_TABLE = $(FS_DIR)/users_table.txt ROOTFS_USERS_TABLES = $(call qstrip,$(BR2_ROOTFS_USERS_TABLES)) +ROOTFS_COMMON_TAR = $(FS_DIR)/rootfs.common.tar + +.PHONY: rootfs-common +rootfs-common: $(ROOTFS_COMMON_TAR) + +ROOTFS_COMMON_DEPENDENCIES = \ + host-fakeroot host-makedevs \ + $(if $(PACKAGES_USERS)$(ROOTFS_USERS_TABLES),host-mkpasswd) + +.PHONY: $(ROOTFS_COMMON_TAR) +# When doing the common tarball, we're not really doing a rootfs. +$(ROOTFS_COMMON_TAR): ROOTFS= +$(ROOTFS_COMMON_TAR): $(ROOTFS_COMMON_DEPENDENCIES) target-finalize + @: + +rootfs-common-show-depends: + @echo $(ROOTFS_COMMON_DEPENDENCIES) + # Since this function will be called from within an $(eval ...) # all variable references except the arguments must be $$-quoted. define inner-rootfs @@ -42,9 +60,7 @@ ROOTFS_$(2)_NAME = $(1) ROOTFS_$(2)_DIR = $$(FS_DIR)/$(1) ROOTFS_$(2)_TARGET_DIR = $$(BASE_TARGET_DIR) -# extra deps -ROOTFS_$(2)_DEPENDENCIES += host-fakeroot host-makedevs \ - $$(if $$(PACKAGES_USERS)$$(ROOTFS_USERS_TABLES),host-mkpasswd) +ROOTFS_$(2)_DEPENDENCIES += rootfs-common ifeq ($$(BR2_TARGET_ROOTFS_$(2)_GZIP),y) ROOTFS_$(2)_COMPRESS_EXT = .gz @@ -77,7 +93,6 @@ endif $$(BINARIES_DIR)/rootfs.$(1): ROOTFS=$(2) $$(BINARIES_DIR)/rootfs.$(1): FAKEROOT_SCRIPT=$$(ROOTFS_$(2)_DIR)/fakeroot -$$(BINARIES_DIR)/rootfs.$(1): target-finalize $$(BINARIES_DIR)/rootfs.$(1): $$(ROOTFS_$(2)_DEPENDENCIES) @$$(call MESSAGE,"Generating root filesystem image rootfs.$(1)") rm -rf $(FS_DIR) $$(ROOTFS_$(2)_DIR)