From cade865ddec81edc3fce1b8d8d68ef84eecf4e1b Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Tue, 6 Aug 2013 03:33:36 +0200
Subject: [PATCH] Add secondary arch haiku [devel] packages to image

---
 build/jam/OptionalPackages           | 6 +++++-
 build/jam/images/HaikuImageBootstrap | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 3578fa7f8e..4e94ff1514 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -130,7 +130,11 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentJava ] {
 # DevelopmentMin
 if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ]
 		&& ( $(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 ;
 }
 
diff --git a/build/jam/images/HaikuImageBootstrap b/build/jam/images/HaikuImageBootstrap
index df92b8d0f2..5fe9ae57a9 100644
--- a/build/jam/images/HaikuImageBootstrap
+++ b/build/jam/images/HaikuImageBootstrap
@@ -172,7 +172,10 @@ SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs bindfs btrfs exfat ext2 fat iso9660
 # 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 ;