From 5c1a3013095c9d18932fb13bf08fa1548fd79d83 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Sat, 20 Mar 2021 18:56:53 -0400 Subject: 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 --- .github/workflows/pullrequest.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to '.github/workflows/pullrequest.yml') 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 -- cgit v1.2.3