Unverified Commit d067aa03 authored by boklm's avatar boklm
Browse files

Bug 22115: use i386 containers for the linux32 build

parent 2d98c063

projects/binutils/build

+2 −1
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ distdir=/var/tmp/dist/binutils 
  export DEB_BUILD_HARDENING_FORTIFY=1

  export DEB_BUILD_HARDENING_FORMAT=1

  export DEB_BUILD_HARDENING_PIE=1



[% END -%]

[% IF c("var/linux-x86_64") %]

  # The libstdc++ shipped by default is non-PIC which breaks the binutils build

  # if we build with DEB_BUILD_HARDENING_PIE=1. We need to install a PIC one AND

  # make sure it gets used before the non-PIC one would.

projects/common/runc-config.json

+5 −1
Original line number Diff line number Diff line
@@ -2,7 +2,11 @@ 
	"ociVersion": "1.0.0-rc1",

	"platform": {

		"os": "linux",

		"arch": "amd64"

[% IF c("var/container/arch") == 'i386' -%]

		"arch": "386"

[% ELSE -%]

		"arch": "[% c("var/container/arch") %]"

[% END -%]

	},

	"process": {

		"terminal": true,

projects/debootstrap-image/config

+22 −0
Original line number Diff line number Diff line
@@ -27,23 +27,45 @@ targets: 
      container:

        suite: wheezy

        arch: amd64

  wheezy-i386:

    var:

      container:

        suite: wheezy

        arch: i386

  jessie-amd64:

    var:

      container:

        suite: jessie

        arch: amd64

  jessie-i386:

    var:

      container:

        suite: jessie

        arch: i386

  precise-amd64:

    var:

      container:

        suite: precise

        arch: amd64

        debootstrap_opt: --keyring=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg

  precise-i386:

    var:

      container:

        suite: precise

        arch: i386

        debootstrap_opt: --keyring=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg

  utopic-amd64:

    var:

      container:

        suite: utopic

        arch: amd64

        debootstrap_mirror: http://old-releases.ubuntu.com/ubuntu/

  utopic-i386:

    var:

      container:

        suite: utopic

        arch: i386

        debootstrap_mirror: http://old-releases.ubuntu.com/ubuntu/



input_files:

  - URL: 'http://cdimage.ubuntu.com/ubuntu-base/releases/[% c("var/ubuntu_version") %]/release/ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz'

projects/firefox/config

+4 −17
Original line number Diff line number Diff line
@@ -28,9 +28,8 @@ targets: 
    var:

      torbrowser_update_channel: default



  linux-x86_64:

  linux:

    var:

      martools_filename: mar-tools-linux64.zip

      arch_deps:

        - libgtk2.0-dev

        - libdbus-glib-1-dev
@@ -44,25 +43,13 @@ targets: 
        - libx11-xcb-dev

        # We built GCC but not the libmpc2, thus we need to install it

        - libmpc2

  linux-x86_64:

    var:

      martools_filename: mar-tools-linux64.zip



  linux-i686:

    var:

      martools_filename: mar-tools-linux32.zip

      sort_deps: 0

      arch_deps:

        - libc6-dev-i386

        - libgtk2.0-dev:i386

        - libdbus-glib-1-dev:i386

        - libxt-dev:i386

        # To pass configure since ESR 31.

        - libpulse-dev:i386

        # To pass configure since ESR 45.

        - libgconf2-dev:i386

        # To pass configure since ESR 52

        - libx11-xcb-dev:i386

        # We built GCC but not the libmpc2, thus we need to install it

        - libmpc2

        - hardening-wrapper



  osx-x86_64:

    var:

projects/gcc/build

+1 −0
Original line number Diff line number Diff line 
#!/bin/sh

[% c("var/set_default_env") -%]

[% c("var/setarch") -%]

distdir=/var/tmp/dist/[% project %]

mkdir /var/tmp/build

tar -C /var/tmp/build -xf [% project %]-[% c("version") %].tar.bz2