scripts/mkimage: use generated serial number for system partition

Also removes unused UUID_SYSTEM variable
This commit is contained in:
Jonas Karlman 2017-10-08 20:08:02 +02:00
parent adf3f57e6c
commit 6176f8b96b
2 changed files with 1 additions and 4 deletions

View File

@ -342,7 +342,6 @@ if [ "$1" = "release" -o "$1" = "mkimage" -o "$1" = "amlpkg" -o "$1" = "noobs" ]
BOOTLOADER="$BOOTLOADER" \
KERNEL_NAME="$KERNEL_NAME" \
RELEASE_DIR=$RELEASE_DIR \
UUID_SYSTEM="$(uuidgen)" \
UUID_STORAGE="$(uuidgen)" \
UBOOT_SYSTEM="$UBOOT_SYSTEM" \
EXTRA_CMDLINE="$EXTRA_CMDLINE" \

View File

@ -118,10 +118,8 @@ fi
alias mcopy="mcopy -i $DISK@@$OFFSET"
alias mmd="mmd -i $DISK@@$OFFSET"
if [ "$BOOTLOADER" = "syslinux" ]; then
if [ "$BOOTLOADER" = "syslinux" -o "$BOOTLOADER" = "bcm2835-bootloader" -o "$BOOTLOADER" = "u-boot" ]; then
mformat -v "$FAT_VOLUME_LABEL" -N "$FAT_SERIAL_NUMBER" ::
elif [ "$BOOTLOADER" = "bcm2835-bootloader" -o "$BOOTLOADER" = "u-boot" ]; then
mformat -v "$FAT_VOLUME_LABEL" ::
fi
sync