aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fs/ext2/Config.in3
-rw-r--r--fs/ext2/ext2.mk8
2 files changed, 11 insertions, 0 deletions
diff --git a/fs/ext2/Config.in b/fs/ext2/Config.in
index 8751b621e9..5b1cd0cd98 100644
--- a/fs/ext2/Config.in
+++ b/fs/ext2/Config.in
@@ -41,6 +41,9 @@ config BR2_TARGET_ROOTFS_EXT2_REV
default 0 if BR2_TARGET_ROOTFS_EXT2_2r0
default 1 if !BR2_TARGET_ROOTFS_EXT2_2r0
+config BR2_TARGET_ROOTFS_EXT2_LABEL
+ string "filesystem label"
+
config BR2_TARGET_ROOTFS_EXT2_BLOCKS
int "size in blocks (leave at 0 for auto calculation)"
default 0
diff --git a/fs/ext2/ext2.mk b/fs/ext2/ext2.mk
index 96b7a4a7fa..1cac72e0d5 100644
--- a/fs/ext2/ext2.mk
+++ b/fs/ext2/ext2.mk
@@ -18,6 +18,14 @@ ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_RESBLKS)),0)
EXT2_OPTS += -r $(BR2_TARGET_ROOTFS_EXT2_RESBLKS)
endif
+# Not qstrip-ing the variable, because it may contain spaces, but we must
+# qstrip it when checking. Furthermore, we need to further quote it, so
+# that the quotes do not get eaten by the echo statement when creating the
+# fakeroot script
+ifneq ($(call qstrip,$(BR2_TARGET_ROOTFS_EXT2_LABEL)),)
+EXT2_OPTS += -l '$(BR2_TARGET_ROOTFS_EXT2_LABEL)'
+endif
+
ROOTFS_EXT2_DEPENDENCIES = host-mke2img
define ROOTFS_EXT2_CMD