diff mbox series

[05/10] wireless-regdb: use ${firmwaredir} instead of ${nonarch_base_libdir}/firmware

Message ID 20260429164821.3425757-5-ross.burton@arm.com
State Under Review
Headers show
Series [01/10] bitbake add firmwaredir | expand

Commit Message

Ross Burton April 29, 2026, 4:48 p.m. UTC 
Now that firmwaredir has been defined, use it instead of explicitly using
${nonarch_base_libdir}/firmware.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../wireless-regdb/wireless-regdb_2026.02.04.bb           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/meta/recipes-kernel/wireless-regdb/wireless-regdb_2026.02.04.bb b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2026.02.04.bb
index 2f7c8160434..e967d51fd32 100644
--- a/meta/recipes-kernel/wireless-regdb/wireless-regdb_2026.02.04.bb
+++ b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2026.02.04.bb
@@ -15,8 +15,8 @@  do_install() {
     install -m 0644 regulatory.bin ${D}${nonarch_libdir}/crda/regulatory.bin
     install -m 0644 wens.key.pub.pem ${D}${sysconfdir}/wireless-regdb/pubkeys/wens.key.pub.pem
 
-    install -m 0644 -D regulatory.db ${D}${nonarch_base_libdir}/firmware/regulatory.db
-    install -m 0644 regulatory.db.p7s ${D}${nonarch_base_libdir}/firmware/regulatory.db.p7s
+    install -m 0644 -D regulatory.db ${D}${firmwaredir}/regulatory.db
+    install -m 0644 regulatory.db.p7s ${D}${firmwaredir}/regulatory.db.p7s
 }
 
 # Install static regulatory DB in /lib/firmware for kernel to load.
@@ -27,8 +27,8 @@  PACKAGES = "${PN}-static ${PN}"
 RCONFLICTS:${PN} = "${PN}-static"
 
 FILES:${PN}-static = " \
-    ${nonarch_base_libdir}/firmware/regulatory.db \
-    ${nonarch_base_libdir}/firmware/regulatory.db.p7s \
+    ${firmwaredir}/regulatory.db \
+    ${firmwaredir}/regulatory.db.p7s \
 "
 
 # Native users might want to use the source of regulatory DB.