Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Default packages are now selected via image build feature.

Browse Source 
* Introduce a build feature per image type (i.e. minimum_image, 
  bootstrap_image and regular_image).
* Activate the build feature matching the active image type.
* Use the image build features to group the default packages.
This commit is contained in:
Oliver Tappe 2014-03-20 19:34:42 +01:00
parent 835bcdda71
commit 6d8c8a9dfd
1 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Jamfile
View File

@ -11,39 +11,36 @@ for architectureObject in [ MultiArchSubDirSetup ] {
}
}
# Include packages that are required by all images:
if $(HAIKU_BOOTSTRAP_BUILD) {
EnableBuildFeatures bootstrap_image ;
} else if $(HAIKU_MINIMUM_BUILD) {
EnableBuildFeatures minimum_image ;
} else {
EnableBuildFeatures regular_image ;
}
# Include required packages:
# primary architecture
AddHaikuImagePackages
AddHaikuImagePackages [ FFilterByBuildFeatures
curl freetype icu libsolv zlib
;
regular_image @{
bzip2 ctags ffmpeg findutils gawk glu grep jpeg libpng
mesa mesa_devel mesa_swrast sed tar which
}@
] ;
# secondary architectures
local architectureObject ;
for architectureObject
in [ MultiArchSubDirSetup $(HAIKU_PACKAGING_ARCHS[2-]) ] {
on $(architectureObject) {
AddHaikuImagePackages
AddHaikuImagePackages [ FFilterByBuildFeatures
curl freetype icu libsolv zlib
;
}
}
# Include packages that are required by non-basic images:
if ! ( $(HAIKU_BOOTSTRAP_BUILD) || $(HAIKU_MINIMUM_BUILD) ) {
# primary architecture
AddHaikuImagePackages
bzip2 ctags ffmpeg findutils gawk glu grep jpeg libpng
mesa mesa_devel mesa_swrast sed tar which
;
# secondary architectures
local architectureObject ;
for architectureObject
in [ MultiArchSubDirSetup $(HAIKU_PACKAGING_ARCHS[2-]) ] {
on $(architectureObject) {
AddHaikuImagePackages
regular_image @{
ffmpeg glu jpeg libpng mesa
;
}
}@
] ;
}
}