Skip to contentSkip to conversation

opensbi-payloads.inc: Use strings for fallback

PATCH New Khem Raj 1 participant 2 messages Oct 15, 2021

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 opensbi-payloads.inc: Use strings for fallback

This function is evaluated during parse and some machines maynot use external payload, on such machines this fails to parse

Fixes
bb.data_smart.ExpansionError: Failure expanding variable do_compile[depends], expression was ${@riscv_get_do_compile_depends(d)} which triggered exception TypeError: argument of type 'NoneType' is not iterab le

Cc Alistair Francis <[email protected]>
---
 meta/recipes-bsp/opensbi/opensbi-payloads.inc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
meta/recipes-bsp/opensbi/opensbi-payloads.inc +4 -4
index cc31ab3b1d..ce537c0587 100644
@@ -17,13 +17,13 @@ def riscv_get_extra_oemake_fdt(d):
     return "FW_FDT_PATH=" + deploy_dir + "/" + sbi_fdt
 
 def riscv_get_do_compile_depends(d):
-    sbi_payload = d.getVar('RISCV_SBI_PAYLOAD')
-    sbi_fdt = d.getVar('RISCV_SBI_FDT')
+    sbi_payload = d.getVar('RISCV_SBI_PAYLOAD') or ""
+    sbi_fdt = d.getVar('RISCV_SBI_FDT') or ""
 
-    if sbi_payload is None and sbi_fdt is None:
+    if sbi_payload == "" and sbi_fdt == "":
         return ""
 
-    if sbi_fdt is not None and 'u-boot.bin' in sbi_payload:
+    if sbi_fdt != "" and 'u-boot.bin' in sbi_payload:
         return "virtual/kernel:do_deploy virtual/bootloader:do_deploy"
 
     if 'linux' in sbi_payload or 'Image' in sbi_payload:
Signature · 1 line
2.33.1
author
#1 lore raw

PATCH 2/2 mesa: Enable svga for x86 only

Enable svga only on x86/x86_64 since some arches e.g. riscv64 do not support it

---
 meta/recipes-graphics/mesa/mesa.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
meta/recipes-graphics/mesa/mesa.inc +3 -1
index 282671d30f..4e95911165 100644
@@ -143,7 +143,9 @@ GALLIUMDRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'v3d', ',v3d', '',
 
 # radeonsi requires LLVM
 GALLIUMDRIVERS_RADEONSI = "${@bb.utils.contains('PACKAGECONFIG', 'r600', ',radeonsi', '', d)}"
-GALLIUMDRIVERS_LLVM = "r300,svga,nouveau${GALLIUMDRIVERS_RADEONSI}"
+GALLIUMDRIVERS_LLVM = "r300,nouveau${GALLIUMDRIVERS_RADEONSI}"
+GALLIUMDRIVERS_LLVM:append:x86:class-target = ",svga"
+GALLIUMDRIVERS_LLVM:append:x86-64:class-target = ",svga"
 
 PACKAGECONFIG[r600] = ""
 PACKAGECONFIG[virgl] = ""
Signature · 1 line
2.33.1