OSDN Git Service

Add version and arch to volume ID of the iso
authorChih-Wei Huang <cwhuang@linux.org.tw>
Fri, 22 Nov 2019 09:42:35 +0000 (17:42 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Fri, 22 Nov 2019 09:42:35 +0000 (17:42 +0800)
It's suggested by the maintainer of libosinfo.

To avoid the volume ID too long, remove 'LiveCD' suffix.

Android.mk

index ef05615..22bb671 100644 (file)
@@ -90,7 +90,7 @@ $(ISO_IMAGE): $(boot_dir) $(BUILT_IMG)
        sed -i "s|OS_TITLE|$(if $(RELEASE_OS_TITLE),$(RELEASE_OS_TITLE),Android-x86)|" $</isolinux/isolinux.cfg $</efi/boot/android.cfg
        $(GENISOIMG) -vJURT -b isolinux/isolinux.bin -c isolinux/boot.cat \
                -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -e boot/grub/efi.img -no-emul-boot \
-               -input-charset utf-8 -V "$(if $(RELEASE_OS_TITLE),$(RELEASE_OS_TITLE),Android-x86) LiveCD" -o $@ $^
+               -input-charset utf-8 -V "$(if $(RELEASE_OS_TITLE),$(RELEASE_OS_TITLE),Android-x86) $(VER) ($(TARGET_ARCH))" -o $@ $^
        $(hide) isohybrid --uefi $@ || echo -e "isohybrid not found.\nInstall syslinux 4.0 or higher if you want to build a usb bootable iso."
        @echo -e "\n\n$@ is built successfully.\n\n"