Bug 40906: Add var/essential_deps

var/essential_deps is the same as var/deps, except that we never
redefine it in projects config. This is for the packages we want to
include in every container (even those of projects where we redefine var/deps).

projects/browser/config

@@ -10,11 +10,7 @@ var:
     - python3
     - libparallel-forkmanager-perl
     - libfile-slurp-perl
-    - zip
-    - unzip
     - bzip2
-    - xz-utils
-    - patch
 
 targets:
   linux:

projects/container-image/config

@@ -44,6 +44,9 @@ pre: |
   apt-get upgrade -y -q
   [%
      deps = [];
+     IF pc(c('origin_project'), 'var/essential_deps', { step => c('origin_step') });
+       CALL deps.import(pc(c('origin_project'), 'var/essential_deps', { step => c('origin_step') }));
+     END;
      IF pc(c('origin_project'), 'var/deps', { step => c('origin_step') });
        CALL deps.import(pc(c('origin_project'), 'var/deps', { step => c('origin_step') }));
      END;

projects/firefox/config

@@ -23,8 +23,6 @@ var:
   git_commit: '[% exec("git rev-parse HEAD") %]'
   deps:
     - build-essential
-    - unzip
-    - zip
     - autoconf
     - yasm
     - pkg-config

projects/geckoview/config

@@ -19,8 +19,6 @@ var:
   git_commit: '[% exec("git rev-parse HEAD") %]'
   deps:
     - build-essential
-    - unzip
-    - zip
     - autoconf2.13
     - yasm
     - python3

projects/glean/config

@@ -17,7 +17,6 @@ var:
     - python3
     - python3-pip
     - torsocks
-    - xz-utils
   glean_wheels_sha256sum:
     3.4.0: 6bbf3a9ffa939ca87e00b486f2020ab5cf9dea772f1d37b048f666fed38f98c1
     4.0.0: c974113bd8671364c592fea9b64bac660b59d4f03a7dcecd4dd4e0c355431db8

projects/manual/config

@@ -12,7 +12,6 @@ var:
     arch: amd64
   deps:
     - python3
-    - unzip
   pre_pkginst: ''
 
 input_files:

projects/python/config

@@ -5,7 +5,6 @@ container:
   use_container: 1
 var:
   deps:
-    - xz-utils
     - build-essential
     - python-all
     - libbz2-dev

rbm.conf

@@ -204,6 +204,16 @@ var:
   DOCSDIR_project: '[% project %]'
   set_MOZ_BUILD_DATE: 'export MOZ_BUILD_DATE=[% c("var_p/MOZ_BUILD_DATE") %]'
 
+  # var/essential_deps is the same as var/deps, except that we never
+  # redefine it in projects config. This is for the packages we want to
+  # include in every container (even those of projects where we redefine var/deps).
+  essential_deps:
+    - less
+    - patch
+    - zip
+    - unzip
+    - xz-utils
+
 targets:
   notarget: linux-x86_64
   noint:
@@ -378,8 +388,6 @@ targets:
         - python3-venv
         - automake
         - libtool
-        - zip
-        - unzip
         - libtinfo5
         - libssl-dev
         - pkg-config
@@ -492,10 +500,6 @@ targets:
         - bison
         - automake
         - libtool
-        - zip
-        - unzip
-        - xz-utils
-        - patch
         - less
       set_hardened_build_flags: |
         export DEB_BUILD_HARDENING=1
@@ -563,8 +567,6 @@ targets:
         - bison
         - automake
         - libtool
-        - zip
-        - unzip
         - libssl-dev
         - zlib1g-dev
 
@@ -648,8 +650,6 @@ targets:
         - automake
         - bison
         - libtool
-        - zip
-        - unzip
         - libssl-dev
         - zlib1g-dev
       faketime_path: /usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1