diff options
| author | Yousong Zhou <yszhou4tech@gmail.com> | 2019-11-03 04:10:12 +0000 |
|---|---|---|
| committer | Yousong Zhou <yszhou4tech@gmail.com> | 2019-11-03 04:25:40 +0000 |
| commit | 66ebca7103052ba851be2261a4452787959de9c2 (patch) | |
| tree | 2ac7b8c43dedb14a40c76f3e64747fdeec5937ba | |
| parent | e4af39d56395738d86daa4babb379ab605b4d277 (diff) | |
| download | upstream-66ebca7103052ba851be2261a4452787959de9c2.tar.gz upstream-66ebca7103052ba851be2261a4452787959de9c2.tar.bz2 upstream-66ebca7103052ba851be2261a4452787959de9c2.zip | |
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 <yszhou4tech@gmail.com>
| -rw-r--r-- | include/image.mk | 2 | ||||
| -rwxr-xr-x | scripts/gen_image_generic.sh | 2 | ||||
| -rw-r--r-- | target/linux/mvebu/image/Makefile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/image.mk b/include/image.mk index 3e6c9adc66..940ae812ea 100644 --- 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 d9beeb0295..2d2fb120ce 100755 --- 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 b4b77b70b4..967a1e4ee1 100644 --- 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 $@.boot/$(dts).dtb;) $(CP) $(IMAGE_KERNEL) $@.boot/$(KERNEL_NAME) -$(CP) $@-boot.scr $@.boot/boot.scr - make_ext4fs -J -l $(CONFIG_TARGET_KERNEL_PARTSIZE)M $@.bootimg $@.boot + make_ext4fs -J -L kernel -l $(CONFIG_TARGET_KERNEL_PARTSIZE)M $@.bootimg $@.boot endef define Build/sdcard-img |