GitLab

at 2024-01-09T14:33:16+01:00

Bug 41016: Switch from bullseye to bookworm on macOS+Windows.

Debian bookworm became the new stable in June 2023, so we should update
our containers to use it.

On macOS the update did not cause any issue, and just updating the
suite name worked.
On Windows, it caused some problems where we used the strip provided by
the OS (only for tor, it seems), because the new version of strip seems
to update the timestamps by default.

We are delaying the process for Android because there are still a
couple of projects that require Java 11, which is not available on
bookworm.

@@ -13,7 +13,7 @@ compress_tar: 'gz'
  var:
    container:
 -    suite: bullseye
 +    suite: bookworm
      arch: amd64
    deps:
      - python3

@@ -175,7 +175,7 @@ EOF
          -DLIBCXX_SUPPORTS_STD_EQ_CXX11_FLAG=TRUE \
          -DLIBCXX_HAVE_CXX_ATOMICS_WITHOUT_LIB=TRUE \
          -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF \
 -        -DLIBCXX_ENABLE_FILESYSTEM=OFF \
 +        -DLIBCXX_ENABLE_FILESYSTEM=ON \
          -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=TRUE \
          -DLIBCXX_CXX_ABI=libcxxabi \
          -DLIBCXX_CXX_ABI_INCLUDE_PATHS=$builddir/clang-source/libcxxabi/include \

@@ -7,7 +7,7 @@ container:
    use_container: 1
  var:
 -  ubuntu_version: 22.04.2
 +  ubuntu_version: 22.04.3
  pre: |
    #!/bin/sh
@@ -50,9 +50,16 @@ targets:
          suite: bullseye
          arch: amd64
 +  bookworm-amd64:
 +    var:
 +      minimal_apt_version: 2.6.1
 +      container:
 +        suite: bookworm
 +        arch: amd64
++
  input_files:
    - project: mmdebstrap
      name: mmdebstrap
    - URL: 'https://cdimage.ubuntu.com/ubuntu-base/releases/[% c("var/ubuntu_version") %]/release/ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz'
      filename: 'container-image_ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz'
 -    sha256sum: 373f064df30519adc3344a08d774f437caabd1479d846fa2ca6fed727ea7a53d
 +    sha256sum: ad33b7ae47b75c92c2e2fe21fd4612e15357e67679d8751d6ce892a475be24fe

  # vim: filetype=yaml sw=2
  filename: '[% project %]-src-[% c("version") %]-[% c("var/build_id") %].tar.gz'
 -version: 0.8.6
 +version: 1.4.0
  git_hash: '[% c("version") %]'
  git_url: https://gitlab.mister-muffin.de/josch/mmdebstrap.git
  gpg_keyring: mmdebstrap.gpg

@@ -97,8 +97,9 @@ cp $distdir/share/tor/geoip6 "$TORDATADIR"
  cd $distdir
  [% IF c("var/windows") %]
 -  install -s $distdir/bin/tor.exe "$TORBINDIR"
 -  install -s $distdir/bin/tor-gencert.exe "$TORBINDIR"
 +  # With Debian bookworm strip changes the date time, llvm-strip doesn't do it.
 +  install -s --strip-program=llvm-strip $distdir/bin/tor.exe "$TORBINDIR"
 +  install -s --strip-program=llvm-strip $distdir/bin/tor-gencert.exe "$TORBINDIR"
  [% END %]
  [% IF c("var/linux") %]

Pier Angelo Vendrame pushed to branch maint-13.0 at The Tor Project / Applications / tor-browser-build

Commits:

6 changed files:

Changes:

@@ -578,7 +578,7 @@ targets:
        windows: 1
        platform: windows
        container:
 -        suite: bullseye
 +        suite: bookworm
          arch: amd64
        configure_opt: '--host=[% c("arch") %]-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]" [% c("var/configure_opt_project") %]'
        CFLAGS: '-fstack-protector-strong -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security [% c("var/flag_mwindows") %]'
@@ -661,7 +661,7 @@ targets:
        platform: macos
        osname: macos
        container:
 -        suite: bullseye
 +        suite: bookworm
          arch: amd64
        compiler: 'macosx-toolchain'
        configure_opt: '--host=[% c("var/build_target") %] CC="[% c("var/build_target") %]-clang [% c("var/FLAGS") %]" CXX="[% c("var/build_target") %]-clang++ [% c("var/FLAGS") %]" [% c("var/configure_opt_project") %]'