linux-firmware: upgrade 20240909 -> 20250311
PATCH 1/1 linux-firmware: upgrade 20240909 -> 20250311
From: Hiago De Franco <[email protected]>
Update the linux-firmware recipe to the most recent upstream tag.
Since commit 515022675f81 ("make: separate installation and de-duplication targets") in linux-firmware, 'install-nodedup' no longer exists. Adapt the do_install function to accommodate these changes, as done in the oe-core master branch.
Signed-off-by Hiago De Franco <[email protected]>
---
...20240909.bb => linux-firmware_20250311.bb} | 24 ++++++++++++++-----
1 file changed, 18 insertions(+), 6 deletions(-)
rename meta/recipes-kernel/linux-firmware/{linux-firmware_20240909.bb => linux-firmware_20250311.bb} (99%)meta/recipes-kernel/linux-firmware/linux-firmware_20250311.bb renamed from meta/recipes-kernel/linux-firmware/linux-firmware_20240909.bb +18 -6
@@ -158,7 +158,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ " # WHENCE checksum is defined separately to ease overriding it if # class-devupstream is selected. -WHENCE_CHKSUM = "6ae5ffd807c84809977286ad0b37acdb" +WHENCE_CHKSUM = "886924eb733c4efcec21dff980795771" # These are not common licenses, set NO_GENERIC_LICENSE for them # so that the license files will be copied from fetched source
@@ -247,23 +247,35 @@ SRC_URI:class-devupstream = "git://git.kernel.org/pub/scm/linux/kernel/git/firmw # Pin this to the 20220509 release, override this in local.conf SRCREV:class-devupstream ?= "b19cbdca78ab2adfd210c91be15a22568e8b8cae" -SRC_URI[sha256sum] = "943fbd19883cf8eadf89e0b22422549db056557b1ecd30a56400615971369671" +SRC_URI[sha256sum] = "b1083a36f19aea46f661dcfd4cd462d13933dcb4e7f0dc809525552dd5c3541d" inherit allarch CLEANBROKEN = "1" -# Use PACKAGECONFIG_CONFARGS to set the Makefile target PACKAGECONFIG ??= "" -# Enabling dedup will turn duplicate firmware files into links -PACKAGECONFIG[deduplicate] = "install,install-nodedup,rdfind-native" +PACKAGECONFIG[deduplicate] = ",,rdfind-native" + +# Possible values are "xz" and "zst". +FIRMWARE_COMPRESSION ?= "" + +def fw_compr_suffix(d): + compr = d.getVar('FIRMWARE_COMPRESSION') + if compr == '': + return '' + return '-' + compr do_compile() { : } do_install() { - oe_runmake 'DESTDIR=${D}' 'FIRMWAREDIR=${nonarch_base_libdir}/firmware' ${PACKAGECONFIG_CONFARGS} + sed -i 's:^./check_whence.py:#./check_whence.py:' ${S}/copy-firmware.sh + + oe_runmake 'DESTDIR=${D}' 'FIRMWAREDIR=${nonarch_base_libdir}/firmware' install${@fw_compr_suffix(d)} + if [ "${@bb.utils.contains('PACKAGECONFIG', 'deduplicate', '1', '0', d)}" = "1" ]; then + oe_runmake 'DESTDIR=${D}' 'FIRMWAREDIR=${nonarch_base_libdir}/firmware' dedup + fi cp LICEN[CS]E.* WHENCE ${D}${nonarch_base_libdir}/firmware/ cp wfx/LICEN[CS]E.* ${D}${nonarch_base_libdir}/firmware/wfx/ }
Signature · 1 line
2.39.5