Haiku/haiku
Haiku/haiku
1
0
Fork 0
mirror of https://review.haiku-os.org/haiku synced 2024-11-23 07:18:40 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Build secondary architecture Haiku package for regular image

Browse Source 
Also add secondary architecture packages to image.
This commit is contained in:
Ingo Weinhold 2013-08-10 09:58:11 +02:00
parent 393c223bcf
commit 271e9484ed
4 changed files with 80 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Jamfile
View File

@ -13,12 +13,26 @@ for architectureObject in [ MultiArchSubDirSetup ] {
# Include packages that are required by all images.
if ! $(HAIKU_BOOTSTRAP_BUILD) {
# primary architecture
AddHaikuImagePackages
bzip2 ctags ffmpeg freetype glu grep icu jpeg libpng libsolv mesa sed
tar zlib
:
system
;
# secondary architectures
local architectureObject ;
for architectureObject
in [ MultiArchSubDirSetup $(HAIKU_PACKAGING_ARCHS[2-]) ] {
on $(architectureObject) {
AddHaikuImagePackages
ffmpeg freetype glu icu jpeg libpng libsolv mesa zlib
:
system
;
}
}
}
# If enabled, make sure that OpenSSL is added to the image.

13
build/jam/DefaultBuildProfiles
View File

@ -61,6 +61,19 @@ rule DefineDefaultBuildProfiles
xz_utils
;
# secondary architectures
local architectureObject ;
for architectureObject
in [ MultiArchSubDirSetup $(HAIKU_PACKAGING_ARCHS[2-]) ] {
on $(architectureObject) {
AddHaikuImagePackages
openssl
:
system
;
}
}
AddOptionalHaikuImagePackages BeBook Development Git WebPositive
Welcome ;
}

5
build/jam/images/HaikuImage
View File

@ -215,7 +215,10 @@ SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs bindfs btrfs cdda exfat ext2 fat iso9660 nfs
# build the haiku system packages and add them
include [ FDirName $(HAIKU_BUILD_RULES_DIR) HaikuPackages ] ;
AddPackageFilesToHaikuImage system : haiku.hpkg ;
AddPackageFilesToHaikuImage system :
haiku.hpkg
haiku_$(TARGET_PACKAGING_ARCHS[2-]).hpkg
;
AddPackageFilesToHaikuImage system : haiku_loader.hpkg ;

49
build/jam/packages/HaikuSecondary Normal file
View File

@ -0,0 +1,49 @@
local architecture = $(TARGET_PACKAGING_ARCH) ;
local haikuPackage = haiku_$(architecture).hpkg ;
HaikuPackage $(haikuPackage) ;
# libs
AddLibrariesToPackage lib $(architecture)
: [ HaikuImageGetSystemLibs ] [ HaikuImageGetPrivateSystemLibs ] ;
# libnetwork.so replaces quite a few libraries
if $(HAIKU_GCC_VERSION_$(architecture)[1]) = 2 {
local libNetworkAliases = libsocket.so libbind.so libnet.so ;
local lib ;
for lib in $(libNetworkAliases) {
AddSymlinkToPackage lib $(architecture) : libnetwork.so : $(lib) ;
}
AddSymlinkToPackage lib $(architecture) : libbnetapi.so : libnetapi.so ;
}
# # add-ons
# local addOnsDir = add-ons $(architecture) ;
#
# AddFilesToPackage $(addOnsDir) accelerants
# : $(SYSTEM_ADD_ONS_ACCELERANTS) ;
# AddFilesToPackage $(addOnsDir) Translators
# : $(SYSTEM_ADD_ONS_TRANSLATORS) ;
# AddFilesToPackage $(addOnsDir) locale catalogs
# : $(SYSTEM_ADD_ONS_LOCALE_CATALOGS) ;
#
# AddFilesToPackage $(addOnsDir) opengl :
# x86 @{
# Legacy\ Software\ Rasterizer@gcc2
# Software\ Rasterizer@!gcc2
# }@ # x86
# ;
#
# AddFilesToPackage $(addOnsDir) media : $(SYSTEM_ADD_ONS_MEDIA) ;
# AddFilesToPackage $(addOnsDir) media plugins
# : $(SYSTEM_ADD_ONS_MEDIA_PLUGINS) ;
#
# AddFilesToPackage $(addOnsDir) disk_systems
# : <disk_system>intel <disk_system>gpt <disk_system>bfs <disk_system>ntfs ;
BuildHaikuPackage $(haikuPackage) : haiku_secondary ;