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

ImageRules: Ensure nightly builds will have a stable volume-id

Browse Source 
Let's make the nightly builds consistent in a way that they would always
be recognized by libosinfo (and, consequently, by GNOME Boxes,
 virt-manager, virt-install, ...) by explictly using "nightly" instead
of the $(HAIKU_VERSION) when generating nightly builds.

Signed-off-by: Fabiano Fidêncio <fabiano@fidencio.org>

Change-Id: I6fc4f15be1e8e9244abf14e75308fc825f37b2e8
Reviewed-on: https://review.haiku-os.org/c/1053
Reviewed-by: Alex von Gluck IV <kallisti5@unixzen.com>
This commit is contained in:
Fabiano Fidêncio 2019-02-14 21:09:24 +01:00 committed by waddlesplash
parent aa7750382a
commit 768957dca1
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/jam/DefaultBuildProfiles
View File

@ -142,6 +142,7 @@ rule DefineDefaultBuildProfiles
HAIKU_IMAGE_SIZE ?= 850 ;
}
HAIKU_IMAGE_SIZE ?= 600 ;
HAIKU_NIGHTLY_BUILD = 1 ;
AddHaikuImagePackages
man

14
build/jam/ImageRules
View File

@ -1553,7 +1553,12 @@ 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_NIGHTLY_BUILD) = 1 {
VOLID on $(image) = haiku-nightly-$(TARGET_ARCH) ;
} else {
VOLID on $(image) = haiku-$(HAIKU_VERSION)-$(TARGET_ARCH) ;
}
if $(HAIKU_ANYBOOT_LEGACY) = 1 {
BuildCDBootImageMBR $(image) : $(bootfloppy) $(extrafiles) ;
@ -1588,7 +1593,12 @@ 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) ;
if $(HAIKU_NIGHTLY_BUILD) = 1 {
VOLID on $(image) = haiku-nightly-$(TARGET_ARCH) ;
} else {
VOLID on $(image) = haiku-$(HAIKU_VERSION)-$(TARGET_ARCH) ;
}
BuildCDBootPPCImage1 $(image) : $(elfloader) $(coffloader) $(chrpscript)
$(extrafiles) ;