From: Ross Burton <ross.burton@arm.com>
Date: Wed, 29 Apr 2026 16:48:16 +0000 (+0100)
Subject: wireless-regdb: use ${firmwaredir} instead of ${nonarch_base_libdir}/firmware
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18a930da2209c3d19846aea5ecfb9038517f7ad1;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

wireless-regdb: use ${firmwaredir} instead of ${nonarch_base_libdir}/firmware

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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

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 2f7c816043..e967d51fd3 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.