Verified Commit dc840a56 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

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.
parent ff64da1a

Makefile

+0 −24
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+5 −5
Original line number Diff line number Diff line
@@ -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

+4 −4
Original line number Diff line number Diff line
@@ -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

+0 −7
Original line number Diff line number Diff line
@@ -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"