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

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
+6 -6
View File
@@ -19,7 +19,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
# Include required packages:
# primary architecture
AddHaikuImageSystemPackages [ FFilterByBuildFeatures
AddHaikuImagePackages [ 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 {
AddHaikuImageSystemPackages [ FFilterByBuildFeatures gcc_syslibs ] ;
AddHaikuImagePackages [ 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) {
AddHaikuImageSystemPackages [ FFilterByBuildFeatures
AddHaikuImagePackages [ FFilterByBuildFeatures
curl freetype icu libsolv zlib
regular_image @{
@@ -61,7 +61,7 @@ if $(HAIKU_PACKAGING_ARCHS[2]) {
}@
] ;
if $(TARGET_PACKAGING_ARCH) != x86_gcc2 {
AddHaikuImageSystemPackages [ FFilterByBuildFeatures gcc_syslibs
AddHaikuImagePackages [ 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 ] {
AddHaikuImageSystemPackages openssl ;
AddHaikuImagePackages openssl ;
}
# add additionally requested packages
AddHaikuImageSystemPackages $(HAIKU_IMAGE_ADDITIONAL_PACKAGES) ;
AddHaikuImagePackages $(HAIKU_IMAGE_ADDITIONAL_PACKAGES) ;
# Optionally we allow not to include the "src" subdirectory.
if $(HAIKU_DONT_INCLUDE_SRC) {