diff options
| author | Will Deacon <will@kernel.org> | 2024-01-04 15:27:35 +0300 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2024-01-04 15:27:35 +0300 |
| commit | 88619527b420481f832828af92fd0d96b6367fbf (patch) | |
| tree | 3575d98f9b8dbb9cef85c0b1f69528f32164ac29 /drivers | |
| parent | 79eb42b269d425ec9c9e1d0613f62b273026de78 (diff) | |
| parent | 97ba4416d6dd53c4202038ee7d86dfb29774e00f (diff) | |
| download | linux-88619527b420481f832828af92fd0d96b6367fbf.tar.xz | |
Merge branch 'for-next/kbuild' into for-next/core
* for-next/kbuild:
efi/libstub: zboot: do not use $(shell ...) in cmd_copy_and_pad
arm64: properly install vmlinuz.efi
arm64: replace <asm-generic/export.h> with <linux/export.h>
arm64: vdso32: rename 32-bit debug vdso to vdso32.so.dbg
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/firmware/efi/libstub/Makefile.zboot | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firmware/efi/libstub/Makefile.zboot b/drivers/firmware/efi/libstub/Makefile.zboot index 2c489627a807..65ffd0b760b2 100644 --- a/drivers/firmware/efi/libstub/Makefile.zboot +++ b/drivers/firmware/efi/libstub/Makefile.zboot @@ -5,8 +5,8 @@ # EFI_ZBOOT_FORWARD_CFI quiet_cmd_copy_and_pad = PAD $@ - cmd_copy_and_pad = cp $< $@ && \ - truncate -s $(shell hexdump -s16 -n4 -e '"%u"' $<) $@ + cmd_copy_and_pad = cp $< $@; \ + truncate -s $$(hexdump -s16 -n4 -e '"%u"' $<) $@ # Pad the file to the size of the uncompressed image in memory, including BSS $(obj)/vmlinux.bin: $(obj)/$(EFI_ZBOOT_PAYLOAD) FORCE |