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

Revert "Move source and development packages out of /system/packages on release images"

Browse Source 
This reverts commit 0ab9c3c538.

It broke booting.
This commit is contained in:
Augustin Cavalier
2020-03-15 19:30:08 -04:00
parent d3571a6f55
commit c31d8dad23
6 changed files with 86 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/UserBuildConfig.ReadMe
+4 -4
View File
@@ -142,7 +142,7 @@ ExtractArchiveToHaikuImage develop tools
# Add the optional package WonderBrush to the image. The package is downloaded
# via wget (i.e. wget must be installed).
AddHaikuImageSystemPackages WonderBrush ;
AddHaikuImagePackages WonderBrush ;
# Add the optional package WebPositive to the image but don't add its
# dependent SQLite optional package to the image. WebPositive still needs
@@ -212,7 +212,7 @@ switch $(HAIKU_BUILD_PROFILE) {
case "disk" : {
AddOptionalHaikuImagePackages BeBook BeHappy Bluetooth Development
OpenSSH OpenSSL Welcome ;
AddHaikuImageSystemPackages bepdf cvs p7zip pe subversion vision wonderbrush ;
AddHaikuImagePackages bepdf cvs p7zip pe subversion vision wonderbrush ;
}
case "qemu" : {
@@ -223,7 +223,7 @@ switch $(HAIKU_BUILD_PROFILE) {
HAIKU_IMAGE_SIZE = 400 ;
HAIKU_DONT_CLEAR_IMAGE = 1 ;
AddOptionalHaikuImagePackages Development ;
AddHaikuImageSystemPackages pe ;
AddHaikuImagePackages pe ;
}
case "anyboot" : {
@@ -234,7 +234,7 @@ switch $(HAIKU_BUILD_PROFILE) {
HAIKU_IMAGE_SIZE = 1024 ;
HAIKU_DONT_CLEAR_IMAGE = 1 ;
AddOptionalHaikuImagePackages Development ;
AddHaikuImageSystemPackages pe ;
AddHaikuImagePackages pe ;
CopyDirectoryToHaikuImage home Desktop : $(HAIKU_TOP)/../crash-tests ;
}
}