From 757d53f086a4458bc336b1db92c0ad9a5ae6ed70 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Thu, 18 Sep 2025 20:09:49 +0200 Subject: [PATCH] linux-firmware: Package ${PN}-wl1251 before ${PN}-wl12xx This effectively reverts commit bfe67c7775fb4a9177c7ca037ac08e93155b5808 and insteads solves it by making sure the ${PN}-wl1251 package is packaged before the ${PN}-wl12xx package. This assures ${PN}-wl1251 gets the files it wants. Signed-off-by: Peter Kjellerstedt Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- .../linux-firmware/linux-firmware_20250808.bb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20250808.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20250808.bb index be38a8edf35..0f4c923a418 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20250808.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20250808.bb @@ -455,7 +455,7 @@ PACKAGES =+ "${PN}-amphion-vpu-license ${PN}-amphion-vpu \ ${PN}-moxa-license ${PN}-moxa \ ${PN}-sd8686 ${PN}-sd8688 ${PN}-sd8787 ${PN}-sd8797 ${PN}-sd8801 \ ${PN}-sd8887 ${PN}-sd8897 ${PN}-sd8997 ${PN}-usb8997 \ - ${PN}-ti-connectivity-license ${PN}-wlcommon ${PN}-wl12xx ${PN}-wl18xx ${PN}-cc33xx \ + ${PN}-ti-connectivity-license ${PN}-wl1251-license ${PN}-wlcommon ${PN}-wl1251 ${PN}-wl12xx ${PN}-wl18xx ${PN}-cc33xx \ ${PN}-ti-keystone-license ${PN}-ti-keystone \ ${PN}-vt6656-license ${PN}-vt6656 \ ${PN}-rs9113 ${PN}-rs9116 \ @@ -642,7 +642,6 @@ PACKAGES =+ "${PN}-amphion-vpu-license ${PN}-amphion-vpu \ ${PN}-lt9611uxc ${PN}-lontium-license \ ${PN}-wfx-license ${PN}-wfx \ ${PN}-whence-license \ - ${PN}-wl1251-license ${PN}-wl1251 \ ${PN}-xc4000-license ${PN}-xc4000 \ ${PN}-xc5000-license ${PN}-xc5000 \ ${PN}-xc5000c-license ${PN}-xc5000c \ @@ -1462,10 +1461,8 @@ FILES:${PN}-wlcommon = " \ ${nonarch_base_libdir}/firmware/ti-connectivity/wl127x-nvs.bin* \ ${nonarch_base_libdir}/firmware/ti-connectivity/wl1271-nvs.bin* \ " -# All wl12* but wl125* which go to wl1251 package FILES:${PN}-wl12xx = " \ - ${nonarch_base_libdir}/firmware/ti-connectivity/wl12[012346789]* \ - ${nonarch_base_libdir}/firmware/ti-connectivity/wl12[a-z]* \ + ${nonarch_base_libdir}/firmware/ti-connectivity/wl12* \ " FILES:${PN}-wl18xx = " \ ${nonarch_base_libdir}/firmware/ti-connectivity/wl18* \ -- 2.47.3