From a871ecfb38bfd0763305f7b88437772fc5d60157 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 7 Sep 2023 11:15:58 -0700 Subject: [PATCH] linux-firmware-rpidistro: Update to 20230210-5_bpo11+1 Symlinks are no longer needed as they already exist in the new raspbian firmware tarball Signed-off-by: Khem Raj --- .../linux-firmware-rpidistro_git.bb | 28 ++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb b/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb index 653f6e070..095516435 100644 --- a/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb +++ b/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb @@ -7,19 +7,19 @@ SECTION = "kernel" LICENSE = "GPL-2.0-only & binary-redist-Cypress-rpidistro & Synaptics-rpidistro" LIC_FILES_CHKSUM = "\ - file://debian/config/brcm80211/copyright;md5=b0630b02d90e3da72206c909b6aecc8c \ + file://debian/copyright;md5=03475efdcf4c53c8f2d8fb4bc1fc6965 \ " # Where these are no common licenses, set NO_GENERIC_LICENSE so that the # license files will be copied from the fetched source. -NO_GENERIC_LICENSE[binary-redist-Cypress-rpidistro] = "debian/config/brcm80211/copyright" -NO_GENERIC_LICENSE[Synaptics-rpidistro] = "debian/config/brcm80211/copyright" +NO_GENERIC_LICENSE[binary-redist-Cypress-rpidistro] = "debian/copyright" +NO_GENERIC_LICENSE[Synaptics-rpidistro] = "debian/copyright" LICENSE_FLAGS = "synaptics-killswitch" SRC_URI = "git://github.com/RPi-Distro/firmware-nonfree;branch=bullseye;protocol=https \ file://0001-Default-43455-firmware-to-standard-variant.patch \ " -SRCREV = "541e5a05d152e7e6f0d9be45622e4a3741e51c02" -PV = "20210315-3+rpt7" +SRCREV = "2c3a8701193ba23d0ef85cdf0d0c9e47baf03dfc" +PV = "20230210-5_bpo11+1" S = "${WORKDIR}/git" inherit allarch @@ -30,7 +30,7 @@ do_compile[noexec] = "1" do_install() { install -d ${D}${nonarch_base_libdir}/firmware/brcm ${D}${nonarch_base_libdir}/firmware/cypress - cp debian/config/brcm80211/copyright ${D}${nonarch_base_libdir}/firmware/copyright.firmware-nonfree-rpidistro + cp debian/copyright ${D}${nonarch_base_libdir}/firmware/copyright.firmware-nonfree-rpidistro for fw in \ brcmfmac43430-sdio \ @@ -44,22 +44,13 @@ do_install() { cp -R --no-dereference --preserve=mode,links -v debian/config/brcm80211/cypress/* ${D}${nonarch_base_libdir}/firmware/cypress/ rm ${D}${nonarch_base_libdir}/firmware/cypress/README.txt - - # add compat links. Fixes errors like - # brcmfmac mmc1:0001:1: Direct firmware load for brcm/brcmfmac43455-sdio.raspberrypi,4-model-compute-module.txt failed with error -2 - ln -s brcmfmac43455-sdio.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-compute-module.txt - # brcmfmac mmc1:0001:1: Direct firmware load for brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.bin failed with error -2 - ln -s brcmfmac43455-sdio.bin ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.bin - # brcmfmac mmc1:0001:1: Direct firmware load for brcm/brcmfmac43430-sdio.raspberrypi,model-zero-w.bin failed with error -2 - ln -s brcmfmac43430-sdio.bin ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-w.bin - # brcmfmac mmc1:0001:1: Direct firmware load for brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.bin failed with error -2 - ln -s brcmfmac43430-sdio.bin ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.bin } PACKAGES = "\ ${PN}-bcm43430 \ ${PN}-bcm43436 \ ${PN}-bcm43436s \ + ${PN}-bcm43439 \ ${PN}-bcm43455 \ ${PN}-bcm43456 \ ${PN}-license \ @@ -68,6 +59,7 @@ PACKAGES = "\ LICENSE:${PN}-bcm43430 = "binary-redist-Cypress-rpidistro" LICENSE:${PN}-bcm43436 = "Synaptics-rpidistro" LICENSE:${PN}-bcm43436s = "Synaptics-rpidistro" +LICENSE:${PN}-bcm43439 = "Synaptics-rpidistro" LICENSE:${PN}-bcm43455 = "binary-redist-Cypress-rpidistro" LICENSE:${PN}-bcm43456 = "Synaptics-rpidistro" LICENSE:${PN}-license = "GPL-2.0-only" @@ -79,6 +71,7 @@ FILES:${PN}-bcm43430 = " \ " FILES:${PN}-bcm43436 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43436-*" FILES:${PN}-bcm43436s = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43436s*" +FILES:${PN}-bcm43439 = "${nonarch_base_libdir}/firmware/cypress/43439A0-7.95.49.00.combined" FILES:${PN}-bcm43455 = " \ ${nonarch_base_libdir}/firmware/brcm/brcmfmac43455* \ ${nonarch_base_libdir}/firmware/cypress/cyfmac43455-sdio* \ @@ -89,18 +82,21 @@ FILES:${PN}-license = "${nonarch_base_libdir}/firmware/copyright.firmware-nonfre RDEPENDS:${PN}-bcm43430 += "${PN}-license" RDEPENDS:${PN}-bcm43436 += "${PN}-license" RDEPENDS:${PN}-bcm43436s += "${PN}-license" +RDEPENDS:${PN}-bcm43439 += "${PN}-license" RDEPENDS:${PN}-bcm43455 += "${PN}-license" RDEPENDS:${PN}-bcm43456 += "${PN}-license" RCONFLICTS:${PN}-bcm43430 = "linux-firmware-raspbian-bcm43430" RCONFLICTS:${PN}-bcm43436 = "linux-firmware-bcm43436" RCONFLICTS:${PN}-bcm43436s = "linux-firmware-bcm43436s" +RCONFLICTS:${PN}-bcm43439 = "linux-firmware-bcm43439" RCONFLICTS:${PN}-bcm43455 = "linux-firmware-bcm43455" RCONFLICTS:${PN}-bcm43456 = "linux-firmware-bcm43456" RREPLACES:${PN}-bcm43430 = "linux-firmware-bcm43430" RREPLACES:${PN}-bcm43436 = "linux-firmware-bcm43436" RREPLACES:${PN}-bcm43436s = "linux-firmware-bcm43436s" +RREPLACES:${PN}-bcm43439 = "linux-firmware-bcm43439" RREPLACES:${PN}-bcm43455 = "linux-firmware-bcm43455" RREPLACES:${PN}-bcm43456 = "linux-firmware-bcm43456"