Commit 74163819 authored by boklm's avatar boklm Committed by morgan
Browse files

Bug 41397: Fix linux-packages following changes from #41040 

- move var/linux-packages and var/linux-packages-aarch64 definition to
  the root, since the browser-linux-* targets are no longer used when
  building all platforms
- fix calls to linux-packages. Some var/browser-linux-* had not been
  updated to var/browser_platforms/linux-*.
- in projects/linux-packages/config, remove test on the browser not
  being mullvadbrowser to enable i686 packages, since that part is now
  handled outside
parent ca6a15eb

projects/linux-packages/config

+1 −1
Changes for projects/linux-packages/config: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ targets: 
      browser-linux-x86_64: 1

  browser-linux-i686:

    var:

      browser-linux-i686: '[% c("var/browser_type") != "mullvadbrowser" %]'

      browser-linux-i686: 1

  browser-linux-aarch64:

    var:

      browser-linux-aarch64: 1

projects/release/config

+8 −9
Changes for projects/release/config: 8 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -8,6 +8,9 @@ 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-aarch64: '[% c("var/browser_platforms/linux-aarch64") && (c("var/mullvad-browser") || c("var/nightly")) %]'



targets:

  browser-all:

    - browser-src
@@ -37,7 +40,6 @@ targets: 
    var:

      browser_platforms:

        linux-x86_64: 1

      linux-packages: '[% c("var/mullvad-browser") || c("var/tor-browser-linux-packages") %]'

  browser-linux-x86_64-asan:

    var:

      browser_platforms:
@@ -47,12 +49,10 @@ targets: 
    var:

      browser_platforms:

        linux-i686: 1

      linux-packages: '[% c("var/mullvad-browser") || c("var/tor-browser-linux-packages") %]'

  browser-linux-aarch64:

    var:

      browser_platforms:

        linux-aarch64: 1

      linux-packages-aarch64: '[% (! c("var/browser-all-target") || c("var/testbuild") || c("var/nightly")) && (c("var/mullvad-browser") || c("var/tor-browser-linux-packages")) %]'

  browser-windows-i686:

    var:

      browser_platforms:
@@ -96,7 +96,6 @@ targets: 
    var:

      browser_type: torbrowser

      git_tag_prefix: tbb

      tor-browser-linux-packages: '[% c("var/nightly") %]'

  basebrowser:

    var:

      browser_type: basebrowser
@@ -201,13 +200,13 @@ input_files: 


  - name: deb-packages

    project: linux-packages

    enable: '[% c("var/browser_platforms/packages") %]'

    enable: '[% c("var/linux-packages") %]'

    # Add $browser_type-linux-x86_64 target for container config

    target:

      - '[% IF c("var/testbuild") %]testbuild[% END %]'

      - '[% c("var/build_target") %]'

      - '[% IF c("var/browser-linux-i686") %]browser-linux-i686[% END %]'

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

      - '[% 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'
@@ -231,8 +230,8 @@ input_files: 
    target:

      - '[% IF c("var/testbuild") %]testbuild[% END %]'

      - '[% c("var/build_target") %]'

      - '[% IF c("var/browser-linux-i686") %]browser-linux-i686[% END %]'

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

      - '[% 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

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