mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 05:06:43 +00:00
Merge pull request #2076 from Kwiboo/mkimage-patitions
scripts/mkimage: rename gpt partitions and use generated serial number
This commit is contained in:
commit
157816bac7
@ -345,7 +345,6 @@ if [ "$1" = "release" -o "$1" = "mkimage" -o "$1" = "amlpkg" -o "$1" = "noobs" ]
|
|||||||
BOOTLOADER="$BOOTLOADER" \
|
BOOTLOADER="$BOOTLOADER" \
|
||||||
KERNEL_NAME="$KERNEL_NAME" \
|
KERNEL_NAME="$KERNEL_NAME" \
|
||||||
RELEASE_DIR=$RELEASE_DIR \
|
RELEASE_DIR=$RELEASE_DIR \
|
||||||
UUID_SYSTEM="$(uuidgen)" \
|
|
||||||
UUID_STORAGE="$(uuidgen)" \
|
UUID_STORAGE="$(uuidgen)" \
|
||||||
UBOOT_SYSTEM="$UBOOT_SYSTEM" \
|
UBOOT_SYSTEM="$UBOOT_SYSTEM" \
|
||||||
EXTRA_CMDLINE="$EXTRA_CMDLINE" \
|
EXTRA_CMDLINE="$EXTRA_CMDLINE" \
|
||||||
|
@ -32,6 +32,12 @@
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ "$BOOTLOADER" = "syslinux" ]; then
|
||||||
|
DISK_LABEL=gpt
|
||||||
|
else
|
||||||
|
DISK_LABEL=msdos
|
||||||
|
fi
|
||||||
|
|
||||||
STORAGE_SIZE=32 # STORAGE_SIZE must be >= 32 !
|
STORAGE_SIZE=32 # STORAGE_SIZE must be >= 32 !
|
||||||
|
|
||||||
DISK_START_PADDING=$(( ($SYSTEM_PART_START + 2048 - 1) / 2048 ))
|
DISK_START_PADDING=$(( ($SYSTEM_PART_START + 2048 - 1) / 2048 ))
|
||||||
@ -71,21 +77,18 @@ trap cleanup SIGINT
|
|||||||
dd if=/dev/zero of="$DISK" bs=1M count="$DISK_SIZE" conv=fsync >"$SAVE_ERROR" 2>&1 || show_error
|
dd if=/dev/zero of="$DISK" bs=1M count="$DISK_SIZE" conv=fsync >"$SAVE_ERROR" 2>&1 || show_error
|
||||||
|
|
||||||
# write a disklabel
|
# write a disklabel
|
||||||
echo "image: creating partition table..."
|
echo "image: creating $DISK_LABEL partition table..."
|
||||||
if [ "$BOOTLOADER" = "syslinux" ]; then
|
parted -s "$DISK" mklabel $DISK_LABEL
|
||||||
parted -s "$DISK" mklabel gpt
|
|
||||||
else
|
|
||||||
parted -s "$DISK" mklabel msdos
|
|
||||||
fi
|
|
||||||
sync
|
sync
|
||||||
|
|
||||||
# create part1
|
# create part1
|
||||||
echo "image: creating part1..."
|
echo "image: creating part1..."
|
||||||
SYSTEM_PART_END=$(( $SYSTEM_PART_START + ($SYSTEM_SIZE * 1024 * 1024 / 512) - 1 ))
|
SYSTEM_PART_END=$(( $SYSTEM_PART_START + ($SYSTEM_SIZE * 1024 * 1024 / 512) - 1 ))
|
||||||
parted -s "$DISK" -a min unit s mkpart primary fat32 $SYSTEM_PART_START $SYSTEM_PART_END
|
if [ "$DISK_LABEL" = "gpt" ]; then
|
||||||
if [ "$BOOTLOADER" = "syslinux" ]; then
|
parted -s "$DISK" -a min unit s mkpart system fat32 $SYSTEM_PART_START $SYSTEM_PART_END
|
||||||
parted -s "$DISK" set 1 legacy_boot on
|
parted -s "$DISK" set 1 legacy_boot on
|
||||||
else
|
else
|
||||||
|
parted -s "$DISK" -a min unit s mkpart primary fat32 $SYSTEM_PART_START $SYSTEM_PART_END
|
||||||
parted -s "$DISK" set 1 boot on
|
parted -s "$DISK" set 1 boot on
|
||||||
fi
|
fi
|
||||||
sync
|
sync
|
||||||
@ -94,7 +97,11 @@ trap cleanup SIGINT
|
|||||||
echo "image: creating part2..."
|
echo "image: creating part2..."
|
||||||
STORAGE_PART_START=$(( $SYSTEM_PART_END + 1 ))
|
STORAGE_PART_START=$(( $SYSTEM_PART_END + 1 ))
|
||||||
STORAGE_PART_END=$(( $STORAGE_PART_START + ($STORAGE_SIZE * 1024 * 1024 / 512) - 1 ))
|
STORAGE_PART_END=$(( $STORAGE_PART_START + ($STORAGE_SIZE * 1024 * 1024 / 512) - 1 ))
|
||||||
|
if [ "$DISK_LABEL" = "gpt" ]; then
|
||||||
|
parted -s "$DISK" -a min unit s mkpart storage ext4 $STORAGE_PART_START $STORAGE_PART_END
|
||||||
|
else
|
||||||
parted -s "$DISK" -a min unit s mkpart primary ext4 $STORAGE_PART_START $STORAGE_PART_END
|
parted -s "$DISK" -a min unit s mkpart primary ext4 $STORAGE_PART_START $STORAGE_PART_END
|
||||||
|
fi
|
||||||
sync
|
sync
|
||||||
|
|
||||||
if [ "$BOOTLOADER" = "syslinux" ]; then
|
if [ "$BOOTLOADER" = "syslinux" ]; then
|
||||||
@ -118,10 +125,8 @@ fi
|
|||||||
alias mcopy="mcopy -i $DISK@@$OFFSET"
|
alias mcopy="mcopy -i $DISK@@$OFFSET"
|
||||||
alias mmd="mmd -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" ::
|
mformat -v "$FAT_VOLUME_LABEL" -N "$FAT_SERIAL_NUMBER" ::
|
||||||
elif [ "$BOOTLOADER" = "bcm2835-bootloader" -o "$BOOTLOADER" = "u-boot" ]; then
|
|
||||||
mformat -v "$FAT_VOLUME_LABEL" ::
|
|
||||||
fi
|
fi
|
||||||
sync
|
sync
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user