[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser-build][main] Bug 41601: Drop support for Linux i686.

Title: GitLab

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:

Changes:

  • Makefile
    ... ... @@ -41,9 +41,6 @@ torbrowser-release-linux-x86_64: submodule-update
    41 41 
     torbrowser-release-linux-x86_64-asan: submodule-update
    42 42 
     	$(rbm) build release --target release --target browser-single-platform --target browser-linux-x86_64-asan --target torbrowser
    43 43
    44 
    -torbrowser-release-linux-i686: submodule-update
    45 
    -	$(rbm) build release --target release --target browser-single-platform --target browser-linux-i686 --target torbrowser
    46 
    -
    47 44 
     torbrowser-release-linux-aarch64: submodule-update
    48 45 
     	$(rbm) build release --target release --target browser-single-platform --target browser-linux-aarch64 --target torbrowser
    49 46
    ... ... @@ -89,9 +86,6 @@ torbrowser-alpha-linux-x86_64-asan: submodule-update
    89 86 
     torbrowser-alpha-linux-aarch64: submodule-update
    90 87 
     	$(rbm) build release --target alpha --target browser-single-platform --target browser-linux-aarch64 --target torbrowser
    91 88
    92 
    -torbrowser-alpha-linux-i686: submodule-update
    93 
    -	$(rbm) build release --target alpha --target browser-single-platform --target browser-linux-i686 --target torbrowser
    94 
    -
    95 89 
     torbrowser-alpha-windows-i686: submodule-update
    96 90 
     	$(rbm) build release --target alpha --target browser-single-platform --target browser-windows-i686 --target torbrowser
    97 91
    ... ... @@ -134,9 +128,6 @@ torbrowser-nightly-linux-x86_64-asan: submodule-update
    134 128 
     torbrowser-nightly-linux-aarch64: submodule-update
    135 129 
     	$(rbm) build release --target nightly --target browser-single-platform --target browser-linux-aarch64 --target torbrowser
    136 130
    137 
    -torbrowser-nightly-linux-i686: submodule-update
    138 
    -	$(rbm) build release --target nightly --target browser-single-platform --target browser-linux-i686 --target torbrowser
    139 
    -
    140 131 
     torbrowser-nightly-windows-i686: submodule-update
    141 132 
     	$(rbm) build release --target nightly --target browser-single-platform --target browser-windows-i686 --target torbrowser
    142 133
    ... ... @@ -176,9 +167,6 @@ torbrowser-testbuild-linux-x86_64: submodule-update
    176 167 
     torbrowser-testbuild-linux-x86_64-asan: submodule-update
    177 168 
     	$(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-x86_64-asan --target torbrowser
    178 169
    179 
    -torbrowser-testbuild-linux-i686: submodule-update
    180 
    -	$(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-i686 --target torbrowser
    181 
    -
    182 170 
     torbrowser-testbuild-linux-aarch64: submodule-update
    183 171 
     	$(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-aarch64 --target torbrowser
    184 172
    ... ... @@ -285,9 +273,6 @@ basebrowser-release-linux-x86_64: submodule-update
    285 273 
     basebrowser-release-linux-x86_64-asan: submodule-update
    286 274 
     	$(rbm) build release --target release --target browser-single-platform --target browser-linux-x86_64-asan --target basebrowser
    287 275
    288 
    -basebrowser-release-linux-i686: submodule-update
    289 
    -	$(rbm) build release --target release --target browser-single-platform --target browser-linux-i686 --target basebrowser
    290 
    -
    291 276 
     basebrowser-release-linux-aarch64: submodule-update
    292 277 
     	$(rbm) build release --target release --target browser-single-platform --target browser-linux-aarch64 --target basebrowser
    293 278
    ... ... @@ -324,9 +309,6 @@ basebrowser-alpha-linux-x86_64: submodule-update
    324 309 
     basebrowser-alpha-linux-x86_64-asan: submodule-update
    325 310 
     	$(rbm) build release --target alpha --target browser-single-platform --target browser-linux-x86_64-asan --target basebrowser
    326 311
    327 
    -basebrowser-alpha-linux-i686: submodule-update
    328 
    -	$(rbm) build release --target alpha --target browser-single-platform --target browser-linux-i686 --target basebrowser
    329 
    -
    330 312 
     basebrowser-alpha-linux-aarch64: submodule-update
    331 313 
     	$(rbm) build release --target alpha --target browser-single-platform --target browser-linux-aarch64 --target basebrowser
    332 314
    ... ... @@ -363,9 +345,6 @@ basebrowser-nightly-linux-x86_64: submodule-update
    363 345 
     basebrowser-nightly-linux-x86_64-asan: submodule-update
    364 346 
     	$(rbm) build release --target nightly --target browser-single-platform --target browser-linux-x86_64-asan --target basebrowser
    365 347
    366 
    -basebrowser-nightly-linux-i686: submodule-update
    367 
    -	$(rbm) build release --target nightly --target browser-single-platform --target browser-linux-i686 --target basebrowser
    368 
    -
    369 348 
     basebrowser-nightly-linux-aarch64: submodule-update
    370 349 
     	$(rbm) build release --target nightly --target browser-single-platform --target browser-linux-aarch64 --target basebrowser
    371 350
    ... ... @@ -402,9 +381,6 @@ basebrowser-testbuild-linux-x86_64: submodule-update
    402 381 
     basebrowser-testbuild-linux-x86_64-asan: submodule-update
    403 382 
     	$(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-x86_64-asan --target basebrowser
    404 383
    405 
    -basebrowser-testbuild-linux-i686: submodule-update
    406 
    -	$(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-i686 --target basebrowser
    407 
    -
    408 384 
     basebrowser-testbuild-linux-aarch64: submodule-update
    409 385 
     	$(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-aarch64 --target basebrowser
    410 386

  • README
    ... ... @@ -128,7 +128,7 @@ If you want to build for a specific platform only, append the platform
    128 128 
     name to the makefile target:
    129 129
    130 130 
       $ make torbrowser-nightly-linux-x86_64
    131 
    -  $ make torbrowser-nightly-linux-i686
    131 
    +  $ make torbrowser-nightly-linux-aarch64
    132 132 
       $ make torbrowser-nightly-windows-i686
    133 133 
       $ make torbrowser-nightly-windows-x86_64
    134 134 
       $ make torbrowser-nightly-macos

  • doc/HACKING.txt
    ... ... @@ -43,13 +43,13 @@ In each of those places, an option can be defined:
    43 43
    44 44 
     The targets are usually used to select:
    45 45
    46 
    -- the platform: torbrowser-linux-x86_64, torbrowser-linux-i686,
    46 
    +- the platform: torbrowser-linux-x86_64, torbrowser-linux-aarch64,
    47 47 
       torbrowser-windows-i686, torbrowser-windows-x86_64, torbrowser-macos,
    48 48 
       torbrowser-android-armv7, torbrowser-android-aarch64, torbrowser-android-x86,
    49 49 
       torbrowser-android-x86_64
    50 50 
     - the channel: release, nightly, alpha
    51 51
    52 
    -The targets torbrowser-linux-x86_64, torbrowser-linux-i686,
    52 
    +The targets torbrowser-linux-x86_64, torbrowser-linux-aarch64,
    53 53 
     torbrowser-windows-i686, torbrowser-windows-x86_64, torbrowser-macos,
    54 54 
     torbrowser-android-armv7, torbrowser-android-x86, torbrowser-android-aarch64,
    55 55 
     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:
    103 103 
         # do something for macOS
    104 104 
       [% END -%]
    105 105
    106 
    -You can also use var/linux-x86_64 and var/linux-i686 for things that
    107 
    -only apply to x86_64 and i686 linux builds. You can use the var/release,
    106 
    +You can also use var/linux-x86_64 and var/linux-aarch64 for things that
    107 
    +only apply to x86_64 and aarch64 linux builds. You can use the var/release,
    108 108 
     var/alpha and var/nightly options to do things depending on the channel.
    109 109
    110 110 
     As an alternative you can define an option with a different value
    ... ... @@ -148,7 +148,7 @@ $platform should be one of the following:
    148 148
    149 149 
      - torbrowser-linux-x86_64
    150 150
    151 
    - - torbrowser-linux-i686
    151 
    + - torbrowser-linux-aarch64
    152 152
    153 153 
      - torbrowser-windows-i686
    154 154

  • doc/MAKEFILE.txt
    ... ... @@ -14,7 +14,7 @@ Build Tor Browser for the release channel, for all supported platforms
    14 14 
     (defined in var/browser_platforms). The resulting build can be found in
    15 15 
     directory torbrowser/release/$version.
    16 16
    17 
    -torbrowser-release-{linux-x86_64,linux-i686,windows-i686,macos,
    17 
    +torbrowser-release-{linux-x86_64,linux-aarch64,windows-i686,macos,
    18 18 
                         android-armv7, android-x86,android-x86_64,
    19 19 
                         android-aarch64,desktop,android}
    20 20 
     --------------------------------------------------------------------
    ... ... @@ -27,7 +27,7 @@ torbrowser-alpha
    27 27 
     Build Tor Browser for the alpha channel, for all supported platforms.
    28 28 
     The resulting build can be found in directory torbrowser/alpha/$version.
    29 29
    30 
    -torbrowser-alpha-{linux-x86_64,linux-i686,windows-i686,macos,
    30 
    +torbrowser-alpha-{linux-x86_64,linux-aarch64,windows-i686,macos,
    31 31 
                       android-armv7,android-x86,android-x86_64,
    32 32 
                       android-aarch64,desktop,android}
    33 33 
     ------------------------------------------------------------------
    ... ... @@ -42,7 +42,7 @@ components.
    42 42
    43 43 
     The resulting build can be found in directory torbrowser/nightly/$date
    44 44
    45 
    -torbrowser-nightly-{linux-x86_64,linux-i686,windows-i686,macos,
    45 
    +torbrowser-nightly-{linux-x86_64,linux-aarch64,windows-i686,macos,
    46 46 
                         android-armv7,android-x86,android-x86_64,
    47 47 
                         android-aarch64,desktop,android}
    48 48 
     --------------------------------------------------------------------
    ... ... @@ -56,7 +56,7 @@ By default it is based on the alpha channel, but you can change that by
    56 56 
     editing rbm.local.conf. The resulting build can be found in directory
    57 57 
     testbuild.
    58 58
    59 
    -torbrowser-testbuild-{linux-x86_64,linux-i686,windows-i686,macos,
    59 
    +torbrowser-testbuild-{linux-x86_64,linux-aarch64,windows-i686,macos,
    60 60 
                         android-armv7,android-x86,android-x86_64,
    61 61 
                         android-aarch64,desktop,android}
    62 62 
     -----------------------------------------------------------------

  • projects/browser/RelativeLink/start-browser
    ... ... @@ -87,13 +87,6 @@ if [ "`id -u`" -eq 0 ]; then
    87 87 
       exit 1
    88 88 
     fi
    89 89
    90 
    -[% IF c('var/linux-i686') || c('var/linux-x86_64') -%]
    91 
    -if test -r /proc/cpuinfo && ! grep -q '^flags\s*:.* sse2' /proc/cpuinfo; then
    92 
    -  complain "[% c('var/Project_Name') %] requires a CPU with SSE2 support.  Exiting."
    93 
    -  exit 1
    94 
    -fi
    95 
    -[% END -%]
    96 
    -
    97 90 
     print_usage () {
    98 91 
       printf "\n[% c('var/Project_Name') %] Script Options\n"
    99 92 
       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:
    19 19
    20 20 
       linux:
    21 21 
         var:
    22 
    -      arch_deps:
    23 
    -        # Install libc6-i386 to be able to run 32bit mar tools in linux-i686
    24 
    -        # builds (bug 29812). We don't need it in x86_64 builds, but we
    25 
    -        # share the container to reduce space used.
    26 
    -        - libc6-i386
    27 22 
           pt_path: ./TorBrowser/Tor/PluggableTransports/
    28 23
    29 24 
       macos:

  • projects/firefox/build
    ... ... @@ -39,12 +39,10 @@ export PATH="/var/tmp/dist/rust/bin:/var/tmp/dist/cbindgen:/var/tmp/dist/node/bi
    39 39 
       [% IF ! c("var/asan") -%]
    40 40 
         export PATH="/var/tmp/dist/clang-linux/bin:$PATH"
    41 41 
       [% END -%]
    42 
    -  [% IF c("var/linux-i686") -%]
    42 
    +  [% IF c("var/linux-cross") -%]
    43 43 
         # Exporting `PKG_CONFIG_PATH` in the mozconfig file is causing build
    44 44 
         # breakage in Rust code. It seems that environment variable is not passed
    45 45 
         # down properly in that case. Thus, we set it here in the build script.
    46 
    -    export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/usr/lib/i386-linux-gnu/pkgconfig"
    47 
    -  [% ELSIF c("var/linux-cross") -%]
    48 46 
         export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/usr/lib/[% c("var/crosstarget") %]/pkgconfig"
    49 47 
       [% END -%]
    50 48 
     [% END -%]
    ... ... @@ -309,7 +307,7 @@ END;
    309 307 
       /var/tmp/dist/gcc/bin/"${CROSS_PREFIX}g++" $rootdir/abicheck.cc -o Browser/abicheck -std=c++17
    310 308 
       libdest=Browser/libstdc++
    311 309 
       mkdir -p "$libdest"
    312 
    -  libdir=[% c("var/libdir") %]
    310 
    +  libdir=lib64
    313 311 
       [% IF c("var/linux-cross") -%]
    314 312 
         libdir="[% c("var/crosstarget") %]/$libdir"
    315 313 
       [% END -%]

  • projects/firefox/config
    ... ... @@ -130,25 +130,6 @@ targets:
    130 130 
             - libasound2-dev
    131 131 
             # To support Wayland mode
    132 132 
             - libdrm-dev
    133 
    -      libdir: lib64
    134 
    -
    135 
    -  linux-i686:
    136 
    -    var:
    137 
    -      sort_deps: 0
    138 
    -      arch_deps:
    139 
    -        - libgtk2.0-dev:i386
    140 
    -        - libgtk-3-dev:i386
    141 
    -        - libdbus-glib-1-dev:i386
    142 
    -        - libxt-dev:i386
    143 
    -        # To pass configure since ESR 31
    144 
    -        - libpulse-dev:i386
    145 
    -        # To pass configure since ESR 52
    146 
    -        - libx11-xcb-dev:i386
    147 
    -        # To pass configure since ESR 102
    148 
    -        - libasound2-dev:i386
    149 
    -        # To support Wayland mode
    150 
    -        - libdrm-dev:i386
    151 
    -      libdir: lib32
    152 133
    153 134 
       linux-aarch64:
    154 135 
         var:
    ... ... @@ -166,7 +147,6 @@ targets:
    166 147 
             - libasound2-dev:arm64
    167 148 
             # To support Wayland mode
    168 149 
             - libdrm-dev:arm64
    169 
    -      libdir: lib64
    170 150
    171 151 
       macos:
    172 152 
         var:

  • projects/gcc-cross/config
    ... ... @@ -16,14 +16,13 @@ var:
    16 16 
         mkdir -p /var/tmp/dist
    17 17 
         tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %]
    18 18 
         export PATH="/var/tmp/dist/[% c("var/distdir") %]/bin:$PATH"
    19 
    -    export LD_LIBRARY_PATH=/var/tmp/dist/[% c("var/distdir") %]/lib64:/var/tmp/dist/[% c("var/distdir") %]/lib32
    19 
    +    export LD_LIBRARY_PATH=/var/tmp/dist/[% c("var/distdir") %]/lib64
    20 20 
         [% IF c("hardened_gcc"); GET c("var/set_hardened_build_flags"); END %]
    21 21 
       configure_opt: '--target=[% c("var/crosstarget") %] --disable-multilib --enable-languages=c,c++ --with-glibc-version=[% c("var/glibc_version") %]'
    22 22 
       # Use stretch's glibc and stretch-security's linux
    23 23 
       glibc_version: 2.24
    24 24 
       linux_version: 4.19.232
    25 25 
       arch_deps:
    26 
    -    - libc6-dev-i386
    27 26 
         - gawk
    28 27 
         - rsync
    29 28

  • projects/gcc/config
    ... ... @@ -16,7 +16,7 @@ var:
    16 16 
         mkdir -p /var/tmp/dist
    17 17 
         tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %]
    18 18 
         export PATH="/var/tmp/dist/[% c("var/distdir") %]/bin:$PATH"
    19 
    -    export LD_LIBRARY_PATH=/var/tmp/dist/[% c("var/distdir") %]/lib64:/var/tmp/dist/[% c("var/distdir") %]/lib32
    19 
    +    export LD_LIBRARY_PATH=/var/tmp/dist/[% c("var/distdir") %]/lib64
    20 20 
         [% IF c("hardened_gcc"); GET c("var/set_hardened_build_flags"); END %]
    21 21
    22 22 
     targets:
    ... ... @@ -29,9 +29,7 @@ targets:
    29 29 
       linux:
    30 30 
         hardened_gcc: 1
    31 31 
         var:
    32 
    -      configure_opt: --enable-multilib --enable-languages=c,c++ --with-arch_32=i686
    33 
    -      arch_deps:
    34 
    -        - libc6-dev-i386
    32 
    +      configure_opt: --enable-multilib --enable-languages=c,c++
    35 33
    36 34 
     input_files:
    37 35 
       - project: container-image

  • projects/go/config
    ... ... @@ -59,9 +59,6 @@ targets:
    59 59 
       linux-x86_64:
    60 60 
         var:
    61 61 
           GOARCH: amd64
    62 
    -  linux-i686:
    63 
    -    var:
    64 
    -      GOARCH: 386
    65 62 
       linux-aarch64:
    66 63 
         var:
    67 64 
           GOARCH: arm64

  • projects/linux-packages/build
    ... ... @@ -9,16 +9,6 @@ mkdir -p "$distdir"
    9 9 
     umask 0022
    10 10
    11 11 
     [% IF c("var/build_deb_pkg") -%]
    12 
    -  [% IF c("var/browser-linux-i686") -%]
    13 
    -    # When building an i386 deb package, dh_strip requires i686-linux-gnu-*
    14 
    -    # commands not provided by the binutils x86_64 package on debian stretch.
    15 
    -    # We can use the binutils-i686-gnu package when we switch to buster.
    16 
    -    mkdir -p /var/tmp/dist/binutils
    17 
    -    for bin in strip objcopy objdump; do
    18 
    -      ln -s /usr/bin/$bin /var/tmp/dist/binutils/i686-linux-gnu-$bin
    19 
    -    done
    20 
    -    export PATH="/var/tmp/dist/binutils:$PATH"
    21 
    -  [% END -%]
    22 12 
       cd $distdir
    23 13 
       project_dir=[% c("var/system_pkg/pkg_name") %]-[% c("var/system_pkg/pkg_version") %]
    24 14 
       mkdir "$project_dir"
    ... ... @@ -52,11 +42,6 @@ umask 0022
    52 42 
           $rootdir/[% c('input_files_by_name/linux-x86_64') %]/[% c("var/project-name") %]-linux-x86_64-[% c("version") %].tar.xz \
    53 43 
           amd64
    54 44 
       [% END -%]
    55 
    -  [% IF c("var/browser-linux-i686") -%]
    56 
    -    extract_src_tar \
    57 
    -      $rootdir/[% c('input_files_by_name/linux-i686') %]/[% c("var/project-name") %]-linux-i686-[% c("version") %].tar.xz \
    58 
    -      i386
    59 
    -  [% END -%]
    60 45 
       [% IF c("var/browser-linux-aarch64") -%]
    61 46 
         extract_src_tar \
    62 47 
           $rootdir/[% c('input_files_by_name/linux-aarch64') %]/[% c("var/project-name") %]-linux-aarch64-[% c("version") %].tar.xz \
    ... ... @@ -93,10 +78,6 @@ EOF
    93 78 
         cp -a $rootdir/[% c('input_files_by_name/linux-x86_64') %]/[% c("var/project-name") %]-linux-x86_64-[% c("version") %].tar.xz \
    94 79 
           SOURCES/[% c("var/system_pkg/pkg_name") %]-linux-x86_64-[% c("var/system_pkg/pkg_version") %].tar.xz
    95 80 
       [% END -%]
    96 
    -  [% IF c("var/browser-linux-i686") -%]
    97 
    -    cp -a $rootdir/[% c('input_files_by_name/linux-i686') %]/[% c("var/project-name") %]-linux-i686-[% c("version") %].tar.xz \
    98 
    -      SOURCES/[% c("var/system_pkg/pkg_name") %]-linux-i386-[% c("var/system_pkg/pkg_version") %].tar.xz
    99 
    -  [% END -%]
    100 81 
       [% IF c("var/browser-linux-aarch64") -%]
    101 82 
         cp -a $rootdir/[% c('input_files_by_name/linux-aarch64') %]/[% c("var/project-name") %]-linux-aarch64-[% c("version") %].tar.xz \
    102 83 
           SOURCES/[% c("var/system_pkg/pkg_name") %]-linux-aarch64-[% c("var/system_pkg/pkg_version") %].tar.xz
    ... ... @@ -105,9 +86,6 @@ EOF
    105 86 
       [% IF c("var/browser-linux-x86_64") -%]
    106 87 
         rpmbuild --define "_topdir $rpmdir" -v -bb SPECS/[% c("var/system_pkg/pkg_name") %].spec
    107 88 
       [% END -%]
    108 
    -  [% IF c("var/browser-linux-i686") -%]
    109 
    -    rpmbuild --define "_topdir $rpmdir" --target i686-redhat-linux -v -bb SPECS/[% c("var/system_pkg/pkg_name") %].spec
    110 
    -  [% END -%]
    111 89 
       [% IF c("var/browser-linux-aarch64") -%]
    112 90 
         rpmbuild --define "_topdir $rpmdir" --target aarch64-redhat-linux -v -bb SPECS/[% c("var/system_pkg/pkg_name") %].spec
    113 91 
       [% END -%]

  • projects/linux-packages/config
    ... ... @@ -18,7 +18,6 @@ var:
    18 18 
         # Use var_p/system_pkg/deb_archs for the processed list
    19 19 
         deb_archs_list:
    20 20 
           - '[% IF c("var/browser-linux-x86_64") %]amd64[% END %]'
    21 
    -      - '[% IF c("var/browser-linux-i686") %]i386[% END %]'
    22 21 
           - '[% IF c("var/browser-linux-aarch64") %]arm64[% END %]'
    23 22
    24 23
    ... ... @@ -28,7 +27,6 @@ targets:
    28 27 
         var:
    29 28 
           build_deb_pkg: 1
    30 29 
           pre_pkginst: |
    31 
    -        dpkg --add-architecture i386
    32 30 
             # some foreign-arch packages fail to install when /var/lib/dpkg/available
    33 31 
             # does not exist, so create it as an empty file
    34 32 
             echo > /var/lib/dpkg/available
    ... ... @@ -54,16 +52,6 @@ targets:
    54 52 
             - libpulse-dev
    55 53 
             - libx11-xcb-dev
    56 54 
             - libxt-dev
    57 
    -        - linux-libc-dev:i386
    58 
    -        - libasound2-dev:i386
    59 
    -        - libfontconfig1-dev:i386
    60 
    -        - libfreetype6-dev:i386
    61 
    -        - libgconf2-dev:i386
    62 
    -        - libgtk-3-dev:i386
    63 
    -        - libpango1.0-dev:i386
    64 
    -        - libpulse-dev:i386
    65 
    -        - libx11-xcb-dev:i386
    66 
    -        - libxt-dev:i386
    67 55 
       deb-arm64:
    68 56 
         var:
    69 57 
           build_deb_pkg: 1
    ... ... @@ -111,9 +99,6 @@ targets:
    111 99 
       browser-linux-x86_64:
    112 100 
         var:
    113 101 
           browser-linux-x86_64: 1
    114 
    -  browser-linux-i686:
    115 
    -    var:
    116 
    -      browser-linux-i686: 1
    117 102 
       browser-linux-aarch64:
    118 103 
         var:
    119 104 
           browser-linux-aarch64: 1
    ... ... @@ -163,13 +148,6 @@ input_files:
    163 148 
           - '[% c("var/build_target") %]'
    164 149 
           - '[% c("var/browser_type") %]-linux-x86_64'
    165 150
    166 
    -  - name: linux-i686
    167 
    -    project: browser
    168 
    -    enable: '[% c("var/browser-linux-i686") %]'
    169 
    -    target:
    170 
    -      - '[% c("var/build_target") %]'
    171 
    -      - '[% c("var/browser_type") %]-linux-i686'
    172 
    -
    173 151 
       - name: linux-aarch64
    174 152 
         project: browser
    175 153 
         enable: '[% c("var/browser-linux-aarch64") %]'

  • projects/linux-packages/debian/control.in
    ... ... @@ -5,7 +5,7 @@ Section: web
    5 5 
     Build-Depends: debhelper (>= 9), dh-apparmor
    6 6
    7 7 
     Package: [% c("var/system_pkg/pkg_name") %]
    8 
    -Architecture: amd64 i386 arm64
    8 
    +Architecture: amd64 arm64
    9 9 
     Depends: ${shlibs:Depends},
    10 10 
     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
    11 11 
     Description: [% c('var/display_name') %]

  • projects/linux-packages/rpm-package.spec
    ... ... @@ -34,9 +34,6 @@ Source1: [% c("var/system_pkg/pkg_name") %].desktop
    34 34 
     [% IF c("var/browser-linux-x86_64") -%]
    35 35 
     Source2: %{name}-linux-x86_64-%{version}.tar.xz
    36 36 
     [% END -%]
    37 
    -[% IF c("var/browser-linux-i686") -%]
    38 
    -Source3: %{name}-linux-i386-%{version}.tar.xz
    39 
    -[% END -%]
    40 37 
     [% IF c("var/browser-linux-aarch64") -%]
    41 38 
     Source4: %{name}-linux-aarch64-%{version}.tar.xz
    42 39 
     [% END -%]

  • projects/openssl/build
    ... ... @@ -7,9 +7,6 @@ mkdir -p /var/tmp/build
    7 7 
     tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
    8 8 
     cd /var/tmp/build/[% project %]-[% c('version') %]
    9 9
    10 
    -[% IF c("var/osname") == "linux-i686" -%]
    11 
    -export CC='gcc -m32'
    12 
    -[% END %]
    13 10 
     # OpenSSL prepends the host triple to $CC
    14 11 
     [% IF c("var/macos") -%]
    15 12 
       # Tricking OpenSSL into using our clang as cross-compiler

  • projects/openssl/config
    ... ... @@ -8,9 +8,6 @@ targets:
    8 8 
       linux-x86_64:
    9 9 
         var:
    10 10 
           configure_opts: -shared enable-ec_nistp_64_gcc_128 linux-x86_64
    11 
    -  linux-i686:
    12 
    -    var:
    13 
    -      configure_opts: -shared linux-x86
    14 11 
       linux-aarch64:
    15 12 
         var:
    16 13 
           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 {
    43 43 
     [% IF c("var/browser_platforms/macos-aarch64") -%]
    44 44 
       mv_files "[% c('input_files_by_name/macos-aarch64') %]"
    45 45 
     [% END -%]
    46 
    -[% IF c("var/browser_platforms/linux-i686") -%]
    47 
    -  mv_files "[% c('input_files_by_name/linux-i686') %]"
    48 
    -[% END -%]
    49 46 
     [% IF c("var/browser_platforms/linux-x86_64") -%]
    50 47 
       mv_files "[% c('input_files_by_name/linux-x86_64') %]"
    51 48 
     [% END -%]
    ... ... @@ -75,8 +72,6 @@ RewriteRule ^sha256sums.incrementals.txt.asc$ sha256sums-unsigned-build.incremen
    75 72 
     [% IF c("var/tor-browser") -%]
    76 73 
     RewriteRule ^tor-browser-linux64-(.*)_ALL.tar.xz.asc$ tor-browser-linux-x86_64-$1.tar.xz.asc
    77 74 
     RewriteRule ^tor-browser-linux64-(.*)_ALL.tar.xz$ tor-browser-linux-x86_64-$1.tar.xz
    78 
    -RewriteRule ^tor-browser-linux32-(.*)_ALL.tar.xz.asc$ tor-browser-linux-i686-$1.tar.xz.asc
    79 
    -RewriteRule ^tor-browser-linux32-(.*)_ALL.tar.xz$ tor-browser-linux-i686-$1.tar.xz
    80 75 
     [% END -%]
    81 76 
     EOF
    82 77

  • projects/release/config
    ... ... @@ -8,7 +8,7 @@ var:
    8 8 
       publish_dir: '[% c("var/signed_status") %]/[% c("version") %]-[% c("var/torbrowser_build") %]'
    9 9 
       containers_target: with_containers
    10 10
    11 
    -  linux-packages: '[% ( c("var/browser_platforms/linux-i686") || c("var/browser_platforms/linux-x86_64") ) && ( c("var/mullvad-browser") || c("var/nightly") ) %]'
    11 
    +  linux-packages: '[% c("var/browser_platforms/linux-x86_64") && ( c("var/mullvad-browser") || c("var/nightly") ) %]'
    12 12 
       linux-packages-aarch64: '[% c("var/browser_platforms/linux-aarch64") && (c("var/mullvad-browser") || c("var/nightly")) %]'
    13 13 
       list_used_projects: '[% INCLUDE list_used_projects %]'
    14 14
    ... ... @@ -57,10 +57,6 @@ targets:
    57 57 
           browser_platforms:
    58 58 
             linux-x86_64: 1
    59 59 
           asan-build: '-asan'
    60 
    -  browser-linux-i686:
    61 
    -    var:
    62 
    -      browser_platforms:
    63 
    -        linux-i686: 1
    64 60 
       browser-linux-aarch64:
    65 61 
         var:
    66 62 
           browser_platforms:
    ... ... @@ -193,13 +189,6 @@ input_files:
    193 189 
           - '[% c("var/build_target") %]'
    194 190 
           - '[% c("var/browser_type") %]-linux-x86_64[% c("var/asan-build") %]'
    195 191
    196 
    -  - name: linux-i686
    197 
    -    project: browser
    198 
    -    enable: '[% c("var/browser_platforms/linux-i686") %]'
    199 
    -    target:
    200 
    -      - '[% c("var/build_target") %]'
    201 
    -      - '[% c("var/browser_type") %]-linux-i686'
    202 
    -
    203 192 
       - name: linux-aarch64
    204 193 
         project: browser
    205 194 
         enable: '[% c("var/browser_platforms/linux-aarch64") %]'
    ... ... @@ -214,7 +203,6 @@ input_files:
    214 203 
         target:
    215 204 
           - '[% IF c("var/testbuild") %]testbuild[% END %]'
    216 205 
           - '[% c("var/build_target") %]'
    217 
    -      - '[% IF c("var/browser_platforms/linux-i686") %]browser-linux-i686[% END %]'
    218 206 
           - '[% IF c("var/browser_platforms/linux-x86_64") %]browser-linux-x86_64[% END %]'
    219 207 
           - deb
    220 208 
           - '[% c("var/browser_type") %]-linux-x86_64'
    ... ... @@ -239,7 +227,6 @@ input_files:
    239 227 
         target:
    240 228 
           - '[% IF c("var/testbuild") %]testbuild[% END %]'
    241 229 
           - '[% c("var/build_target") %]'
    242 
    -      - '[% IF c("var/browser_platforms/linux-i686") %]browser-linux-i686[% END %]'
    243 230 
           - '[% IF c("var/browser_platforms/linux-x86_64") %]browser-linux-x86_64[% END %]'
    244 231 
           - '[% IF c("var/linux-packages-aarch64") %]browser-linux-aarch64[% END %]'
    245 232 
           - rpm

  • projects/release/update_responses_config.yml
    ... ... @@ -20,7 +20,6 @@ download:
    20 20 
     [% END -%]
    21 21 
     build_targets:
    22 22 
         linux-aarch64: Linux_aarch64-gcc3
    23 
    -    linux-i686: Linux_x86-gcc3
    24 23 
         linux-x86_64: Linux_x86_64-gcc3
    25 24 
         windows-i686:
    26 25 
             - WINNT_x86-gcc3
    ... ... @@ -68,8 +67,6 @@ versions:
    68 67 
             windows-x86_64:
    69 68 
                 # Windows 10
    70 69 
                 minSupportedOSVersion: 10.0
    71 
    -        linux-i686:
    72 
    -            minSupportedInstructionSet: SSE2
    73 70 
             linux-x86_64:
    74 71 
                 minSupportedInstructionSet: SSE2
    75 72 
     [% IF c("var/tor-browser") && c("var/torbrowser_legacy_version") -%]

  • projects/rust/config
    ... ... @@ -15,11 +15,6 @@ targets:
    15 15 
           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
    16 16
    17 17 
       linux:
    18 
    -    var:
    19 
    -      target: i686-unknown-linux-gnu
    20 
    -      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
    21 
    -
    22 
    -  linux-aarch64:
    23 18 
         var:
    24 19 
           target: aarch64-unknown-linux-gnu
    25 20 
           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:
    19 19 
         var:
    20 20 
           flag_mwindows: '-Wl,--subsystem,console'
    21 21
    22 
    -  linux-i686:
    23 
    -    var:
    24 
    -      libdir: lib32
    25 
    -      sort_deps: 0
    26 
    -      arch_deps:
    27 
    -        - zlib1g-dev:i386
    28 22 
       linux-x86_64:
    29 23 
         var:
    30 24 
           libdir: lib64

  • rbm.conf
    ... ... @@ -87,7 +87,6 @@ var:
    87 87 
         android-x86_64: '[% c("var/browser_platforms/is_android_release") %]'
    88 88 
         android-aarch64: '[% c("var/browser_platforms/is_android_release") %]'
    89 89 
         linux-x86_64: '[% c("var/browser_platforms/is_desktop_release") %]'
    90 
    -    linux-i686: '[% c("var/browser_platforms/is_desktop_release") && c("var/tor-browser") %]'
    91 90 
         linux-aarch64: '[% c("var/browser_platforms/is_desktop_release") %]'
    92 91 
         windows-i686: '[% c("var/browser_platforms/is_desktop_release") && c("var/tor-browser") %]'
    93 92 
         windows-x86_64: '[% c("var/browser_platforms/is_desktop_release") %]'
    ... ... @@ -114,7 +113,6 @@ var:
    114 113 
         signing_desktop: |
    115 114 
           [%-
    116 115 
           c("var/browser_platforms/linux-x86_64") ||
    117 
    -      c("var/browser_platforms/linux-i686") ||
    118 116 
           c("var/browser_platforms/linux-aarch64") ||
    119 117 
           c("var/browser_platforms/windows-i686") ||
    120 118 
           c("var/browser_platforms/windows-x86_64") ||
    ... ... @@ -534,14 +532,6 @@ targets:
    534 532 
         - linux-x86_64
    535 533 
         - linux
    536 534 
         - mullvadbrowser
    537 
    -  torbrowser-linux-i686:
    538 
    -    - linux-i686
    539 
    -    - linux
    540 
    -    - torbrowser
    541 
    -  basebrowser-linux-i686:
    542 
    -    - linux-i686
    543 
    -    - linux
    544 
    -    - basebrowser
    545 535 
       torbrowser-linux-aarch64:
    546 536 
         - linux-cross
    547 537 
         - linux-aarch64
    ... ... @@ -574,14 +564,6 @@ targets:
    574 564 
           osname: linux-x86_64
    575 565 
           linux-cross: 0
    576 566 
           arch_debian: amd64
    577 
    -  linux-i686:
    578 
    -    arch: i686
    579 
    -    var:
    580 
    -      linux-i686: 1
    581 
    -      osname: linux-i686
    582 
    -      linux-cross: 0
    583 
    -      configure_opt: '--host=i686-linux-gnu CFLAGS=-m32 CXXFLAGS=-m32 LDFLAGS=-m32 [% c("var/configure_opt_project") %]'
    584 
    -      arch_debian: i386
    585 567 
       linux-aarch64:
    586 568 
         arch: aarch64
    587 569 
         var:
    ... ... @@ -615,11 +597,8 @@ targets:
    615 597 
           container:
    616 598 
             suite: stretch
    617 599 
             arch: amd64
    618 
    -      pre_pkginst: dpkg --add-architecture i386
    619 600 
           deps:
    620 601 
             - ca-certificates
    621 
    -        - libc6-dev-i386
    622 
    -        - lib32stdc++6
    623 602 
             - pkg-config
    624 603 
             - libssl-dev
    625 604 
             - build-essential

  • tools/dmg2mar
    ... ... @@ -59,19 +59,6 @@ sub capture_exec {
    59 59 
       return $stdout;
    60 60 
     }
    61 61
    62 
    -sub osname {
    63 
    -    my ($osname) = capture_exec('uname', '-s');
    64 
    -    my ($arch) = capture_exec('uname', '-m');
    65 
    -    chomp($osname, $arch);
    66 
    -    if ($osname eq 'Linux' && $arch eq 'x86_64') {
    67 
    -        return 'linux-x86_64';
    68 
    -    }
    69 
    -    if ($osname eq 'Linux' && $arch =~ m/^i.86$/) {
    70 
    -        return 'linux-i686';
    71 
    -    }
    72 
    -    exit_error 'Unknown OS';
    73 
    -}
    74 
    -
    75 62 
     sub setup_martools {
    76 63 
       my ($out, $err, $exit) = capture {
    77 64 
         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
    7 7 
     torbrowser:
    8 8 
       publish_dirs:
    9 9 
         - nightly-linux-x86_64
    10 
    -    - nightly-linux-i686
    11 10 
         - nightly-linux-aarch64
    12 11 
         - nightly-windows-x86_64
    13 12 
         - nightly-windows-i686

  • tools/signing/nightly/update-responses-base-config.yml
    ... ... @@ -3,7 +3,6 @@ download:
    3 3 
         mars_url: https://nightlies.tbb.torproject.org/nightly-updates
    4 4 
     build_targets:
    5 5 
         linux-aarch64: Linux_aarch64-gcc3
    6 
    -    linux-i686: Linux_x86-gcc3
    7 6 
         linux-x86_64: Linux_x86_64-gcc3
    8 7 
         windows-i686:
    9 8 
             - WINNT_x86-gcc3
    ... ... @@ -30,8 +29,6 @@ versions:
    30 29 
             windows-x86_64:
    31 30 
                 # Windows v10
    32 31 
                 minSupportedOSVersion: 10.0
    33 
    -        linux-i686:
    34 
    -            minSupportedInstructionSet: SSE2
    35 32 
             linux-x86_64:
    36 33 
                 minSupportedInstructionSet: SSE2
    37 34 
     mar_compression: xz

  • tools/signing/staticiforme-prepare-cdn-dist-upload
    ... ... @@ -18,8 +18,6 @@ if is_project torbrowser; then
    18 18 
       cat >> "$dist_dir/.htaccess" << 'EOF'
    19 19 
     RewriteRule ^tor-browser-linux64-(.*)_ALL.tar.xz.asc$ tor-browser-linux-x86_64-$1.tar.xz.asc
    20 20 
     RewriteRule ^tor-browser-linux64-(.*)_ALL.tar.xz$ tor-browser-linux-x86_64-$1.tar.xz
    21 
    -RewriteRule ^tor-browser-linux32-(.*)_ALL.tar.xz.asc$ tor-browser-linux-i686-$1.tar.xz.asc
    22 
    -RewriteRule ^tor-browser-linux32-(.*)_ALL.tar.xz$ tor-browser-linux-i686-$1.tar.xz
    23 21 
     EOF
    24 22 
     fi
    25 23

  • tools/update-responses/update_responses
    ... ... @@ -171,7 +171,7 @@ sub get_version_downloads {
    171 171 
             my $os;
    172 172 
             if ($file =~ m/^$config->{appname_bundle}-macos-$version.dmg$/) {
    173 173 
                 $os = 'macos';
    174 
    -        } elsif ($file =~ m/^$config->{appname_bundle}-(linux-i686|linux-x86_64)-${version}.tar.xz$/) {
    174 
    +        } elsif ($file =~ m/^$config->{appname_bundle}-(linux-x86_64|linux-aarch64)-${version}.tar.xz$/) {
    175 175 
                 $os = $1;
    176 176 
             } elsif ($file =~ m/^$config->{appname_bundle}-windows-x86_64-(portable-|)${version}.exe$/) {
    177 177 
                 $os = 'win64';
    ... ... @@ -200,7 +200,7 @@ sub get_perplatform_downloads {
    200 200 
             my $os;
    201 201 
             if ($file =~ m/^$config->{appname_bundle}-macos-$version.dmg$/) {
    202 202 
               $os = 'macos';
    203 
    -        } elsif ($file =~ m/^$config->{appname_bundle}-(linux-i686|linux-x86_64)-${version}.tar.xz$/) {
    203 
    +        } elsif ($file =~ m/^$config->{appname_bundle}-(linux-x86_64|linux-aarch64)-${version}.tar.xz$/) {
    204 204 
               $os = $1;
    205 205 
             } elsif ($file =~ m/^$config->{appname_bundle}-(windows-i686|windows-x86_64)-(portable-|)${version}.exe$/) {
    206 206 
               $os = $1;

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help Notification message regarding https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/dc840a56568124078744b681cad459c45beaec63 at 1764089360 

    _______________________________________________
tor-commits mailing list -- tor-commits@xxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to tor-commits-leave@xxxxxxxxxxxxxxxxxxxx