Patrick Rudolph has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/38530 )
Change subject: payloads/LinuxBoot: Fix initramfs Makefile rule ......................................................................
payloads/LinuxBoot: Fix initramfs Makefile rule
Pass $(top) to LinuxBoot Makefile and build u-root before trying to include it into uImage on aarch64.
Change-Id: I91d037a24b2893455761912fc966aa02272ad070 Signed-off-by: Patrick Rudolph patrick.rudolph@9elements.com --- M payloads/external/LinuxBoot/Makefile M payloads/external/Makefile.inc 2 files changed, 6 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/30/38530/1
diff --git a/payloads/external/LinuxBoot/Makefile b/payloads/external/LinuxBoot/Makefile index 5840e8e..67bb730 100644 --- a/payloads/external/LinuxBoot/Makefile +++ b/payloads/external/LinuxBoot/Makefile @@ -62,7 +62,10 @@ fi endif
-linuxboot: kernel initramfs_compressed +linuxboot: + # for AARCH64 uroot needs to be build first + $(MAKE) initramfs_compressed + $(MAKE) kernel
clean: if [ -d "$(kernel_dir)" ]; then rm -rf $(kernel_dir); fi diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index b8af8c9..4388a9e 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -295,7 +295,8 @@ CONFIG_LINUXBOOT_UROOT_SHELL=$(CONFIG_LINUXBOOT_UROOT_SHELL) \ CONFIG_LINUXBOOT_UROOT_COMMANDS=$(CONFIG_LINUXBOOT_UROOT_COMMANDS) \ CONFIG_LINUXBOOT_UROOT_FILES=$(CONFIG_LINUXBOOT_UROOT_FILES) \ - CONFIG_LINUXBOOT_DTB_FILE=$(CONFIG_LINUXBOOT_DTB_FILE) + CONFIG_LINUXBOOT_DTB_FILE=$(CONFIG_LINUXBOOT_DTB_FILE) \ + top=$(top)
payloads/external/LinuxBoot/linuxboot/bzImage: linuxboot payloads/external/LinuxBoot/linuxboot/uImage: linuxboot
Hello build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/38530
to look at the new patch set (#2).
Change subject: payloads/LinuxBoot: Fix initramfs Makefile rule ......................................................................
payloads/LinuxBoot: Fix initramfs Makefile rule
Pass $(top) to LinuxBoot Makefile and build u-root before trying to include it into uImage on aarch64.
Fixes build on aarch64.
Change-Id: I91d037a24b2893455761912fc966aa02272ad070 Signed-off-by: Patrick Rudolph patrick.rudolph@9elements.com --- M payloads/external/LinuxBoot/Makefile M payloads/external/Makefile.inc 2 files changed, 6 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/30/38530/2
Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38530 )
Change subject: payloads/LinuxBoot: Fix initramfs Makefile rule ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/c/coreboot/+/38530/2/payloads/external/LinuxBoot... File payloads/external/LinuxBoot/Makefile:
https://review.coreboot.org/c/coreboot/+/38530/2/payloads/external/LinuxBoot... PS2, Line 65: linuxboot: kernel initramfs_compressed could this be
linuxboot: kernel initramfs_compressed kernel: initramfs_compressed
? That should also enforce the order without serializing via calling sub-makes (which seems hackish to me)
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38530 )
Change subject: payloads/LinuxBoot: Fix initramfs Makefile rule ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/c/coreboot/+/38530/2/payloads/external/LinuxBoot... File payloads/external/LinuxBoot/Makefile:
https://review.coreboot.org/c/coreboot/+/38530/2/payloads/external/LinuxBoot... PS2, Line 65: linuxboot: kernel initramfs_compressed
could this be […]
there's a dependency on "initramfs" above, maybe it's racing only on the compression part?
Marcello Sylvester Bauer has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38530 )
Change subject: payloads/LinuxBoot: Fix initramfs Makefile rule ......................................................................
Patch Set 4: Code-Review+1
Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38530 )
Change subject: payloads/LinuxBoot: Fix initramfs Makefile rule ......................................................................
Patch Set 4:
(1 comment)
https://review.coreboot.org/c/coreboot/+/38530/4/payloads/external/LinuxBoot... File payloads/external/LinuxBoot/Makefile:
https://review.coreboot.org/c/coreboot/+/38530/4/payloads/external/LinuxBoot... PS4, Line 47: initramfs isn't it enough to change this to initramfs_compressed instead of doing the sub-makes at line 67+?
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38530 )
Change subject: payloads/LinuxBoot: Fix initramfs Makefile rule ......................................................................
Patch Set 4:
(1 comment)
There's an open comment
https://review.coreboot.org/c/coreboot/+/38530/2/payloads/external/LinuxBoot... File payloads/external/LinuxBoot/Makefile:
https://review.coreboot.org/c/coreboot/+/38530/2/payloads/external/LinuxBoot... PS2, Line 65: linuxboot: kernel initramfs_compressed
there's a dependency on "initramfs" above, maybe it's racing only on the compression part?
*poke*
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38530 )
Change subject: payloads/LinuxBoot: Fix initramfs Makefile rule ......................................................................
Patch Set 4: Code-Review+1
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38530 )
Change subject: payloads/LinuxBoot: Fix initramfs Makefile rule ......................................................................
Patch Set 4:
(1 comment)
https://review.coreboot.org/c/coreboot/+/38530/4/payloads/external/LinuxBoot... File payloads/external/LinuxBoot/Makefile:
https://review.coreboot.org/c/coreboot/+/38530/4/payloads/external/LinuxBoot... PS4, Line 66: uroot u-root
Martin L Roth has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/38530?usp=email )
Change subject: payloads/LinuxBoot: Fix initramfs Makefile rule ......................................................................
Abandoned
This patch has not been touched in over 12 months. Anyone who wants to take over work on this patch, please feel free to restore it and do any work needed to get it merged. If you create a new patch based on this work, please credit the original author.