Skip to contentSkip to conversation

fs: allow filesystems to set the name of their output file

PATCH New Yann E. MORIN 3 participants 3 messages Dec 1, 2018 VFS

lore
Share & tools
lore

Yann E. MORIN

author
#0 lore raw

PATCH v4 1/1 fs: allow filesystems to set the name of their output file

From: Carlos Santos <[email protected]>

Some filesystems may want to tweak their output names, rather than using the fixed "rootfs.foo" scheme. Add a ROOTFS_FOO_IMAGE_NAME variable for this purpose.

Signed-off-by Carlos Santos <[email protected]>
[yann.morin.1998 at free.fr: fix the patch]
Signed-off-by "Yann E. MORIN" <[email protected]>

---
Changes v3 -> v4 (Yann):
- fix use of $(strip)
Changes v2->v3 (Carlos):
- Fix typo and use strip instead of qstrip, as spotted by Yann Morin.
Changes v1->v2 (Carlos):
- Prevent leading space when the filesystem gets 'imaginative', as pointed by Yann Morin.

---
 fs/common.mk | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
fs/common.mk +7 -5
index e4a6a4897b..20bf0941aa 100644
@@ -70,6 +70,8 @@ rootfs-common-show-depends:
 # all variable references except the arguments must be $$-quoted.
 define inner-rootfs
 
+ROOTFS_$(2)_IMAGE_NAME ?= rootfs.$(1)
+ROOTFS_$(2)_FINAL_IMAGE_NAME = $$(strip $$(ROOTFS_$(2)_IMAGE_NAME))
 ROOTFS_$(2)_DIR = $$(FS_DIR)/$(1)
 ROOTFS_$(2)_TARGET_DIR = $$(ROOTFS_$(2)_DIR)/target
 

@@ -104,10 +106,10 @@ 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): FAKEROOT_SCRIPT=$$(ROOTFS_$(2)_DIR)/fakeroot
-$$(BINARIES_DIR)/rootfs.$(1): $$(ROOTFS_$(2)_DEPENDENCIES)
-	@$$(call MESSAGE,"Generating root filesystem image rootfs.$(1)")
+$$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): ROOTFS=$(2)
+$$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): FAKEROOT_SCRIPT=$$(ROOTFS_$(2)_DIR)/fakeroot
+$$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES)
+	@$$(call MESSAGE,"Generating filesystem image $$(ROOTFS_$(2)_FINAL_IMAGE_NAME)")
 	rm -rf $$(ROOTFS_$(2)_DIR)
 	mkdir -p $$(ROOTFS_$(2)_DIR)
 	rsync -auH \

@@ -142,7 +144,7 @@ endif
 rootfs-$(1)-show-depends:
 	@echo $$(ROOTFS_$(2)_DEPENDENCIES)
 
-rootfs-$(1): $$(BINARIES_DIR)/rootfs.$(1)
+rootfs-$(1): $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME)
 
 .PHONY: rootfs-$(1) rootfs-$(1)-show-depends
Signature · 1 line
2.14.1
#1 lore raw

PATCH v4 1/1 fs: allow filesystems to set the name of their output file

Quoted 12 lines

From: "Yann Morin" <[email protected]>
To: "buildroot" <[email protected]>
Cc: "DATACOM" <[email protected]>, "Yann Morin" <[email protected]>
Sent: S?bado, 1 de dezembro de 2018 7:14:36
Subject: [PATCHv4] fs: allow filesystems to set the name of their output file

From: Carlos Santos <[email protected]>

Some filesystems may want to tweak their output names, rather than using the fixed "rootfs.foo" scheme. Add a ROOTFS_FOO_IMAGE_NAME variable for this purpose.

Quoted 7 lines
Signed-off-by Carlos Santos <[email protected]>
[yann.morin.1998 at free.fr: fix the patch]
Signed-off-by "Yann E. MORIN" <[email protected]>

---
Changes v3 -> v4 (Yann):
- fix use of $(strip)

Thanks!

Signature · 1 line
Carlos Santos (Casantos) - DATACOM, P&D
Applied
#2 lore raw

PATCH v4 1/1 fs: allow filesystems to set the name of their output file

In reply to Yann E. MORIN

Hello,

Quoted 18 lines · Yann E. MORIN

From: Carlos Santos <[email protected]>

Some filesystems may want to tweak their output names, rather than using the fixed "rootfs.foo" scheme. Add a ROOTFS_FOO_IMAGE_NAME variable for this purpose.

Signed-off-by Carlos Santos <[email protected]>
[yann.morin.1998 at free.fr: fix the patch]
Signed-off-by "Yann E. MORIN" <[email protected]>

---
Changes v3 -> v4 (Yann):
- fix use of $(strip)
Changes v2->v3 (Carlos):
- Fix typo and use strip instead of qstrip, as spotted by Yann Morin.
Changes v1->v2 (Carlos):
- Prevent leading space when the filesystem gets 'imaginative', as pointed by Yann Morin.

Quoted 3 lines
---
 fs/common.mk | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

Applied to next, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com