Build secondary architecture Haiku package for regular image

Also add secondary architecture packages to image.

Jamfile

@@ -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.

build/jam/DefaultBuildProfiles

@@ -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 ;
 		}

build/jam/images/HaikuImage

@@ -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 ;
 
 

build/jam/packages/HaikuSecondary

@@ -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 ;