[haiku-commits] BRANCH HaikuPM-github.package-management [a4b13ed] build/jam/repositories/HaikuPorts build/jam/repositories/HaikuPortsCross src/tools/package_repo build/jam

  • From: HaikuPM-github.package-management <community@xxxxxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sat, 7 Sep 2013 15:45:32 +0200 (CEST)

added 4 changesets to branch 'refs/remotes/HaikuPM-github/package-management'
old head: fb99605f490abbeeaff4373193e5cccd619025a6
new head: a4b13eda69875a991450e341536d4f15334b3461
overview: https://github.com/haiku/HaikuPM/compare/fb99605...a4b13ed

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

818ed1e: Remove blocks for secondary packages for x86_64.

a84cf45: Add missing search path for <build>package_repo.

797c1a7: Update x64_64 to current state of things.

a4b13ed: Increase size of bootstrap image to 20 GB.

                                    [ Oliver Tappe <zooey@xxxxxxxxxxxxxxx> ]

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

4 files changed, 31 insertions(+), 53 deletions(-)
build/jam/DefaultBuildProfiles                |  2 +-
build/jam/repositories/HaikuPorts/x86_64      | 60 ++++++++++-------------
build/jam/repositories/HaikuPortsCross/x86_64 | 17 -------
src/tools/package_repo/Jamfile                |  5 +-

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

Commit:      818ed1eaf04e4928714415a913700a0a381b9603
Author:      Oliver Tappe <zooey@xxxxxxxxxxxxxxx>
Date:        Fri Sep  6 15:21:35 2013 UTC

Remove blocks for secondary packages for x86_64.

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

diff --git a/build/jam/repositories/HaikuPortsCross/x86_64 
b/build/jam/repositories/HaikuPortsCross/x86_64
index 315003d..46e2a47 100644
--- a/build/jam/repositories/HaikuPortsCross/x86_64
+++ b/build/jam/repositories/HaikuPortsCross/x86_64
@@ -27,28 +27,11 @@ BootstrapPackageRepository HaikuPortsCross
        texinfo_bootstrap-4.13a-1
        zlib_bootstrap-1.2.8-2
        zlib_bootstrap_devel-1.2.8-2
-
-#      secondary_x86_gcc2 @{
-#              binutils_bootstrap_x86_gcc2-2.17_2013_04_21-3
-#              freetype_bootstrap_x86_gcc2-2.4.9-1
-#              freetype_bootstrap_x86_gcc2_devel-2.4.9-1
-#              gcc_bootstrap_x86_gcc2-2.95.3_2013_08_15-1
-#              icu_bootstrap_x86_gcc2-4.8.1.1-1
-#              icu_bootstrap_x86_gcc2_devel-4.8.1.1-1
-#              ncurses_bootstrap_x86_gcc2-5.9-1
-#              ncurses_bootstrap_x86_gcc2_devel-5.9-1
-#              zlib_bootstrap_x86_gcc2-1.2.8-2
-#              zlib_bootstrap_x86_gcc2_devel-1.2.8-2
-#      }@ # secondary_x86_gcc2
        :
        # repository architecture packages (stage 2)
        libsolv_bootstrap-0.3.0_haiku_2013_06_16-1
        libsolv_bootstrap_devel-0.3.0_haiku_2013_06_16-1
 
-#      secondary_x86_gcc2 @{
-#              libsolv_bootstrap_x86_gcc2-0.3.0_haiku_2013_06_16-1
-#              libsolv_bootstrap_x86_gcc2_devel-0.3.0_haiku_2013_06_16-1
-#      }@ # secondary_x86_gcc2
        :
        # source packages
        autoconf_bootstrap

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

Commit:      a84cf45805e67d14fa821202772b92139bda9957
Author:      Oliver Tappe <zooey@xxxxxxxxxxxxxxx>
Date:        Fri Sep  6 20:49:08 2013 UTC

Add missing search path for <build>package_repo.

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

diff --git a/src/tools/package_repo/Jamfile b/src/tools/package_repo/Jamfile
index 008b442..e5f2484 100644
--- a/src/tools/package_repo/Jamfile
+++ b/src/tools/package_repo/Jamfile
@@ -1,6 +1,9 @@
 SubDir HAIKU_TOP src tools package_repo ;
 
-SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src bin package_repo ] ;
+SEARCH_SOURCE +=
+       [ FDirName $(HAIKU_TOP) src bin package_repo ]
+       [ FDirName $(HAIKU_TOP) src bin package ]
+       ;
 
 UsePrivateHeaders kernel shared ;
 

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

Commit:      797c1a759078bf4d4d64bde930f8f525faaa3521
Author:      Oliver Tappe <zooey@xxxxxxxxxxxxxxx>
Date:        Sat Sep  7 13:25:15 2013 UTC

Update x64_64 to current state of things.

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

diff --git a/build/jam/repositories/HaikuPorts/x86_64 
b/build/jam/repositories/HaikuPorts/x86_64
index 45c14fb..b6f7af8 100644
--- a/build/jam/repositories/HaikuPorts/x86_64
+++ b/build/jam/repositories/HaikuPorts/x86_64
@@ -6,7 +6,7 @@ RemotePackageRepository HaikuPorts
        be_book-2008_10_26-1
        ca_root_certificates-2012_12_29-1
        texi2html-1.82-2
-       timgmsoundfont-2004_01_24-3
+       timgmsoundfont-2004_01_24-4
        wqy_microhei-0.2.0~beta-3
        :
        # repository architecture packages
@@ -18,7 +18,7 @@ RemotePackageRepository HaikuPorts
        autoconf-2.69-4
        automake-1.13.1-4
 #      bepdf-1.1.1~beta5_2013_04_28-1
-       binutils-2.23.2_2013_04_09-1
+       binutils-2.23.2_2013_04_09-2
        bison-2.4.3-5
        bzip2-1.0.6-3
        cdrtools-3.01~a07-3
@@ -62,21 +62,21 @@ RemotePackageRepository HaikuPorts
        libedit-2012_06_01_3.0-1
        libiconv-1.13.1-6
        libiconv_devel-1.13.1-6
-       libogg-1.3.0-2
-       libogg_devel-1.3.0-2
+#      libogg-1.3.0-2
+#      libogg_devel-1.3.0-2
        libpcre-8.21-5
        libpng-1.5.12-3
        libpng_devel-1.5.12-3
        libsolv-0.3.0_haiku_2013_06_16-2
        libsolv_devel-0.3.0_haiku_2013_06_16-2
-       libtheora-1.1.1-2
-       libtheora_devel-1.1.1-2
+#      libtheora-1.1.1-2
+#      libtheora_devel-1.1.1-2
        libtool-2.4-8
        libtool_libltdl-2.4-8
-       libvorbis-1.3.2-2
-       libvorbis_devel-1.3.2-2
-       libvpx-1.0.0-2
-       libvpx_devel-1.0.0-2
+#      libvorbis-1.3.2-2
+#      libvorbis_devel-1.3.2-2
+#      libvpx-1.0.0-2
+#      libvpx_devel-1.0.0-2
        libxml2-2.8.0-5
        libxml2_devel-2.8.0-5
        libxml2_python-2.8.0-5
@@ -95,31 +95,29 @@ RemotePackageRepository HaikuPorts
        openssh-6.0p1-7
        openssl-1.0.0j-3
        openssl_devel-1.0.0j-3
-       p7zip-9.20.1-4
-       pe-2.4.3_hg602-5
-       perl-5.10.1-5
+       p7zip-9.20.1-5
+#      pe-2.4.3_hg606-1
+       perl-5.10.1-6
        pkgconfig-0.27.1-1
        python-2.6.8-5
        readline-6.2-3
        scons-2.2.0-1
        sed-4.2.1-6
-       speex-1.2~rc1-2
-       speex_devel-1.2~rc1-2
+#      speex-1.2~rc1-2
+#      speex_devel-1.2~rc1-2
        sqlite-3.7.13-4
        sqlite_devel-3.7.13-4
        subversion-1.6.18-6
        subversion_devel-1.6.18-6
        tar-1.26-6
        texinfo-4.13a-7
-       vision-0.9.7.r944-1
+#      vision-0.9.7.r944-1
        wpa_supplicant-2.0-3
-       xz_utils-5.0.4-1
+       xz_utils-5.0.4-2
        yasm-1.2.0-3
        zlib-1.2.8-3
        zlib_devel-1.2.8-3
 
-       # secondary architecture (x86_gcc2)
-
        :
 
        # source packages
@@ -128,7 +126,6 @@ RemotePackageRepository HaikuPorts
        automake
 #      bepdf
        binutils
-       binutils_x86_gcc2
        bison
        bzip2
        cdrtools
@@ -138,18 +135,17 @@ RemotePackageRepository HaikuPorts
        cvs
        doxygen
        expat
-       ffmpeg
+#      ffmpeg
        flex
        freetype
        gcc
-#      gcc_x86_gcc2
        gettext
        git
        glu
        gperf
        grep
        groff
-       haikuwebkit
+#      haikuwebkit
        htmldoc
        icu
        jam
@@ -157,21 +153,20 @@ RemotePackageRepository HaikuPorts
        keymapswitcher
        libedit
        libiconv
-       libogg
+#      libogg
        libpcre
        libpng
        libsolv
-       libtheora
+#      libtheora
        libtool
-       libvorbis
-       libvpx
+#      libvorbis
+#      libvpx
        libxml2
        m4
        make
        man
        mercurial
        mesa
-       mesa_x86_gcc2
        mkdepend
        nano
        ncurses
@@ -179,27 +174,24 @@ RemotePackageRepository HaikuPorts
        openssh
        openssl
        p7zip
-       pe
+#      pe
        perl
        pkgconfig
        python
        readline
        scons
        sed
-       speex
+#      speex
        sqlite
        subversion
        tar
        texi2html
        texinfo
-       vision
+#      vision
        wpa_supplicant
        yasm
        xz_utils
        zlib
        :
        # debuginfo packages
-       grep
-       sed
-       tar
        ;

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

Commit:      a4b13eda69875a991450e341536d4f15334b3461
Author:      Oliver Tappe <zooey@xxxxxxxxxxxxxxx>
Date:        Sat Sep  7 13:25:55 2013 UTC

Increase size of bootstrap image to 20 GB.

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

diff --git a/build/jam/DefaultBuildProfiles b/build/jam/DefaultBuildProfiles
index 3f2b72f..5560540 100644
--- a/build/jam/DefaultBuildProfiles
+++ b/build/jam/DefaultBuildProfiles
@@ -115,7 +115,7 @@ rule DefineDefaultBuildProfiles
                case "bootstrap-*" : {
                        Echo Building Haiku Bootstrap ;
                        HAIKU_IMAGE_HOST_NAME = shredder ;
-                       HAIKU_IMAGE_SIZE = 4000 ;
+                       HAIKU_IMAGE_SIZE = 20000 ;
 
                        AddHaikuImagePackages
                                freetype


Other related posts:

  • » [haiku-commits] BRANCH HaikuPM-github.package-management [a4b13ed] build/jam/repositories/HaikuPorts build/jam/repositories/HaikuPortsCross src/tools/package_repo build/jam - HaikuPM-github . package-management