Update upstream source from tag 'upstream/15.3'debian/15.3-1

Update to upstream version '15.3'
with Debian dir 1b484f1c1ac270604a5a1451b34de4b0865c6211

2 files changed, 162 insertions, 110 deletions

diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml
index 2821b2f4..41ca282c 100644
--- a/.github/workflows/pullrequest.yml
+++ b/.github/workflows/pullrequest.yml
@@ -1,15 +1,129 @@
-name: pull-request-builds
+name: pull-request
 
 on:
+  push:
+    branches:
+      - main
   pull_request:
     branches:
       - main
-      - sbat
 
 jobs:
-  pull-request-intel:
+  cross-build-pull-request:
+    runs-on: ubuntu-20.04
+    container: vathpela/efi-ci:${{ matrix.distro }}-x64
+    name: ${{ matrix.distro }} ${{ matrix.efiarch }} cross-build
+
+    strategy:
+      matrix:
+        include:
+          - arch: amd64
+            efiarch: aa64
+            gccarch: aarch64
+            makearch: aarch64
+            distro: f35
+          - arch: amd64
+            efiarch: aa64
+            gccarch: aarch64
+            makearch: aarch64
+            distro: f34
+          - arch: amd64
+            efiarch: aa64
+            gccarch: aarch64
+            makearch: aarch64
+            distro: f33
+          - arch: amd64
+            efiarch: aa64
+            gccarch: aarch64
+            makearch: aarch64
+            distro: f32
+          - arch: amd64
+            efiarch: arm
+            gccarch: arm
+            makearch: arm
+            distro: f35
+          - arch: amd64
+            efiarch: arm
+            gccarch: arm
+            makearch: arm
+            distro: f34
+          - arch: amd64
+            efiarch: arm
+            gccarch: arm
+            makearch: arm
+            distro: f33
+          - arch: amd64
+            efiarch: arm
+            gccarch: arm
+            makearch: arm
+            distro: f32
+          - arch: amd64
+            efiarch: x64
+            gccarch: x86_64
+            makearch: x86_64
+            distro: f35
+          - arch: amd64
+            efiarch: x64
+            gccarch: x86_64
+            makearch: x86_64
+            distro: f34
+          - arch: amd64
+            efiarch: x64
+            gccarch: x86_64
+            makearch: x86_64
+            distro: f33
+          - arch: amd64
+            efiarch: x64
+            gccarch: x86_64
+            makearch: x86_64
+            distro: f32
+          - arch: amd64
+            efiarch: ia32
+            gccarch: x86_64
+            makearch: ia32
+            distro: f35
+          - arch: amd64
+            efiarch: ia32
+            gccarch: x86_64
+            makearch: ia32
+            distro: f34
+          - arch: amd64
+            efiarch: ia32
+            gccarch: x86_64
+            makearch: ia32
+            distro: f33
+          - arch: amd64
+            efiarch: ia32
+            gccarch: x86_64
+            makearch: ia32
+            distro: f32
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          # otherwise we are testing target branch instead of the PR branch (see pull_request_target trigger)
+          ref: ${{ github.event.pull_request.head.sha }}
+          fetch-depth: 0
+          submodules: recursive
+      - name: Update submodules on ${{ matrix.distro }} for ${{ matrix.efiarch }}
+        id: update-submodules
+        run: |
+          make update
+      - name: Do the build on ${{ matrix.distro }} for ${{ matrix.efiarch }}
+        id: build
+        run: |
+          make -s CROSS_COMPILE=${{ matrix.gccarch }}-linux-gnu- ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true clean all || make CROSS_COMPILE=${{ matrix.gccarch }}-linux-gnu- ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true clean all
+      - name: Install on ${{ matrix.distro }} for ${{ matrix.efiarch }}
+        id: install
+        run: |
+          make -s CROSS_COMPILE=${{ matrix.gccarch }}-linux-gnu- ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install || make CROSS_COMPILE=${{ matrix.gccarch }}-linux-gnu- ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install
+          echo 'results:'
+          find /destdir -type f
+
+  build-pull-request-intel:
     runs-on: ubuntu-20.04
-    container: vathpela/efi-ci:f34-x64
+    container: vathpela/efi-ci:${{ matrix.distro }}-x64
     name: ${{ matrix.distro }} ${{ matrix.efiarch }} build
 
     strategy:
@@ -18,33 +132,51 @@ jobs:
           - arch: amd64
             efiarch: x64
             makearch: x86_64
-            distro: efi-ci-f34
-            libdir: /usr/lib64
+            distro: f35
+          - arch: amd64
+            efiarch: x64
+            makearch: x86_64
+            distro: f34
+          - arch: amd64
+            efiarch: x64
+            makearch: x86_64
+            distro: f33
+          - arch: amd64
+            efiarch: x64
+            makearch: x86_64
+            distro: f32
           - arch: amd64
             efiarch: x64
             makearch: x86_64
-            distro: efi-ci-f33
-            libdir: /usr/lib64
+            distro: centos8
           - arch: amd64
             efiarch: x64
             makearch: x86_64
-            distro: efi-ci-f32
-            libdir: /usr/lib64
+            distro: centos7
+          - arch: amd64
+            efiarch: ia32
+            makearch: ia32
+            distro: f35
           - arch: amd64
             efiarch: ia32
             makearch: ia32
-            distro: efi-ci-f34
-            libdir: /usr/lib
+            distro: f34
           - arch: amd64
             efiarch: ia32
             makearch: ia32
-            distro: efi-ci-f33
-            libdir: /usr/lib
+            distro: f33
           - arch: amd64
             efiarch: ia32
             makearch: ia32
-            distro: efi-ci-f32
-            libdir: /usr/lib
+            distro: f32
+          - arch: amd64
+            efiarch: ia32
+            makearch: ia32
+            distro: centos8
+          - arch: amd64
+            efiarch: ia32
+            makearch: ia32
+            distro: centos7
 
     steps:
       - name: Checkout
@@ -53,16 +185,22 @@ jobs:
           # otherwise we are testing target branch instead of the PR branch (see pull_request_target trigger)
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
+          submodules: recursive
+      - name: Update submodules on ${{ matrix.distro }} for ${{ matrix.efiarch }}
+        id: update-submodules
+        run: |
+          make update
+      - name: Run tests on ${{ matrix.distro }} for ${{ matrix.efiarch }}
+        id: test
+        run: |
+          make -s ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true test || make ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true test
       - name: Do the build on ${{ matrix.distro }} for ${{ matrix.efiarch }}
         id: build
         run: |
-          make -s ARCH=${{ matrix.makearch }} PREFIX=/usr LIBDIR=${{ matrix.libdir }} DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true clean all
-          make -s ARCH=${{ matrix.makearch }} PREFIX=/usr LIBDIR=${{ matrix.libdir }} DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install
+          make -s ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true clean all || make ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true clean all
+      - name: Install on ${{ matrix.distro }} for ${{ matrix.efiarch }}
+        id: install
+        run: |
+          make -s ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install || make ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install
           echo 'results:'
           find /destdir -type f
-#      - name: Archive production artifacts
-#        uses: actions/upload-artifact@v2
-#        with:
-#          name: shim
-#          path: |
-#            /destdir
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
deleted file mode 100644
index f4e59355..00000000
--- a/.github/workflows/push.yml
+++ /dev/null
@@ -1,86 +0,0 @@
-name: push-builds
-
-on:
-  push:
-    branches:
-      - main
-  schedule:
-    - cron: '0 3 * * *'
-
-jobs:
-  push-f34-x64:
-    runs-on: ubuntu-20.04
-    container: vathpela/efi-ci:f34
-    name: f34 build
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Do the build
-        run: make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true clean all
-        id: build
-      - name: Install in /destdir
-        run: make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install
-        id: install
-#      - name: Archive production artifacts
-#        uses: actions/upload-artifact@v2
-#        with:
-#          name: shim
-#          path: |
-#            /destdir
-  push-f33-x64:
-    runs-on: ubuntu-20.04
-    container: vathpela/efi-ci:f33
-    name: f33 build
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Do the build
-        run: make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true clean all
-        id: build
-      - name: Install in /destdir
-        run: make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install
-        id: install
-#      - name: Archive production artifacts
-#        uses: actions/upload-artifact@v2
-#        with:
-#          name: shim
-#          path: |
-#            /destdir
-  push-f32-x64:
-    runs-on: ubuntu-20.04
-    container: vathpela/efi-ci:f32
-    name: f32 build
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Do the build
-        run: make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true clean all
-        id: build
-      - name: Install in /destdir
-        run: make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install
-        id: install
-#      - name: Archive production artifacts
-#        uses: actions/upload-artifact@v2
-#        with:
-#          name: shim
-#          path: |
-#            /destdir
-  push-f31-x64:
-    runs-on: ubuntu-20.04
-    container: vathpela/efi-ci:f31
-    name: f31 build
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Do the build
-        run: make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true clean all
-        id: build
-      - name: Install in /destdir
-        run: make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install
-        id: install
-#      - name: Archive production artifacts
-#        uses: actions/upload-artifact@v2
-#        with:
-#          name: shim
-#          path: |
-#            /destdir