i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: Change anyboot output from image to iso

Browse Source 
* 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.
This commit is contained in:
Alexander von Gluck IV
2016-11-29 09:41:55 -06:00
parent ecb395852e
commit 738ca0a3a3
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildSetup
+1 -1
View File
@@ -80,7 +80,7 @@ HAIKU_DEFAULT_CD_DIR = $(HAIKU_OUTPUT_DIR) ;
HAIKU_DEFAULT_CD_LABEL = Haiku ; HAIKU_DEFAULT_CD_LABEL = Haiku ;
# Haiku Anyboot defaults # 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_DIR = $(HAIKU_OUTPUT_DIR) ;
HAIKU_DEFAULT_ANYBOOT_LABEL ?= Haiku ; HAIKU_DEFAULT_ANYBOOT_LABEL ?= Haiku ;
build/jam/DefaultBuildProfiles
+4 -4
View File
@@ -38,14 +38,14 @@ rule DefineDefaultBuildProfiles
DefineBuildProfile release-vmware : vmware-image : "haiku-release.vmdk" ; DefineBuildProfile release-vmware : vmware-image : "haiku-release.vmdk" ;
DefineBuildProfile release-cd : cd-image : "haiku-release.iso" ; DefineBuildProfile release-cd : cd-image : "haiku-release.iso" ;
DefineBuildProfile release-anyboot : anyboot-image DefineBuildProfile release-anyboot : anyboot-image
: "haiku-release-anyboot.image" ; : "haiku-release-anyboot.iso" ;
# nightly profiles # nightly profiles
DefineBuildProfile nightly-raw : image : "haiku-nightly.image" ; DefineBuildProfile nightly-raw : image : "haiku-nightly.image" ;
DefineBuildProfile nightly-vmware : vmware-image : "haiku-nightly.vmdk" ; DefineBuildProfile nightly-vmware : vmware-image : "haiku-nightly.vmdk" ;
DefineBuildProfile nightly-cd : cd-image : "haiku-nightly.iso" ; DefineBuildProfile nightly-cd : cd-image : "haiku-nightly.iso" ;
DefineBuildProfile nightly-anyboot : anyboot-image DefineBuildProfile nightly-anyboot : anyboot-image
: "haiku-nightly-anyboot.image" ; : "haiku-nightly-anyboot.iso" ;
# bootstrap profiles # bootstrap profiles
DefineBuildProfile bootstrap-raw : image : "haiku-bootstrap.image" ; DefineBuildProfile bootstrap-raw : image : "haiku-bootstrap.image" ;
@@ -53,14 +53,14 @@ rule DefineDefaultBuildProfiles
DefineBuildProfile bootstrap-vmware : vmware-image DefineBuildProfile bootstrap-vmware : vmware-image
: "haiku-bootstrap.vmdk" ; : "haiku-bootstrap.vmdk" ;
DefineBuildProfile bootstrap-anyboot : anyboot-image DefineBuildProfile bootstrap-anyboot : anyboot-image
: "haiku-bootstrap-anyboot.image" ; : "haiku-bootstrap-anyboot.iso" ;
# minimum profiles # minimum profiles
DefineBuildProfile minimum-raw : image : "haiku-minimum.image" ; DefineBuildProfile minimum-raw : image : "haiku-minimum.image" ;
DefineBuildProfile minimum-mmc : haiku-mmc-image : "haiku-minimum.mmc" ; DefineBuildProfile minimum-mmc : haiku-mmc-image : "haiku-minimum.mmc" ;
DefineBuildProfile minimum-vmware : vmware-image : "haiku-minimum.vmdk" ; DefineBuildProfile minimum-vmware : vmware-image : "haiku-minimum.vmdk" ;
DefineBuildProfile minimum-anyboot : anyboot-image DefineBuildProfile minimum-anyboot : anyboot-image
: "haiku-minimum-anyboot.image" ; : "haiku-minimum-anyboot.iso" ;
switch $(HAIKU_BUILD_PROFILE) { switch $(HAIKU_BUILD_PROFILE) {
build/jam/UserBuildConfig.ReadMe
+2 -2
View File
@@ -194,7 +194,7 @@ AddGroupToHaikuImage party : 101 : baron walter ;
# ("haiku.vmdk" in the generated directory) will be used, unless the # ("haiku.vmdk" in the generated directory) will be used, unless the
# respective variables are set. # respective variables are set.
# anyboot - A custom image (type "anyboot-image"), its size will be 4 MB larger # 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 # crash - Similar to the vmware profile, but created at a specific location
# and 1 GB size. Furthermore a "crash-tests" directory will be copied # and 1 GB size. Furthermore a "crash-tests" directory will be copied
# to the image. # to the image.
@@ -203,7 +203,7 @@ AddGroupToHaikuImage party : 101 : baron walter ;
DefineBuildProfile disk : disk : "/dev/sda57" ; DefineBuildProfile disk : disk : "/dev/sda57" ;
DefineBuildProfile qemu : image : "haiku-qemu.image" ; DefineBuildProfile qemu : image : "haiku-qemu.image" ;
DefineBuildProfile vmware : vmware-image ; DefineBuildProfile vmware : vmware-image ;
DefineBuildProfile anyboot : anyboot-image : "haiku-anyboot.image" ; DefineBuildProfile anyboot : anyboot-image : "haiku-anyboot.iso" ;
DefineBuildProfile crash : vmware-image DefineBuildProfile crash : vmware-image
: "/home/foobar/vmware/Virtual Machines/CrashOMatic/CrashOMatic.vmdk" ; : "/home/foobar/vmware/Virtual Machines/CrashOMatic/CrashOMatic.vmdk" ;
DefineBuildProfile install : install : /Haiku2 ; DefineBuildProfile install : install : /Haiku2 ;