build: label kernel and rootfs ext4 volumes

UUID of ext4 volumes generated by make_ext4fs are determined by volume
label and it will all be 57f8f4bc-abf4-655f-bf67-946fc0f9f25b when label
is empty

Labeling them does not make them unique but tools like block command
from fstools have a better chance differentiating them

Signed-off-by: Yousong Zhou <[email protected]>

diff --git a/include/image.mk b/include/image.mk
index 3e6c9adc661e85b39b437f82a3900bbe6f4268ef..940ae812ea950c8ddbc16a0532b5a903d532473c 100644 (file)
--- a/include/image.mk
+++ b/include/image.mk
@@ -287,7 +287,7 @@ define Image/mkfs/ubifs
 endef
 
 define Image/mkfs/ext4
-       $(STAGING_DIR_HOST)/bin/make_ext4fs \
+       $(STAGING_DIR_HOST)/bin/make_ext4fs -L rootfs \
                -l $(ROOTFS_PARTSIZE) -b $(CONFIG_TARGET_EXT4_BLOCKSIZE) \
                $(if $(CONFIG_TARGET_EXT4_RESERVED_PCT),-m $(CONFIG_TARGET_EXT4_RESERVED_PCT)) \
                $(if $(CONFIG_TARGET_EXT4_JOURNAL),,-J) \

diff --git a/scripts/gen_image_generic.sh b/scripts/gen_image_generic.sh
index d9beeb02953a224bdf6376966b368b47ff8a5331..2d2fb120ceadabc389ad76ca36e027f30262fef6 100755 (executable)
--- a/scripts/gen_image_generic.sh
+++ b/scripts/gen_image_generic.sh
@@ -30,6 +30,6 @@ ROOTFSSIZE="$(($4 / 512))"
 [ -n "$PADDING" ] && dd if=/dev/zero of="$OUTPUT" bs=512 seek="$ROOTFSOFFSET" conv=notrunc count="$ROOTFSSIZE"
 dd if="$ROOTFSIMAGE" of="$OUTPUT" bs=512 seek="$ROOTFSOFFSET" conv=notrunc
 
-make_ext4fs -J -l "$KERNELSIZE" "$OUTPUT.kernel" "$KERNELDIR"
+make_ext4fs -J -L kernel -l "$KERNELSIZE" "$OUTPUT.kernel" "$KERNELDIR"
 dd if="$OUTPUT.kernel" of="$OUTPUT" bs=512 seek="$KERNELOFFSET" conv=notrunc
 rm -f "$OUTPUT.kernel"

diff --git a/target/linux/mvebu/image/Makefile b/target/linux/mvebu/image/Makefile
index b4b77b70b4b8746f44a4ecb209b80711838284a0..967a1e4ee1525ec9db9197c3d5ac13a8ef1c1810 100644 (file)
--- a/target/linux/mvebu/image/Makefile
+++ b/target/linux/mvebu/image/Makefile
@@ -38,7 +38,7 @@ define Build/boot-img-ext4
        $(foreach dts,$(DEVICE_DTS), $(CP) $(KDIR)/image-$(dts).dtb [email protected]/$(dts).dtb;)
        $(CP) $(IMAGE_KERNEL) [email protected]/$(KERNEL_NAME)
        -$(CP) [email protected] [email protected]/boot.scr
-       make_ext4fs -J -l $(CONFIG_TARGET_KERNEL_PARTSIZE)M [email protected] [email protected]
+       make_ext4fs -J -L kernel -l $(CONFIG_TARGET_KERNEL_PARTSIZE)M [email protected] [email protected]
 endef
 
 define Build/sdcard-img