From c2792f5dbba194ec8757cc652050b48fc3fc2c69 Mon Sep 17 00:00:00 2001 From: "Tomas Kelemen (vudiq)" Date: Wed, 30 May 2018 08:31:04 +0200 Subject: [PATCH] redefine variable names for partition labels --- distributions/LibreELEC/options | 6 +++--- packages/sysutils/busybox/package.mk | 4 ++-- packages/tools/u-boot/package.mk | 8 ++++---- projects/Amlogic/packages/u-boot/package.mk | 8 ++++---- scripts/mkimage | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/distributions/LibreELEC/options b/distributions/LibreELEC/options index 1a44b2ff653..166882daabd 100644 --- a/distributions/LibreELEC/options +++ b/distributions/LibreELEC/options @@ -211,6 +211,6 @@ # Default supported get handlers (archive, git, file etc.) GET_HANDLER_SUPPORT="archive" -# Partition labels - DISTRO_FAT_VOLUME_LABEL="LIBREELEC" - DISTRO_STORAGE_VOLUME_LABEL="STORAGE" +# Partition labels for USB/SD installation media + DISTRO_BOOTLABEL="LIBREELEC" + DISTRO_DISKLABEL="STORAGE" diff --git a/packages/sysutils/busybox/package.mk b/packages/sysutils/busybox/package.mk index 71889680fee..63d519ed931 100644 --- a/packages/sysutils/busybox/package.mk +++ b/packages/sysutils/busybox/package.mk @@ -218,8 +218,8 @@ makeinstall_init() { if find_file_path initramfs/platform_init; then cp ${FOUND_PATH} $INSTALL - sed -e "s/@BOOT_LABEL@/$DISTRO_FAT_VOLUME_LABEL/g" \ - -e "s/@DISK_LABEL@/$DISTRO_STORAGE_VOLUME_LABEL/g" \ + sed -e "s/@BOOT_LABEL@/$DISTRO_BOOTLABEL/g" \ + -e "s/@DISK_LABEL@/$DISTRO_DISKLABEL/g" \ -i $INSTALL/platform_init chmod 755 $INSTALL/platform_init fi diff --git a/packages/tools/u-boot/package.mk b/packages/tools/u-boot/package.mk index cce1fa3d334..22d094d9240 100644 --- a/packages/tools/u-boot/package.mk +++ b/packages/tools/u-boot/package.mk @@ -71,15 +71,15 @@ makeinstall_target() { # Replace partition names in update.sh if [ -f "$INSTALL/usr/share/bootloader/update.sh" ] ; then - sed -e "s/@BOOT_LABEL@/$DISTRO_FAT_VOLUME_LABEL/g" \ - -e "s/@DISK_LABEL@/$DISTRO_STORAGE_VOLUME_LABEL/g" \ + sed -e "s/@BOOT_LABEL@/$DISTRO_BOOTLABEL/g" \ + -e "s/@DISK_LABEL@/$DISTRO_DISKLABEL/g" \ -i $INSTALL/usr/share/bootloader/update.sh fi # Replace labels in boot.ini if [ -f "$INSTALL/usr/share/bootloader/boot.ini" ] ; then - sed -e "s/@BOOT_LABEL@/$DISTRO_FAT_VOLUME_LABEL/g" \ - -e "s/@DISK_LABEL@/$DISTRO_STORAGE_VOLUME_LABEL/g" \ + sed -e "s/@BOOT_LABEL@/$DISTRO_BOOTLABEL/g" \ + -e "s/@DISK_LABEL@/$DISTRO_DISKLABEL/g" \ -i $INSTALL/usr/share/bootloader/boot.ini fi diff --git a/projects/Amlogic/packages/u-boot/package.mk b/projects/Amlogic/packages/u-boot/package.mk index 0110fe45250..557f94f98c6 100644 --- a/projects/Amlogic/packages/u-boot/package.mk +++ b/projects/Amlogic/packages/u-boot/package.mk @@ -92,15 +92,15 @@ makeinstall_target() { # Replace partition names in update.sh if [ -f "$INSTALL/usr/share/bootloader/update.sh" ] ; then - sed -e "s/@BOOT_LABEL@/$DISTRO_FAT_VOLUME_LABEL/g" \ - -e "s/@DISK_LABEL@/$DISTRO_STORAGE_VOLUME_LABEL/g" \ + sed -e "s/@BOOT_LABEL@/$DISTRO_BOOTLABEL/g" \ + -e "s/@DISK_LABEL@/$DISTRO_DISKLABEL/g" \ -i $INSTALL/usr/share/bootloader/update.sh fi # Replace labels in boot.ini if [ -f "$INSTALL/usr/share/bootloader/boot.ini" ] ; then - sed -e "s/@BOOT_LABEL@/$DISTRO_FAT_VOLUME_LABEL/g" \ - -e "s/@DISK_LABEL@/$DISTRO_STORAGE_VOLUME_LABEL/g" \ + sed -e "s/@BOOT_LABEL@/$DISTRO_BOOTLABEL/g" \ + -e "s/@DISK_LABEL@/$DISTRO_DISKLABEL/g" \ -i $INSTALL/usr/share/bootloader/boot.ini fi } diff --git a/scripts/mkimage b/scripts/mkimage index 679197ba8dc..424181ec0a5 100755 --- a/scripts/mkimage +++ b/scripts/mkimage @@ -71,8 +71,8 @@ trap cleanup SIGINT UUID_2=$(date '+%M%S') FAT_SERIAL_NUMBER="${UUID_1}${UUID_2}" UUID_SYSTEM="${UUID_1}-${UUID_2}" - FAT_VOLUME_LABEL="${DISTRO_FAT_VOLUME_LABEL}" - STORAGE_VOLUME_LABEL="${DISTRO_STORAGE_VOLUME_LABEL}" + FAT_VOLUME_LABEL="${DISTRO_BOOTLABEL}" + STORAGE_VOLUME_LABEL="${DISTRO_DISKLABEL}" # create an image echo