Skip to contentSkip to conversation

systemd-boot: fix bbappend file to suit latest version

PATCH In review Chen Qi 2 participants 3 messages Mar 5, 2018 – Mar 6, 2018

lore
Share & tools
lore

Chen Qi

author
#0 lore raw

PATCH 1/1 systemd-boot: fix bbappend file to suit latest version

Fix the bbappend file to suit the latest systemd version.

As systemd has now dropped autotools support, using ninja instead of make in do_compile.

---
 recipes-bsp/systemd-boot/systemd-boot_%.bbappend | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
recipes-bsp/systemd-boot/systemd-boot_%.bbappend +2 -2
index 9e6cc16..46dd8a4 100644
@@ -7,11 +7,11 @@ SRC_URI_append_intel-x86-common = " \
 PACKAGE_ARCH_intel-x86-common = "${INTEL_COMMON_PACKAGE_ARCH}"
 
 do_compile_append_intel-x86-common() {
-	oe_runmake linux${SYSTEMD_BOOT_EFI_ARCH}.efi.stub
+	ninja src/boot/efi/linux${SYSTEMD_BOOT_EFI_ARCH}.efi.stub
 }
 
 do_deploy_append_intel-x86-common() {
-	install ${B}/linux*.efi.stub ${DEPLOYDIR}
+	install ${B}/src/boot/efi/linux*.efi.stub ${DEPLOYDIR}
 }
 
 # includes rmc-boot.inc if rmc-boot is the EFI_PROVIDER
Signature · 1 line
1.9.1
#1 lore raw

Thanks for the patch. I assume this is needed when OE-core merges the update to v236?

Thanks,
Cal

Quoted 28 lines · Chen Qi

Fix the bbappend file to suit the latest systemd version.

As systemd has now dropped autotools support, using ninja instead of make in do_compile.

---
  recipes-bsp/systemd-boot/systemd-boot_%.bbappend | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
recipes-bsp/systemd-boot/systemd-boot_%.bbappend +2 -2
index 9e6cc16..46dd8a4 100644
@@ -7,11 +7,11 @@ SRC_URI_append_intel-x86-common = " \
  PACKAGE_ARCH_intel-x86-common = "${INTEL_COMMON_PACKAGE_ARCH}"
 
  do_compile_append_intel-x86-common() {
-	oe_runmake linux${SYSTEMD_BOOT_EFI_ARCH}.efi.stub
+	ninja src/boot/efi/linux${SYSTEMD_BOOT_EFI_ARCH}.efi.stub
  }
 
  do_deploy_append_intel-x86-common() {
-	install ${B}/linux*.efi.stub ${DEPLOYDIR}
+	install ${B}/src/boot/efi/linux*.efi.stub ${DEPLOYDIR}
  }
 
  # includes rmc-boot.inc if rmc-boot is the EFI_PROVIDER
author
#2 lore raw
Quoted 5 lines · Cal Sullivan

Thanks for the patch. I assume this is needed when OE-core merges the update to v236?

Thanks,
Cal

Yes. It's needed when OE-core merges the update to v237.

Best Regards,
Chen Qi

Quoted 28 lines · Chen Qi
Quoted 25 lines

Fix the bbappend file to suit the latest systemd version.

As systemd has now dropped autotools support, using ninja instead of make in do_compile.

---
  recipes-bsp/systemd-boot/systemd-boot_%.bbappend | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
recipes-bsp/systemd-boot/systemd-boot_%.bbappend +2 -2
index 9e6cc16..46dd8a4 100644
@@ -7,11 +7,11 @@ SRC_URI_append_intel-x86-common = " \
  PACKAGE_ARCH_intel-x86-common = "${INTEL_COMMON_PACKAGE_ARCH}"
    do_compile_append_intel-x86-common() {
-    oe_runmake linux${SYSTEMD_BOOT_EFI_ARCH}.efi.stub
+    ninja src/boot/efi/linux${SYSTEMD_BOOT_EFI_ARCH}.efi.stub
  }
    do_deploy_append_intel-x86-common() {
-    install ${B}/linux*.efi.stub ${DEPLOYDIR}
+    install ${B}/src/boot/efi/linux*.efi.stub ${DEPLOYDIR}
  }
    # includes rmc-boot.inc if rmc-boot is the EFI_PROVIDER