Skip to contentSkip to conversation

fs/ext2: misc enhancements (branch yem/fs-vol-id)

PATCH New Yann E. MORIN 2 participants 5 messages Dec 6, 2014 – Dec 7, 2014 ext2 file system

lore
Share & tools
lore

Yann E. MORIN

author
#0 lore raw

v4 cover fs/ext2: misc enhancements (branch yem/fs-vol-id)

Hello All!

This series enhances the fs/ext2 generation. Not much to say beside the individual commit logs... ;-)

Changes v3 -> v4:
- help + slight fixes in the new mke2img script (Thomas, me)

Changes v2 -> v3:
- fix quoting for labels with a space in them (K?roly)

Changes v1 -> v2:
- move our genext2fs.sh wrapper and make it a proper host package, with extensive tweaks to the code (Thomas)

Regards,
Yann E. MORIN.

The following changes since commit c5f0e93d2cc6107cce249e1f11158aeccb4a3449:

rp-pppoe: install default conf file (2014-12-03 23:26:21 +0100)

are available in the git repository at:

git://git.busybox.net/~ymorin/git/buildroot yem/fs-vol-id

for you to fetch changes up to 7dfc8f18b87384622f5e99d73f9efe274a4539ff:

fs/ext2: add option to specify a filesystem label (2014-12-06 23:29:46 +0100)

----------------------------------------------------------------
Yann E. MORIN (3):
package/mke2img: new package
fs/ext2: use the new mke2img host package fs/ext2: add option to specify a filesystem label

 fs/ext2/Config.in              |   6 +-
 fs/ext2/ext2.mk                |  19 ++--
 fs/ext2/genext2fs.sh           | 121 ------------------------
 package/Config.in.host         |   1 +
 package/mke2img/Config.in.host |   9 ++
 package/mke2img/mke2img        | 206 +++++++++++++++++++++++++++++++++++++++++
 package/mke2img/mke2img.mk     |  14 +++
 7 files changed, 246 insertions(+), 130 deletions(-)
 delete mode 100755 fs/ext2/genext2fs.sh
 create mode 100644 package/mke2img/Config.in.host
 create mode 100755 package/mke2img/mke2img
 create mode 100644 package/mke2img/mke2img.mk
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
author
#1 lore raw

PATCH v4 1/3 package/mke2img: new package

Currently, we are using a shell script called genext2fs, that impersonates the real genext2fs. But that script does much more than just call genextfs: it also calls tune2fs and e2fsck.

Because it impersonates genext2fs, we can not easily add new options, and are constrained by the genext2fs options.

But it turns out that, of all the options supported by the real genext2fs, we only really care for a subset, namely:
- number of blocks
- number of inodes
- percentage of blocks reeserved to root
- the root directory which to generate the image from

So, we introduce a new host package, mke2img, that is intended to eventually replace genext2fs.sh.

This new script is highly modeled from the existing genext2fs.sh, but was slightly refreshed, and a new, supposedly sane set of options has been choosen for the features we need (see above), and some new options were added, too, rather than relying on the arguments order or environment variables:

  -b <nb-blocks>    number of blocks in the filesystem
  -i <nb-inodes>    number of inodes in the filesystem
  -r <pc-reserved>  percentage of reserved blocks
* -d <root-dir>     directory containing the root of the filesystem
* -o <img-file>     output image file
  -G <ext-gen>      extfs generation: 2, 3, or 4 (default: 2)
  -R <ext-rev>      ext2 revision: 0 or 1 (default 1)
  -l <label>        filesystem label
  -u <uid>          filesystem UUID; if not specified, a random one is used

* Mandatory options

Since the upstream e2fsprogs are expected to release a new mke2fs that will be able to generate a filesystem image from a directory, we then will be able to replace all the logic in mke2img, to use mke2fs instead of the (relatively fragile) combination of the three tools we currently use.

An entry is added for it in the "Host utilities" menu, so it can be selected for use by post-{build,image} scripts. The ext2 filesystem selection is changed to select that now.

Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Thomas Petazzoni <[email protected]>
Tested-by Karoly Kasza <[email protected]>
Reviewed-by Karoly Kasza <[email protected]>
Tested-by Thomas Petazzoni <[email protected]>

---
Changes v3 -> v4:
- add help (Thomas)
- default to an ext2 rev1 filesystem
- do not accept revision 0 for ext3 and ext4

---
 fs/ext2/Config.in              |   3 +-
 package/Config.in.host         |   1 +
 package/mke2img/Config.in.host |   9 ++
 package/mke2img/mke2img        | 206 +++++++++++++++++++++++++++++++++++++++++
 package/mke2img/mke2img.mk     |  14 +++
 5 files changed, 231 insertions(+), 2 deletions(-)
 create mode 100644 package/mke2img/Config.in.host
 create mode 100755 package/mke2img/mke2img
 create mode 100644 package/mke2img/mke2img.mk
fs/ext2/Config.in +1 -2
index adba6f3..8751b62 100644
@@ -1,7 +1,6 @@
 config BR2_TARGET_ROOTFS_EXT2
 	bool "ext2/3/4 root filesystem"
-	select BR2_PACKAGE_HOST_GENEXT2FS
-	select BR2_PACKAGE_HOST_E2FSPROGS
+	select BR2_PACKAGE_HOST_MKE2IMG
 	help
 	  Build an ext2/3/4 root filesystem
package/Config.in.host +1 -0
index 185dcbc..0b7bc36 100644
@@ -10,6 +10,7 @@ menu "Host utilities"
 	source "package/genimage/Config.in.host"
 	source "package/genpart/Config.in.host"
 	source "package/lpc3250loader/Config.in.host"
+	source "package/mke2img/Config.in.host"
 	source "package/mtd/Config.in.host"
 	source "package/mtools/Config.in.host"
 	source "package/omap-u-boot-utils/Config.in.host"
package/mke2img/Config.in.host new file +9 -0
new file mode 100644
index 0000000..9781c6a
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_HOST_MKE2IMG
+	bool "host mke2img"
+	select BR2_PACKAGE_HOST_E2FSPROGS
+	select BR2_PACKAGE_HOST_GENEXT2FS
+	help
+	  Easily create filesystems of the extend familly: ext2/3/4.
+
+	  This tool is bundled by, and specific to Buildroot. However, it can
+	  be used from post-images scripts is needed.
package/mke2img/mke2img new file +206 -0

206 lines not on this page · raw message

package/mke2img/mke2img.mk new file +14 -0
new file mode 100644
index 0000000..04aaa8f
@@ -0,0 +1,14 @@
+################################################################################
+#
+# mke2img
+#
+################################################################################
+
+HOST_MKE2IMG_SOURCE =
+HOST_MKE2IMG_DEPENDENCIES = host-genext2fs host-e2fsprogs
+
+define HOST_MKE2IMG_INSTALL_CMDS
+	$(INSTALL) -D -m 0755 package/mke2img/mke2img $(HOST_DIR)/usr/bin/mke2img
+endef
+
+$(eval $(host-generic-package))
Signature · 1 line
1.9.1
author
#2 lore raw

PATCH v4 2/3 fs/ext2: use the new mke2img host package

In reply to Yann E. MORIN

And get rid of the old genext2fs.sh wrapper.

Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Thomas Petazzoni <[email protected]>
Tested-by Karoly Kasza <[email protected]>
Reviewed-by Karoly Kasza <[email protected]>
Reviewed-by Thomas Petazzoni <[email protected]>
Tested-by Thomas Petazzoni <[email protected]>
---
 fs/ext2/ext2.mk      |  13 +++---
 fs/ext2/genext2fs.sh | 121 ---------------------------------------------------
 2 files changed, 5 insertions(+), 129 deletions(-)
 delete mode 100755 fs/ext2/genext2fs.sh
fs/ext2/ext2.mk +5 -8
index 425f7bf..96b7a4a 100644
@@ -4,27 +4,24 @@
 #
 ################################################################################
 
-EXT2_OPTS :=
+EXT2_OPTS = -G $(BR2_TARGET_ROOTFS_EXT2_GEN) -R $(BR2_TARGET_ROOTFS_EXT2_REV)
 
 ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_BLOCKS)),0)
 EXT2_OPTS += -b $(BR2_TARGET_ROOTFS_EXT2_BLOCKS)
 endif
 
 ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_INODES)),0)
-EXT2_OPTS += -N $(BR2_TARGET_ROOTFS_EXT2_INODES)
+EXT2_OPTS += -i $(BR2_TARGET_ROOTFS_EXT2_INODES)
 endif
 
 ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_RESBLKS)),0)
-EXT2_OPTS += -m $(BR2_TARGET_ROOTFS_EXT2_RESBLKS)
+EXT2_OPTS += -r $(BR2_TARGET_ROOTFS_EXT2_RESBLKS)
 endif
 
-ROOTFS_EXT2_DEPENDENCIES = host-genext2fs host-e2fsprogs
-
-EXT2_ENV = GEN=$(BR2_TARGET_ROOTFS_EXT2_GEN)
-EXT2_ENV += REV=$(BR2_TARGET_ROOTFS_EXT2_REV)
+ROOTFS_EXT2_DEPENDENCIES = host-mke2img
 
 define ROOTFS_EXT2_CMD
-	PATH=$(BR_PATH) $(EXT2_ENV) fs/ext2/genext2fs.sh -d $(TARGET_DIR) $(EXT2_OPTS) $@
+	PATH=$(BR_PATH) mke2img -d $(TARGET_DIR) $(EXT2_OPTS) -o $@
 endef
 
 rootfs-ext2-symlink:
fs/ext2/genext2fs.sh deleted +0 -121

121 lines not on this page · raw message

Signature · 1 line
1.9.1
author
#3 lore raw

PATCH v4 3/3 fs/ext2: add option to specify a filesystem label

In reply to Yann E. MORIN

Filesystems of the ext familly can carry a filesystem label. Add an option for the user to specify such a label.

Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Thomas Petazzoni <[email protected]>
Cc K?roly Kasza <[email protected]>
Tested-by Karoly Kasza <[email protected]>
Reviewed-by Karoly Kasza <[email protected]>
Reviewed-by Thomas Petazzoni <[email protected]>
Tested-by Thomas Petazzoni <[email protected]>

---
Changes v2 -> v3:
- fix quoting for when the label contains a space (K?roly)

---
 fs/ext2/Config.in | 3 +++
 fs/ext2/ext2.mk   | 8 ++++++++
 2 files changed, 11 insertions(+)
fs/ext2/Config.in +3 -0
index 8751b62..5b1cd0c 100644
@@ -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
fs/ext2/ext2.mk +8 -0
index 96b7a4a..1cac72e 100644
@@ -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
Signature · 1 line
1.9.1
#4 lore raw

v4 cover fs/ext2: misc enhancements (branch yem/fs-vol-id)

In reply to Yann E. MORIN

Dear Yann E. MORIN,

Quoted 4 lines · Yann E. MORIN

Yann E. MORIN (3):
package/mke2img: new package
fs/ext2: use the new mke2img host package fs/ext2: add option to specify a filesystem label

Series applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com