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

AddHaikuImagePackages/IsHaikuImagePackageAdded: 2ndary arch fix

Browse Source 
For the secondary architecture the same specified package name means a
different package, so we need to use the mapped name IsPackageAvailable
returns.
This commit is contained in:
Ingo Weinhold
2013-08-06 03:24:14 +02:00
parent db16bcba41
commit 85eed25cdd
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/ImageRules
+12 -9
View File
@@ -999,15 +999,16 @@ rule AddHaikuImagePackages packages : installationLocation
local package ; local package ;
for package in $(packages) { for package in $(packages) {
if ! [ on $(package) return $(HAIKU_PACKAGE_ADDED) ] { local resolvedPackage = [ IsPackageAvailable $(package) ] ;
if ! [ IsPackageAvailable $(package) ] { if ! $(resolvedPackage) {
Echo "AddHaikuImagePackages: package" $(package) Echo "AddHaikuImagePackages: package" $(package)
"not available!" ; "not available!" ;
continue ; continue ;
} }
HAIKU_PACKAGE_ADDED on $(package) = 1 ; if ! [ on $(resolvedPackage) return $(HAIKU_PACKAGE_ADDED) ] {
HAIKU_ADDED_PACKAGES += $(package) ; HAIKU_PACKAGE_ADDED on $(resolvedPackage) = 1 ;
HAIKU_ADDED_PACKAGES += $(resolvedPackage) ;
# download the package file and add it to the image # download the package file and add it to the image
local file = [ FetchPackage $(package) ] ; local file = [ FetchPackage $(package) ] ;
@@ -1024,7 +1025,9 @@ rule AddHaikuImagePackages packages : installationLocation
rule IsHaikuImagePackageAdded package rule IsHaikuImagePackageAdded package
{ {
if [ on $(package) return $(HAIKU_PACKAGE_ADDED) ] { local resolvedPackage = [ IsPackageAvailable $(package) ] ;
if $(resolvedPackage)
&& [ on $(resolvedPackage) return $(HAIKU_PACKAGE_ADDED) ] {
return 1 ; return 1 ;
} }