Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: dc840a56 by Pier Angelo Vendrame at 2025-11-25T17:48:20+01:00 Bug 41601: Drop support for Linux i686. Mozilla moved Linux i686 to tier 3, and its support is up to distributions. For that reason, we are forced to drop support for that platform. - - - - - 28 changed files: - Makefile - README - doc/HACKING.txt - doc/MAKEFILE.txt - projects/browser/RelativeLink/start-browser - projects/browser/config - projects/firefox/build - projects/firefox/config - projects/gcc-cross/config - projects/gcc/config - projects/go/config - projects/linux-packages/build - projects/linux-packages/config - projects/linux-packages/debian/control.in - projects/linux-packages/rpm-package.spec - projects/openssl/build - projects/openssl/config - projects/release/build - projects/release/config - projects/release/update_responses_config.yml - projects/rust/config - projects/tor/config - rbm.conf - tools/dmg2mar - tools/signing/nightly/config.yml - tools/signing/nightly/update-responses-base-config.yml - tools/signing/staticiforme-prepare-cdn-dist-upload - tools/update-responses/update_responses Changes: ===================================== Makefile ===================================== @@ -41,9 +41,6 @@ torbrowser-release-linux-x86_64: submodule-update torbrowser-release-linux-x86_64-asan: submodule-update $(rbm) build release --target release --target browser-single-platform --target browser-linux-x86_64-asan --target torbrowser -torbrowser-release-linux-i686: submodule-update - $(rbm) build release --target release --target browser-single-platform --target browser-linux-i686 --target torbrowser - torbrowser-release-linux-aarch64: submodule-update $(rbm) build release --target release --target browser-single-platform --target browser-linux-aarch64 --target torbrowser @@ -89,9 +86,6 @@ torbrowser-alpha-linux-x86_64-asan: submodule-update torbrowser-alpha-linux-aarch64: submodule-update $(rbm) build release --target alpha --target browser-single-platform --target browser-linux-aarch64 --target torbrowser -torbrowser-alpha-linux-i686: submodule-update - $(rbm) build release --target alpha --target browser-single-platform --target browser-linux-i686 --target torbrowser - torbrowser-alpha-windows-i686: submodule-update $(rbm) build release --target alpha --target browser-single-platform --target browser-windows-i686 --target torbrowser @@ -134,9 +128,6 @@ torbrowser-nightly-linux-x86_64-asan: submodule-update torbrowser-nightly-linux-aarch64: submodule-update $(rbm) build release --target nightly --target browser-single-platform --target browser-linux-aarch64 --target torbrowser -torbrowser-nightly-linux-i686: submodule-update - $(rbm) build release --target nightly --target browser-single-platform --target browser-linux-i686 --target torbrowser - torbrowser-nightly-windows-i686: submodule-update $(rbm) build release --target nightly --target browser-single-platform --target browser-windows-i686 --target torbrowser @@ -176,9 +167,6 @@ torbrowser-testbuild-linux-x86_64: submodule-update torbrowser-testbuild-linux-x86_64-asan: submodule-update $(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-x86_64-asan --target torbrowser -torbrowser-testbuild-linux-i686: submodule-update - $(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-i686 --target torbrowser - torbrowser-testbuild-linux-aarch64: submodule-update $(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-aarch64 --target torbrowser @@ -285,9 +273,6 @@ basebrowser-release-linux-x86_64: submodule-update basebrowser-release-linux-x86_64-asan: submodule-update $(rbm) build release --target release --target browser-single-platform --target browser-linux-x86_64-asan --target basebrowser -basebrowser-release-linux-i686: submodule-update - $(rbm) build release --target release --target browser-single-platform --target browser-linux-i686 --target basebrowser - basebrowser-release-linux-aarch64: submodule-update $(rbm) build release --target release --target browser-single-platform --target browser-linux-aarch64 --target basebrowser @@ -324,9 +309,6 @@ basebrowser-alpha-linux-x86_64: submodule-update basebrowser-alpha-linux-x86_64-asan: submodule-update $(rbm) build release --target alpha --target browser-single-platform --target browser-linux-x86_64-asan --target basebrowser -basebrowser-alpha-linux-i686: submodule-update - $(rbm) build release --target alpha --target browser-single-platform --target browser-linux-i686 --target basebrowser - basebrowser-alpha-linux-aarch64: submodule-update $(rbm) build release --target alpha --target browser-single-platform --target browser-linux-aarch64 --target basebrowser @@ -363,9 +345,6 @@ basebrowser-nightly-linux-x86_64: submodule-update basebrowser-nightly-linux-x86_64-asan: submodule-update $(rbm) build release --target nightly --target browser-single-platform --target browser-linux-x86_64-asan --target basebrowser -basebrowser-nightly-linux-i686: submodule-update - $(rbm) build release --target nightly --target browser-single-platform --target browser-linux-i686 --target basebrowser - basebrowser-nightly-linux-aarch64: submodule-update $(rbm) build release --target nightly --target browser-single-platform --target browser-linux-aarch64 --target basebrowser @@ -402,9 +381,6 @@ basebrowser-testbuild-linux-x86_64: submodule-update basebrowser-testbuild-linux-x86_64-asan: submodule-update $(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-x86_64-asan --target basebrowser -basebrowser-testbuild-linux-i686: submodule-update - $(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-i686 --target basebrowser - basebrowser-testbuild-linux-aarch64: submodule-update $(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-aarch64 --target basebrowser ===================================== README ===================================== @@ -128,7 +128,7 @@ If you want to build for a specific platform only, append the platform name to the makefile target: $ make torbrowser-nightly-linux-x86_64 - $ make torbrowser-nightly-linux-i686 + $ make torbrowser-nightly-linux-aarch64 $ make torbrowser-nightly-windows-i686 $ make torbrowser-nightly-windows-x86_64 $ make torbrowser-nightly-macos ===================================== doc/HACKING.txt ===================================== @@ -43,13 +43,13 @@ In each of those places, an option can be defined: The targets are usually used to select: -- the platform: torbrowser-linux-x86_64, torbrowser-linux-i686, +- the platform: torbrowser-linux-x86_64, torbrowser-linux-aarch64, torbrowser-windows-i686, torbrowser-windows-x86_64, torbrowser-macos, torbrowser-android-armv7, torbrowser-android-aarch64, torbrowser-android-x86, torbrowser-android-x86_64 - the channel: release, nightly, alpha -The targets torbrowser-linux-x86_64, torbrowser-linux-i686, +The targets torbrowser-linux-x86_64, torbrowser-linux-aarch64, torbrowser-windows-i686, torbrowser-windows-x86_64, torbrowser-macos, torbrowser-android-armv7, torbrowser-android-x86, torbrowser-android-aarch64, torbrowser-android-x86_64 are special cases. They do not contain options @@ -103,8 +103,8 @@ You can use the following template syntax in the build scripts: # do something for macOS [% END -%] -You can also use var/linux-x86_64 and var/linux-i686 for things that -only apply to x86_64 and i686 linux builds. You can use the var/release, +You can also use var/linux-x86_64 and var/linux-aarch64 for things that +only apply to x86_64 and aarch64 linux builds. You can use the var/release, var/alpha and var/nightly options to do things depending on the channel. As an alternative you can define an option with a different value @@ -148,7 +148,7 @@ $platform should be one of the following: - torbrowser-linux-x86_64 - - torbrowser-linux-i686 + - torbrowser-linux-aarch64 - torbrowser-windows-i686 ===================================== doc/MAKEFILE.txt ===================================== @@ -14,7 +14,7 @@ Build Tor Browser for the release channel, for all supported platforms (defined in var/browser_platforms). The resulting build can be found in directory torbrowser/release/$version. -torbrowser-release-{linux-x86_64,linux-i686,windows-i686,macos, +torbrowser-release-{linux-x86_64,linux-aarch64,windows-i686,macos, android-armv7, android-x86,android-x86_64, android-aarch64,desktop,android} -------------------------------------------------------------------- @@ -27,7 +27,7 @@ torbrowser-alpha Build Tor Browser for the alpha channel, for all supported platforms. The resulting build can be found in directory torbrowser/alpha/$version. -torbrowser-alpha-{linux-x86_64,linux-i686,windows-i686,macos, +torbrowser-alpha-{linux-x86_64,linux-aarch64,windows-i686,macos, android-armv7,android-x86,android-x86_64, android-aarch64,desktop,android} ------------------------------------------------------------------ @@ -42,7 +42,7 @@ components. The resulting build can be found in directory torbrowser/nightly/$date -torbrowser-nightly-{linux-x86_64,linux-i686,windows-i686,macos, +torbrowser-nightly-{linux-x86_64,linux-aarch64,windows-i686,macos, android-armv7,android-x86,android-x86_64, android-aarch64,desktop,android} -------------------------------------------------------------------- @@ -56,7 +56,7 @@ By default it is based on the alpha channel, but you can change that by editing rbm.local.conf. The resulting build can be found in directory testbuild. -torbrowser-testbuild-{linux-x86_64,linux-i686,windows-i686,macos, +torbrowser-testbuild-{linux-x86_64,linux-aarch64,windows-i686,macos, android-armv7,android-x86,android-x86_64, android-aarch64,desktop,android} ----------------------------------------------------------------- ===================================== projects/browser/RelativeLink/start-browser ===================================== @@ -87,13 +87,6 @@ if [ "`id -u`" -eq 0 ]; then exit 1 fi -[% IF c('var/linux-i686') || c('var/linux-x86_64') -%] -if test -r /proc/cpuinfo && ! grep -q '^flags\s*:.* sse2' /proc/cpuinfo; then - complain "[% c('var/Project_Name') %] requires a CPU with SSE2 support. Exiting." - exit 1 -fi -[% END -%] - print_usage () { printf "\n[% c('var/Project_Name') %] Script Options\n" printf " --verbose Display [% IF c("var/tor-browser") -%]Tor and [% END -%]the browser output in the terminal\n" ===================================== projects/browser/config ===================================== @@ -19,11 +19,6 @@ targets: linux: var: - arch_deps: - # Install libc6-i386 to be able to run 32bit mar tools in linux-i686 - # builds (bug 29812). We don't need it in x86_64 builds, but we - # share the container to reduce space used. - - libc6-i386 pt_path: ./TorBrowser/Tor/PluggableTransports/ macos: ===================================== projects/firefox/build ===================================== @@ -39,12 +39,10 @@ export PATH="/var/tmp/dist/rust/bin:/var/tmp/dist/cbindgen:/var/tmp/dist/node/bi [% IF ! c("var/asan") -%] export PATH="/var/tmp/dist/clang-linux/bin:$PATH" [% END -%] - [% IF c("var/linux-i686") -%] + [% IF c("var/linux-cross") -%] # Exporting `PKG_CONFIG_PATH` in the mozconfig file is causing build # breakage in Rust code. It seems that environment variable is not passed # down properly in that case. Thus, we set it here in the build script. - export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/usr/lib/i386-linux-gnu/pkgconfig" - [% ELSIF c("var/linux-cross") -%] export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/usr/lib/[% c("var/crosstarget") %]/pkgconfig" [% END -%] [% END -%] @@ -309,7 +307,7 @@ END; /var/tmp/dist/gcc/bin/"${CROSS_PREFIX}g++" $rootdir/abicheck.cc -o Browser/abicheck -std=c++17 libdest=Browser/libstdc++ mkdir -p "$libdest" - libdir=[% c("var/libdir") %] + libdir=lib64 [% IF c("var/linux-cross") -%] libdir="[% c("var/crosstarget") %]/$libdir" [% END -%] ===================================== projects/firefox/config ===================================== @@ -130,25 +130,6 @@ targets: - libasound2-dev # To support Wayland mode - libdrm-dev - libdir: lib64 - - linux-i686: - var: - sort_deps: 0 - arch_deps: - - libgtk2.0-dev:i386 - - libgtk-3-dev:i386 - - libdbus-glib-1-dev:i386 - - libxt-dev:i386 - # To pass configure since ESR 31 - - libpulse-dev:i386 - # To pass configure since ESR 52 - - libx11-xcb-dev:i386 - # To pass configure since ESR 102 - - libasound2-dev:i386 - # To support Wayland mode - - libdrm-dev:i386 - libdir: lib32 linux-aarch64: var: @@ -166,7 +147,6 @@ targets: - libasound2-dev:arm64 # To support Wayland mode - libdrm-dev:arm64 - libdir: lib64 macos: var: ===================================== projects/gcc-cross/config ===================================== @@ -16,14 +16,13 @@ var: mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] export PATH="/var/tmp/dist/[% c("var/distdir") %]/bin:$PATH" - export LD_LIBRARY_PATH=/var/tmp/dist/[% c("var/distdir") %]/lib64:/var/tmp/dist/[% c("var/distdir") %]/lib32 + export LD_LIBRARY_PATH=/var/tmp/dist/[% c("var/distdir") %]/lib64 [% IF c("hardened_gcc"); GET c("var/set_hardened_build_flags"); END %] configure_opt: '--target=[% c("var/crosstarget") %] --disable-multilib --enable-languages=c,c++ --with-glibc-version=[% c("var/glibc_version") %]' # Use stretch's glibc and stretch-security's linux glibc_version: 2.24 linux_version: 4.19.232 arch_deps: - - libc6-dev-i386 - gawk - rsync ===================================== projects/gcc/config ===================================== @@ -16,7 +16,7 @@ var: mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] export PATH="/var/tmp/dist/[% c("var/distdir") %]/bin:$PATH" - export LD_LIBRARY_PATH=/var/tmp/dist/[% c("var/distdir") %]/lib64:/var/tmp/dist/[% c("var/distdir") %]/lib32 + export LD_LIBRARY_PATH=/var/tmp/dist/[% c("var/distdir") %]/lib64 [% IF c("hardened_gcc"); GET c("var/set_hardened_build_flags"); END %] targets: @@ -29,9 +29,7 @@ targets: linux: hardened_gcc: 1 var: - configure_opt: --enable-multilib --enable-languages=c,c++ --with-arch_32=i686 - arch_deps: - - libc6-dev-i386 + configure_opt: --enable-multilib --enable-languages=c,c++ input_files: - project: container-image ===================================== projects/go/config ===================================== @@ -59,9 +59,6 @@ targets: linux-x86_64: var: GOARCH: amd64 - linux-i686: - var: - GOARCH: 386 linux-aarch64: var: GOARCH: arm64 ===================================== projects/linux-packages/build ===================================== @@ -9,16 +9,6 @@ mkdir -p "$distdir" umask 0022 [% IF c("var/build_deb_pkg") -%] - [% IF c("var/browser-linux-i686") -%] - # When building an i386 deb package, dh_strip requires i686-linux-gnu-* - # commands not provided by the binutils x86_64 package on debian stretch. - # We can use the binutils-i686-gnu package when we switch to buster. - mkdir -p /var/tmp/dist/binutils - for bin in strip objcopy objdump; do - ln -s /usr/bin/$bin /var/tmp/dist/binutils/i686-linux-gnu-$bin - done - export PATH="/var/tmp/dist/binutils:$PATH" - [% END -%] cd $distdir project_dir=[% c("var/system_pkg/pkg_name") %]-[% c("var/system_pkg/pkg_version") %] mkdir "$project_dir" @@ -52,11 +42,6 @@ umask 0022 $rootdir/[% c('input_files_by_name/linux-x86_64') %]/[% c("var/project-name") %]-linux-x86_64-[% c("version") %].tar.xz \ amd64 [% END -%] - [% IF c("var/browser-linux-i686") -%] - extract_src_tar \ - $rootdir/[% c('input_files_by_name/linux-i686') %]/[% c("var/project-name") %]-linux-i686-[% c("version") %].tar.xz \ - i386 - [% END -%] [% IF c("var/browser-linux-aarch64") -%] extract_src_tar \ $rootdir/[% c('input_files_by_name/linux-aarch64') %]/[% c("var/project-name") %]-linux-aarch64-[% c("version") %].tar.xz \ @@ -93,10 +78,6 @@ EOF cp -a $rootdir/[% c('input_files_by_name/linux-x86_64') %]/[% c("var/project-name") %]-linux-x86_64-[% c("version") %].tar.xz \ SOURCES/[% c("var/system_pkg/pkg_name") %]-linux-x86_64-[% c("var/system_pkg/pkg_version") %].tar.xz [% END -%] - [% IF c("var/browser-linux-i686") -%] - cp -a $rootdir/[% c('input_files_by_name/linux-i686') %]/[% c("var/project-name") %]-linux-i686-[% c("version") %].tar.xz \ - SOURCES/[% c("var/system_pkg/pkg_name") %]-linux-i386-[% c("var/system_pkg/pkg_version") %].tar.xz - [% END -%] [% IF c("var/browser-linux-aarch64") -%] cp -a $rootdir/[% c('input_files_by_name/linux-aarch64') %]/[% c("var/project-name") %]-linux-aarch64-[% c("version") %].tar.xz \ SOURCES/[% c("var/system_pkg/pkg_name") %]-linux-aarch64-[% c("var/system_pkg/pkg_version") %].tar.xz @@ -105,9 +86,6 @@ EOF [% IF c("var/browser-linux-x86_64") -%] rpmbuild --define "_topdir $rpmdir" -v -bb SPECS/[% c("var/system_pkg/pkg_name") %].spec [% END -%] - [% IF c("var/browser-linux-i686") -%] - rpmbuild --define "_topdir $rpmdir" --target i686-redhat-linux -v -bb SPECS/[% c("var/system_pkg/pkg_name") %].spec - [% END -%] [% IF c("var/browser-linux-aarch64") -%] rpmbuild --define "_topdir $rpmdir" --target aarch64-redhat-linux -v -bb SPECS/[% c("var/system_pkg/pkg_name") %].spec [% END -%] ===================================== projects/linux-packages/config ===================================== @@ -18,7 +18,6 @@ var: # Use var_p/system_pkg/deb_archs for the processed list deb_archs_list: - '[% IF c("var/browser-linux-x86_64") %]amd64[% END %]' - - '[% IF c("var/browser-linux-i686") %]i386[% END %]' - '[% IF c("var/browser-linux-aarch64") %]arm64[% END %]' @@ -28,7 +27,6 @@ targets: var: build_deb_pkg: 1 pre_pkginst: | - dpkg --add-architecture i386 # some foreign-arch packages fail to install when /var/lib/dpkg/available # does not exist, so create it as an empty file echo > /var/lib/dpkg/available @@ -54,16 +52,6 @@ targets: - libpulse-dev - libx11-xcb-dev - libxt-dev - - linux-libc-dev:i386 - - libasound2-dev:i386 - - libfontconfig1-dev:i386 - - libfreetype6-dev:i386 - - libgconf2-dev:i386 - - libgtk-3-dev:i386 - - libpango1.0-dev:i386 - - libpulse-dev:i386 - - libx11-xcb-dev:i386 - - libxt-dev:i386 deb-arm64: var: build_deb_pkg: 1 @@ -111,9 +99,6 @@ targets: browser-linux-x86_64: var: browser-linux-x86_64: 1 - browser-linux-i686: - var: - browser-linux-i686: 1 browser-linux-aarch64: var: browser-linux-aarch64: 1 @@ -163,13 +148,6 @@ input_files: - '[% c("var/build_target") %]' - '[% c("var/browser_type") %]-linux-x86_64' - - name: linux-i686 - project: browser - enable: '[% c("var/browser-linux-i686") %]' - target: - - '[% c("var/build_target") %]' - - '[% c("var/browser_type") %]-linux-i686' - - name: linux-aarch64 project: browser enable: '[% c("var/browser-linux-aarch64") %]' ===================================== projects/linux-packages/debian/control.in ===================================== @@ -5,7 +5,7 @@ Section: web Build-Depends: debhelper (>= 9), dh-apparmor Package: [% c("var/system_pkg/pkg_name") %] -Architecture: amd64 i386 arm64 +Architecture: amd64 arm64 Depends: ${shlibs:Depends}, Recommends: libavcodec61 | libavcodec-extra61 | libavcodec60 | libavcodec-extra60 | libavcodec59 | libavcodec-extra59 | libavcodec58 | libavcodec-extra58 | libavcodec57 | libavcodec-extra57 | libavcodec56 | libavcodec-extra56 | libavcodec55 | libavcodec-extra55 | libavcodec54 | libavcodec-extra54 | libavcodec53 | libavcodec-extra53 Description: [% c('var/display_name') %] ===================================== projects/linux-packages/rpm-package.spec ===================================== @@ -34,9 +34,6 @@ Source1: [% c("var/system_pkg/pkg_name") %].desktop [% IF c("var/browser-linux-x86_64") -%] Source2: %{name}-linux-x86_64-%{version}.tar.xz [% END -%] -[% IF c("var/browser-linux-i686") -%] -Source3: %{name}-linux-i386-%{version}.tar.xz -[% END -%] [% IF c("var/browser-linux-aarch64") -%] Source4: %{name}-linux-aarch64-%{version}.tar.xz [% END -%] ===================================== projects/openssl/build ===================================== @@ -7,9 +7,6 @@ mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] -[% IF c("var/osname") == "linux-i686" -%] -export CC='gcc -m32' -[% END %] # OpenSSL prepends the host triple to $CC [% IF c("var/macos") -%] # Tricking OpenSSL into using our clang as cross-compiler ===================================== projects/openssl/config ===================================== @@ -8,9 +8,6 @@ targets: linux-x86_64: var: configure_opts: -shared enable-ec_nistp_64_gcc_128 linux-x86_64 - linux-i686: - var: - configure_opts: -shared linux-x86 linux-aarch64: var: configure_opts: -shared --cross-compile-prefix=[% c("var/crosstarget") %]- enable-ec_nistp_64_gcc_128 linux-aarch64 ===================================== projects/release/build ===================================== @@ -43,9 +43,6 @@ function mv_files { [% IF c("var/browser_platforms/macos-aarch64") -%] mv_files "[% c('input_files_by_name/macos-aarch64') %]" [% END -%] -[% IF c("var/browser_platforms/linux-i686") -%] - mv_files "[% c('input_files_by_name/linux-i686') %]" -[% END -%] [% IF c("var/browser_platforms/linux-x86_64") -%] mv_files "[% c('input_files_by_name/linux-x86_64') %]" [% END -%] @@ -75,8 +72,6 @@ RewriteRule ^sha256sums.incrementals.txt.asc$ sha256sums-unsigned-build.incremen [% IF c("var/tor-browser") -%] RewriteRule ^tor-browser-linux64-(.*)_ALL.tar.xz.asc$ tor-browser-linux-x86_64-$1.tar.xz.asc RewriteRule ^tor-browser-linux64-(.*)_ALL.tar.xz$ tor-browser-linux-x86_64-$1.tar.xz -RewriteRule ^tor-browser-linux32-(.*)_ALL.tar.xz.asc$ tor-browser-linux-i686-$1.tar.xz.asc -RewriteRule ^tor-browser-linux32-(.*)_ALL.tar.xz$ tor-browser-linux-i686-$1.tar.xz [% END -%] EOF ===================================== projects/release/config ===================================== @@ -8,7 +8,7 @@ var: publish_dir: '[% c("var/signed_status") %]/[% c("version") %]-[% c("var/torbrowser_build") %]' containers_target: with_containers - linux-packages: '[% ( c("var/browser_platforms/linux-i686") || c("var/browser_platforms/linux-x86_64") ) && ( c("var/mullvad-browser") || c("var/nightly") ) %]' + linux-packages: '[% c("var/browser_platforms/linux-x86_64") && ( c("var/mullvad-browser") || c("var/nightly") ) %]' linux-packages-aarch64: '[% c("var/browser_platforms/linux-aarch64") && (c("var/mullvad-browser") || c("var/nightly")) %]' list_used_projects: '[% INCLUDE list_used_projects %]' @@ -57,10 +57,6 @@ targets: browser_platforms: linux-x86_64: 1 asan-build: '-asan' - browser-linux-i686: - var: - browser_platforms: - linux-i686: 1 browser-linux-aarch64: var: browser_platforms: @@ -193,13 +189,6 @@ input_files: - '[% c("var/build_target") %]' - '[% c("var/browser_type") %]-linux-x86_64[% c("var/asan-build") %]' - - name: linux-i686 - project: browser - enable: '[% c("var/browser_platforms/linux-i686") %]' - target: - - '[% c("var/build_target") %]' - - '[% c("var/browser_type") %]-linux-i686' - - name: linux-aarch64 project: browser enable: '[% c("var/browser_platforms/linux-aarch64") %]' @@ -214,7 +203,6 @@ input_files: target: - '[% IF c("var/testbuild") %]testbuild[% END %]' - '[% c("var/build_target") %]' - - '[% IF c("var/browser_platforms/linux-i686") %]browser-linux-i686[% END %]' - '[% IF c("var/browser_platforms/linux-x86_64") %]browser-linux-x86_64[% END %]' - deb - '[% c("var/browser_type") %]-linux-x86_64' @@ -239,7 +227,6 @@ input_files: target: - '[% IF c("var/testbuild") %]testbuild[% END %]' - '[% c("var/build_target") %]' - - '[% IF c("var/browser_platforms/linux-i686") %]browser-linux-i686[% END %]' - '[% IF c("var/browser_platforms/linux-x86_64") %]browser-linux-x86_64[% END %]' - '[% IF c("var/linux-packages-aarch64") %]browser-linux-aarch64[% END %]' - rpm ===================================== projects/release/update_responses_config.yml ===================================== @@ -20,7 +20,6 @@ download: [% END -%] build_targets: linux-aarch64: Linux_aarch64-gcc3 - linux-i686: Linux_x86-gcc3 linux-x86_64: Linux_x86_64-gcc3 windows-i686: - WINNT_x86-gcc3 @@ -68,8 +67,6 @@ versions: windows-x86_64: # Windows 10 minSupportedOSVersion: 10.0 - linux-i686: - minSupportedInstructionSet: SSE2 linux-x86_64: minSupportedInstructionSet: SSE2 [% IF c("var/tor-browser") && c("var/torbrowser_legacy_version") -%] ===================================== projects/rust/config ===================================== @@ -15,11 +15,6 @@ targets: target_flags: --set=target.armv7-linux-androideabi.cc=armv7a-linux-androideabi21-clang --set=target.armv7-linux-androideabi.ar=llvm-ar --set=target.thumbv7neon-linux-androideabi.cc=armv7a-linux-androideabi21-clang --set=target.thumbv7neon-linux-androideabi.ar=llvm-ar --set=target.aarch64-linux-android.cc=aarch64-linux-android21-clang --set=target.aarch64-linux-android.ar=llvm-ar --set=target.i686-linux-android.cc=i686-linux-android21-clang --set=target.i686-linux-android.ar=llvm-ar --set=target.x86_64-linux-android.cc=x86_64-linux-android21-clang --set=target.x86_64-linux-android.ar=llvm-ar linux: - var: - target: i686-unknown-linux-gnu - target_flags: --set target.i686-unknown-linux-gnu.linker=clang --set target.i686-unknown-linux-gnu.ar=llvm-ar --set target.i686-unknown-linux-gnu.ranlib=llvm-ranlib - - linux-aarch64: var: target: aarch64-unknown-linux-gnu target_flags: --set target.aarch64-unknown-linux-gnu.linker=aarch64-linux-gnu-gcc --set target.aarch64-unknown-linux-gnu.ar=llvm-ar --set target.aarch64-unknown-linux-gnu.ranlib=llvm-ranlib ===================================== projects/tor/config ===================================== @@ -19,12 +19,6 @@ targets: var: flag_mwindows: '-Wl,--subsystem,console' - linux-i686: - var: - libdir: lib32 - sort_deps: 0 - arch_deps: - - zlib1g-dev:i386 linux-x86_64: var: libdir: lib64 ===================================== rbm.conf ===================================== @@ -87,7 +87,6 @@ var: android-x86_64: '[% c("var/browser_platforms/is_android_release") %]' android-aarch64: '[% c("var/browser_platforms/is_android_release") %]' linux-x86_64: '[% c("var/browser_platforms/is_desktop_release") %]' - linux-i686: '[% c("var/browser_platforms/is_desktop_release") && c("var/tor-browser") %]' linux-aarch64: '[% c("var/browser_platforms/is_desktop_release") %]' windows-i686: '[% c("var/browser_platforms/is_desktop_release") && c("var/tor-browser") %]' windows-x86_64: '[% c("var/browser_platforms/is_desktop_release") %]' @@ -114,7 +113,6 @@ var: signing_desktop: | [%- c("var/browser_platforms/linux-x86_64") || - c("var/browser_platforms/linux-i686") || c("var/browser_platforms/linux-aarch64") || c("var/browser_platforms/windows-i686") || c("var/browser_platforms/windows-x86_64") || @@ -534,14 +532,6 @@ targets: - linux-x86_64 - linux - mullvadbrowser - torbrowser-linux-i686: - - linux-i686 - - linux - - torbrowser - basebrowser-linux-i686: - - linux-i686 - - linux - - basebrowser torbrowser-linux-aarch64: - linux-cross - linux-aarch64 @@ -574,14 +564,6 @@ targets: osname: linux-x86_64 linux-cross: 0 arch_debian: amd64 - linux-i686: - arch: i686 - var: - linux-i686: 1 - osname: linux-i686 - linux-cross: 0 - configure_opt: '--host=i686-linux-gnu CFLAGS=-m32 CXXFLAGS=-m32 LDFLAGS=-m32 [% c("var/configure_opt_project") %]' - arch_debian: i386 linux-aarch64: arch: aarch64 var: @@ -615,11 +597,8 @@ targets: container: suite: stretch arch: amd64 - pre_pkginst: dpkg --add-architecture i386 deps: - ca-certificates - - libc6-dev-i386 - - lib32stdc++6 - pkg-config - libssl-dev - build-essential ===================================== tools/dmg2mar ===================================== @@ -59,19 +59,6 @@ sub capture_exec { return $stdout; } -sub osname { - my ($osname) = capture_exec('uname', '-s'); - my ($arch) = capture_exec('uname', '-m'); - chomp($osname, $arch); - if ($osname eq 'Linux' && $arch eq 'x86_64') { - return 'linux-x86_64'; - } - if ($osname eq 'Linux' && $arch =~ m/^i.86$/) { - return 'linux-i686'; - } - exit_error 'Unknown OS'; -} - sub setup_martools { my ($out, $err, $exit) = capture { system("$FindBin::Bin/setup-martools"); ===================================== tools/signing/nightly/config.yml ===================================== @@ -7,7 +7,6 @@ builds_url: /srv/tbb-nightlies-master.torproject.org/htdocs/nightly-builds/tor-b torbrowser: publish_dirs: - nightly-linux-x86_64 - - nightly-linux-i686 - nightly-linux-aarch64 - nightly-windows-x86_64 - nightly-windows-i686 ===================================== tools/signing/nightly/update-responses-base-config.yml ===================================== @@ -3,7 +3,6 @@ download: mars_url: https://nightlies.tbb.torproject.org/nightly-updates build_targets: linux-aarch64: Linux_aarch64-gcc3 - linux-i686: Linux_x86-gcc3 linux-x86_64: Linux_x86_64-gcc3 windows-i686: - WINNT_x86-gcc3 @@ -30,8 +29,6 @@ versions: windows-x86_64: # Windows v10 minSupportedOSVersion: 10.0 - linux-i686: - minSupportedInstructionSet: SSE2 linux-x86_64: minSupportedInstructionSet: SSE2 mar_compression: xz ===================================== tools/signing/staticiforme-prepare-cdn-dist-upload ===================================== @@ -18,8 +18,6 @@ if is_project torbrowser; then cat >> "$dist_dir/.htaccess" << 'EOF' RewriteRule ^tor-browser-linux64-(.*)_ALL.tar.xz.asc$ tor-browser-linux-x86_64-$1.tar.xz.asc RewriteRule ^tor-browser-linux64-(.*)_ALL.tar.xz$ tor-browser-linux-x86_64-$1.tar.xz -RewriteRule ^tor-browser-linux32-(.*)_ALL.tar.xz.asc$ tor-browser-linux-i686-$1.tar.xz.asc -RewriteRule ^tor-browser-linux32-(.*)_ALL.tar.xz$ tor-browser-linux-i686-$1.tar.xz EOF fi ===================================== tools/update-responses/update_responses ===================================== @@ -171,7 +171,7 @@ sub get_version_downloads { my $os; if ($file =~ m/^$config->{appname_bundle}-macos-$version.dmg$/) { $os = 'macos'; - } elsif ($file =~ m/^$config->{appname_bundle}-(linux-i686|linux-x86_64)-${version}.tar.xz$/) { + } elsif ($file =~ m/^$config->{appname_bundle}-(linux-x86_64|linux-aarch64)-${version}.tar.xz$/) { $os = $1; } elsif ($file =~ m/^$config->{appname_bundle}-windows-x86_64-(portable-|)${version}.exe$/) { $os = 'win64'; @@ -200,7 +200,7 @@ sub get_perplatform_downloads { my $os; if ($file =~ m/^$config->{appname_bundle}-macos-$version.dmg$/) { $os = 'macos'; - } elsif ($file =~ m/^$config->{appname_bundle}-(linux-i686|linux-x86_64)-${version}.tar.xz$/) { + } elsif ($file =~ m/^$config->{appname_bundle}-(linux-x86_64|linux-aarch64)-${version}.tar.xz$/) { $os = $1; } elsif ($file =~ m/^$config->{appname_bundle}-(windows-i686|windows-x86_64)-(portable-|)${version}.exe$/) { $os = $1; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/dc... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/dc... You're receiving this email because of your account on gitlab.torproject.org.
participants (1)
-
Pier Angelo Vendrame (＠pierov)