From: Arnout Vandecappelle <arnout@mind.be>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 07/15 v4] fs: use a per-rootfs fakeroot script
Date: Sat, 31 Mar 2018 20:43:09 +0200 [thread overview]
Message-ID: <6b438cb6-714a-fc52-5b60-6fb59f2fe014@mind.be> (raw)
In-Reply-To: <e39375ef-2546-2b16-1b41-b9663d460fb0@mind.be>
On 31-03-18 20:26, Arnout Vandecappelle wrote:
>
>
> On 31-03-18 11:05, Yann E. MORIN wrote:
>> ... and locate that script in a per-rootfs directory.
>>
>> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
>> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
>> Cc: Arnout Vandecappelle <arnout@mind.be>
>> ---
>> 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
>
> I don't agree with this bit. We want to avoid this kind of per-target override
> whenever possible.
>
> So IMO we should define the global FAKEROOT_SCRIPT as
>
> -FAKEROOT_SCRIPT = $(FS_DIR)/fakeroot.fs
> +FAKEROOT_SCRIPT = $(ROOTFS_$(ROOTFS)_DIR)/fakeroot.fs
As Yann pointed out to me, if we do this, then patch 12/15 should also add a
definition of ROOTFS_COMMON_DIR = $(FS_DIR). And then probably FS_DIR should be
renamed to ROOTFS_COMMON_DIR (which it is, in the end...).
Given that this is getting a little complicated, I'm OK to do this in a
follow-up patch instead.
Regards,
Arnout
>
> Regards,
> Arnout
>
>> $$(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),\
>>
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
next prev parent reply other threads:[~2018-03-31 18:43 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-31 9:05 [Buildroot] [PATCH 00/15 v4] fs: support parallel filesystems build Yann E. MORIN
2018-03-31 9:05 ` [Buildroot] [PATCH 01/15 v4] fs: run filesystem hooks under fakeroot Yann E. MORIN
2018-03-31 9:05 ` [Buildroot] [PATCH 02/15 v4] fs/cpio: don't extend packages' permissions table Yann E. MORIN
2018-03-31 17:43 ` Peter Korsgaard
2018-03-31 9:05 ` [Buildroot] [PATCH 03/15 v4] fs/iso9660: rename internal variable Yann E. MORIN
2018-03-31 9:05 ` [Buildroot] [PATCH 04/15 v4] core: introduce intermediate BASE_TARGET_DIR variable Yann E. MORIN
2018-03-31 9:05 ` [Buildroot] [PATCH 05/15 v4] fs: set per-rootfs variable name Yann E. MORIN
2018-03-31 18:28 ` Arnout Vandecappelle
2018-03-31 9:05 ` [Buildroot] [PATCH 06/15 v4] fs: define per-rootfs directory Yann E. MORIN
2018-03-31 9:05 ` [Buildroot] [PATCH 07/15 v4] fs: use a per-rootfs fakeroot script Yann E. MORIN
2018-03-31 17:50 ` Peter Korsgaard
2018-03-31 18:26 ` Arnout Vandecappelle
2018-03-31 18:43 ` Arnout Vandecappelle [this message]
2018-03-31 9:05 ` [Buildroot] [PATCH 08/15 v4] fs: split per-rootfs dependency line Yann E. MORIN
2018-03-31 9:05 ` [Buildroot] [PATCH 09/15 v4] fs: introduce per-rootfs TARGET_DIR variable Yann E. MORIN
2018-03-31 18:30 ` Arnout Vandecappelle
2018-03-31 18:51 ` Yann E. MORIN
2018-03-31 18:57 ` Arnout Vandecappelle
2018-03-31 19:11 ` Yann E. MORIN
2018-03-31 9:05 ` [Buildroot] [PATCH 10/15 v4] fs: new intermediate rootfs-common to gather common dependencies Yann E. MORIN
2018-03-31 9:05 ` [Buildroot] [PATCH 11/15 v4] fs: introduce a macro for reproducible command Yann E. MORIN
2018-03-31 9:05 ` [Buildroot] [PATCH 12/15 v4] fs: use a common tarball as base for the other filesystems Yann E. MORIN
2018-03-31 18:53 ` Arnout Vandecappelle
2018-03-31 9:05 ` [Buildroot] [PATCH 13/15 v4] fs: run packages' filesystem hooks in a copy of target/ Yann E. MORIN
2018-03-31 19:04 ` Arnout Vandecappelle
2018-03-31 20:27 ` Peter Korsgaard
2018-03-31 21:09 ` Arnout Vandecappelle
2018-04-01 9:54 ` Peter Korsgaard
2018-03-31 9:06 ` [Buildroot] [PATCH 14/15 v4] fs: get rid of package-provided post-fs hooks Yann E. MORIN
2018-03-31 9:06 ` [Buildroot] [PATCH 15/15 v4] fs: remove intermediate artefacts Yann E. MORIN
2018-03-31 17:53 ` Peter Korsgaard
2018-03-31 18:53 ` [Buildroot] [PATCH 00/15 v4] fs: support parallel filesystems build Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6b438cb6-714a-fc52-5b60-6fb59f2fe014@mind.be \
--to=arnout@mind.be \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.