From 22271bfdc25f9c08bb4dff38e48caa0ee7da850b Mon Sep 17 00:00:00 2001
From: Michael Lotz <mmlr@mlotz.ch>
Date: Sun, 3 Dec 2017 15:16:52 +0100
Subject: [PATCH] bootstrap: Strip build down by removing unneeded packages.

Don't include makefile_engine, userguide, welcome, netfs and userland_fs
in the build for bootstrap.
---
 build/jam/OptionalPackages   | 10 +++++++-
 build/jam/repositories/Haiku | 47 ++++++++++++++++++++----------------
 2 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index bbd6371898..b219b62929 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -125,10 +125,18 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ]
 		:
 		haiku_devel.hpkg
 		haiku_$(TARGET_PACKAGING_ARCHS[2-])_devel.hpkg
-		makefile_engine.hpkg
 		:
 		nameFromMetaInfo
 		;
+
+	if $(HAIKU_IS_BOOTSTRAP) != 1 {
+		AddPackageFilesToHaikuImage system
+			:
+			makefile_engine.hpkg
+			:
+			nameFromMetaInfo
+			;
+	}
 }
 
 
diff --git a/build/jam/repositories/Haiku b/build/jam/repositories/Haiku
index 14f5ebeaf7..60a39a6473 100644
--- a/build/jam/repositories/Haiku
+++ b/build/jam/repositories/Haiku
@@ -12,32 +12,37 @@ local packages = [ FFilterByBuildFeatures
 	haiku
 	haiku_devel
 	haiku_loader
-	haiku_userguide_ca
-	haiku_userguide_de
-	haiku_userguide_en
-	haiku_userguide_es
-	haiku_userguide_fi
-	haiku_userguide_fr
-	haiku_userguide_hu
-	haiku_userguide_it
-	haiku_userguide_jp
-	haiku_userguide_pl
-	haiku_userguide_pt_BR
-	haiku_userguide_pt_PT
-	haiku_userguide_ru
-	haiku_userguide_sk
-	haiku_userguide_sv_SE
-	haiku_userguide_uk
-	haiku_userguide_zh_CN
-	haiku_welcome
-	makefile_engine
-	netfs@!x86_64
-	userland_fs
 
 	haiku_$(secondaryArchs)
 	haiku_$(secondaryArchs)_devel
 	] ;
 
+if $(HAIKU_IS_BOOTSTRAP) != 1 {
+	packages += [ FFilterByBuildFeatures
+		haiku_userguide_ca
+		haiku_userguide_de
+		haiku_userguide_en
+		haiku_userguide_es
+		haiku_userguide_fi
+		haiku_userguide_fr
+		haiku_userguide_hu
+		haiku_userguide_it
+		haiku_userguide_jp
+		haiku_userguide_pl
+		haiku_userguide_pt_BR
+		haiku_userguide_pt_PT
+		haiku_userguide_ru
+		haiku_userguide_sk
+		haiku_userguide_sv_SE
+		haiku_userguide_uk
+		haiku_userguide_zh_CN
+		haiku_welcome
+		makefile_engine
+		netfs@!x86_64
+		userland_fs
+		] ;
+}
+
 local webPositiveIsAvailable ;
 local architectureObject ;
 for architectureObject in [ MultiArchSubDirSetup ] {