From 4e29847d38246401c1f62a71dba6183068d94f95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Mon, 11 Feb 2019 22:18:14 +0100 Subject: [PATCH] ImageRules: Use a less generic name as volume-id MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The current volume-id is "bootimg", does not matter which version of haiku nor to which architecture the ISO is targetting. Having a "too generic" name as volume-id directly affects the ISO's recognition by libosinfo. From now on, let's use: haiku-$(HAIKU_VERSION)-$(TARGET_ARCH) Which would generate an ISO with volume-id as: Volume id: haiku-default-r1~beta1-x86_64 Fixes: #14695 Signed-off-by: Fabiano Fidêncio Change-Id: I25e2f5338403058a363872abd196d698764cc3c1 Reviewed-on: https://review.haiku-os.org/c/1034 Reviewed-by: waddlesplash --- build/jam/ImageRules | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/build/jam/ImageRules b/build/jam/ImageRules index 98fd2f4672..f5617c26ae 100644 --- a/build/jam/ImageRules +++ b/build/jam/ImageRules @@ -1553,6 +1553,7 @@ rule BuildCDBootImage image : bootfloppy : bootefi : extrafiles Depends $(image) : $(bootefi) ; Depends $(image) : $(extrafiles) ; BOOTIMG on $(image) = $(bootfloppy) ; + VOLID on $(image) = haiku-$(HAIKU_VERSION)-$(TARGET_ARCH) ; if $(HAIKU_ANYBOOT_LEGACY) = 1 { BuildCDBootImageMBR $(image) : $(bootfloppy) $(extrafiles) ; @@ -1565,14 +1566,14 @@ rule BuildCDBootImage image : bootfloppy : bootefi : extrafiles actions BuildCDBootImageMBR { $(RM) $(<) - xorriso -as mkisofs -b $(BOOTIMG) -r -J -V bootimg -o $(<) $(>[1]) $(>[2-]) + xorriso -as mkisofs -b $(BOOTIMG) -r -J -V $(VOLID) -o $(<) $(>[1]) $(>[2-]) } actions BuildCDBootImageEFI { $(RM) $(<) xorriso -as mkisofs -b $(BOOTIMG) -eltorito-alt-boot -no-emul-boot -e $(BOOTEFI) \ - -r -J -V bootimg -o $(<) $(>[1]) $(>[2]) $(>[3-]) + -r -J -V $(VOLID) -o $(<) $(>[1]) $(>[2]) $(>[3-]) } @@ -1587,6 +1588,7 @@ rule BuildCDBootPPCImage image : hfsmaps : elfloader : coffloader : chrpscript Depends $(image) : $(extrafiles) ; Depends $(image) : $(hfsmaps) ; MAPS on $(image) = $(hfsmaps) ; + VOLID on $(image) = haiku-$(HAIKU_VERSION)-$(TARGET_ARCH) ; BuildCDBootPPCImage1 $(image) : $(elfloader) $(coffloader) $(chrpscript) $(extrafiles) ; @@ -1607,7 +1609,7 @@ actions BuildCDBootPPCImage1 bind MAPS cp $(>[4]) $(HAIKU_OUTPUT_DIR)/cd/ xorriso -as mkisofs -v -hfs -part -map $(MAPS) -no-desktop -hfs-volid bootimg \ - -V bootimg -hfs-bless $(HAIKU_OUTPUT_DIR)/cd/boot -prep-boot \ + -V $(VOLID) -hfs-bless $(HAIKU_OUTPUT_DIR)/cd/boot -prep-boot \ boot/haikuloader.xcf -r -o $(<) $(HAIKU_OUTPUT_DIR)/cd $(RM) -r $(HAIKU_OUTPUT_DIR)/cd }