[haiku-commits] haiku: hrev51654 - in build/jam/repositories: . HaikuPortsCross build/jam

  • From: mmlr@xxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Mon, 4 Dec 2017 19:55:25 +0100 (CET)

hrev51654 adds 3 changesets to branch 'master'
old head: f1e8af173c9d6367dfb320d6ca17b1330a87d7f7
new head: a88944c86ecf4a4876b9bb4cb07534359d22896e
overview: 
http://cgit.haiku-os.org/haiku/log/?qt=range&q=a88944c86ecf+%5Ef1e8af173c9d

----------------------------------------------------------------------------

22271bfdc25f: bootstrap: Strip build down by removing unneeded packages.
  
  Don't include makefile_engine, userguide, welcome, netfs and userland_fs
  in the build for bootstrap.

1484b2336aeb: bootstrap: Update cross packages for make, bash, icu.

a88944c86ecf: bootstrap: Add missing noto package to cross repos.

                                            [ Michael Lotz <mmlr@xxxxxxxx> ]

----------------------------------------------------------------------------

5 files changed, 50 insertions(+), 34 deletions(-)
build/jam/OptionalPackages                      | 10 ++++-
build/jam/repositories/Haiku                    | 47 ++++++++++++---------
build/jam/repositories/HaikuPortsCross/x86      |  9 ++--
build/jam/repositories/HaikuPortsCross/x86_64   |  9 ++--
build/jam/repositories/HaikuPortsCross/x86_gcc2 |  9 ++--

############################################################################

Commit:      22271bfdc25f9c08bb4dff38e48caa0ee7da850b
URL:         http://cgit.haiku-os.org/haiku/commit/?id=22271bfdc25f
Author:      Michael Lotz <mmlr@xxxxxxxx>
Date:        Sun Dec  3 14:16:52 2017 UTC

bootstrap: Strip build down by removing unneeded packages.

Don't include makefile_engine, userguide, welcome, netfs and userland_fs
in the build for bootstrap.

----------------------------------------------------------------------------

diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index bbd6371..b219b62 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 14f5ebe..60a39a6 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 ] {

############################################################################

Commit:      1484b2336aeb842ecebf639b78d24dc324556ee9
URL:         http://cgit.haiku-os.org/haiku/commit/?id=1484b2336aeb
Author:      Michael Lotz <mmlr@xxxxxxxx>
Date:        Sun Dec  3 14:20:58 2017 UTC

bootstrap: Update cross packages for make, bash, icu.

----------------------------------------------------------------------------

diff --git a/build/jam/repositories/HaikuPortsCross/x86 
b/build/jam/repositories/HaikuPortsCross/x86
index cc3daa5..5ec2b71 100644
--- a/build/jam/repositories/HaikuPortsCross/x86
+++ b/build/jam/repositories/HaikuPortsCross/x86
@@ -15,7 +15,7 @@ BootstrapPackageRepository HaikuPortsCross
        }@ # secondary_x86_gcc2
        :
        # repository architecture packages (stage 1)
-       bash_bootstrap-4.3.42-1
+       bash_bootstrap-4.4.012-1
        binutils_bootstrap-2.26.1_2016_02_29-1
        bison_bootstrap-2.4.3-1
        coreutils_bootstrap-8.22-1
@@ -29,11 +29,11 @@ BootstrapPackageRepository HaikuPortsCross
        freetype_bootstrap_devel-2.6.3-1
        gawk_bootstrap-3.1.8-2
        grep_bootstrap-2.14-1
-       icu_bootstrap-54.1-1
-       icu_bootstrap_devel-54.1-1
+       icu_bootstrap-57.1-2
+       icu_bootstrap_devel-57.1-2
        less_bootstrap-451-1
        m4_bootstrap-1.4.16-1
-       make_bootstrap-3.82-1
+       make_bootstrap-4.1-2
        ncurses6_bootstrap-6.0-1
        ncurses6_bootstrap_devel-6.0-1
        python_bootstrap-2.7.6-1
diff --git a/build/jam/repositories/HaikuPortsCross/x86_64 
b/build/jam/repositories/HaikuPortsCross/x86_64
index 5618905..d51b014 100644
--- a/build/jam/repositories/HaikuPortsCross/x86_64
+++ b/build/jam/repositories/HaikuPortsCross/x86_64
@@ -10,7 +10,7 @@ BootstrapPackageRepository HaikuPortsCross
        gcc_bootstrap_syslibs_devel-5.4.0_2016_06_04-1
        :
        # repository architecture packages (stage 1)
-       bash_bootstrap-4.3.42-1
+       bash_bootstrap-4.4.012-1
        binutils_bootstrap-2.26.1_2016_02_29-1
        bison_bootstrap-2.4.3-1
        coreutils_bootstrap-8.22-1
@@ -24,11 +24,11 @@ BootstrapPackageRepository HaikuPortsCross
        freetype_bootstrap_devel-2.6.3-1
        gawk_bootstrap-3.1.8-2
        grep_bootstrap-2.14-1
-       icu_bootstrap-54.1-1
-       icu_bootstrap_devel-54.1-1
+       icu_bootstrap-57.1-2
+       icu_bootstrap_devel-57.1-2
        less_bootstrap-451-1
        m4_bootstrap-1.4.16-1
-       make_bootstrap-3.82-1
+       make_bootstrap-4.1-2
        ncurses6_bootstrap-6.0-1
        ncurses6_bootstrap_devel-6.0-1
        python_bootstrap-2.7.6-1
diff --git a/build/jam/repositories/HaikuPortsCross/x86_gcc2 
b/build/jam/repositories/HaikuPortsCross/x86_gcc2
index cf9385e..3e2125f 100644
--- a/build/jam/repositories/HaikuPortsCross/x86_gcc2
+++ b/build/jam/repositories/HaikuPortsCross/x86_gcc2
@@ -15,7 +15,7 @@ BootstrapPackageRepository HaikuPortsCross
        }@ # secondary_x86_gcc2
        :
        # repository architecture packages (stage 1)
-       bash_bootstrap-4.3.42-1
+       bash_bootstrap-4.4.012-1
        binutils_bootstrap-2.17_2013_04_21-3
        bison_bootstrap-2.4.3-1
        coreutils_bootstrap-8.22-1
@@ -27,10 +27,10 @@ BootstrapPackageRepository HaikuPortsCross
        freetype_bootstrap_devel-2.6.3-1
        gawk_bootstrap-3.1.8-2
        grep_bootstrap-2.14-1
-       icu_bootstrap-54.1-1
-       icu_bootstrap_devel-54.1-1
+       icu_bootstrap-57.1-2
+       icu_bootstrap_devel-57.1-2
        m4_bootstrap-1.4.16-1
-       make_bootstrap-3.82-1
+       make_bootstrap-4.1-2
        ncurses6_bootstrap-6.0-1
        ncurses6_bootstrap_devel-6.0-1
        python_bootstrap-2.7.6-1

############################################################################

Revision:    hrev51654
Commit:      a88944c86ecf4a4876b9bb4cb07534359d22896e
URL:         http://cgit.haiku-os.org/haiku/commit/?id=a88944c86ecf
Author:      Michael Lotz <mmlr@xxxxxxxx>
Date:        Mon Dec  4 18:49:59 2017 UTC

bootstrap: Add missing noto package to cross repos.

----------------------------------------------------------------------------

diff --git a/build/jam/repositories/HaikuPortsCross/x86 
b/build/jam/repositories/HaikuPortsCross/x86
index 5ec2b71..a7d2af3 100644
--- a/build/jam/repositories/HaikuPortsCross/x86
+++ b/build/jam/repositories/HaikuPortsCross/x86
@@ -3,6 +3,7 @@ BootstrapPackageRepository HaikuPortsCross
        :
        # architecture "any" packages
        haikuporter-0-1
+       noto-20170202-7
        :
        # repository architecture packages (stage 0)
        gcc_bootstrap-5.4.0_2016_06_04-1
diff --git a/build/jam/repositories/HaikuPortsCross/x86_64 
b/build/jam/repositories/HaikuPortsCross/x86_64
index d51b014..b043c04 100644
--- a/build/jam/repositories/HaikuPortsCross/x86_64
+++ b/build/jam/repositories/HaikuPortsCross/x86_64
@@ -3,6 +3,7 @@ BootstrapPackageRepository HaikuPortsCross
        :
        # architecture "any" packages
        haikuporter-0-1
+       noto-20170202-7
        :
        # repository architecture packages (stage 0)
        gcc_bootstrap-5.4.0_2016_06_04-1
diff --git a/build/jam/repositories/HaikuPortsCross/x86_gcc2 
b/build/jam/repositories/HaikuPortsCross/x86_gcc2
index 3e2125f..6054a00 100644
--- a/build/jam/repositories/HaikuPortsCross/x86_gcc2
+++ b/build/jam/repositories/HaikuPortsCross/x86_gcc2
@@ -3,6 +3,7 @@ BootstrapPackageRepository HaikuPortsCross
        :
        # architecture "any" packages
        haikuporter-0-1
+       noto-20170202-7
        :
        # repository architecture packages (stage 0)
        gcc_bootstrap-2.95.3_2014_08_03-1


Other related posts:

  • » [haiku-commits] haiku: hrev51654 - in build/jam/repositories: . HaikuPortsCross build/jam - mmlr