Update build packages repository

- Switch to Python3
- Switch to mawk instead of gawk
- Update ffmpeg (there are several new dependencies)
- Update ICU
- Fix various pre-existing problems with packages not being properly
  declared for gcc2 (but somehow it ended up working)
- remove curl, subversion, mercurial

Confirmed that both nightly and release images are building fine on both
32 and 64bit. However, non-x86 architecture may require re-bootstrapping
to do a complete nightly or release image build (the minimal profile
should be fine)

Fixes #16751.

Change-Id: Iacac92923c4113b3e0a49a64b0b4cc1b8e2f5e2e
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3871
Reviewed-by: Adrien Destugues <[email protected]>
This commit is contained in:
Adrien Destugues
2021-05-14 14:59:19 +00:00
committed by Adrien Destugues
parent f203aee66c
commit 3b3bcbf7aa
13 changed files with 340 additions and 274 deletions
+12 -9
View File
@@ -20,25 +20,28 @@ for architectureObject in [ MultiArchSubDirSetup ] {
# Include required packages:
# primary architecture
AddHaikuImageSystemPackages [ FFilterByBuildFeatures
bash bc coreutils curl freetype icu libsolv zlib zstd
bash bc coreutils freetype libsolv zlib
!gcc2 @{ icu66 }@
gcc2 @{ icu icu66_x86@secondary_x86 }@
regular_image @{
bzip2 diffutils expat ffmpeg findutils gawk glu grep gutenprint8
gzip
bzip2 diffutils expat ffmpeg findutils glu gutenprint8 gzip
lame less libedit libicns
mesa mesa_devel mesa_swpipe@!gcc2 mesa_swrast@gcc2
mawk mesa mesa_devel mesa_swpipe@!gcc2 mesa_swrast@gcc2
netcat
sed sharutils
tar tcpdump unzip wget which zip
tcpdump unzip wget which zip
!gcc2 @{ grep tar zstd }@
gcc2 @{ grep_x86@secondary_x86 tar_x86@secondary_x86 }@
}@
] ;
AddHaikuImageSourcePackages [ FFilterByBuildFeatures
bash bc coreutils
regular_image @{
expat ffmpeg findutils gawk grep gutenprint8
gzip
lame less libicns
expat ffmpeg findutils grep gutenprint8 gzip
lame less libicns mawk
sed sharutils
tar wget which
}@
@@ -54,7 +57,7 @@ if $(HAIKU_PACKAGING_ARCHS[2]) {
in [ MultiArchSubDirSetup $(HAIKU_PACKAGING_ARCHS[2-]) ] {
on $(architectureObject) {
AddHaikuImageSystemPackages [ FFilterByBuildFeatures
curl freetype icu libsolv zlib
freetype icu libsolv zlib
regular_image @{
ffmpeg glu jasper jpeg libicns libpng16 libwebp mesa