hrev50718 adds 1 changeset to branch 'master'
old head: ecb395852e86c5deac1ca0b01ecb317ca831eebc
new head: 738ca0a3a31da260d5b3ba18b6dd616dc59a0e03
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=738ca0a3a31d+%5Eecb395852e86
----------------------------------------------------------------------------
738ca0a3a31d: build: Change anyboot output from image to iso
* Re ML discussions, this should make a lot more
sense to users as it is inline with what most
linux distros ship.
* This will require a tweak to the buildbot.
* First step to shipping anyboot instead of plain iso.
[ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev50718
Commit: 738ca0a3a31da260d5b3ba18b6dd616dc59a0e03
URL: http://cgit.haiku-os.org/haiku/commit/?id=738ca0a3a31d
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Tue Nov 29 15:41:15 2016 UTC
----------------------------------------------------------------------------
3 files changed, 7 insertions(+), 7 deletions(-)
build/jam/BuildSetup | 2 +-
build/jam/DefaultBuildProfiles | 8 ++++----
build/jam/UserBuildConfig.ReadMe | 4 ++--
----------------------------------------------------------------------------
diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index 8ca886b..13edfe1 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -80,7 +80,7 @@ HAIKU_DEFAULT_CD_DIR = $(HAIKU_OUTPUT_DIR) ;
HAIKU_DEFAULT_CD_LABEL = Haiku ;
# Haiku Anyboot defaults
-HAIKU_DEFAULT_ANYBOOT_NAME = haiku-anyboot.image ;
+HAIKU_DEFAULT_ANYBOOT_NAME = haiku-anyboot.iso ;
HAIKU_DEFAULT_ANYBOOT_DIR = $(HAIKU_OUTPUT_DIR) ;
HAIKU_DEFAULT_ANYBOOT_LABEL ?= Haiku ;
diff --git a/build/jam/DefaultBuildProfiles b/build/jam/DefaultBuildProfiles
index b7fa17e..7263991 100644
--- a/build/jam/DefaultBuildProfiles
+++ b/build/jam/DefaultBuildProfiles
@@ -38,14 +38,14 @@ rule DefineDefaultBuildProfiles
DefineBuildProfile release-vmware : vmware-image : "haiku-release.vmdk"
;
DefineBuildProfile release-cd : cd-image : "haiku-release.iso" ;
DefineBuildProfile release-anyboot : anyboot-image
- : "haiku-release-anyboot.image" ;
+ : "haiku-release-anyboot.iso" ;
# nightly profiles
DefineBuildProfile nightly-raw : image : "haiku-nightly.image" ;
DefineBuildProfile nightly-vmware : vmware-image : "haiku-nightly.vmdk"
;
DefineBuildProfile nightly-cd : cd-image : "haiku-nightly.iso" ;
DefineBuildProfile nightly-anyboot : anyboot-image
- : "haiku-nightly-anyboot.image" ;
+ : "haiku-nightly-anyboot.iso" ;
# bootstrap profiles
DefineBuildProfile bootstrap-raw : image : "haiku-bootstrap.image" ;
@@ -53,14 +53,14 @@ rule DefineDefaultBuildProfiles
DefineBuildProfile bootstrap-vmware : vmware-image
: "haiku-bootstrap.vmdk" ;
DefineBuildProfile bootstrap-anyboot : anyboot-image
- : "haiku-bootstrap-anyboot.image" ;
+ : "haiku-bootstrap-anyboot.iso" ;
# minimum profiles
DefineBuildProfile minimum-raw : image : "haiku-minimum.image" ;
DefineBuildProfile minimum-mmc : haiku-mmc-image : "haiku-minimum.mmc" ;
DefineBuildProfile minimum-vmware : vmware-image : "haiku-minimum.vmdk"
;
DefineBuildProfile minimum-anyboot : anyboot-image
- : "haiku-minimum-anyboot.image" ;
+ : "haiku-minimum-anyboot.iso" ;
switch $(HAIKU_BUILD_PROFILE) {
diff --git a/build/jam/UserBuildConfig.ReadMe b/build/jam/UserBuildConfig.ReadMe
index 8e4f0c4..63691a5 100644
--- a/build/jam/UserBuildConfig.ReadMe
+++ b/build/jam/UserBuildConfig.ReadMe
@@ -194,7 +194,7 @@ AddGroupToHaikuImage party : 101 : baron walter ;
# ("haiku.vmdk" in the generated directory) will be used, unless the
# respective variables are set.
# anyboot - A custom image (type "anyboot-image"), its size will be 4 MB larger
-# than the value of HAIKU_IMAGE_SIZE, named haiku-anyboot.image.
+# than the value of HAIKU_IMAGE_SIZE, named haiku-anyboot.iso.
# crash - Similar to the vmware profile, but created at a specific location
# and 1 GB size. Furthermore a "crash-tests" directory will be copied
# to the image.
@@ -203,7 +203,7 @@ AddGroupToHaikuImage party : 101 : baron walter ;
DefineBuildProfile disk : disk : "/dev/sda57" ;
DefineBuildProfile qemu : image : "haiku-qemu.image" ;
DefineBuildProfile vmware : vmware-image ;
-DefineBuildProfile anyboot : anyboot-image : "haiku-anyboot.image" ;
+DefineBuildProfile anyboot : anyboot-image : "haiku-anyboot.iso" ;
DefineBuildProfile crash : vmware-image
: "/home/foobar/vmware/Virtual Machines/CrashOMatic/CrashOMatic.vmdk" ;
DefineBuildProfile install : install : /Haiku2 ;
