Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fs/ext2: fix namespace for variables
In filesystems, variables must be prefixed with ROOTFS_, to avoid ckashing with packages of the same name. We do not have a package named 'ext2', so we currently have no clash, but it is still ebtter that the variables be properly namespaced. Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Cc: Kory Maincent <kory.maincent@bootlin.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
- Loading branch information
1 parent
4906e77
commit db7d786
Showing
1 changed file
with
8 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,32 +4,32 @@ | |
# | ||
################################################################################ | ||
|
||
EXT2_SIZE = $(call qstrip,$(BR2_TARGET_ROOTFS_EXT2_SIZE)) | ||
ifeq ($(BR2_TARGET_ROOTFS_EXT2)-$(EXT2_SIZE),y-) | ||
ROOTFS_EXT2_SIZE = $(call qstrip,$(BR2_TARGET_ROOTFS_EXT2_SIZE)) | ||
ifeq ($(BR2_TARGET_ROOTFS_EXT2)-$(ROOTFS_EXT2_SIZE),y-) | ||
$(error BR2_TARGET_ROOTFS_EXT2_SIZE cannot be empty) | ||
endif | ||
|
||
EXT2_MKFS_OPTS = $(call qstrip,$(BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS)) | ||
ROOTFS_EXT2_MKFS_OPTS = $(call qstrip,$(BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS)) | ||
|
||
# qstrip results in stripping consecutive spaces into a single one. So the | ||
# variable is not qstrip-ed to preserve the integrity of the string value. | ||
EXT2_LABEL = $(subst ",,$(BR2_TARGET_ROOTFS_EXT2_LABEL)) | ||
ROOTFS_EXT2_LABEL = $(subst ",,$(BR2_TARGET_ROOTFS_EXT2_LABEL)) | ||
#" Syntax highlighting... :-/ ) | ||
|
||
EXT2_OPTS = \ | ||
ROOTFS_EXT2_OPTS = \ | ||
-d $(TARGET_DIR) \ | ||
-r $(BR2_TARGET_ROOTFS_EXT2_REV) \ | ||
-N $(BR2_TARGET_ROOTFS_EXT2_INODES) \ | ||
-m $(BR2_TARGET_ROOTFS_EXT2_RESBLKS) \ | ||
-L "$(EXT2_LABEL)" \ | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
yann-morin-1998
Author
Contributor
|
||
$(EXT2_MKFS_OPTS) | ||
$(ROOTFS_EXT2_MKFS_OPTS) | ||
|
||
ROOTFS_EXT2_DEPENDENCIES = host-e2fsprogs | ||
|
||
define ROOTFS_EXT2_CMD | ||
rm -f $@ | ||
$(HOST_DIR)/sbin/mkfs.ext$(BR2_TARGET_ROOTFS_EXT2_GEN) $(EXT2_OPTS) $@ \ | ||
"$(EXT2_SIZE)" \ | ||
$(HOST_DIR)/sbin/mkfs.ext$(BR2_TARGET_ROOTFS_EXT2_GEN) $(ROOTFS_EXT2_OPTS) $@ \ | ||
"$(ROOTFS_EXT2_SIZE)" \ | ||
|| { ret=$$?; \ | ||
echo "*** Maybe you need to increase the filesystem size (BR2_TARGET_ROOTFS_EXT2_SIZE)" 1>&2; \ | ||
exit $$ret; \ | ||
|
Sorry @yann-morin-1998 and @arnout but here you have missed to replace
$(EXT2_LABEL)
with$(ROOTFS_EXT2_LABEL)
which results inBR2_TARGET_ROOTFS_EXT2_LABEL
not being respected anymore, thus the root fs being created without the choosen user label.