From cba0f0b8b925db48e8a8ff13dccde26b0756c395 Mon Sep 17 00:00:00 2001 From: Maximilian Brune Date: Sun, 25 May 2025 11:03:07 +0200 Subject: [PATCH] payloads/external/LinuxBoot: Rename build target To avoid confusion and make it more obvious that the 'build' target creates the build directory, append a slash at the end. Signed-off-by: Maximilian Brune Change-Id: I49b4fef859f642cc03c0223cb1773597718e56cb Reviewed-on: https://review.coreboot.org/c/coreboot/+/87819 Reviewed-by: Matt DeVillier Tested-by: build bot (Jenkins) --- payloads/external/LinuxBoot/Makefile | 12 ++++++------ payloads/external/LinuxBoot/targets/linux.mk | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/payloads/external/LinuxBoot/Makefile b/payloads/external/LinuxBoot/Makefile index 83b8d6e0ea..c56e9fc635 100644 --- a/payloads/external/LinuxBoot/Makefile +++ b/payloads/external/LinuxBoot/Makefile @@ -19,32 +19,32 @@ endif ifeq ($(CONFIG_LINUXBOOT_KERNEL_BZIMAGE),y) -build/Image: $(kernel_dir)/arch/x86/boot/bzImage | build +build/Image: $(kernel_dir)/arch/x86/boot/bzImage | build/ cp $< $@ else ifeq ($(CONFIG_LINUXBOOT_KERNEL_UIMAGE),y) -build/target.dtb: $(CONFIG_LINUXBOOT_DTS_FILE) | build +build/target.dtb: $(CONFIG_LINUXBOOT_DTS_FILE) | build/ $(DTC) -o $@ $< -build/Image: build/vmlinux.bin.lzma build/initramfs build/target.dtb $(LINUX_ARCH-y)/kernel_fdt_lzma.its | build +build/Image: build/vmlinux.bin.lzma build/initramfs build/target.dtb $(LINUX_ARCH-y)/kernel_fdt_lzma.its | build/ mkimage -f $(LINUX_ARCH-y)/kernel_fdt_lzma.its $@ else ifneq ($(CONFIG_LINUXBOOT_COMPILE_KERNEL),y) -build/Image: $(CONFIG_LINUXBOOT_KERNEL_PATH) | build +build/Image: $(CONFIG_LINUXBOOT_KERNEL_PATH) | build/ cp $< $@ endif -build/initramfs: build/initramfs_u-root.cpio | build +build/initramfs: build/initramfs_u-root.cpio | build/ ifeq ($(CONFIG_LINUXBOOT_INITRAMFS_COMPRESSION_XZ),y) xz --stdout --keep --force --check=crc32 --lzma2=dict=1MiB $< > $@ else cp $< $@ endif -build: +build/: mkdir build clean: diff --git a/payloads/external/LinuxBoot/targets/linux.mk b/payloads/external/LinuxBoot/targets/linux.mk index 5cd3c540e0..17ed9dd198 100644 --- a/payloads/external/LinuxBoot/targets/linux.mk +++ b/payloads/external/LinuxBoot/targets/linux.mk @@ -28,7 +28,7 @@ else ifeq ($(findstring x6.,x$(kernel_version)),x6.) kernel_mirror_path := $(kernel_mirror)/v6.x endif -build/$(kernel_tarball).xz: | build +build/$(kernel_tarball).xz: | build/ echo " Test $(kernel_version)" echo " WWW $(kernel_mirror_path)/$(kernel_tarball).xz"; curl -OLSs --output-dir build "$(kernel_mirror_path)/$(kernel_tarball).xz"; @@ -48,7 +48,7 @@ $(kernel_dir)/vmlinux : $(kernel_dir)/.config | $(kernel_dir) echo "$(MAKE) -j $(CPUS) -C $(kernel_dir) $(KERNEL_MAKE_FLAGS) vmlinux" $(MAKE) -j $(CPUS) -C $(kernel_dir) $(KERNEL_MAKE_FLAGS) vmlinux -build/vmlinux.bin: $(kernel_dir)/vmlinux | build +build/vmlinux.bin: $(kernel_dir)/vmlinux | build/ $(OBJCOPY) -O binary $< $@ build/vmlinux.bin.lzma: build/vmlinux.bin