From patchwork Sat Mar 31 09:05:47 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: 893733 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@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; dmarc=none (p=none dis=none) header.from=free.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="s2KtQ/qy"; 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 40CszX4Cmqz9s1S for ; Sat, 31 Mar 2018 20:06:16 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 924658A0DD; Sat, 31 Mar 2018 09:06:13 +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 p7NaX8SI8qGs; Sat, 31 Mar 2018 09:06:12 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 3ECFD8A0D0; Sat, 31 Mar 2018 09:06:12 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 72F891C062E for ; Sat, 31 Mar 2018 09:06:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id EAA008AD33 for ; Sat, 31 Mar 2018 09:06:07 +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 e6QBrgee2W4l for ; Sat, 31 Mar 2018 09:06:05 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by hemlock.osuosl.org (Postfix) with ESMTPS id E85B68ABEE for ; Sat, 31 Mar 2018 09:06:04 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id z73so9627580wrb.0 for ; Sat, 31 Mar 2018 02:06:04 -0700 (PDT) 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=UxssPJ0JTNRMds/KwT1hJjo5bE12vWeFcKsTph8A4Cs=; b=s2KtQ/qynxIAxVjELr4gVI9395Hbn7tLI2uHgn2owGBokG6xgj1wf/NKBt+D7+4WC2 kOvun20iRwzThDTMvYDAZMKbsorxuYNElPd63/XkJsJs4KeF7DWHrGR5QRSjeYgc8fzs a+NujGg0GaOE3+4lVXwmF1XZqvIjarSBdu7gRr7gj3ZkuuMY6u+qIglpn8nJadbStHDQ MW1c2Fo7KBUAK73rDo/bpa44aveul7YEb1dWbvnCxW233G9wnxGhvwqHWh+W8mo/kIiP yvPCH4e8FHjkE6DBIOssxxTtoBigrR5Mr/hiZCo/oHCzyn3qDwzVG5ficIk9iZTMpScn UXHA== 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=UxssPJ0JTNRMds/KwT1hJjo5bE12vWeFcKsTph8A4Cs=; b=EdNo+V4Cb+AXdPK3eX45DtVkowYnbKwTaFsZvWwUasN2vRCRXI+GFSzYzUs/13/BvD 9sXjRnY1H+zguIyJYyH1xpTMfTAi2dSeG9hLuY3TqA0fXxMtUGAfqYrZHlG149jOjeFq NMOaYgOOCWenJVjGqAld0RF3HhxSv6WYJZnbp7DsYrdZURgpBjzOLRujs0CQCesXe+V7 F6Qggcefb8yHXBk9gmBZ4LBvxSr3z0vx9hQuym4VdSrXHgRKdyN079iCexpfizgMLto2 Ucji/dBQwKuDv+8AQpqbqe9l49O6buvcztYLUD+uIFJleAj5SyiqKrDU+H3TCijgLHd8 7mVg== X-Gm-Message-State: ALQs6tBKSSEncN/MpAoFi5A4lTpFbt9r2XX11hQgywihjVqO3CA7heIj VtNmCAfQlh7v4zWYDVmEYJpixw== X-Google-Smtp-Source: AIpwx49RrJLX1Y0cT4K58GB32U2F3+reSgPTncwOSTo0JZPJlpTjQ1uJQml0jNFppNDIdFT91a7b8g== X-Received: by 10.223.196.212 with SMTP id o20mr1441854wrf.144.1522487163326; Sat, 31 Mar 2018 02:06:03 -0700 (PDT) Received: from scaer.online.net (ns304657.ip-46-105-103.eu. [46.105.103.66]) by smtp.gmail.com with ESMTPSA id u110sm18111490wrc.72.2018.03.31.02.06.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 31 Mar 2018 02:06:02 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 31 Mar 2018 11:05:47 +0200 Message-Id: X-Mailer: git-send-email 2.14.1 In-Reply-To: References: Subject: [Buildroot] [PATCH 01/15 v4] fs: run filesystem hooks under fakeroot 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: "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Currently, the pre-gen hooks of the various filesystems are run before we enter the fakeroot. However, this precludes those hooks from doing actions that require root, like creating a pseudo-device or the likes. So, move those pre-gen hooks under fakeroot. This has currently no side-effect, as they are still called before everything else in the fakeroot script, even the system-wide chown call. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle --- fs/common.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/common.mk b/fs/common.mk index 6d579db810..274a3e9c7b 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -76,9 +76,10 @@ $$(BINARIES_DIR)/rootfs.$(1): target-finalize $$(ROOTFS_$(2)_DEPENDENCIES) @$$(call MESSAGE,"Generating root filesystem image rootfs.$(1)") rm -rf $(FS_DIR) mkdir -p $(FS_DIR) - $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),$$(call $$(hook))$$(sep)) echo '#!/bin/sh' > $$(FAKEROOT_SCRIPT) echo "set -e" >> $$(FAKEROOT_SCRIPT) + $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),\ + $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) echo "chown -h -R 0:0 $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT) ifneq ($$(ROOTFS_USERS_TABLES),) cat $$(ROOTFS_USERS_TABLES) >> $$(USERS_TABLE) From patchwork Sat Mar 31 09:05:49 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: 893734 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=free.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="EozKrjqA"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40Cszb3rbgz9s1r for ; Sat, 31 Mar 2018 20:06:19 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 00F538AD9E; Sat, 31 Mar 2018 09:06:18 +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 RDfFh8F17Fi5; Sat, 31 Mar 2018 09:06:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 060158AD4F; Sat, 31 Mar 2018 09:06:17 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 487721C062E for ; Sat, 31 Mar 2018 09:06:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 45DFE8AD44 for ; Sat, 31 Mar 2018 09:06:12 +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 xbZJkuNd4VWs for ; Sat, 31 Mar 2018 09:06:11 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by hemlock.osuosl.org (Postfix) with ESMTPS id E62E38ACFF for ; Sat, 31 Mar 2018 09:06:07 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id 80so9641753wrb.2 for ; Sat, 31 Mar 2018 02:06:07 -0700 (PDT) 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=jhlQdmevl6pDYqXK9XACR3Ry7ZRdwv124N5tpuR7kmM=; b=EozKrjqAOI7TMF36e4I80G7vTNbaFdkxXL1wFwsEMV72zbiLMSXtSJeW/McO2+5FEZ mVhyeXzKzeFM6Bfs9FfcziUtQVmfx50VfMUmcY6AbZXaMWlbzmgvSlTQES5j70/A7+tR MywVkJU1rreeF6W9t+ES1WBBYpVkHUDc1T50b3stmIzG4FSUbSysQqA+K03BczIvq/rz WA6wLgFy9BWpD8JqDtfZX6EiAylMBq2LnXqXdL8mHbyXmvwFRkyrmytAbY0+pd1Wun9B hZW45Vyub4qA4ROE6mRAvOlVt+Ux/MAoeb5HMKxZL+Hy4v9LoKKcot69owIdRUo1wOOF 2lYw== 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=jhlQdmevl6pDYqXK9XACR3Ry7ZRdwv124N5tpuR7kmM=; b=XR2NUKQAj94ef8eYIy9R2iu4YUnpE/D+UtnrJijefnbVypcL8JO0Q8bHdcrhVaf2L6 21VaWSBuy7LyQXV14dS+yrFMhPzj7tHGvyevPwkPLcQnkfeczjhjjFY8hFKLSZ+H/Xnt YupYZe6A1u4yixVLeStIa/qcYw6iYHfE/Y5NdMQA+qe815AjWdKXgBHAJyZPh/rxebaD h4NyYPD9ADArGqdcDZRYWpZqfLdWV7jz0+Eqpl9S6nUgHychyuUiSYB2CqpEcaF1k7/w Jq25bk5crXe6u/a36o8eMFxOQ73Vi3IC+BH458uX59uEkMbznklLGMIBPcL20CfJortY hXdg== X-Gm-Message-State: AElRT7HPPOe0sHt4JWsNJroFzCxNk/+k0PyNCCnF9o1GXsBbw7Qt8OVG T5kQA2fgNUqZiNMQBOjj9wrG6A== X-Google-Smtp-Source: AIpwx4/TI5OsqW8DuK1JDIezaLLSjkOaZinAtYqY3J72jb8At54kHqiTxz0mjPj2dz3ohJ2I2+39Aw== X-Received: by 10.223.177.213 with SMTP id r21mr1516916wra.89.1522487166221; Sat, 31 Mar 2018 02:06:06 -0700 (PDT) Received: from scaer.online.net (ns304657.ip-46-105-103.eu. [46.105.103.66]) by smtp.gmail.com with ESMTPSA id u110sm18111490wrc.72.2018.03.31.02.06.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 31 Mar 2018 02:06:05 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 31 Mar 2018 11:05:49 +0200 Message-Id: X-Mailer: git-send-email 2.14.1 In-Reply-To: References: Subject: [Buildroot] [PATCH 03/15 v4] fs/iso9660: rename internal variable 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: "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" We're soon to introduce a generic variable with that name, i.e. $(FS_NAME)_TARGET_DIR, so our internal, temporary variable would clash with it. Just rename it. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle --- fs/iso9660/iso9660.mk | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk index 207c6aa39f..b33cf4cd8a 100644 --- a/fs/iso9660/iso9660.mk +++ b/fs/iso9660/iso9660.mk @@ -35,47 +35,47 @@ ROOTFS_ISO9660_USE_INITRD = YES endif ifeq ($(ROOTFS_ISO9660_USE_INITRD),YES) -ROOTFS_ISO9660_TARGET_DIR = $(FS_DIR)/rootfs.iso9660.tmp +ROOTFS_ISO9660_TMP_TARGET_DIR = $(FS_DIR)/rootfs.iso9660.tmp define ROOTFS_ISO9660_CREATE_TEMPDIR - $(RM) -rf $(ROOTFS_ISO9660_TARGET_DIR) - mkdir -p $(ROOTFS_ISO9660_TARGET_DIR) + $(RM) -rf $(ROOTFS_ISO9660_TMP_TARGET_DIR) + mkdir -p $(ROOTFS_ISO9660_TMP_TARGET_DIR) endef ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_CREATE_TEMPDIR else ifeq ($(BR2_TARGET_ROOTFS_ISO9660_TRANSPARENT_COMPRESSION),y) ROOTFS_ISO9660_DEPENDENCIES += host-zisofs-tools -ROOTFS_ISO9660_TARGET_DIR = $(FS_DIR)/rootfs.iso9660.tmp +ROOTFS_ISO9660_TMP_TARGET_DIR = $(FS_DIR)/rootfs.iso9660.tmp # This must be early, before we copy the bootloader files. define ROOTFS_ISO9660_MKZFTREE - $(RM) -rf $(ROOTFS_ISO9660_TARGET_DIR) + $(RM) -rf $(ROOTFS_ISO9660_TMP_TARGET_DIR) $(HOST_DIR)/bin/mkzftree -X -z 9 -p $(PARALLEL_JOBS) \ $(TARGET_DIR) \ - $(ROOTFS_ISO9660_TARGET_DIR) + $(ROOTFS_ISO9660_TMP_TARGET_DIR) endef ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_MKZFTREE ROOTFS_ISO9660_GENISOIMAGE_OPTS += -z else -ROOTFS_ISO9660_TARGET_DIR = $(TARGET_DIR) +ROOTFS_ISO9660_TMP_TARGET_DIR = $(TARGET_DIR) endif ifeq ($(BR2_TARGET_ROOTFS_ISO9660_GRUB2),y) ROOTFS_ISO9660_DEPENDENCIES += grub2 ROOTFS_ISO9660_BOOTLOADER_CONFIG_PATH = \ - $(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/grub.cfg + $(ROOTFS_ISO9660_TMP_TARGET_DIR)/boot/grub/grub.cfg ROOTFS_ISO9660_BOOT_IMAGE = boot/grub/grub-eltorito.img define ROOTFS_ISO9660_INSTALL_BOOTLOADER $(INSTALL) -D -m 0644 $(BINARIES_DIR)/grub-eltorito.img \ - $(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/grub-eltorito.img + $(ROOTFS_ISO9660_TMP_TARGET_DIR)/boot/grub/grub-eltorito.img endef else ifeq ($(BR2_TARGET_ROOTFS_ISO9660_ISOLINUX),y) ROOTFS_ISO9660_DEPENDENCIES += syslinux ROOTFS_ISO9660_BOOTLOADER_CONFIG_PATH = \ - $(ROOTFS_ISO9660_TARGET_DIR)/isolinux/isolinux.cfg + $(ROOTFS_ISO9660_TMP_TARGET_DIR)/isolinux/isolinux.cfg ROOTFS_ISO9660_BOOT_IMAGE = isolinux/isolinux.bin define ROOTFS_ISO9660_INSTALL_BOOTLOADER $(INSTALL) -D -m 0644 $(BINARIES_DIR)/syslinux/* \ - $(ROOTFS_ISO9660_TARGET_DIR)/isolinux/ + $(ROOTFS_ISO9660_TMP_TARGET_DIR)/isolinux/ $(INSTALL) -D -m 0644 $(HOST_DIR)/share/syslinux/ldlinux.c32 \ - $(ROOTFS_ISO9660_TARGET_DIR)/isolinux/ldlinux.c32 + $(ROOTFS_ISO9660_TMP_TARGET_DIR)/isolinux/ldlinux.c32 endef endif @@ -96,7 +96,7 @@ endef # Copy the kernel to temporary filesystem define ROOTFS_ISO9660_COPY_KERNEL $(INSTALL) -D -m 0644 $(LINUX_IMAGE_PATH) \ - $(ROOTFS_ISO9660_TARGET_DIR)/boot/$(LINUX_IMAGE_NAME) + $(ROOTFS_ISO9660_TMP_TARGET_DIR)/boot/$(LINUX_IMAGE_NAME) endef ifeq ($(ROOTFS_ISO9660_USE_INITRD),YES) @@ -111,7 +111,7 @@ else ROOTFS_ISO9660_DEPENDENCIES += rootfs-cpio define ROOTFS_ISO9660_COPY_INITRD $(INSTALL) -D -m 0644 $(BINARIES_DIR)/rootfs.cpio$(ROOTFS_CPIO_COMPRESS_EXT) \ - $(ROOTFS_ISO9660_TARGET_DIR)/boot/initrd + $(ROOTFS_ISO9660_TMP_TARGET_DIR)/boot/initrd $(SED) "s%__INITRD_PATH__%/boot/initrd%" \ $(ROOTFS_ISO9660_BOOTLOADER_CONFIG_PATH) endef @@ -133,7 +133,7 @@ define ROOTFS_ISO9660_CMD $(HOST_DIR)/bin/genisoimage -J -R -b $(ROOTFS_ISO9660_BOOT_IMAGE) \ -no-emul-boot -boot-load-size 4 -boot-info-table \ $(ROOTFS_ISO9660_GENISOIMAGE_OPTS) \ - -o $@ $(ROOTFS_ISO9660_TARGET_DIR) + -o $@ $(ROOTFS_ISO9660_TMP_TARGET_DIR) endef ifeq ($(BR2_TARGET_ROOTFS_ISO9660_HYBRID),y) From patchwork Sat Mar 31 09:05:50 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: 893735 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=free.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="cIYjjki8"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40Cszf65xZz9s1S for ; Sat, 31 Mar 2018 20:06:22 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id BE4A48AD33; Sat, 31 Mar 2018 09:06:19 +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 zDqwyRuZjUXH; Sat, 31 Mar 2018 09:06:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id B63F78AD87; Sat, 31 Mar 2018 09:06:17 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 5DD541CF0FC for ; Sat, 31 Mar 2018 09:06:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 5260E8AD44 for ; Sat, 31 Mar 2018 09:06:12 +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 yY0BO23W9qqW for ; Sat, 31 Mar 2018 09:06:11 +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 hemlock.osuosl.org (Postfix) with ESMTPS id 552A38AD4B for ; Sat, 31 Mar 2018 09:06:09 +0000 (UTC) Received: by mail-wm0-f67.google.com with SMTP id l9so18534226wmh.2 for ; Sat, 31 Mar 2018 02:06:09 -0700 (PDT) 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=YcElOSej/+TvC0qC0J9krZAMgJcoR0/zRjOSjppkUHw=; b=cIYjjki89hBs7RGPO1Dr6pC11DL/HIGyOVH9Z+WLUApV26VJ5wxsIAzlyBArknHEPI FpwKHWJeJF4gMr6XYYdMHxvOpBEpCsNioSnPEDsCUfHRAc0202ePFAfLr628f3yHLzFc CBFd5BLfBVy9VfWF0BLj004kCn19H/ZEoF8NrDmU5vAgMFc2293ZDO+P1/tYRZ50kXWS 8PDVxWRXILP7R9Km8H24mY2Ip5ZXs29jsdxIc44e5N+e83aSxATho4R0a8yqKHFvxxj/ /V3lVbV7PIpoOIbzJOcaS+LGbbO8RJiJt+7MkrQoGWCRWAB9WtCdA3MrGMyhX7Tad1RM J13Q== 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=YcElOSej/+TvC0qC0J9krZAMgJcoR0/zRjOSjppkUHw=; b=PBa8BjDnYiDvWHpasaz2jxhj7NEgNcq4JK/RTjDEPDmoYu2u/p6cUzooyikerSTuVb Am8jtn69EppbJrrUKzUdNjvCW8P87eV8Z9SRXOGN028ITmT/m/spQTceewvdXXU8frQ5 /KYNsKdjYJBDJ/1FbxaI9i+31oGQdDSHoiP7/dOdQbQ4dcrXW/qIW0cXA3drATWmlv7B K7sKYmlksQpcJHEGMXwJwEiggt00nit59LUebufOHQ6BjNDY8FXdZioj610rCJr962UV Be6/UDcq7pKtZURqJ1YdcQqh98FAe2PYI7KQsphoRJ7Zl3ueLxSaXtV62Gqbvyo8km4O ojcw== X-Gm-Message-State: AElRT7HlSZT1eqEQAIokZFrHNfWdvTxmv6KAvNAGNhEbie1JmT50j9NX tsvwfdU6dq88azD4baP+j9Upcg== X-Google-Smtp-Source: AIpwx4/vHPVc6W2NAXpTlGl52vfkBiI/TnzLQAuJRrBU5nE65e4pqFQwr2KVcpIQ/uZmSBypUvtTyg== X-Received: by 10.28.4.86 with SMTP id 83mr4013174wme.13.1522487167546; Sat, 31 Mar 2018 02:06:07 -0700 (PDT) Received: from scaer.online.net (ns304657.ip-46-105-103.eu. [46.105.103.66]) by smtp.gmail.com with ESMTPSA id u110sm18111490wrc.72.2018.03.31.02.06.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 31 Mar 2018 02:06:06 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 31 Mar 2018 11:05:50 +0200 Message-Id: <0b3d90c6c6fc42bf69538ecc56ddb278f93e0d8d.1522487149.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: Subject: [Buildroot] [PATCH 04/15 v4] core: introduce intermediate BASE_TARGET_DIR variable 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: "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This new BASE_TARGET_DIR variable is set in stone to point to the real location where packages will be installed. Its name is modelled after its definition: it is located in $(BASE_DIR), and it is named 'target/', hence BASE_TARGET_DIR. The already-existing TARGET_DIR variable now simply points to the same location, except that it is recursively expanded, so that we can later change it depending on the context. All locations that really need to reference the existing target/ directory, are changed to use BASE_TARGET_DIR; surprinsigly enough, they all seem to be located in the main Makefile. :-) The rest is left with using good-old TARGET_DIR. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle --- Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 9e2402d7d9..41624b859e 100644 --- a/Makefile +++ b/Makefile @@ -215,7 +215,8 @@ BR_GRAPH_OUT := $(or $(BR2_GRAPH_OUT),pdf) BUILD_DIR := $(BASE_DIR)/build BINARIES_DIR := $(BASE_DIR)/images -TARGET_DIR := $(BASE_DIR)/target +BASE_TARGET_DIR := $(BASE_DIR)/target +TARGET_DIR = $(BASE_TARGET_DIR) # initial definition so that 'make clean' works for most users, even without # .config. HOST_DIR will be overwritten later when .config is included. HOST_DIR := $(BASE_DIR)/host @@ -237,7 +238,7 @@ LEGAL_REPORT = $(LEGAL_INFO_DIR)/README # dependencies anywhere else # ################################################################################ -$(BUILD_DIR) $(TARGET_DIR) $(HOST_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST): +$(BUILD_DIR) $(BASE_TARGET_DIR) $(HOST_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST): @mkdir -p $@ BR2_CONFIG = $(CONFIG_DIR)/.config @@ -459,7 +460,7 @@ BR_PATH = "$(HOST_DIR)/bin:$(HOST_DIR)/sbin:$(PATH)" # Location of a file giving a big fat warning that output/target # should not be used as the root filesystem. -TARGET_DIR_WARNING_FILE = $(TARGET_DIR)/THIS_IS_NOT_YOUR_ROOT_FILESYSTEM +TARGET_DIR_WARNING_FILE = $(BASE_TARGET_DIR)/THIS_IS_NOT_YOUR_ROOT_FILESYSTEM ifeq ($(BR2_CCACHE),y) CCACHE := $(HOST_DIR)/bin/ccache @@ -556,7 +557,7 @@ $(foreach pkg,$(call UPPERCASE,$(PACKAGES)),\ endif .PHONY: dirs -dirs: $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \ +dirs: $(BUILD_DIR) $(STAGING_DIR) $(BASE_TARGET_DIR) \ $(HOST_DIR) $(BINARIES_DIR) $(BUILD_DIR)/buildroot-config/auto.conf: $(BR2_CONFIG) @@ -972,7 +973,7 @@ printvars: .PHONY: clean clean: - rm -rf $(TARGET_DIR) $(BINARIES_DIR) $(HOST_DIR) \ + rm -rf $(BASE_TARGET_DIR) $(BINARIES_DIR) $(HOST_DIR) \ $(BUILD_DIR) $(BASE_DIR)/staging \ $(LEGAL_INFO_DIR) $(GRAPHS_DIR) From patchwork Sat Mar 31 09:05:51 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: 893736 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=free.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="blxEjW27"; dkim-atps=neutral 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 40Cszg1n6Gz9s1r for ; Sat, 31 Mar 2018 20:06:23 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E12433078B; Sat, 31 Mar 2018 09:06:20 +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 MMioINITvkS4; Sat, 31 Mar 2018 09:06:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 610CC25F2A; Sat, 31 Mar 2018 09:06:19 +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 D30811C062E for ; Sat, 31 Mar 2018 09:06:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id CF16189209 for ; Sat, 31 Mar 2018 09:06:12 +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 1ZQKre8tbHS8 for ; Sat, 31 Mar 2018 09:06:12 +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 fraxinus.osuosl.org (Postfix) with ESMTPS id CA6A389205 for ; Sat, 31 Mar 2018 09:06:10 +0000 (UTC) Received: by mail-wm0-f67.google.com with SMTP id l9so18534272wmh.2 for ; Sat, 31 Mar 2018 02:06:10 -0700 (PDT) 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=NpKibzIQgBNPZpYpmMR9/tVKcQL71Fj66EUBTy3Xm24=; b=blxEjW27rIszjIW4S0qBo2osTAlopiK2CjWUvDXepQey5KnBVW1xnygkA/y6O2NLbS bDU7i4vRsBeVV81SJwpsmsC91ThRiQKWWWv1u5/eUvJbzd0LqCRf1ZQ3TE1kj6MYjjR+ 4NV2aVcnRQfPSMmYawAM2tNnBDL8+tPhrvnbYyWQDRT2clxInpt1dnO6oQPeJFzFNSrx aX6BOJQUpH68O8z+LQC7ucHcPn4GhT4uY+0xQDa2EPvUoVT6rCa+x7s3wC3vC+0LVRfR 3TKjWkEd+iSb6DKTPhrJBhKKIO/WBb7gGU75mo2bKB39hVNdeb9330rzkCZvQQnCz290 AaJg== 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=NpKibzIQgBNPZpYpmMR9/tVKcQL71Fj66EUBTy3Xm24=; b=Wovz25g/earxZezLnwxWWbn8PjLIMSiFkPOB18AF/Jo+3v6ro5kTvQhIzUhF7pyHXq UaeTh35F2egs+KlcT/uf7Naw7zcRcTerCUM2kecE+1V5wdW+h3EzxKZ1tJCxPzGgpxlA O1SfyfPuel2vwOw9CZPA5S6q4mzSZ1hLvjjAlEpZ54Vg3JJlIgEy2vF5mrvESRwhmi6o Bq3L/6OU8oNhw90mcrrdIrJErr6wKuFbpsf0LbSZMU6GAg6Qj8bxzcSaafX+fZHaQg+/ p7rq1aOYfvDLZy+EaF0PZcNOJLOhcVcW8rGmun/Iv3FhOT7XHg0bLSM7I89WUHzj52vj Bwbg== X-Gm-Message-State: ALQs6tABrXQ2pcjD0l1VcEyBtxJUsJVGmFbWgiEqWujnCnwJhwhzgzda yaJnmkLhgnNJxy8y1KHMr9EtDw== X-Google-Smtp-Source: AIpwx49oGAW3KYUzLRLqHBSSFaBJ1SEvOAH64vINUYT8qK3Z8IzKJweIPyM4kDrAL5dP6SL02H3Htg== X-Received: by 10.28.160.9 with SMTP id j9mr4508861wme.50.1522487168875; Sat, 31 Mar 2018 02:06:08 -0700 (PDT) Received: from scaer.online.net (ns304657.ip-46-105-103.eu. [46.105.103.66]) by smtp.gmail.com with ESMTPSA id u110sm18111490wrc.72.2018.03.31.02.06.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 31 Mar 2018 02:06:08 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 31 Mar 2018 11:05:51 +0200 Message-Id: <2c9871505f740e5fec41247211aa86aa47feef6b.1522487149.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: Subject: [Buildroot] [PATCH 05/15 v4] fs: set per-rootfs variable name 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: "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Like we do for packages with the PKG variable, set ROOTFS to contain the upper-case name of the rootfs currently being generated. This will be usefull in later patches, when we need more per-rootfs variables, like a per-rootfs TARGET_DIR for example. In Makefiles, per-rule variables trickle down the dependency chain, to all dependencies of that rule, so we have to stop ROOTFS as soone as we're not in a rootfs. This means we have to stop it at target-finalize (which is a dependency of all filesystems), and for each package individually, since some packages (host or target) can be direct dependencies of filesystems as well. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle --- Makefile | 3 +++ fs/common.mk | 3 +++ package/pkg-generic.mk | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/Makefile b/Makefile index 41624b859e..e17675be9b 100644 --- a/Makefile +++ b/Makefile @@ -680,6 +680,9 @@ endif $(TARGETS_ROOTFS): target-finalize +# Avoid the rootfs name leaking down the dependency chain +target-finalize: ROOTFS= + .PHONY: target-finalize target-finalize: $(PACKAGES) @$(call MESSAGE,"Finalizing target directory") diff --git a/fs/common.mk b/fs/common.mk index 274a3e9c7b..af6799bb83 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -39,6 +39,8 @@ ROOTFS_USERS_TABLES = $(call qstrip,$(BR2_ROOTFS_USERS_TABLES)) # all variable references except the arguments must be $$-quoted. define inner-rootfs +ROOTFS_$(2)_NAME = $(1) + # extra deps ROOTFS_$(2)_DEPENDENCIES += host-fakeroot host-makedevs \ $$(if $$(PACKAGES_USERS)$$(ROOTFS_USERS_TABLES),host-mkpasswd) @@ -72,6 +74,7 @@ ROOTFS_$(2)_COMPRESS_EXT = .xz ROOTFS_$(2)_COMPRESS_CMD = xz -9 -C crc32 -c endif +$$(BINARIES_DIR)/rootfs.$(1): ROOTFS=$(2) $$(BINARIES_DIR)/rootfs.$(1): target-finalize $$(ROOTFS_$(2)_DEPENDENCIES) @$$(call MESSAGE,"Generating root filesystem image rootfs.$(1)") rm -rf $(FS_DIR) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 6d82f7027e..152e1d0c67 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -384,6 +384,10 @@ endef define inner-generic-package +# When doing a package, we're definitely not doing a rootfs, but we +# may inherit it via the dependency chain, so we reset it. +$(1): ROOTFS= + # Ensure the package is only declared once, i.e. do not accept that a # package be re-defined by a br2-external tree ifneq ($(call strip,$(filter $(1),$(PACKAGES_ALL))),) From patchwork Sat Mar 31 09:05:52 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: 893737 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=free.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="CwYQOIEw"; dkim-atps=neutral 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 40Cszh2bSvz9s1S for ; Sat, 31 Mar 2018 20:06:24 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 10F848923E; Sat, 31 Mar 2018 09:06:22 +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 G8Xbxxf7tXGU; Sat, 31 Mar 2018 09:06:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0DD2789205; Sat, 31 Mar 2018 09:06:20 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id E0E981CF0FC for ; Sat, 31 Mar 2018 09:06:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id C63758AD9C for ; Sat, 31 Mar 2018 09:06:12 +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 vL2yhERfVBl0 for ; Sat, 31 Mar 2018 09:06:12 +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 hemlock.osuosl.org (Postfix) with ESMTPS id 1B0D28AD6F for ; Sat, 31 Mar 2018 09:06:12 +0000 (UTC) Received: by mail-wm0-f67.google.com with SMTP id r82so19891371wme.0 for ; Sat, 31 Mar 2018 02:06:12 -0700 (PDT) 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=X0E0Ca6tmKEc6iUTWRJMq1ZAzx8HioUTJAc4jb7mZRw=; b=CwYQOIEwkfwYzosdVfAijKaWpqecl/RNn64ttrZNgcj09pA7l6IIjFBs+N84d3nkd7 rSKrlOzJdD1LqjM58cB7COGbZ10I9oirTQt+jwRylktOydJvmdUeCY7TgDXnJzPSCf/m +hHnE5lxkRgxsfBmiMlQQQY+kvpzvapmB7Xx+5Q45ZByke+2lnm0xnYELTzz903Ek72E no4ub9dqoLvSzTVtl8N5mseExYl2jLFkhtV1A7AJ9AY2JWYBVbsBpAEbQwmXtRhKToTj WoEER3/KCgTyniG/jOUqtxqLGmfXavxooaQslVji+xIzu6e5TBF4gtAu3RSg5xelqX/K MTNQ== 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=X0E0Ca6tmKEc6iUTWRJMq1ZAzx8HioUTJAc4jb7mZRw=; b=BPY/IrzHNlOL8e5PZbt4S3sf1JwEEyQ5DNg3L7AS7MEtMMQNB5wbnQiJv/Q5vM/qBI 5rDXvhEqAg6SxEN0cMD0xG52f6EOGDX1Gsdn+KvX/K8pdku9otCUwQK/oIwcupxRN8mF Ofw/dEeOhYiK1DrwGNMcZwQkrGlMROKYMxU2CSsKukKa9yZwTDhVNbsz8q4JqewcgSdS OSbvX3/tkhuiNGnSKF3A9VELCwEZlrWA+hbV1XMujo/nU5ioiXPs2c7YFh1vBsFxKfsS GNyvwdvkAoZoAlAQBjgbFWR+e6KO7fdw3/E63KVjy0qO39jyD4eheUlLv9VMIC9bVLlm wf3A== X-Gm-Message-State: ALQs6tBkAxDzyJ/nIfem4fk9mXcsglp3JNd+8LKPZKNuddN/+xLFG6Ky 3zZuS9CDHoz6kQHndKcRMnz8Yw== X-Google-Smtp-Source: AIpwx4/lkzyuDDc3EYRljxW1OPPW3eD9gSPcwznTZjw9stN/Q+9w+cw4+oX+hyvfKSMcHdBbgX4YZg== X-Received: by 10.28.48.76 with SMTP id w73mr3817221wmw.156.1522487170464; Sat, 31 Mar 2018 02:06:10 -0700 (PDT) Received: from scaer.online.net (ns304657.ip-46-105-103.eu. [46.105.103.66]) by smtp.gmail.com with ESMTPSA id u110sm18111490wrc.72.2018.03.31.02.06.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 31 Mar 2018 02:06:09 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 31 Mar 2018 11:05:52 +0200 Message-Id: X-Mailer: git-send-email 2.14.1 In-Reply-To: References: Subject: [Buildroot] [PATCH 06/15 v4] fs: define per-rootfs directory 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: "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This will serve in future commits to store pre-rootfs files, like fakeroot script... Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle --- fs/common.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/common.mk b/fs/common.mk index af6799bb83..eebe83d6e5 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -40,6 +40,7 @@ ROOTFS_USERS_TABLES = $(call qstrip,$(BR2_ROOTFS_USERS_TABLES)) define inner-rootfs ROOTFS_$(2)_NAME = $(1) +ROOTFS_$(2)_DIR = $$(FS_DIR)/$(1) # extra deps ROOTFS_$(2)_DEPENDENCIES += host-fakeroot host-makedevs \ From patchwork Sat Mar 31 09:05:53 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: 893739 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=free.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="cbzMbht1"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40Cszn3CLwz9s1S for ; Sat, 31 Mar 2018 20:06:29 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id CD4B88AD9C; Sat, 31 Mar 2018 09:06:22 +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 TDdCsYYh1DeU; Sat, 31 Mar 2018 09:06:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id A69008ADC5; Sat, 31 Mar 2018 09:06:20 +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 D57CC1C062E for ; Sat, 31 Mar 2018 09:06:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id CB0FD89EA9 for ; Sat, 31 Mar 2018 09:06:14 +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 VHmu+vfwzI73 for ; Sat, 31 Mar 2018 09:06:13 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by whitealder.osuosl.org (Postfix) with ESMTPS id 576138A0D8 for ; Sat, 31 Mar 2018 09:06:13 +0000 (UTC) Received: by mail-wr0-f194.google.com with SMTP id f14so9604099wre.8 for ; Sat, 31 Mar 2018 02:06:13 -0700 (PDT) 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=vL/hQQ7CNFu+EED1WwsnckBOdXZFRg7kNRISNjPeSno=; b=cbzMbht1d8W68HSYMBqdT3idiwPi7aPNCG6wTOOMEo4jo9QJUaRZmJd9PDmUohc7nV o/0MZGHJlP2gJIuq2HV6xlQ3MZTEMdRnGXIkePRLWKxg0VNu+7b6akHZQI7PLTRAMgVf 3NXsFbFuomD7OIbr3dZPEbLPxHg29XfhYRoJ8SVzTXFsWGkA/P8z4dU0YrFMTJQjDV3U 8d4avwO/1bvSw2WfGgsS6D9k6LdnbbvHpLoyJtYZEaJo9wEC3n1Act+ze6hFrScSyBxP oxZd2i84Ccaw23a7TZTKxETqKvLC7VHaDXE8HUG2UDylCHY4XBi0ywHvCjn5QeAbv5tx Jg8w== 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=vL/hQQ7CNFu+EED1WwsnckBOdXZFRg7kNRISNjPeSno=; b=ct9dmc/VThsgKXidZ9DKBkmOSt0u5krRRcY4vsGX/Knb9pSemlGn3lqa58kEEqBGYO 7aymg/7BtC5svp/6QwKMzcrOP5rRd3loVBGnDOMYrhmY+ZpQ/fLFefT55YWnlRjmKKJJ h17pc2LuwYn+1keGU2Y4twNii2XfXyoLhNHqWZrMParAhpu+t7/c2n21Xv7AfezeAdrG yFpt3sTFjCWRukyfRUWIFL8V057mBfd14pL5GnfFRcZbjTeWlVRfMvZb9lT3DRjYYQB3 jESvc+uYEsgYYaCJdExLcGAKsUUN/KDfqz5qxSjOBsUAt2RQ9xykd7jYRLWNgScKp3B7 XFJA== X-Gm-Message-State: AElRT7HnQbOIizpJPPxxNGwxZYcfBYB/tMhfHoMqVGeDeYiZPohXfJen 7oWtCq5MJFg4gzKNI6p/jz1Q1w== X-Google-Smtp-Source: AIpwx4/pmRQ6O4BKYMJb+qKWNJ8OBYN1A6rPG/Mqrg7MkI4zobDWqP3Im41+aYgEetbVrIhMrdov0Q== X-Received: by 10.223.196.141 with SMTP id m13mr1423343wrf.173.1522487171737; Sat, 31 Mar 2018 02:06:11 -0700 (PDT) Received: from scaer.online.net (ns304657.ip-46-105-103.eu. [46.105.103.66]) by smtp.gmail.com with ESMTPSA id u110sm18111490wrc.72.2018.03.31.02.06.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 31 Mar 2018 02:06:10 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 31 Mar 2018 11:05:53 +0200 Message-Id: X-Mailer: git-send-email 2.14.1 In-Reply-To: References: Subject: [Buildroot] [PATCH 07/15 v4] fs: use a per-rootfs fakeroot script 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: "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" ... and locate that script in a per-rootfs directory. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle --- fs/common.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/common.mk b/fs/common.mk index eebe83d6e5..db4f8c23ad 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -28,7 +28,6 @@ # macro will automatically generate a compressed filesystem image. FS_DIR = $(BUILD_DIR)/buildroot-fs -FAKEROOT_SCRIPT = $(FS_DIR)/fakeroot.fs FULL_DEVICE_TABLE = $(FS_DIR)/device_table.txt ROOTFS_DEVICE_TABLES = $(call qstrip,$(BR2_ROOTFS_DEVICE_TABLE) \ $(BR2_ROOTFS_STATIC_DEVICE_TABLE)) @@ -76,10 +75,11 @@ ROOTFS_$(2)_COMPRESS_CMD = xz -9 -C crc32 -c endif $$(BINARIES_DIR)/rootfs.$(1): ROOTFS=$(2) +$$(BINARIES_DIR)/rootfs.$(1): FAKEROOT_SCRIPT=$$(ROOTFS_$(2)_DIR)/fakeroot $$(BINARIES_DIR)/rootfs.$(1): target-finalize $$(ROOTFS_$(2)_DEPENDENCIES) @$$(call MESSAGE,"Generating root filesystem image rootfs.$(1)") - rm -rf $(FS_DIR) - mkdir -p $(FS_DIR) + rm -rf $(FS_DIR) $$(ROOTFS_$(2)_DIR) + mkdir -p $(FS_DIR) $$(ROOTFS_$(2)_DIR) echo '#!/bin/sh' > $$(FAKEROOT_SCRIPT) echo "set -e" >> $$(FAKEROOT_SCRIPT) $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),\ From patchwork Sat Mar 31 09:05:54 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: 893738 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=free.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="n7CarGWC"; dkim-atps=neutral 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 40Cszj3Y9nz9s1r for ; Sat, 31 Mar 2018 20:06:25 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id D6DEB89215; Sat, 31 Mar 2018 09:06:22 +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 bwOEpA8D3-oQ; Sat, 31 Mar 2018 09:06:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 726628922B; Sat, 31 Mar 2018 09:06:21 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 3283E1C062E for ; Sat, 31 Mar 2018 09:06:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 2CD918AD4F for ; Sat, 31 Mar 2018 09:06:15 +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 9fUCh+jyFQSQ for ; Sat, 31 Mar 2018 09:06:14 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by hemlock.osuosl.org (Postfix) with ESMTPS id 814658AD33 for ; Sat, 31 Mar 2018 09:06:14 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id f14so9604120wre.8 for ; Sat, 31 Mar 2018 02:06:14 -0700 (PDT) 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=7YZAo06sls6cg20+YEn/HgzCicLbtkbiaVKP9WNNE5M=; b=n7CarGWCKt0uMGrdVTyW0KIoryUk9JZJ4p983n69Y2s7FAwkRoSK0FAstcyqaD3K7p dPXS35PBDVvZKu7hiLVdPkPYV0ByybZoeXaQcSARN5WJi+8W58TatB5qs+4snWaNGB6G Mo0WNhQMWa1iaYc7dH8NZIFsjk/aT7Nh/nRrLB3Ue4QhcdxrHO9HPkL0iBIaDnoK3JdZ LocqTxB+Vao4fA8qHZ4lrH7SV3UC6tlTGLK9/mo9IYbjaz26vLjyPjAdF+feW5myONWN xVJ58UefhaSbRUyc0hPoe8iTuKCBCkethKrF2e4zV+EwsDw/ez8N1MMF54gBTiK9ruIj OEpA== 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=7YZAo06sls6cg20+YEn/HgzCicLbtkbiaVKP9WNNE5M=; b=YXF1RBAj12Dyig0ptKL7xczRLsJWB53LF/gbiwpAXfycE5ooFFeE0BZvw6hjmwKS4k emGb4kFBjqZ5rim4AvTtsX882zDO4HGjDPnOiAZv6QRT/M7yF67Zk5SZ7YRKuy/uhAu7 hnIjrBFjm72r37LW02W9zwuj4QwJHryB57xc1SPJLuwKYDuLXTOppQLBCrU22PaMSZpv ZbFZtc4JW0QL6WlyfX3hcIuCyUaZHig/aUZ0c0lPN7PDW9or7Va1VQxVC6RQnGLAovr6 GuID2iCCeXJVE27YAYkCRGg2xd29OawEnVKiXN3VS9oc6u5QlxDv2Z8CPpyZF/7bJQf4 Nf6Q== X-Gm-Message-State: AElRT7HgxqUOPcmtxZpCnzJJ+Cs6oOlseKF8z4l17UG/dQTgQL1cwoTq tKCgoP3EEBwZtinzmZ36iNWJsg== X-Google-Smtp-Source: AIpwx4/7y8fomRUoJ6eA9pOrHUoitBaPGD4Op+2xRs3viKvCkooVZxrgr9CXB8C5BVXVAjyKEmCuTQ== X-Received: by 10.223.225.17 with SMTP id d17mr1386022wri.51.1522487172961; Sat, 31 Mar 2018 02:06:12 -0700 (PDT) Received: from scaer.online.net (ns304657.ip-46-105-103.eu. [46.105.103.66]) by smtp.gmail.com with ESMTPSA id u110sm18111490wrc.72.2018.03.31.02.06.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 31 Mar 2018 02:06:12 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 31 Mar 2018 11:05:54 +0200 Message-Id: <048f82f4f10b900976fdb95c93c7cd3ca7bc7c05.1522487149.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: Subject: [Buildroot] [PATCH 08/15 v4] fs: split per-rootfs dependency line 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: "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle --- Note: in its own patch for easier review of a later, bigger patch. --- fs/common.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/common.mk b/fs/common.mk index db4f8c23ad..cd132cdbc7 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -76,7 +76,8 @@ endif $$(BINARIES_DIR)/rootfs.$(1): ROOTFS=$(2) $$(BINARIES_DIR)/rootfs.$(1): FAKEROOT_SCRIPT=$$(ROOTFS_$(2)_DIR)/fakeroot -$$(BINARIES_DIR)/rootfs.$(1): target-finalize $$(ROOTFS_$(2)_DEPENDENCIES) +$$(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) mkdir -p $(FS_DIR) $$(ROOTFS_$(2)_DIR) From patchwork Sat Mar 31 09:05:55 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: 893740 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=free.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="DJYa/XId"; dkim-atps=neutral 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 40Cszt6bDpz9s1S for ; Sat, 31 Mar 2018 20:06:34 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 49B1089235; Sat, 31 Mar 2018 09:06:33 +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 TP4SBRMvNe-A; Sat, 31 Mar 2018 09:06:31 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id B8E0A89200; Sat, 31 Mar 2018 09:06:31 +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 AC24D1C062E for ; Sat, 31 Mar 2018 09:06:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A520E8A0D3 for ; Sat, 31 Mar 2018 09:06:16 +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 L4KxzUQCNdS2 for ; Sat, 31 Mar 2018 09:06:16 +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 whitealder.osuosl.org (Postfix) with ESMTPS id CFAAE89EA9 for ; Sat, 31 Mar 2018 09:06:15 +0000 (UTC) Received: by mail-wr0-f195.google.com with SMTP id d1so9603068wrj.13 for ; Sat, 31 Mar 2018 02:06:15 -0700 (PDT) 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=G+3WQF2FU6lebF/BIW5GKysDmjDRNRXJMJyHEU+vEvA=; b=DJYa/XIdQYOxxi85bDi1bN3SayuciEirAKDnLyTTqhqDx4Gl3hNwm345fhisw+WEaR tCv74YqsZGXso/4DvG7p4xKFo/tvIatE9+yoh8h4slRBuv1SG6il3JPwMsh/pOE3wtch mndAyTfco50khi9d9Yz5mzmDySwooGAomGRnWtFIVt50XwpaU7HB9Rmx3xo+dATJHnsl eDrV57nmLQWkAVCTAZplL8uTuuIzTXMaEgFyt96cwaXLPTQNrxj0Cni9LC8dpT1URv/c 2Rw03MjJpXdqF0VVI1TI32vNa/mB4iK1Xo3StuqOthEkGcyTyXOTOPlhtl/fYsVKs8R5 vjDA== 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=G+3WQF2FU6lebF/BIW5GKysDmjDRNRXJMJyHEU+vEvA=; b=PKMv9zW6j0wygpj0o7iILWxpPAeLmOqUxhxFR+fKfM2VdjYqKvOaS/mBLG4kCXU+Vi 7g16zBbjefDXDKDH+TOgkSdk4N27m5Et+q40kpHqK+tRmt5pAWvatwybUMnkT0AIfqdP 6rS9CWXzE1LF4CCKLDKJyuC6LOYxhYMpM+B1OYdTTjgxFqfgo53f83IVTmBlAq70GpST LSqNDlHx+86xTeBu5IIk44GDZsCnSkHiQUPmWSTZ3IgvOiOmuAglj65y9bCmJkt1m8i9 9AGX90b3uBj+z/8KJTaBdPIZuf3y9/Cm22tjZQUHn/5YmPlN6v/EssmdRv8kEqxGa6kT hC6w== X-Gm-Message-State: AElRT7FOCe2e8eJR5wRy2bL9/ljqh+0iro5bzEy8GyRY/RHY9Q9HuukB ZX8PS69gpeToI+o0XTtceaos6g== X-Google-Smtp-Source: AIpwx49MWhm1mNBR3dKavtQsdfrnZgp69br+MMCAZijOAH/t9cZzz3x4MjcUJnIwrNx+kKkFzMbjng== X-Received: by 10.223.151.1 with SMTP id r1mr1450366wrb.126.1522487174172; Sat, 31 Mar 2018 02:06:14 -0700 (PDT) Received: from scaer.online.net (ns304657.ip-46-105-103.eu. [46.105.103.66]) by smtp.gmail.com with ESMTPSA id u110sm18111490wrc.72.2018.03.31.02.06.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 31 Mar 2018 02:06:13 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 31 Mar 2018 11:05:55 +0200 Message-Id: <98f2dfa3b5a89f108b51cc567c41665628a01bc3.1522487149.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: Subject: [Buildroot] [PATCH 09/15 v4] fs: introduce per-rootfs TARGET_DIR variable 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: "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" ... which for now still points to the base target directory, but this is a step forward. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle --- Makefile | 4 +++- fs/common.mk | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e17675be9b..9fba7a3ed8 100644 --- a/Makefile +++ b/Makefile @@ -215,8 +215,10 @@ BR_GRAPH_OUT := $(or $(BR2_GRAPH_OUT),pdf) BUILD_DIR := $(BASE_DIR)/build BINARIES_DIR := $(BASE_DIR)/images +# The target directory is common to all packages, +# but there is one that is specific to each filesystem. BASE_TARGET_DIR := $(BASE_DIR)/target -TARGET_DIR = $(BASE_TARGET_DIR) +TARGET_DIR = $(if $(ROOTFS),$(ROOTFS_$(ROOTFS)_TARGET_DIR),$(BASE_TARGET_DIR)) # initial definition so that 'make clean' works for most users, even without # .config. HOST_DIR will be overwritten later when .config is included. HOST_DIR := $(BASE_DIR)/host diff --git a/fs/common.mk b/fs/common.mk index cd132cdbc7..363798bb20 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -40,6 +40,7 @@ define inner-rootfs 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 \ From patchwork Sat Mar 31 09:05:56 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: 893743 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=free.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="xCP7aW3J"; dkim-atps=neutral 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 40Cszx1xgMz9s2R for ; Sat, 31 Mar 2018 20:06:37 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 92BB13008C; Sat, 31 Mar 2018 09:06:34 +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 SQQWnNZHq5IT; Sat, 31 Mar 2018 09:06:32 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 62BD226072; Sat, 31 Mar 2018 09:06:32 +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 E4F981C062E for ; Sat, 31 Mar 2018 09:06:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id E187D891F7 for ; Sat, 31 Mar 2018 09:06:17 +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 sn3-wkS3hpWU for ; Sat, 31 Mar 2018 09:06:17 +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 28F7589205 for ; Sat, 31 Mar 2018 09:06:17 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id o23so4669956wmf.0 for ; Sat, 31 Mar 2018 02:06:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=rbuvJMJZlkkNPCkNV+o1jfF1QkNvZKorG/KD6soh0ds=; b=xCP7aW3JN6J8Z3f08KZPwZwAI158AcSyzPJjSN1905r9nhPYo3YTlvsIwf7ackqScg Hkgud8GQzIORDNVKfdib0XVdcTHy6iPDhNIuUn7VvrTmBQk1WcjRFCxBYkssUM1+NyFK MxE17zJjMwozCBH79kcRfA6Y3gDNaoncfVA3TGIFQ10/a+UWxJJlCMn5Fw1vzItEPEmH WOq2ukTaoD0oR1uJDptEL29byj3XA3SRlZTXGPH9KkXlV2mqw+1bN5/I3qE+Pv/exLsR g9x3MUbuyeO6uYY5MmDcgGTAOmFob10OErR6syTUJwV7DTF1p+SXdAo/y6jXVApJY7Ws BzoA== 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 :in-reply-to:references; bh=rbuvJMJZlkkNPCkNV+o1jfF1QkNvZKorG/KD6soh0ds=; b=gJpnmcSnnrvdw5vZJzP/y0FCkO2VVfsezoYIbtvobe7oJiQrXFpiShPiaDPZFJhK1x IsfmIbrJpZWljNG6ljPZWRbSg9UYhI2eeTxSGMTGsnaBMeDIyjkXG/mUQ6+hFXU1dxRC XO/IlYXJWYMevyDeA9GX3DsKbKusXi2oB30/XfIdifRyZ9+YPc4fcKeQNTOq3SbjK6/S YnRP61bokWvXDKQZnRuKY+v6a7r4RIHf/849FZ7KtNpaeAAEHMwvYbCPYt3XpyfsmQWh B5bUkNONBlrThMC0Gi0J3Ej0VkbOWI2S8Fe2Z9kyLaj6Uu00Xb42XS4B0ygtlEbc1ZJV HzHg== X-Gm-Message-State: ALQs6tACue7TEuzSSEQ2LazbNDQyIh7rPXsmEoN5kR4FbF0D20TVNTZ5 cWy9VcIivQLmgJvuxW6Ap8IQGA== X-Google-Smtp-Source: AIpwx4+Ln1Ed056+kn1QQASSRRmcKOI09qkbvd/epw0Yv2/yFfM3AZ02ctdmYyGByLvaXnAdf4Zapg== X-Received: by 10.28.184.193 with SMTP id i184mr371727wmf.1.1522487175414; Sat, 31 Mar 2018 02:06:15 -0700 (PDT) Received: from scaer.online.net (ns304657.ip-46-105-103.eu. [46.105.103.66]) by smtp.gmail.com with ESMTPSA id u110sm18111490wrc.72.2018.03.31.02.06.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 31 Mar 2018 02:06:14 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 31 Mar 2018 11:05:56 +0200 Message-Id: <3171e3da8d9aab3216d7360aac6181d3d7cf4083.1522487149.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: Subject: [Buildroot] [PATCH 10/15 v4] 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: "Yann E. MORIN" , Thomas Petazzoni 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) From patchwork Sat Mar 31 09:05:57 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: 893742 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@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; dmarc=none (p=none dis=none) header.from=free.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="CW7OV9b5"; 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 40Cszw4px8z9s1r for ; Sat, 31 Mar 2018 20:06:36 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D858F8A0D4; Sat, 31 Mar 2018 09:06:34 +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 wWW7HV1nyKYN; Sat, 31 Mar 2018 09:06:33 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 1D0188A0CE; Sat, 31 Mar 2018 09:06:33 +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 0E0B31C062E for ; Sat, 31 Mar 2018 09:06:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0B3B08A0CE for ; Sat, 31 Mar 2018 09:06:19 +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 XyZAZvXc3nxO for ; Sat, 31 Mar 2018 09:06:18 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by whitealder.osuosl.org (Postfix) with ESMTPS id 6665989EA9 for ; Sat, 31 Mar 2018 09:06:18 +0000 (UTC) Received: by mail-wr0-f194.google.com with SMTP id c24so9621845wrc.6 for ; Sat, 31 Mar 2018 02:06:18 -0700 (PDT) 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=z9sJMR2QLar9MF2HvcjsmkAEvCEoXHSNvYwuwJ60rw0=; b=CW7OV9b58N/kLtJCGh/mQm+pxwntoHZSemtJCg2A87W9zTx/H+BFGTZ/OiI770InPt lvAiV2HMqsu1QUOVfpjiuUZtEms4oQFFcUWbTV7rCQM3iT17+wGWcfhzXfsgjRaBdojV b2baMsmK3RHosM96ElxFGpC3ryWNwa1bj59bJ+xrFXk72D5OZeRT6DXeYZlWrRp03zCm wg7ncrhFLY7gftcLV2qbJB0P/RsiwSJ0Rwgk1BspY4gb/lEOX8b6RE1Y5FvAq0TiqlM+ x1LJLMRUqbARwDrCrMYmUhu8PdeA4MAFKrlEdCq3sHANb05Aucs/r+l0VyKALDCeYrDf MiRA== 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=z9sJMR2QLar9MF2HvcjsmkAEvCEoXHSNvYwuwJ60rw0=; b=OJnMJMqyRT1CaFW3vFBsno/pg4LcDrwBwL8e6jPB+KPLwlUEGJoS8bcdiW7AlTbCx5 V4eY97xKs6G0Z6oqCcJ1wAM4DiSxQlXzWmIc0E1/FzINbTua0tBCNobG9k2LEjFO5uwq I+N7Fx9yCtwvYDBW8Lu1incmQUAMcThlp0FTgvuf3ab96V90Sd34CUsZ+NU3KlOg3WxS RRdFfkd7mcNWSYBrwhUA0XWvPtfYdiLfblp4CPl0vb7H2P6clUqty7LAZSsCVlVizZlo MY/nL+w6MMyhz+0fHWT+2PlhzCsP1gbZWSiBg9b34NQRlf75FXGg8CCPoAiUKf2bFess Z0TA== X-Gm-Message-State: AElRT7GSVVhtWIzEvStMM4L1ACKE8WTDN0I9LLuu0KFfMePdw9qLVcUc mX2ll/nW/ZTalqk3nq21luVliA== X-Google-Smtp-Source: AIpwx48EglKmleemGvji/pA3xHye8Uc68AlY8NS6QzqCW2P+s2Lx6SX+aqCz9I8QeZXqrsJ6dTeL5Q== X-Received: by 10.223.173.197 with SMTP id w63mr1551527wrc.83.1522487176775; Sat, 31 Mar 2018 02:06:16 -0700 (PDT) Received: from scaer.online.net (ns304657.ip-46-105-103.eu. [46.105.103.66]) by smtp.gmail.com with ESMTPSA id u110sm18111490wrc.72.2018.03.31.02.06.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 31 Mar 2018 02:06:15 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 31 Mar 2018 11:05:57 +0200 Message-Id: <2ffc709e1da86c8c3d8026203f9fdffdab24db04.1522487149.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: Subject: [Buildroot] [PATCH 11/15 v4] fs: introduce a macro for reproducible command 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: "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle --- fs/common.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/fs/common.mk b/fs/common.mk index 3505a32e5d..05ae107192 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -34,6 +34,12 @@ 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)) +ifeq ($(BR2_REPRODUCIBLE),y) +define ROOTFS_REPRODUCIBLE + find $(TARGET_DIR) -print0 | xargs -0 -r touch -hd @$(SOURCE_DATE_EPOCH) +endef +endif + ROOTFS_COMMON_TAR = $(FS_DIR)/rootfs.common.tar .PHONY: rootfs-common @@ -120,9 +126,7 @@ endif echo $$(EXTRA_ENV) $$(s) $$(TARGET_DIR) $$(BR2_ROOTFS_POST_SCRIPT_ARGS) >> $$(FAKEROOT_SCRIPT)$$(sep)) $$(foreach hook,$$(ROOTFS_PRE_CMD_HOOKS),\ $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) -ifeq ($$(BR2_REPRODUCIBLE),y) - echo "find $$(TARGET_DIR) -print0 | xargs -0 -r touch -hd @$$(SOURCE_DATE_EPOCH)" >> $$(FAKEROOT_SCRIPT) -endif + $$(call PRINTF,$$(ROOTFS_REPRODUCIBLE)) >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) $$(foreach hook,$$(ROOTFS_POST_CMD_HOOKS),\ $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) From patchwork Sat Mar 31 09:05:58 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: 893741 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=free.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="H2JX0vLi"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40Cszw1vl7z9s1S for ; Sat, 31 Mar 2018 20:06:36 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id CCF188AD6F; Sat, 31 Mar 2018 09:06:34 +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 VZboSvRk1Uug; Sat, 31 Mar 2018 09:06:33 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id D374F8AD90; Sat, 31 Mar 2018 09:06:33 +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 1B5671C062E for ; Sat, 31 Mar 2018 09:06:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 17D0B8A0D4 for ; Sat, 31 Mar 2018 09:06:22 +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 fw1zlcK1jG7Y for ; Sat, 31 Mar 2018 09:06:20 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by whitealder.osuosl.org (Postfix) with ESMTPS id E2D3A8A0D3 for ; Sat, 31 Mar 2018 09:06:19 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id p53so9612691wrc.10 for ; Sat, 31 Mar 2018 02:06:19 -0700 (PDT) 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=MvH5F2QeEgMCIjJ0hmDBfp4U4ZG9S38YIXol4R35qpA=; b=H2JX0vLihRD1mmFYWO9P0Tz+sxRwrNx/UkrCAVPUOHcI4hAAGLzoWYGObWHkycRzDz Jodi2GgG6J81KVvegVSulN/TKz9bgTLNxdrihOQVvp08ECrATK7sPauU7LYu4GTLWBHz zJFxJWQXW7Dv1E/MqXahCYs+pkBZ9cCw0xTnvU8C+edGwgHjvDHThfAzWn2kGTLbYsPq cMBJBd77SjYIcaz9Jla37XkU9x0tLf+l1lmHecWapuFCIrwbBAkKlIzdTgxmKcb60sqt RjevzR14H76/eShwrylu7u5QGrFV6A+XNHtVYe9RrgJI3W2hhC+XoAnRlZalAWI/0je7 lCRA== 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=MvH5F2QeEgMCIjJ0hmDBfp4U4ZG9S38YIXol4R35qpA=; b=BbnAr17RzgZVqf6V8KfT9CSMsy8yw7W26aupUWtNFpoQuo5dlvcj+crQnP1NPK7wiC 1KCXMp1dRGowX8sbfQ0GFhhmytYviWJLpoKNmEPHWp7ynJ9pO2jm5qPRRDxGB31r1TDk 4zgHZCm2A8Nc5nTOmVws78uTnpoTeT5CTrpENNG9tbncH59lLghYlF0CPEeP3BmORyC+ l3bkTCv5e1mTylgjNIVXnq3hEp9T580SKtwo7+xkJ2lE1syzc2mcn7PHu7aI7WHU0GUK XzrweAN5RTOvZEWf9SP/lGpkD35oJ5AqiJL9/Hxui+0etJbRyFNoacNuFPjgkMYoXcrw 1TRg== X-Gm-Message-State: AElRT7FOsiTw+dEcYLRPnC0eehLUmnSVfL+0ROKIZqO2uXJVgUlGS8zk /fCH95hG7x0u/Ji0VcSZ9sljvQ== X-Google-Smtp-Source: AIpwx4/VR4tNN8nxmQ9cwkfauwVTGTWYuCz934z6bhSMK1YLr7614GYmqNJ08MMW5WgqjKQshAxLcQ== X-Received: by 10.223.134.47 with SMTP id 44mr1400703wrv.114.1522487178116; Sat, 31 Mar 2018 02:06:18 -0700 (PDT) Received: from scaer.online.net (ns304657.ip-46-105-103.eu. [46.105.103.66]) by smtp.gmail.com with ESMTPSA id u110sm18111490wrc.72.2018.03.31.02.06.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 31 Mar 2018 02:06:17 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 31 Mar 2018 11:05:58 +0200 Message-Id: <8b15f15c58976dd080a4daf6969828bcf8291f8c.1522487149.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: Subject: [Buildroot] [PATCH 12/15 v4] fs: use a common tarball as base for the other filesystems 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: "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Currently, some filesystems may want to tweak the content of the target directory, create special device nodes etc... This all means that: - the content of the target directory for a specific filesystems may depend on whether another filesystem is enabled or not; for example, cpio will create a /init script or symlink and a /dev/console node; - the filesysems can not be built in parallel, because they may change the content of the target directory wil another is being assembled. Furthermore, the same fakeroot script is executed over-and-over-again for each filesystem, to create the device nodes, the users and their homes and files, and setting permissions... We introduce an intermediate tarball, for which we do the full fakeroot shebang. That tarball then serves as the base for the other filesystems, with a very simple fakeroot script that untars the common tarball, and calls the actual filesystem image generator on that. Note that we use a very simple tar command to generate the intermediate tarball, because we are not concerned with reproducibility of the archive itself (only of the archived files). Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle --- fs/common.mk | 75 +++++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 47 insertions(+), 28 deletions(-) diff --git a/fs/common.mk b/fs/common.mk index 05ae107192..f3d42519f6 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -42,6 +42,19 @@ endif ROOTFS_COMMON_TAR = $(FS_DIR)/rootfs.common.tar +# Command to create the common tarball from the base target directory. +define ROOTFS_COMMON_TAR_CMD + tar cf $(ROOTFS_COMMON_TAR) --numeric-owner \ + --exclude=$(notdir $(TARGET_DIR_WARNING_FILE)) \ + -C $(TARGET_DIR) . +endef + +# Command to extract the common tarball into the per-rootfs target directory +define ROOTFS_COMMON_UNTAR_CMD + mkdir -p $(TARGET_DIR) + tar xf $(ROOTFS_COMMON_TAR) -C $(TARGET_DIR) +endef + .PHONY: rootfs-common rootfs-common: $(ROOTFS_COMMON_TAR) @@ -49,11 +62,39 @@ 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): FAKEROOT_SCRIPT=$(FS_DIR)/fakeroot.fs $(ROOTFS_COMMON_TAR): $(ROOTFS_COMMON_DEPENDENCIES) target-finalize - @: + @$(call MESSAGE,"Generating common rootfs tarball") + rm -rf $(FS_DIR) + mkdir -p $(FS_DIR) + echo '#!/bin/sh' > $(FAKEROOT_SCRIPT) + echo "set -e" >> $(FAKEROOT_SCRIPT) + echo "chown -h -R 0:0 $(TARGET_DIR)" >> $(FAKEROOT_SCRIPT) +ifneq ($(ROOTFS_USERS_TABLES),) + cat $(ROOTFS_USERS_TABLES) >> $(USERS_TABLE) +endif + $(call PRINTF,$(PACKAGES_USERS)) >> $(USERS_TABLE) + PATH=$(BR_PATH) $(TOPDIR)/support/scripts/mkusers $(USERS_TABLE) $(TARGET_DIR) >> $(FAKEROOT_SCRIPT) +ifneq ($(ROOTFS_DEVICE_TABLES),) + cat $(ROOTFS_DEVICE_TABLES) > $(FULL_DEVICE_TABLE) +ifeq ($(BR2_ROOTFS_DEVICE_CREATION_STATIC),y) + $(call PRINTF,$(PACKAGES_DEVICES_TABLE)) >> $(FULL_DEVICE_TABLE) +endif +endif + $(call PRINTF,$(PACKAGES_PERMISSIONS_TABLE)) >> $(FULL_DEVICE_TABLE) + echo "$(HOST_DIR)/bin/makedevs -d $(FULL_DEVICE_TABLE) $(TARGET_DIR)" >> $(FAKEROOT_SCRIPT) + $(foreach s,$(call qstrip,$(BR2_ROOTFS_POST_FAKEROOT_SCRIPT)),\ + echo "echo '$(TERM_BOLD)>>> Executing fakeroot script $(s)$(TERM_RESET)'" >> $(FAKEROOT_SCRIPT); \ + echo $(EXTRA_ENV) $(s) $(TARGET_DIR) $(BR2_ROOTFS_POST_SCRIPT_ARGS) >> $(FAKEROOT_SCRIPT)$(sep)) + $(foreach hook,$(ROOTFS_PRE_CMD_HOOKS),\ + $(call PRINTF,$($(hook))) >> $(FAKEROOT_SCRIPT)$(sep)) + $(call PRINTF,$(ROOTFS_COMMON_TAR_CMD)) >> $(FAKEROOT_SCRIPT) + $(foreach hook,$(ROOTFS_POST_CMD_HOOKS),\ + $(call PRINTF,$($(hook))) >> $(FAKEROOT_SCRIPT)$(sep)) + chmod a+x $(FAKEROOT_SCRIPT) + PATH=$(BR_PATH) $(HOST_DIR)/bin/fakeroot -- $(FAKEROOT_SCRIPT) rootfs-common-show-depends: @echo $(ROOTFS_COMMON_DEPENDENCIES) @@ -64,7 +105,7 @@ define inner-rootfs ROOTFS_$(2)_NAME = $(1) ROOTFS_$(2)_DIR = $$(FS_DIR)/$(1) -ROOTFS_$(2)_TARGET_DIR = $$(BASE_TARGET_DIR) +ROOTFS_$(2)_TARGET_DIR = $$(ROOTFS_$(2)_DIR)/target ROOTFS_$(2)_DEPENDENCIES += rootfs-common @@ -101,39 +142,17 @@ $$(BINARIES_DIR)/rootfs.$(1): ROOTFS=$(2) $$(BINARIES_DIR)/rootfs.$(1): FAKEROOT_SCRIPT=$$(ROOTFS_$(2)_DIR)/fakeroot $$(BINARIES_DIR)/rootfs.$(1): $$(ROOTFS_$(2)_DEPENDENCIES) @$$(call MESSAGE,"Generating root filesystem image rootfs.$(1)") - rm -rf $(FS_DIR) $$(ROOTFS_$(2)_DIR) - mkdir -p $(FS_DIR) $$(ROOTFS_$(2)_DIR) + rm -rf $$(ROOTFS_$(2)_DIR) + mkdir -p $$(ROOTFS_$(2)_DIR) echo '#!/bin/sh' > $$(FAKEROOT_SCRIPT) echo "set -e" >> $$(FAKEROOT_SCRIPT) + $$(call PRINTF,$$(ROOTFS_COMMON_UNTAR_CMD)) >> $$(FAKEROOT_SCRIPT) $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),\ $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) - echo "chown -h -R 0:0 $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT) -ifneq ($$(ROOTFS_USERS_TABLES),) - cat $$(ROOTFS_USERS_TABLES) >> $$(USERS_TABLE) -endif - $$(call PRINTF,$$(PACKAGES_USERS)) >> $$(USERS_TABLE) - PATH=$$(BR_PATH) $$(TOPDIR)/support/scripts/mkusers $$(USERS_TABLE) $$(TARGET_DIR) >> $$(FAKEROOT_SCRIPT) -ifneq ($$(ROOTFS_DEVICE_TABLES),) - cat $$(ROOTFS_DEVICE_TABLES) > $$(FULL_DEVICE_TABLE) -ifeq ($$(BR2_ROOTFS_DEVICE_CREATION_STATIC),y) - $$(call PRINTF,$$(PACKAGES_DEVICES_TABLE)) >> $$(FULL_DEVICE_TABLE) -endif -endif - $$(call PRINTF,$$(PACKAGES_PERMISSIONS_TABLE)) >> $$(FULL_DEVICE_TABLE) - echo "$$(HOST_DIR)/bin/makedevs -d $$(FULL_DEVICE_TABLE) $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT) - $$(foreach s,$$(call qstrip,$$(BR2_ROOTFS_POST_FAKEROOT_SCRIPT)),\ - echo "echo '$$(TERM_BOLD)>>> Executing fakeroot script $$(s)$$(TERM_RESET)'" >> $$(FAKEROOT_SCRIPT); \ - echo $$(EXTRA_ENV) $$(s) $$(TARGET_DIR) $$(BR2_ROOTFS_POST_SCRIPT_ARGS) >> $$(FAKEROOT_SCRIPT)$$(sep)) - $$(foreach hook,$$(ROOTFS_PRE_CMD_HOOKS),\ - $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) $$(call PRINTF,$$(ROOTFS_REPRODUCIBLE)) >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) - $$(foreach hook,$$(ROOTFS_POST_CMD_HOOKS),\ - $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) chmod a+x $$(FAKEROOT_SCRIPT) - rm -f $$(TARGET_DIR_WARNING_FILE) PATH=$$(BR_PATH) $$(HOST_DIR)/bin/fakeroot -- $$(FAKEROOT_SCRIPT) - $$(INSTALL) -m 0644 support/misc/target-dir-warning.txt $$(TARGET_DIR_WARNING_FILE) ifneq ($$(ROOTFS_$(2)_COMPRESS_CMD),) PATH=$$(BR_PATH) $$(ROOTFS_$(2)_COMPRESS_CMD) $$@ > $$@$$(ROOTFS_$(2)_COMPRESS_EXT) endif From patchwork Sat Mar 31 09:05:59 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: 893744 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=free.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Yrxd2TXc"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40Cszz2pFYz9s1S for ; Sat, 31 Mar 2018 20:06:39 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 87D498ADF5; Sat, 31 Mar 2018 09:06:37 +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 dpJWfEKEZebB; Sat, 31 Mar 2018 09:06:35 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 7444E8ADA6; Sat, 31 Mar 2018 09:06:34 +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 8A7A31C062E for ; Sat, 31 Mar 2018 09:06:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8742489215 for ; Sat, 31 Mar 2018 09:06:22 +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 9wRdATTBEzcT for ; Sat, 31 Mar 2018 09:06:21 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f180.google.com (mail-wr0-f180.google.com [209.85.128.180]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 4CB6F89216 for ; Sat, 31 Mar 2018 09:06:21 +0000 (UTC) Received: by mail-wr0-f180.google.com with SMTP id l49so9633747wrl.4 for ; Sat, 31 Mar 2018 02:06:21 -0700 (PDT) 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=TCAcQDeE1FMx4Uj9lYH9nXxMo62rAWpKpN9t/C8nPFQ=; b=Yrxd2TXcREkFARYdcTXoj6UkFQ5q2RWemCwlpAorWGPcJufyW07hrU85ty2a2P7xHG JqSt6BvK+3dm9SyB71EXk0PvSyAlMiJtsBXNB0t1KBcLHuPsZo196SFb7cNKJrxWPVh2 FiTymuf+AyXjkRa1VualqWSYPPrnH7He1WJN9+CmxW45RVkuFL0aXMoJJXe5hovZjsU5 SCRxWNUlzftYJPYafnK3JJzSOVH+MSNT7c7iwZX5MtIYzPdGNcjAylpwmiqoe27/RPvw vi443CNoBHulj7RYJGEfipwvSpKcssS8Lcxz5AgXshdLFCfQxaWP1o58MJTgsVqA4ljq 2Yzw== 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=TCAcQDeE1FMx4Uj9lYH9nXxMo62rAWpKpN9t/C8nPFQ=; b=AxQTWYybZoiVikR4emjfh08H8ApWPY0Ib4vc8zvVQQLrXK+1d4QvweG80gePuxgaVH Tf5KVQ0yqBwu0s5mZeAKcqvCVnTpDFS8XHN2OZYVPC7eRInqt2OJK2kCZMUNBEyxGezH IYwDiW/qkbwIMsOI/syZi13U3ya1bnGbL2hv8TigKUMFvhiMyVPB+Cbmjm9xmk0riIyd wIf/sp3F7E2289RGLo4OQnUt3u/8rz1XmhY9U4LCvvYOHiNbUCysbrATRj+gKKdTgHPi 3vHkt6aTFl2SzYSG28KVMSVYoVedTJU4mihb2pDZbYyVtetP5dSFgChsCu7L99NrOHoq PADQ== X-Gm-Message-State: AElRT7HLiPJRACEuYBQh0AU8kEDEo1N7sHnyqHk4huhSR5TRF7le4RUq 0eCPbASWRzVs1Kbaf59s9yEdSw== X-Google-Smtp-Source: AIpwx49N7LXVw5x4Em+pwTFECOhbh9o9nMravBS6O8/ewGU4NVMCb8vlWOQVkTg3st12onup2eHN/w== X-Received: by 10.223.225.210 with SMTP id l18mr1533362wri.251.1522487179515; Sat, 31 Mar 2018 02:06:19 -0700 (PDT) Received: from scaer.online.net (ns304657.ip-46-105-103.eu. [46.105.103.66]) by smtp.gmail.com with ESMTPSA id u110sm18111490wrc.72.2018.03.31.02.06.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 31 Mar 2018 02:06:18 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 31 Mar 2018 11:05:59 +0200 Message-Id: <193b195e0bb305f01ccedd565a517635a975b154.1522487149.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: Subject: [Buildroot] [PATCH 13/15 v4] fs: run packages' filesystem hooks in a copy of target/ 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: "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Currently, some packages may regigter hooks to be run just before and judt after the generic tarball image is generated, because they need to prepare the filesystem for read-only or read-write operation. However, this means that, if any of the hooks or the image generation fails, the target directory is left in a dangling, inconsistent state. We fix that by doing a copy of target/, run the hooks on that copy, generate the generic tarball image out of that, and get rid of the copy. This way, we can guarantee consistency of the target directory, and we can even ditch support for post-fs hooks (those that restore target/). Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle --- fs/common.mk | 7 +++++-- support/testing/tests/core/test_post_scripts.py | 23 +++++++++++++---------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/fs/common.mk b/fs/common.mk index f3d42519f6..8bb26f1146 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -58,17 +58,20 @@ endef .PHONY: rootfs-common rootfs-common: $(ROOTFS_COMMON_TAR) +# Emulate being in a filesystem, so that we can have our own TARGET_DIR. +ROOTFS_COMMON_TARGET_DIR = $(FS_DIR)/target + ROOTFS_COMMON_DEPENDENCIES = \ host-fakeroot host-makedevs \ $(if $(PACKAGES_USERS)$(ROOTFS_USERS_TABLES),host-mkpasswd) -# When doing the common tarball, we're not really doing a rootfs. -$(ROOTFS_COMMON_TAR): ROOTFS= +$(ROOTFS_COMMON_TAR): ROOTFS=COMMON $(ROOTFS_COMMON_TAR): FAKEROOT_SCRIPT=$(FS_DIR)/fakeroot.fs $(ROOTFS_COMMON_TAR): $(ROOTFS_COMMON_DEPENDENCIES) target-finalize @$(call MESSAGE,"Generating common rootfs tarball") rm -rf $(FS_DIR) mkdir -p $(FS_DIR) + rsync -au $(BASE_TARGET_DIR)/ $(TARGET_DIR) echo '#!/bin/sh' > $(FAKEROOT_SCRIPT) echo "set -e" >> $(FAKEROOT_SCRIPT) echo "chown -h -R 0:0 $(TARGET_DIR)" >> $(FAKEROOT_SCRIPT) diff --git a/support/testing/tests/core/test_post_scripts.py b/support/testing/tests/core/test_post_scripts.py index edb339d8c4..a0e5b6b454 100644 --- a/support/testing/tests/core/test_post_scripts.py +++ b/support/testing/tests/core/test_post_scripts.py @@ -18,17 +18,17 @@ class TestPostScripts(infra.basetest.BRTest): infra.filepath("tests/core/post-fakeroot.sh"), infra.filepath("tests/core/post-image.sh")) - def check_post_log_file(self, path, what): + def check_post_log_file(self, f, what, target_dir): lines = {} - with open(path, 'rb') as csvfile: + with open(os.path.join(self.builddir, "build", f), 'rb') as csvfile: r = csv.reader(csvfile, delimiter=',') for row in r: lines[row[0]] = row[1] - self.assertEqual(lines["arg1"], os.path.join(self.builddir, what)) + self.assertEqual(lines["arg1"], what) self.assertEqual(lines["arg2"], "foobar") self.assertEqual(lines["arg3"], "baz") - self.assertEqual(lines["TARGET_DIR"], os.path.join(self.builddir, "target")) + self.assertEqual(lines["TARGET_DIR"], target_dir) self.assertEqual(lines["BUILD_DIR"], os.path.join(self.builddir, "build")) self.assertEqual(lines["HOST_DIR"], os.path.join(self.builddir, "host")) staging = os.readlink(os.path.join(self.builddir, "staging")) @@ -37,9 +37,12 @@ class TestPostScripts(infra.basetest.BRTest): self.assertEqual(lines["BR2_CONFIG"], os.path.join(self.builddir, ".config")) def test_run(self): - f = os.path.join(self.builddir, "build", "post-build.log") - self.check_post_log_file(f, "target") - f = os.path.join(self.builddir, "build", "post-fakeroot.log") - self.check_post_log_file(f, "target") - f = os.path.join(self.builddir, "build", "post-image.log") - self.check_post_log_file(f, "images") + self.check_post_log_file("post-build.log", + os.path.join(self.builddir, "target"), + os.path.join(self.builddir, "target")) + self.check_post_log_file("post-fakeroot.log", + os.path.join(self.builddir, "build/buildroot-fs/target"), + os.path.join(self.builddir, "build/buildroot-fs/target")) + self.check_post_log_file("post-image.log", + os.path.join(self.builddir, "images"), + os.path.join(self.builddir, "target")) From patchwork Sat Mar 31 09:06:00 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: 893745 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=free.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="U7SgkFMC"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40Ct091q1dz9s1S for ; Sat, 31 Mar 2018 20:06:49 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 3D2AE81F03; Sat, 31 Mar 2018 09:06:39 +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 FCG319Q7hnuY; Sat, 31 Mar 2018 09:06:35 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 982CD8ADD6; Sat, 31 Mar 2018 09:06:35 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 525251C062E for ; Sat, 31 Mar 2018 09:06:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 4D9522E64D for ; Sat, 31 Mar 2018 09:06:23 +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 d666TTklNLj4 for ; Sat, 31 Mar 2018 09:06:22 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by silver.osuosl.org (Postfix) with ESMTPS id 8140826072 for ; Sat, 31 Mar 2018 09:06:22 +0000 (UTC) Received: by mail-wr0-f193.google.com with SMTP id n2so6292760wrj.7 for ; Sat, 31 Mar 2018 02:06:22 -0700 (PDT) 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=BZA4ewr1+TG+AHFZf7OsTUMufWEZIguLSRvBJd3b1Bo=; b=U7SgkFMCl1tWAU55PEwbfLx7c52jAKKR8AEidja797S0LVHdHzTJiDBqFCFuUapT9A Nl2A6i+oRsE9KxaGxJwF97UgLF0z7ZY8uiODHF4tv+77eA+pkvnW1P/bIpn7zWCI1G7X 26EKFZZpit+dg2LyyG0PO/a5I4GjhvDR5q8QuRDOkXt9Q28dVZbx4QY+NdpQCvVpZ7XB cfBTQXGDPrp4ji1cs5lP+a6uRatuH0DWrJtDuwIoFWAcbhhTx9sOnzMsw5/fLJk6cyns 1neYy66zQjHDkE1+rCFpm6xk6gdyL1Szvxa3gst+TJ/Cf5epV05QHV+7yzNG6W2qqI4W fn+A== 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=BZA4ewr1+TG+AHFZf7OsTUMufWEZIguLSRvBJd3b1Bo=; b=tgC/ZefYaDmp/bnwdCEVmPgavAGN8SpK2KvlOORuQQDiLObggUvlAWO0sQCt5BjU3r NeZLJWE1V1pstqQlTHDEX0e+weGwhhlf8pt4pNTMKeDNl9rMwOn2DIzHDsF4v4g2RjZi f//LcJMu5HDDlurb0Lnfhxmiwflu7SD8tcAxY6VzAuV21FI3P+cf0Qb0XvDCtY5V95l/ 3ZtH5QBDQAoMhktTdr7hlwygrHdb13cg00g2lotTVFwo7SG+E/P+gpq0p2GTr8GSe5kh vWiPOBYLNonqYsWZ8AlHo7pHIZ2zA9lvvb5TjEbwOaYjRBVuoiQExH51iSVwedtXAsIs 30bw== X-Gm-Message-State: AElRT7Fcz7lsY779wiT9x8K6Ekkix1JryLZQzJsBpOFyOUHcDp870D1/ eUEjiYrRMPH8rOTa2Vxh08NWXQ== X-Google-Smtp-Source: AIpwx4+UHQ5MmA713PLJZqObWf/RNRF3nk91gAcY9caGhA3GFywy8TFz47PYgu9Gwhn8ZQPQZdiS3g== X-Received: by 10.223.226.210 with SMTP id d18mr1381822wrj.192.1522487180857; Sat, 31 Mar 2018 02:06:20 -0700 (PDT) Received: from scaer.online.net (ns304657.ip-46-105-103.eu. [46.105.103.66]) by smtp.gmail.com with ESMTPSA id u110sm18111490wrc.72.2018.03.31.02.06.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 31 Mar 2018 02:06:20 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 31 Mar 2018 11:06:00 +0200 Message-Id: <787ad63d8daaadfaee2cbe6beb14dab63ef4d673.1522487149.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: Subject: [Buildroot] [PATCH 14/15 v4] fs: get rid of package-provided post-fs hooks 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: "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Now that the pre-fs ones are run on a transient copy of target/, the post-fs hooks are no longer needed because we no longer need to restore the target/ directory as it is only a internal copy. Remove support for the post-fs hooks, and update the sole package using them. Unlike for the pre-/post-gen hooks, we do not add a legacy check because this was mostly a purely-internal detail that was never really exposed nor documented. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle --- fs/common.mk | 2 -- package/pkg-generic.mk | 2 -- package/skeleton-init-systemd/skeleton-init-systemd.mk | 6 ------ 3 files changed, 10 deletions(-) diff --git a/fs/common.mk b/fs/common.mk index 8bb26f1146..bacc98ec68 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -94,8 +94,6 @@ endif $(foreach hook,$(ROOTFS_PRE_CMD_HOOKS),\ $(call PRINTF,$($(hook))) >> $(FAKEROOT_SCRIPT)$(sep)) $(call PRINTF,$(ROOTFS_COMMON_TAR_CMD)) >> $(FAKEROOT_SCRIPT) - $(foreach hook,$(ROOTFS_POST_CMD_HOOKS),\ - $(call PRINTF,$($(hook))) >> $(FAKEROOT_SCRIPT)$(sep)) chmod a+x $(FAKEROOT_SCRIPT) PATH=$(BR_PATH) $(HOST_DIR)/bin/fakeroot -- $(FAKEROOT_SCRIPT) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 152e1d0c67..88375916fd 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -644,7 +644,6 @@ $(2)_PRE_LEGAL_INFO_HOOKS ?= $(2)_POST_LEGAL_INFO_HOOKS ?= $(2)_TARGET_FINALIZE_HOOKS ?= $(2)_ROOTFS_PRE_CMD_HOOKS ?= -$(2)_ROOTFS_POST_CMD_HOOKS ?= # human-friendly targets and target sequencing $(1): $(1)-install @@ -954,7 +953,6 @@ PACKAGES_USERS += $$($(2)_USERS)$$(sep) endif TARGET_FINALIZE_HOOKS += $$($(2)_TARGET_FINALIZE_HOOKS) ROOTFS_PRE_CMD_HOOKS += $$($(2)_ROOTFS_PRE_CMD_HOOKS) -ROOTFS_POST_CMD_HOOKS += $$($(2)_ROOTFS_POST_CMD_HOOKS) ifeq ($$($(2)_SITE_METHOD),svn) DL_TOOLS_DEPENDENCIES += svn diff --git a/package/skeleton-init-systemd/skeleton-init-systemd.mk b/package/skeleton-init-systemd/skeleton-init-systemd.mk index ff64205cbe..5d6b716f7a 100644 --- a/package/skeleton-init-systemd/skeleton-init-systemd.mk +++ b/package/skeleton-init-systemd/skeleton-init-systemd.mk @@ -55,12 +55,6 @@ define SKELETON_INIT_SYSTEMD_PRE_ROOTFS_VAR endef SKELETON_INIT_SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SKELETON_INIT_SYSTEMD_PRE_ROOTFS_VAR -define SKELETON_INIT_SYSTEMD_POST_ROOTFS_VAR - rm -rf $(TARGET_DIR)/var - mv $(TARGET_DIR)/usr/share/factory/var $(TARGET_DIR)/var -endef -SKELETON_INIT_SYSTEMD_ROOTFS_POST_CMD_HOOKS += SKELETON_INIT_SYSTEMD_POST_ROOTFS_VAR - endif define SKELETON_INIT_SYSTEMD_INSTALL_TARGET_CMDS From patchwork Sat Mar 31 09:06:01 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: 893746 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=free.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="EBKh1HdQ"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40Ct0D1LNRz9s1S for ; Sat, 31 Mar 2018 20:06:52 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 8D5F984043; Sat, 31 Mar 2018 09:06:40 +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 Cx5gSlWmjSbG; Sat, 31 Mar 2018 09:06:38 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 8BA0E8ADEF; Sat, 31 Mar 2018 09:06:36 +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 D76871C062E for ; Sat, 31 Mar 2018 09:06:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id D23D289200 for ; Sat, 31 Mar 2018 09:06:24 +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 CKdU6D2Udwz4 for ; Sat, 31 Mar 2018 09:06:24 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f172.google.com (mail-wr0-f172.google.com [209.85.128.172]) by fraxinus.osuosl.org (Postfix) with ESMTPS id E5C0A8922B for ; Sat, 31 Mar 2018 09:06:23 +0000 (UTC) Received: by mail-wr0-f172.google.com with SMTP id f14so9604300wre.8 for ; Sat, 31 Mar 2018 02:06:23 -0700 (PDT) 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=5jsYfsHFUakbsa9Vc7fAKYYbrDxGkDiggZHlLboNsmA=; b=EBKh1HdQNe2/VbjwDatBCNIlCfgQGR8wOn+sKJ+tm0GsQr9oxvxj8gB0BobgpFxsxa GVKe9l3Sppf8BQdWVSnVnGHsUcIwOs35wPcPMeegPcLUX5/vkdjqnYQHg+kKes4r/UDt jEz4rgSfP8lq6iTRhtxMNufHRG3wtY2fLexDZk/vYE+y9xcm7MMxDgJmodKRAJ8BVNwV d6nuS/JvCi9qVzu7d3v2igJoblAKfZDeE+fYo0jRx13r7dQScklWn0rXk8PjPrxZGcUO GImIAUqIBXe1/sn8C5qbSpNfA2or6NqjK4SHYQ/zkX+iPmaNEEryTxZHzJ7ClBFojvvd 95qQ== 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=5jsYfsHFUakbsa9Vc7fAKYYbrDxGkDiggZHlLboNsmA=; b=qrAuQZ34JlD5nmI0DtV4a78ZZwblT4IYb2A62QULbtwVKnjSLxdc0WPC/VxZ+U+Sx8 maNT1y19upnr9j56zLjzt7OVGuHQwGDj8Tq0gEDaHBeatszAQg5LM9zgJ3fDaIa5ye2M Y6GjTHc2Q4qbCm8Pj3i3waWiEhfvlLhIlI0W6ID8Pv3YTLfuvGAIotVdbqyw9E2rgPZ2 UrZfik2/x8S8IbeoDufsmkxEy/Osz9j2HygClEcJlsgrE/JxTr5LEJzi1KCQAdn44WRI LLPlmgq9Qrj3qrEoduJTSx1qvMKWRvBqQKOKQUJoldjVyYDYW1VVMugnCPWl+tMG64vK 6KhA== X-Gm-Message-State: AElRT7HxYIpToeTlTo7LRaFLQs4RZ9l1t36cfYvEh8/E7qqfr4JMyML7 S7TNZmWZbxN85yyUZQaLxuZZYA== X-Google-Smtp-Source: AIpwx4/cZreh12+7XWcjXEhXwe+0lPrBQr+V+/HFHV3nOmks0CJ0/v7GOHf7RaKkAumaNu4zeMwMNA== X-Received: by 10.223.159.79 with SMTP id f15mr1524160wrg.115.1522487182173; Sat, 31 Mar 2018 02:06:22 -0700 (PDT) Received: from scaer.online.net (ns304657.ip-46-105-103.eu. [46.105.103.66]) by smtp.gmail.com with ESMTPSA id u110sm18111490wrc.72.2018.03.31.02.06.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 31 Mar 2018 02:06:21 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 31 Mar 2018 11:06:01 +0200 Message-Id: X-Mailer: git-send-email 2.14.1 In-Reply-To: References: Subject: [Buildroot] [PATCH 15/15 v4] fs: remove intermediate artefacts 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: "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Each of the intermediate, per-rootfs target directories, as well as the intermediate tarball, can take quite some place, and is mostly a duplication of what's already in target/. The only delta, if any, would be the tweaks made by the filesystem image generations, but those tweaks are most probably only meaningfull when seen as root. We normally do not remove intermediate files, but those can be quite large, and are not directly usable by, nor accessible to the user. So, get rid of them once the filesystem has been generated. This does not need to be done in fakeroot. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Tested-by: Matt Weber --- Makefile | 1 + fs/common.mk | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 9fba7a3ed8..96c2d200a3 100644 --- a/Makefile +++ b/Makefile @@ -756,6 +756,7 @@ endif .PHONY: target-post-image target-post-image: $(TARGETS_ROOTFS) target-finalize + @rm -f $(ROOTFS_COMMON_TAR) @$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_IMAGE_SCRIPT)), \ $(call MESSAGE,"Executing post-image script $(s)"); \ $(EXTRA_ENV) $(s) $(BINARIES_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep)) diff --git a/fs/common.mk b/fs/common.mk index bacc98ec68..2ee130ee08 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -96,6 +96,7 @@ endif $(call PRINTF,$(ROOTFS_COMMON_TAR_CMD)) >> $(FAKEROOT_SCRIPT) chmod a+x $(FAKEROOT_SCRIPT) PATH=$(BR_PATH) $(HOST_DIR)/bin/fakeroot -- $(FAKEROOT_SCRIPT) + $(Q)rm -rf $(TARGET_DIR) rootfs-common-show-depends: @echo $(ROOTFS_COMMON_DEPENDENCIES) @@ -154,6 +155,7 @@ $$(BINARIES_DIR)/rootfs.$(1): $$(ROOTFS_$(2)_DEPENDENCIES) $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) chmod a+x $$(FAKEROOT_SCRIPT) PATH=$$(BR_PATH) $$(HOST_DIR)/bin/fakeroot -- $$(FAKEROOT_SCRIPT) + $(Q)rm -rf $$(TARGET_DIR) ifneq ($$(ROOTFS_$(2)_COMPRESS_CMD),) PATH=$$(BR_PATH) $$(ROOTFS_$(2)_COMPRESS_CMD) $$@ > $$@$$(ROOTFS_$(2)_COMPRESS_EXT) endif