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 <maximilian.brune@9elements.com> Change-Id: I49b4fef859f642cc03c0223cb1773597718e56cb Reviewed-on: https://review.coreboot.org/c/coreboot/+/87819 Reviewed-by: Matt DeVillier <matt.devillier@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
parent
43a54e3b1b
commit
cba0f0b8b9
2 changed files with 8 additions and 8 deletions
12
payloads/external/LinuxBoot/Makefile
vendored
12
payloads/external/LinuxBoot/Makefile
vendored
|
|
@ -19,32 +19,32 @@ endif
|
||||||
|
|
||||||
ifeq ($(CONFIG_LINUXBOOT_KERNEL_BZIMAGE),y)
|
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 $< $@
|
cp $< $@
|
||||||
|
|
||||||
else ifeq ($(CONFIG_LINUXBOOT_KERNEL_UIMAGE),y)
|
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 $@ $<
|
$(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 $@
|
mkimage -f $(LINUX_ARCH-y)/kernel_fdt_lzma.its $@
|
||||||
|
|
||||||
else ifneq ($(CONFIG_LINUXBOOT_COMPILE_KERNEL),y)
|
else ifneq ($(CONFIG_LINUXBOOT_COMPILE_KERNEL),y)
|
||||||
|
|
||||||
build/Image: $(CONFIG_LINUXBOOT_KERNEL_PATH) | build
|
build/Image: $(CONFIG_LINUXBOOT_KERNEL_PATH) | build/
|
||||||
cp $< $@
|
cp $< $@
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
build/initramfs: build/initramfs_u-root.cpio | build
|
build/initramfs: build/initramfs_u-root.cpio | build/
|
||||||
ifeq ($(CONFIG_LINUXBOOT_INITRAMFS_COMPRESSION_XZ),y)
|
ifeq ($(CONFIG_LINUXBOOT_INITRAMFS_COMPRESSION_XZ),y)
|
||||||
xz --stdout --keep --force --check=crc32 --lzma2=dict=1MiB $< > $@
|
xz --stdout --keep --force --check=crc32 --lzma2=dict=1MiB $< > $@
|
||||||
else
|
else
|
||||||
cp $< $@
|
cp $< $@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
build:
|
build/:
|
||||||
mkdir build
|
mkdir build
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
|
|
|
||||||
4
payloads/external/LinuxBoot/targets/linux.mk
vendored
4
payloads/external/LinuxBoot/targets/linux.mk
vendored
|
|
@ -28,7 +28,7 @@ else ifeq ($(findstring x6.,x$(kernel_version)),x6.)
|
||||||
kernel_mirror_path := $(kernel_mirror)/v6.x
|
kernel_mirror_path := $(kernel_mirror)/v6.x
|
||||||
endif
|
endif
|
||||||
|
|
||||||
build/$(kernel_tarball).xz: | build
|
build/$(kernel_tarball).xz: | build/
|
||||||
echo " Test $(kernel_version)"
|
echo " Test $(kernel_version)"
|
||||||
echo " WWW $(kernel_mirror_path)/$(kernel_tarball).xz";
|
echo " WWW $(kernel_mirror_path)/$(kernel_tarball).xz";
|
||||||
curl -OLSs --output-dir build "$(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"
|
echo "$(MAKE) -j $(CPUS) -C $(kernel_dir) $(KERNEL_MAKE_FLAGS) vmlinux"
|
||||||
$(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 $< $@
|
$(OBJCOPY) -O binary $< $@
|
||||||
|
|
||||||
build/vmlinux.bin.lzma: build/vmlinux.bin
|
build/vmlinux.bin.lzma: build/vmlinux.bin
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue