From 7ac00f2efee4973703ef9725c81242bd6eae36c0 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 22 Dec 2016 17:07:43 +0000 Subject: linux-firmware: remove alternatives for brcmfmac-stdio.bin These alternatives are only used to provide an unversioned brcmfmac-sdio.bin, which was required by kernels prior to 3.13. As these alternatives all have the same priority there's no determinism in which one is selected, and current kernels (since January 2014) use the appropriately versioned firmware names. Signed-off-by: Ross Burton --- .../linux-firmware/linux-firmware_git.bb | 24 +--------------------- 1 file changed, 1 insertion(+), 23 deletions(-) (limited to 'meta/recipes-kernel/linux-firmware') diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb index 1d881d714e..4fedcfbc67 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb @@ -186,7 +186,7 @@ SRC_URI[iwlwifi-19.sha256sum] = "2034470df64d323b827c4f2d4d0d55be2846b7360179b55 S = "${WORKDIR}/git" -inherit allarch update-alternatives +inherit allarch CLEANBROKEN = "1" @@ -413,10 +413,6 @@ FILES_${PN}-vt6656 = " \ RDEPENDS_${PN}-vt6656 = "${PN}-vt6656-license" # For broadcom -# -# WARNING: The ALTERNATIVE_* variables are not using ${PN} because of -# a bug in bitbake; when this is fixed and bitbake learns how to proper -# pass variable flags with expansion we can rework this patch. LICENSE_${PN}-bcm4329 = "Firmware-broadcom_bcm43xx" LICENSE_${PN}-bcm4330 = "Firmware-broadcom_bcm43xx" @@ -452,24 +448,6 @@ FILES_${PN}-bcm4354 = " \ /lib/firmware/brcm/brcmfmac4354-sdio.bin \ " -ALTERNATIVE_LINK_NAME[brcmfmac-sdio.bin] = "/lib/firmware/brcm/brcmfmac-sdio.bin" - -ALTERNATIVE_linux-firmware-bcm4334 = "brcmfmac-sdio.bin" -ALTERNATIVE_TARGET_linux-firmware-bcm4334[brcmfmac-sdio.bin] = "/lib/firmware/brcm/brcmfmac4334-sdio.bin" -ALTERNATIVE_linux-firmware-bcm43340 = "brcmfmac-sdio.bin" -ALTERNATIVE_TARGET_linux-firmware-bcm43340[brcmfmac-sdio.bin] = "/lib/firmware/brcm/brcmfmac43340-sdio.bin" -ALTERNATIVE_linux_firmware-bcm4354 = "brcmfmac-sdio.bin" -ALTERNATIVE_TARGET_linux-firmware-bcm4354[brcmfmac-sdio.bin] = "/lib/firmware/brcm/brcmfmac4354-sdio.bin" -ALTERNATIVE_linux-firmware-bcm4329 = "brcmfmac-sdio.bin" -ALTERNATIVE_TARGET_linux-firmware-bcm4329[brcmfmac-sdio.bin] = "/lib/firmware/brcm/brcmfmac4329-sdio.bin" -ALTERNATIVE_linux-firmware-bcm4330 = "brcmfmac-sdio.bin" -ALTERNATIVE_TARGET_linux-firmware-bcm4330[brcmfmac-sdio.bin] = "/lib/firmware/brcm/brcmfmac4330-sdio.bin" -ALTERNATIVE_linux-firmware-bcm4339 = "brcmfmac-sdio.bin" -ALTERNATIVE_TARGET_linux-firmware-bcm4339[brcmfmac-sdio.bin] = "/lib/firmware/brcm/brcmfmac4339-sdio.bin" -ALTERNATIVE_PRIORITY_linux-firmware-bcm4339[brcmfmac-sdio.bin] = "20" -ALTERNATIVE_linux-firmware-bcm43430 = "brcmfmac-sdio.bin" -ALTERNATIVE_TARGET_linux-firmware-bcm43430[brcmfmac-sdio.bin] = "/lib/firmware/brcm/brcmfmac43430-sdio.bin" - RDEPENDS_${PN}-bcm4329 += "${PN}-broadcom-license" RDEPENDS_${PN}-bcm4330 += "${PN}-broadcom-license" RDEPENDS_${PN}-bcm4334 += "${PN}-broadcom-license" -- cgit v1.2.3