diff options
| author | Peter Jones <pjones@redhat.com> | 2021-03-20 18:56:53 -0400 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2021-03-22 16:43:44 -0400 |
| commit | 5c1a3013095c9d18932fb13bf08fa1548fd79d83 (patch) | |
| tree | 67aa841790d9b5f7f9192700fe92f1dbe4d35833 | |
| parent | 33db42def2ce6fe040b5f77642347e8b3c6420e5 (diff) | |
| download | efi-boot-shim-5c1a3013095c9d18932fb13bf08fa1548fd79d83.tar.gz efi-boot-shim-5c1a3013095c9d18932fb13bf08fa1548fd79d83.zip | |
Don't set LIBDIR in CI builds any more.
Setting libdir will make it try to use /usr/lib*/libefi.a and such,
which is now wrong. Normally you don't *see* any problem, but when we're
cross compiling, it'll fail to find libefi.a.
Signed-off-by: Peter Jones <pjones@redhat.com>
| -rw-r--r-- | .github/workflows/pullrequest.yml | 12 | ||||
| -rw-r--r-- | .github/workflows/push.yml | 12 |
2 files changed, 6 insertions, 18 deletions
diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 4f99dbb2..df506555 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -19,32 +19,26 @@ jobs: efiarch: x64 makearch: x86_64 distro: efi-ci-f34 - libdir: /usr/lib64 - arch: amd64 efiarch: x64 makearch: x86_64 distro: efi-ci-f33 - libdir: /usr/lib64 - arch: amd64 efiarch: x64 makearch: x86_64 distro: efi-ci-f32 - libdir: /usr/lib64 - arch: amd64 efiarch: ia32 makearch: ia32 distro: efi-ci-f34 - libdir: /usr/lib - arch: amd64 efiarch: ia32 makearch: ia32 distro: efi-ci-f33 - libdir: /usr/lib - arch: amd64 efiarch: ia32 makearch: ia32 distro: efi-ci-f32 - libdir: /usr/lib steps: - name: Checkout @@ -57,8 +51,8 @@ jobs: id: build run: | make update || : - make -s ARCH=${{ matrix.makearch }} PREFIX=/usr LIBDIR=${{ matrix.libdir }} DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true test || make ARCH=${{ matrix.makearch }} PREFIX=/usr LIBDIR=${{ matrix.libdir }} DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true test - make -s ARCH=${{ matrix.makearch }} PREFIX=/usr LIBDIR=${{ matrix.libdir }} DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true clean all || make ARCH=${{ matrix.makearch }} PREFIX=/usr LIBDIR=${{ matrix.libdir }} DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true all - make -s ARCH=${{ matrix.makearch }} PREFIX=/usr LIBDIR=${{ matrix.libdir }} DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install || make 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 test || make ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true test + 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 + 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 diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index bab120ca..f902390d 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -20,32 +20,26 @@ jobs: efiarch: x64 makearch: x86_64 distro: efi-ci-f34 - libdir: /usr/lib64 - arch: amd64 efiarch: x64 makearch: x86_64 distro: efi-ci-f33 - libdir: /usr/lib64 - arch: amd64 efiarch: x64 makearch: x86_64 distro: efi-ci-f32 - libdir: /usr/lib64 - arch: amd64 efiarch: ia32 makearch: ia32 distro: efi-ci-f34 - libdir: /usr/lib - arch: amd64 efiarch: ia32 makearch: ia32 distro: efi-ci-f33 - libdir: /usr/lib - arch: amd64 efiarch: ia32 makearch: ia32 distro: efi-ci-f32 - libdir: /usr/lib steps: - name: Checkout @@ -54,8 +48,8 @@ jobs: id: build run: | make update || : - make -s ARCH=${{ matrix.makearch }} PREFIX=/usr LIBDIR=${{ matrix.libdir }} DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true test || make ARCH=${{ matrix.makearch }} PREFIX=/usr LIBDIR=${{ matrix.libdir }} DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true test - make -s ARCH=${{ matrix.makearch }} PREFIX=/usr LIBDIR=${{ matrix.libdir }} DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true clean all || make ARCH=${{ matrix.makearch }} PREFIX=/usr LIBDIR=${{ matrix.libdir }} DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true all - make -s ARCH=${{ matrix.makearch }} PREFIX=/usr LIBDIR=${{ matrix.libdir }} DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install || make 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 test || make ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true test + 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 + 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 |