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

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

Browse Source 
Activating all these packages on live boot (especially live DVD where we
also have the write overlay eating up RAM) significantly increases
memory requirements for running Haiku, to the point that Installer may
fail to run. Move them outside the packages/ directory so they are not
activated.

Installer already skips the _sources_ directory when installing, and
lists the contents of _packages_ with checkbox to decide what to include
in the install (they are put in system/packages on the target disk).

Fix from previous version: the Haiku package was installed to /system
instead of /system/packages.

Fixes #15621.
This commit is contained in:
Adrien Destugues
2020-03-16 10:32:00 +01:00
parent e3952a44cd
commit 4f44282c3b
7 changed files with 88 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jamfile
+6 -6
View File
@@ -19,7 +19,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
# Include required packages:
# primary architecture
AddHaikuImagePackages [ FFilterByBuildFeatures
AddHaikuImageSystemPackages [ FFilterByBuildFeatures
bash bc coreutils curl freetype icu libsolv zlib zstd
regular_image @{
@@ -44,7 +44,7 @@ AddHaikuImageSourcePackages [ FFilterByBuildFeatures
}@
] ;
if $(HAIKU_PACKAGING_ARCHS[1]) != x86_gcc2 {
AddHaikuImagePackages [ FFilterByBuildFeatures gcc_syslibs ] ;
AddHaikuImageSystemPackages [ FFilterByBuildFeatures gcc_syslibs ] ;
}
if $(HAIKU_PACKAGING_ARCHS[2]) {
@@ -53,7 +53,7 @@ if $(HAIKU_PACKAGING_ARCHS[2]) {
for architectureObject
in [ MultiArchSubDirSetup $(HAIKU_PACKAGING_ARCHS[2-]) ] {
on $(architectureObject) {
AddHaikuImagePackages [ FFilterByBuildFeatures
AddHaikuImageSystemPackages [ FFilterByBuildFeatures
curl freetype icu libsolv zlib
regular_image @{
@@ -61,7 +61,7 @@ if $(HAIKU_PACKAGING_ARCHS[2]) {
}@
] ;
if $(TARGET_PACKAGING_ARCH) != x86_gcc2 {
AddHaikuImagePackages [ FFilterByBuildFeatures gcc_syslibs
AddHaikuImageSystemPackages [ FFilterByBuildFeatures gcc_syslibs
mesa_swpipe ] ;
}
}
@@ -70,11 +70,11 @@ if $(HAIKU_PACKAGING_ARCHS[2]) {
# If enabled, make sure that OpenSSL is added to the image.
if [ FIsBuildFeatureEnabled openssl ] {
AddHaikuImagePackages openssl ;
AddHaikuImageSystemPackages openssl ;
}
# add additionally requested packages
AddHaikuImagePackages $(HAIKU_IMAGE_ADDITIONAL_PACKAGES) ;
AddHaikuImageSystemPackages $(HAIKU_IMAGE_ADDITIONAL_PACKAGES) ;
# Optionally we allow not to include the "src" subdirectory.
if $(HAIKU_DONT_INCLUDE_SRC) {