marvell-gspi and marvell-sdio: move duplicated license in separate package/recipe

Before moving the license we had:
Collected errors:
 * check_data_file_clashes: Package marvell-sdio-fw wants to install file .../rootfs/x11-sato2-image/lib/firmware/Marvell-Licence.txt
        But that file is already provided by package  * marvell-gspi-fw
 * opkg_install_cmd: Cannot install package task-base-extended.
in do_rootfs for machine bug under angstrom.

In bug.conf there is:
MACHINE_EXTRA_RRECOMMENDS = "marvell-gspi-fw marvell-sdio-fw kernel-modules"
  That installed both marvell-gspi-fw and marvell-sdio-fw
  each recipe had the same firmware license file(Marvell-Licence.txt)
The two identic license files were installed at the same location
  which led to the install issue mentioned above.

Moving the license in its own recipe/package removes the clash.

In order to fullfill the legal requirements of the license I used
  RDEPENDS in order to be shure that the license would be present if
  at least one of the firmwares are present

diff --git a/recipes/firmwares/marvell-gspi-fw_9.70.3-p37.bb b/recipes/firmwares/marvell-gspi-fw_9.70.3-p37.bb
index 736ddb8..bee8fc6 100644 (file)
--- a/recipes/firmwares/marvell-gspi-fw_9.70.3-p37.bb
+++ b/recipes/firmwares/marvell-gspi-fw_9.70.3-p37.bb
@@ -1,8 +1,9 @@
 DESCRIPTION = "Firmware for Marvel 8686 gspi wifi chipset"
 LICENCE = "closed"
 
-SRC_URI = "file://${PV}.tar.gz \
-           file://Marvell-Licence.txt"
+SRC_URI = "file://${PV}.tar.gz"
+
+PR="r1"
 
 S = "${WORKDIR}/${PV}/FwImage"
 
@@ -10,7 +11,6 @@ do_install() {
 
        install -d ${D}${base_libdir}/firmware
        install -m 0644 gspi8686.bin helper_gspi.bin ${D}${base_libdir}/firmware
-       install -m 0644 ${WORKDIR}/Marvell-Licence.txt ${D}${base_libdir}/firmware
        ln -s helper_gspi.bin ${D}${base_libdir}/firmware/gspi8686_hlp.bin
 }
 

diff --git a/recipes/firmwares/marvell-license_9.70.3-p37.bb b/recipes/firmwares/marvell-license_9.70.3-p37.bb
new file mode 100644 (file)
index 0000000..a72d820
--- /dev/null
+++ b/recipes/firmwares/marvell-license_9.70.3-p37.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "License for Marvel 8686 wifi chipsets"
+LICENCE = "closed"
+
+SRC_URI = "file://Marvell-Licence.txt"
+
+RDEPENDS_${PN} += "marvell-license"
+
+do_install() {
+
+       install -d ${D}${base_libdir}/firmware
+       install -m 0644 ${WORKDIR}/Marvell-Licence.txt ${D}${base_libdir}/firmware
+}
+
+PACKAGES = "${PN}"
+FILES_${PN} += "${base_libdir}/firmware"
+
+PACKAGE_ARCH = "all"

diff --git a/recipes/firmwares/marvell-sdio-fw_9.70.3-p37.bb b/recipes/firmwares/marvell-sdio-fw_9.70.3-p37.bb
index c3ccaf7..f0b44b7 100644 (file)
--- a/recipes/firmwares/marvell-sdio-fw_9.70.3-p37.bb
+++ b/recipes/firmwares/marvell-sdio-fw_9.70.3-p37.bb
@@ -1,8 +1,11 @@
 DESCRIPTION = "Firmware for Marvel 8686 gspi wifi chipset"
 LICENCE = "closed"
 
-SRC_URI = "file://${PV}.tar.gz \
-           file://Marvell-Licence.txt"
+SRC_URI = "file://${PV}.tar.gz"
+
+PR = "r1"
+
+RDEPENDS_${PN} += "marvell-license"
 
 S = "${WORKDIR}/${PV}/FwImage"
 
@@ -10,7 +13,6 @@ do_install() {
 
        install -d ${D}${base_libdir}/firmware
        install -m 0644 sd8686.bin sd8686_helper.bin ${D}${base_libdir}/firmware
-       install -m 0644 ${WORKDIR}/Marvell-Licence.txt ${D}${base_libdir}/firmware
 }
 
 PACKAGES = "${PN}"