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

Add secondary arch haiku [devel] packages to image

Browse Source
This commit is contained in:
Ingo Weinhold
2013-08-06 03:33:36 +02:00
parent b4d3e055a9
commit cade865dde
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/OptionalPackages
+5 -1
View File
@@ -130,7 +130,11 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentJava ] {
# DevelopmentMin # DevelopmentMin
if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ]
&& ( $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 ) { && ( $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 ) {
AddPackageFilesToHaikuImage system : haiku_devel.hpkg ; AddPackageFilesToHaikuImage system
:
haiku_devel.hpkg
haiku_$(TARGET_PACKAGING_ARCHS[2-])_devel.hpkg
;
AddPackageFilesToHaikuImage common : makefile_engine.hpkg ; AddPackageFilesToHaikuImage common : makefile_engine.hpkg ;
} }
build/jam/images/HaikuImageBootstrap
+4 -1
View File
@@ -172,7 +172,10 @@ SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs bindfs btrfs exfat ext2 fat iso9660
# build the haiku system packages and add them # build the haiku system packages and add them
include [ FDirName $(HAIKU_BUILD_RULES_DIR) HaikuPackages ] ; 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 ; AddPackageFilesToHaikuImage system : haiku_loader.hpkg ;