diff options
| author | Peter Jones <pjones@redhat.com> | 2021-03-24 17:51:48 -0400 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2021-03-25 14:36:53 -0400 |
| commit | 8578b75f9c18fd267c8a0746192ab3f051561df2 (patch) | |
| tree | 437dd31143333ddf9bfdd3bba7a2de9a67c9c80a /.github | |
| parent | d74629207188d290810db15dbfe91a89e7751ffb (diff) | |
| download | efi-boot-shim-8578b75f9c18fd267c8a0746192ab3f051561df2.tar.gz efi-boot-shim-8578b75f9c18fd267c8a0746192ab3f051561df2.zip | |
Make building outside of the top directory work.
This also makes the cross-build targets (and not the others) /use/ this
functionality, so we'll catch it if we break it again.
This fixes issue #340.
Signed-off-by: Peter Jones <pjones@redhat.com>
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/pullrequest.yml | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 6df69833..5329496c 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -110,18 +110,24 @@ jobs: id: update-submodules run: | make update - - name: Do 'make clean' on ${{ matrix.distro }} for ${{ matrix.efiarch }} - id: clean + - name: Make a build directory for ${{ matrix.distro }} for ${{ matrix.efiarch }} + id: builddir run: | - make CROSS_COMPILE=${{ matrix.gccarch }}-linux-gnu- ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true clean + rm -rf build-${{ matrix.distro }}-${{ matrix.efiarch }} + mkdir build-${{ matrix.distro }}-${{ matrix.efiarch }} + cd build-${{ matrix.distro }}-${{ matrix.efiarch }} - name: Do the build on ${{ matrix.distro }} for ${{ matrix.efiarch }} id: build run: | - make CROSS_COMPILE=${{ matrix.gccarch }}-linux-gnu- ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true all + pwd + cd build-${{ matrix.distro }}-${{ matrix.efiarch }} + make TOPDIR=.. -f ../Makefile CROSS_COMPILE=${{ matrix.gccarch }}-linux-gnu- ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true all - name: Install on ${{ matrix.distro }} for ${{ matrix.efiarch }} id: install run: | - make CROSS_COMPILE=${{ matrix.gccarch }}-linux-gnu- ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install + pwd + cd build-${{ matrix.distro }}-${{ matrix.efiarch }} + make TOPDIR=.. -f ../Makefile 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 |