Remove more optional package related left-overs

build/jam/ImageRules

@@ -1145,32 +1145,6 @@ rule AddGroupToHaikuImage group : gid : members
 }
 
 
-rule AddOptionalPackageDescriptionToHaikuImage file : searchPath
-{
-	if $(searchPath) {
-		SEARCH on $(file) = [ FDirName $(searchPath) ] ;
-	}
-
-	HAIKU_IMAGE_OPTIONAL_PACKAGE_DESCRIPTIONS += $(file) ;
-}
-
-rule AddLicenseToHaikuImage file : name : searchPath
-{
-	if $(searchPath) {
-		SEARCH on $(file) = [ FDirName $(searchPath) ] ;
-	}
-
-	if $(name) && $(file:BS) = $(name) {
-		name = ;
-	}
-
-	local systemDirTokens
-		= [ on $(container) return $(HAIKU_CONTAINER_SYSTEM_DIR_TOKENS) ] ;
-
-	AddFilesToHaikuImage $(systemDirTokens) data licenses : $(file) : $(name) ;
-}
-
-
 rule AddLibrariesToHaikuImage directory : libs
 {
 	# AddLibraryToHaikuImage <directory> : <libs>

build/jam/OptionalTestPackages

@@ -7,34 +7,35 @@
 
 
 # libMicro
-if [ IsOptionalHaikuImagePackageAdded libMicro ] {
+# TODO: Make this an actual package!
-	# add scripts, tattle executable and README
+# if [ IsOptionalHaikuImagePackageAdded libMicro ] {
-	SEARCH on <libmicro>bench <libmicro>multiview <libmicro>README
+# 	# add scripts, tattle executable and README
-		= [ FDirName $(HAIKU_TOP) src tests system benchmarks libMicro ] ;
+# 	SEARCH on <libmicro>bench <libmicro>multiview <libmicro>README
-
+# 		= [ FDirName $(HAIKU_TOP) src tests system benchmarks libMicro ] ;
-	AddFilesToHaikuImage home benchmarks libmicro
+# 
-		: <libmicro>bench <libmicro>multiview <libmicro>README ;
+# 	AddFilesToHaikuImage home benchmarks libmicro
-	AddFilesToHaikuImage home benchmarks libmicro bin-BePC : tattle ;
+# 		: <libmicro>bench <libmicro>multiview <libmicro>README ;
-
+# 	AddFilesToHaikuImage home benchmarks libmicro bin-BePC : tattle ;
-	# add libmicro benchmarks
+# 
-	AddFilesToHaikuImage home benchmarks libmicro bin-BePC :
+# 	# add libmicro benchmarks
-		atomic <libmicro>bind cachetocache cascade_cond cascade_fcntl
+# 	AddFilesToHaikuImage home benchmarks libmicro bin-BePC :
-		cascade_flock cascade_lockf cascade_mutex chdir close close_tcp
+# 		atomic <libmicro>bind cachetocache cascade_cond cascade_fcntl
-		connection dup exec exec_bin exit exp fcntl fcntl_ndelay file_lock fork
+# 		cascade_flock cascade_lockf cascade_mutex chdir close close_tcp
-		getcontext getenv <libmicro>getpeername getpid getrusage getsockname
+# 		connection dup exec exec_bin exit exp fcntl fcntl_ndelay file_lock fork
-		gettimeofday isatty listen localtime_r <libmicro>log longjmp lrand48
+# 		getcontext getenv <libmicro>getpeername getpid getrusage getsockname
-		lseek malloc memcpy memmove memrand memset mktime mmap mprotect msync
+# 		gettimeofday isatty listen localtime_r <libmicro>log longjmp lrand48
-		munmap mutex nop <libmicro>open pipe poll pread pthread_create pwrite
+# 		lseek malloc memcpy memmove memrand memset mktime mmap mprotect msync
-		read realpath recurse select semop setcontext setsockopt sigaction
+# 		munmap mutex nop <libmicro>open pipe poll pread pthread_create pwrite
-		siglongjmp signal sigprocmask <libmicro>socket socketpair <libmicro>stat
+# 		read realpath recurse select semop setcontext setsockopt sigaction
-		strcasecmp strchr strcmp strcpy strftime strlen strtol system time times
+# 		siglongjmp signal sigprocmask <libmicro>socket socketpair <libmicro>stat
-		write writev ;
+# 		strcasecmp strchr strcmp strcpy strftime strlen strtol system time times
-
+# 		write writev ;
-	AddSymlinkToHaikuImage home benchmarks libmicro : bin-BePC : bin ;
+# 
-
+# 	AddSymlinkToHaikuImage home benchmarks libmicro : bin-BePC : bin ;
-	AddOptionalPackageDescriptionToHaikuImage
+# 
-		<libmicro>.OptionalPackageDescription
+# 	AddOptionalPackageDescriptionToHaikuImage
-		: $(HAIKU_TOP) src tests system benchmarks libMicro ;
+# 		<libmicro>.OptionalPackageDescription
-	AddLicenseToHaikuImage <libmicro>OPENSOLARIS.LICENSE : OpenSolaris
+# 		: $(HAIKU_TOP) src tests system benchmarks libMicro ;
-		: $(HAIKU_TOP) src tests system benchmarks libMicro ;
+# 	AddLicenseToHaikuImage <libmicro>OPENSOLARIS.LICENSE : OpenSolaris
-}
+# 		: $(HAIKU_TOP) src tests system benchmarks libMicro ;
+# }

build/jam/images/Haiku64Image

@@ -448,29 +448,9 @@ CopyDirectoryToHaikuImage system documentation
 #pragma mark - Optional Packages
 
 
-HAIKU_IMAGE_OPTIONAL_PACKAGE_DESCRIPTIONS = ;
-
 include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalPackages ] ;
 include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalTestPackages ] ;
 
-local optionalPackageDescriptions ;
-if $(HAIKU_IMAGE_OPTIONAL_PACKAGE_DESCRIPTIONS) {
-	optionalPackageDescriptions = <haiku-image>optional_package_descriptions ;
-	MakeLocate $(optionalPackageDescriptions)
-		: $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) ;
-
-	Depends $(optionalPackageDescriptions)
-		: $(HAIKU_IMAGE_OPTIONAL_PACKAGE_DESCRIPTIONS) ;
-
-	actions together BuildOptionalPackageDescriptions
-	{
-		cat $(2) > $(1)
-	}
-
-	BuildOptionalPackageDescriptions $(optionalPackageDescriptions)
-		: $(HAIKU_IMAGE_OPTIONAL_PACKAGE_DESCRIPTIONS) ;
-}
-
 
 #pragma mark - User/Group Setup
 
@@ -554,10 +534,6 @@ if $(HOST_RM_ATTRS_TARGET) {
 } else {
 	AddVariableToScript $(script) : rmAttrs : rm ;
 }
-if $(optionalPackageDescriptions) {
-	AddTargetVariableToScript $(script) : $(optionalPackageDescriptions)
-		: optionalPackageDescriptions ;
-}
 
 
 # create the other scripts

build/jam/images/HaikuImage

@@ -320,29 +320,9 @@ for repository in $(HAIKU_REPOSITORIES) {
 #pragma mark - Optional Packages
 
 
-HAIKU_IMAGE_OPTIONAL_PACKAGE_DESCRIPTIONS = ;
-
 include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalPackages ] ;
 include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalTestPackages ] ;
 
-local optionalPackageDescriptions ;
-if $(HAIKU_IMAGE_OPTIONAL_PACKAGE_DESCRIPTIONS) {
-	optionalPackageDescriptions = <haiku-image>optional_package_descriptions ;
-	MakeLocate $(optionalPackageDescriptions)
-		: $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) ;
-
-	Depends $(optionalPackageDescriptions)
-		: $(HAIKU_IMAGE_OPTIONAL_PACKAGE_DESCRIPTIONS) ;
-
-	actions together BuildOptionalPackageDescriptions
-	{
-		cat $(2) > $(1)
-	}
-
-	BuildOptionalPackageDescriptions $(optionalPackageDescriptions)
-		: $(HAIKU_IMAGE_OPTIONAL_PACKAGE_DESCRIPTIONS) ;
-}
-
 
 #pragma mark - User/Group Setup
 
@@ -428,10 +408,6 @@ if $(HOST_RM_ATTRS_TARGET) {
 } else {
 	AddVariableToScript $(script) : rmAttrs : rm ;
 }
-if $(optionalPackageDescriptions) {
-	AddTargetVariableToScript $(script) : $(optionalPackageDescriptions)
-		: optionalPackageDescriptions ;
-}
 
 # Add a variable to indicate whether packages dependencies shall be resolved. We
 # always want to do that in non-update mode, but also in update mode when all

build/scripts/build_haiku_image

@@ -20,7 +20,6 @@ set -o errexit
 # updateOnly
 # dontClearImage
 # isVMwareImage
-# optionalPackageDescriptions
 #
 # addattr
 # copyattr
@@ -245,9 +244,6 @@ downloadFile()
 mkdir -p $tmpDir
 copyrightsFile=$tmpDir/copyrights
 $rmAttrs -f $copyrightsFile
-if [ "$optionalPackageDescriptions" ]; then
-	cp "$optionalPackageDescriptions" $copyrightsFile
-fi
 
 if [ $isCD ]; then
 	# setup output dir