From e8b9e92b32ed01ec1824d950bf69f18bd2695910 Mon Sep 17 00:00:00 2001 From: Darren Hart Date: Fri, 27 Apr 2012 09:36:14 -0700 Subject: linux-firmware: Move fri2 linux-firmware append to common In preparation for linux-firmware updates from new BSPs, move the fri2 linux-firmware bbappend into meta-intel/common. Eventually this should be moved into oe-core. Signed-off-by: Darren Hart Acked-by: Tom Zanussi --- .../linux-firmware/linux-firmware_git.bbappend | 18 ++++++++++++++++++ .../linux-firmware/linux-firmware_git.bbappend | 18 ------------------ 2 files changed, 18 insertions(+), 18 deletions(-) create mode 100644 common/recipes-kernel/linux-firmware/linux-firmware_git.bbappend delete mode 100644 meta-fri2/recipes-kernel/linux-firmware/linux-firmware_git.bbappend diff --git a/common/recipes-kernel/linux-firmware/linux-firmware_git.bbappend b/common/recipes-kernel/linux-firmware/linux-firmware_git.bbappend new file mode 100644 index 00000000..97e64a59 --- /dev/null +++ b/common/recipes-kernel/linux-firmware/linux-firmware_git.bbappend @@ -0,0 +1,18 @@ +FILESEXTRAPATHS_prepend := "${THISDIR/${PN}:" + +# This exists in Yocto 1.1, but include it here for completeness +LIC_FILES_CHKSUM += "file://LICENCE.iwlwifi_firmware;md5=311cc823df5b1be4f00fbf0f17d96a6b" + +FWPATH = "/lib/firmware" + +do_install_append() { + install -m 0644 LICENCE.iwlwifi_firmware ${D}${FWPATH} + install -m 0644 iwlwifi-6000g2a-5.ucode ${D}${FWPATH} +} + +PACKAGES =+ "${PN}-iwlwifi-6000g2a-5" + +FILES_${PN}-iwlwifi-6000g2a-5 = " \ + ${FWPATH}/LICENCE.iwlwifi_firmware \ + ${FWPATH}/iwlwifi-6000g2a-5.ucode \ +" diff --git a/meta-fri2/recipes-kernel/linux-firmware/linux-firmware_git.bbappend b/meta-fri2/recipes-kernel/linux-firmware/linux-firmware_git.bbappend deleted file mode 100644 index 97e64a59..00000000 --- a/meta-fri2/recipes-kernel/linux-firmware/linux-firmware_git.bbappend +++ /dev/null @@ -1,18 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR/${PN}:" - -# This exists in Yocto 1.1, but include it here for completeness -LIC_FILES_CHKSUM += "file://LICENCE.iwlwifi_firmware;md5=311cc823df5b1be4f00fbf0f17d96a6b" - -FWPATH = "/lib/firmware" - -do_install_append() { - install -m 0644 LICENCE.iwlwifi_firmware ${D}${FWPATH} - install -m 0644 iwlwifi-6000g2a-5.ucode ${D}${FWPATH} -} - -PACKAGES =+ "${PN}-iwlwifi-6000g2a-5" - -FILES_${PN}-iwlwifi-6000g2a-5 = " \ - ${FWPATH}/LICENCE.iwlwifi_firmware \ - ${FWPATH}/iwlwifi-6000g2a-5.ucode \ -" -- cgit v1.2.3-54-g00ecf