jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2076 from Kwiboo/mkimage-patitions

Browse Source 
scripts/mkimage: rename gpt partitions and use generated serial number
This commit is contained in:
Christian Hewitt 2017-10-12 21:33:12 +04:00 committed by GitHub
commit 157816bac7
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/image
View File

@ -345,7 +345,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" \

29
scripts/mkimage
View File

@ -32,6 +32,12 @@
exit 1
fi
if [ "$BOOTLOADER" = "syslinux" ]; then
DISK_LABEL=gpt
else
DISK_LABEL=msdos
fi
STORAGE_SIZE=32 # STORAGE_SIZE must be >= 32 !
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
# write a disklabel
echo "image: creating partition table..."
if [ "$BOOTLOADER" = "syslinux" ]; then
parted -s "$DISK" mklabel gpt
else
parted -s "$DISK" mklabel msdos
fi
echo "image: creating $DISK_LABEL partition table..."
parted -s "$DISK" mklabel $DISK_LABEL
sync
# create part1
echo "image: creating part1..."
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 [ "$BOOTLOADER" = "syslinux" ]; then
if [ "$DISK_LABEL" = "gpt" ]; 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
else
parted -s "$DISK" -a min unit s mkpart primary fat32 $SYSTEM_PART_START $SYSTEM_PART_END
parted -s "$DISK" set 1 boot on
fi
sync
@ -94,7 +97,11 @@ trap cleanup SIGINT
echo "image: creating part2..."
STORAGE_PART_START=$(( $SYSTEM_PART_END + 1 ))
STORAGE_PART_END=$(( $STORAGE_PART_START + ($STORAGE_SIZE * 1024 * 1024 / 512) - 1 ))
parted -s "$DISK" -a min unit s mkpart primary ext4 $STORAGE_PART_START $STORAGE_PART_END
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
fi
sync
if [ "$BOOTLOADER" = "syslinux" ]; then
@ -118,10 +125,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