bootstrap: Strip build down by removing unneeded packages.

Don't include makefile_engine, userguide, welcome, netfs and userland_fs in the build for bootstrap.
2017-12-04 19:52:04 +01:00
parent f1e8af173c
commit 22271bfdc2
2 changed files with 35 additions and 22 deletions
@@ -125,11 +125,19 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ]
 		:
 		haiku_devel.hpkg
 		haiku_$(TARGET_PACKAGING_ARCHS[2-])_devel.hpkg
+		:
+		nameFromMetaInfo
+		;
+
+	if $(HAIKU_IS_BOOTSTRAP) != 1 {
+		AddPackageFilesToHaikuImage system
+			:
 			makefile_engine.hpkg
 			:
 			nameFromMetaInfo
 			;
 	}
+}


 # FFmpeg
@@ -12,6 +12,13 @@ local packages = [ FFilterByBuildFeatures
 	haiku
 	haiku_devel
 	haiku_loader
+
+	haiku_$(secondaryArchs)
+	haiku_$(secondaryArchs)_devel
+	] ;
+
+if $(HAIKU_IS_BOOTSTRAP) != 1 {
+	packages += [ FFilterByBuildFeatures
 		haiku_userguide_ca
 		haiku_userguide_de
 		haiku_userguide_en
@@ -33,10 +40,8 @@ local packages = [ FFilterByBuildFeatures
 		makefile_engine
 		netfs@!x86_64
 		userland_fs
-
-	haiku_$(secondaryArchs)
-	haiku_$(secondaryArchs)_devel
 		] ;
+}

 local webPositiveIsAvailable ;
 local architectureObject ;