From 768957dca124dc39664263bf622b548830092d16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fabiano@fidencio.org>
Date: Thu, 14 Feb 2019 21:09:24 +0100
Subject: [PATCH] ImageRules: Ensure nightly builds will have a stable
 volume-id
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 build/jam/DefaultBuildProfiles |  1 +
 build/jam/ImageRules           | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/build/jam/DefaultBuildProfiles b/build/jam/DefaultBuildProfiles
index 1e3d895f84..a8af980eab 100644
--- a/build/jam/DefaultBuildProfiles
+++ b/build/jam/DefaultBuildProfiles
@@ -142,6 +142,7 @@ rule DefineDefaultBuildProfiles
 				HAIKU_IMAGE_SIZE ?= 850 ;
 			}
 			HAIKU_IMAGE_SIZE ?= 600 ;
+			HAIKU_NIGHTLY_BUILD = 1 ;
 
 			AddHaikuImagePackages
 				man
diff --git a/build/jam/ImageRules b/build/jam/ImageRules
index f5617c26ae..bcaa5d7fdc 100644
--- a/build/jam/ImageRules
+++ b/build/jam/ImageRules
@@ -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) ;