Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ImageRules: Use a less generic name as volume-id

Browse Source 
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 <fabiano@fidencio.org>

Change-Id: I25e2f5338403058a363872abd196d698764cc3c1
Reviewed-on: https://review.haiku-os.org/c/1034
Reviewed-by: waddlesplash <waddlesplash@gmail.com>
This commit is contained in:
Fabiano Fidêncio 2019-02-11 22:18:14 +01:00 committed by waddlesplash
parent a0d1cbb95d
commit 4e29847d38
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/jam/ImageRules
View File

@ -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
}