Remove installoptionalpackage

build/jam/HaikuImage

@@ -201,18 +201,6 @@ include [ FDirName $(HAIKU_BUILD_RULES_DIR) HaikuPackages ] ;
 AddFilesToHaikuImage system packages : haiku.hpkg ;
 
 
-# TODO: remove!
-# Add the files to be used by installoptionalpackage.
-AddDirectoryToHaikuImage common data optional-packages ;
-local optional-pkg-files = OptionalBuildFeatures OptionalPackageDependencies
-	OptionalPackages OptionalLibPackages ;
-for name in $(optional-pkg-files) {
-	local file = [ FDirName $(HAIKU_TOP) build jam $(name) ] ;
-	AddFilesToHaikuImage common data optional-packages
-		: $(file) ;
-}
-AddInstalledPackagesFileToHaikuImage ;
-
 AddSymlinkToHaikuImage home Desktop : /boot/home : Home ;
 
 # Mailbox folders and symlink

build/jam/HaikuPackages

@@ -130,8 +130,6 @@ AddFilesToPackage demos			: $(SYSTEM_DEMOS) ;
 
 SEARCH on which = [ FDirName $(HAIKU_TOP) data bin ] ;
 AddFilesToPackage bin : which ;
-SEARCH on installoptionalpackage = [ FDirName $(HAIKU_TOP) data bin ] ;
-AddFilesToPackage bin : installoptionalpackage ;
 SEARCH on install-wifi-firmwares.sh = [ FDirName $(HAIKU_TOP) data bin ] ;
 AddFilesToPackage bin : install-wifi-firmwares.sh ;
 

build/jam/ImageRules

@@ -999,23 +999,6 @@ rule AddExpanderRuleToHaikuImage mimetype : extension : list : extract
 		: $(entry) ;
 }
 
-rule AddInstalledPackagesFileToHaikuImage
-{
-	#AddInstalledPackagesFileToHaikuImage
-	local file = <haiku-image>InstalledPackages ;
-
-	Always $(file) ;
-	MakeLocate $(file) : $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) ;
-	BuildHaikuImageInstalledPackagesFile $(file) ;
-	AddFilesToHaikuImage common data optional-packages
-		: $(file) ;
-}
-
-actions BuildHaikuImageInstalledPackagesFile
-{
-	echo -e "$(HAIKU_ADDED_OPTIONAL_PACKAGES)" | tr '\ ' '\n'  > $(1)
-}
-
 rule AddOptionalPackageDescriptionToHaikuImage file : searchPath
 {
 	if $(searchPath) {