Ticket #5560: 5560-MandatoryPackages.diff

build/jam/HaikuImage

@@ -32 +32 @@
     AddOptionalHaikuImagePackages OpenSSL ;
 }
 
+#include the necessary packages
+AddOptionalHaikuImagePackages MandatoryPackages ; 
+
 SYSTEM_BIN = "[" addattr alert arp base64 basename bash bc beep bootman bzip2
     cal cat catattr checkfs checkitout chgrp chmod chop chown chroot cksum clear
     clockconfig cmp collectcatkeys comm compress copyattr CortexAddOnHost cp
@@ -614 +617 @@
 
 HAIKU_IMAGE_OPTIONAL_PACKAGE_DESCRIPTIONS = ;
 
+include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalPackageDependencies ] ;
 include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalPackages ] ;
 include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalTestPackages ] ;
 

build/jam/OptionalPackageDependencies

@@ -17 +17 @@
 OptionalPackageDependencies Mercurial : Python ;
 OptionalPackageDependencies Git : Expat Curl OpenSSL ;
 OptionalPackageDependencies Curl : OpenSSL ;
+OptionalPackageDependencies MandatoryPackages : Sed ;
 OptionalPackageDependencies NetFS : UserlandFS ;
 OptionalPackageDependencies Vim : LibIconv ;
 OptionalPackageDependencies XZ-Utils : Tar ;

build/jam/OptionalPackages

@@ -15 +15 @@
 #   ABI-compliance-checker  - tool for checking ABI compatibility between libs
 #   APR                     - support libraries used for example by Subversion
 #   APR-util                - Apache portable runtime utility library
-#   BasicCommandLineTools   - basic commandline tools
 #   Beam                    - powerful native e-mail client
 #   BeBook                  - the classic BeOS API documentation
 #   BeHappy                 - special documentation (i.e. BeBook) browser
@@ -55 +54 @@
 #   Perl                    - the scripting language
 #   Python                  - the scripting language
 #   Rsync                   - remote directory synchronization
+#   Sed                     - the ultimate stream editor
 #   SQLite                  - the database implementation
 #   Subversion              - the version control system
 #   Tar                     - archiving utility
@@ -110 +110 @@
 }
 
 
-# BasicCommandLineTools
-if [ IsOptionalHaikuImagePackageAdded BasicCommandLineTools ] {
-    if $(TARGET_ARCH) != x86 {
-        Echo "No optional package BasicCommandLineTools available for $(TARGET_ARCH)" ;
-    } else {
-        # sed
-        InstallOptionalHaikuImagePackage sed-4.2.1-r1a1-x86-gcc2-2009-08-30.zip
-            : $(baseURL)/sed-4.2.1-r1a1-x86-gcc2-2009-08-30.zip
-            :
-            : true ;
-    }
-}
-
-
 # Beam
 if [ IsOptionalHaikuImagePackageAdded Beam ] {
     if $(TARGET_ARCH) != x86 {
@@ -928 +914 @@
 }
 
 
+# Sed
+if [ IsOptionalHaikuImagePackageAdded Sed ] {
+    if $(TARGET_ARCH) != x86 {
+        Echo "No optional package Sed available for $(TARGET_ARCH)" ;
+    } else {
+        InstallOptionalHaikuImagePackage sed-4.2.1-r1a1-x86-gcc2-2009-08-30.zip
+            : $(baseURL)/sed-4.2.1-r1a1-x86-gcc2-2009-08-30.zip
+            :
+            :
+        ;
+    }
+}
+
+
 # SQLite
 if [ IsOptionalHaikuImagePackageAdded SQLite ] {
     if $(TARGET_ARCH) != x86 {

build/jam/ReleaseBuildProfiles

@@ -14 +14 @@
         HAIKU_IMAGE_HOST_NAME = shredder ;
         HAIKU_IMAGE_SIZE = 650 ;
 
-        AddOptionalHaikuImagePackages BasicCommandLineTools ;
         AddOptionalHaikuImagePackages BePDF BeZillaBrowser Clockwerk Pe Vision
             VLC WonderBrush ;
         AddOptionalHaikuImagePackages CVS Development Git Mercurial
@@ -34 +33 @@
         HAIKU_IMAGE_HOST_NAME = shredder ;
         HAIKU_IMAGE_SIZE = 450 ;
 
-        AddOptionalHaikuImagePackages BasicCommandLineTools ;
         AddOptionalHaikuImagePackages Pe Nano Vision P7zip ;
         AddOptionalHaikuImagePackages Development Subversion OpenSSH ;
     }