Merge pull request #448 from lumag/nexus-fw

Fix Nexus firmware dependency on meta-oe layer

dynamic-layers/openembedded-layer/recipes-bsp/firmware-nexus/firmware-qcom-nexus5x.bb

@@ -9,4 +9,4 @@ CHECKSUM_vendor = "bb4176a6"
 
 SRC_URI[vendor.sha256sum] = "eaba58f7219eb477697869454138d151b38a1589db1ab40cec1b4525774fe869"
 
-require recipes-bsp/firmware-nexus/firmware-qcom-pixel.inc
+require firmware-qcom-pixel.inc

dynamic-layers/openembedded-layer/recipes-bsp/firmware-nexus/firmware-qcom-nexus6p.bb

@@ -9,4 +9,4 @@ CHECKSUM_vendor = "52ed73ce"
 
 SRC_URI[vendor.sha256sum] = "2eb9a77de059739d33c7fad07e34034f03a93d70eea39460bb0d9278e5763053"
 
-require recipes-bsp/firmware-nexus/firmware-qcom-pixel.inc
+require firmware-qcom-pixel.inc

dynamic-layers/openembedded-layer/recipes-bsp/firmware-nexus/firmware-qcom-pixel.bb

@@ -7,4 +7,4 @@ CHECKSUM_vendor = "a1615a0f"
 
 SRC_URI[vendor.sha256sum] = "1cfffa986c4640a8bb3466f69a6f9bf511b4b6a8cb06fb0e1474a331e53876d6"
 
-require recipes-bsp/firmware-nexus/firmware-qcom-pixel.inc
+require firmware-qcom-pixel.inc

dynamic-layers/openembedded-layer/recipes-bsp/firmware-nexus/firmware-qcom-pixel2.bb

@@ -7,4 +7,4 @@ CHECKSUM_vendor = "2fdea26a"
 
 SRC_URI[vendor.sha256sum] = "4ec6cf5dfd6616ae39cf61f95657662e4b17dd193b6ab30547ef016359cfc118"
 
-require recipes-bsp/firmware-nexus/firmware-qcom-pixel.inc
+require firmware-qcom-pixel.inc

dynamic-layers/openembedded-layer/recipes-bsp/firmware-nexus/firmware-qcom-pixel3.bb

@@ -7,4 +7,4 @@ CHECKSUM_vendor = "0b9f3bc0"
 
 SRC_URI[vendor.sha256sum] = "5e48f4769d3cdba3c958f956d13df56b60e18e8fe03893d38f4125b421ab7ff9"
 
-require recipes-bsp/firmware-nexus/firmware-qcom-pixel.inc
+require firmware-qcom-pixel.inc

dynamic-layers/openembedded-layer/recipes-bsp/firmware-nexus/firmware-qcom-pixel3a.bb

@@ -7,4 +7,4 @@ CHECKSUM_vendor = "85defed7"
 
 SRC_URI[vendor.sha256sum] = "427d9a6f1d0196c0301d37353230359237df43bbee8920f987477867c6163d56"
 
-require recipes-bsp/firmware-nexus/firmware-qcom-pixel.inc
+require firmware-qcom-pixel.inc

dynamic-layers/openembedded-layer/recipes-bsp/firmware-nexus/firmware-qcom-pixel4.bb

@@ -7,4 +7,4 @@ CHECKSUM_vendor = "ead1b1a8"
 
 SRC_URI[vendor.sha256sum] = "8e919f063cd753948c12e0aee386cb8a86d905039ea45668e7fe6bc62bd08aca"
 
-require recipes-bsp/firmware-nexus/firmware-qcom-pixel.inc
+require firmware-qcom-pixel.inc

dynamic-layers/openembedded-layer/recipes-bsp/firmware-nexus/firmware-qcom-pixel4a-5g.bb

@@ -6,4 +6,4 @@ CHECKSUM_vendor = "395ecce2"
 
 SRC_URI[vendor.sha256sum] = "fb89a8a4bb9baeb88512443f54454c473cb4524c049d50389eee49a93e3d6c67"
 
-require recipes-bsp/firmware-nexus/firmware-qcom-pixel.inc
+require firmware-qcom-pixel.inc

dynamic-layers/openembedded-layer/recipes-bsp/firmware-nexus/firmware-qcom-pixel4a.bb

@@ -6,4 +6,4 @@ CHECKSUM_vendor = "5acbf701"
 
 SRC_URI[vendor.sha256sum] = "ed16536e4de2714ef237f350343d38226199417f286d31de7ebfa0a95784ee2b"
 
-require recipes-bsp/firmware-nexus/firmware-qcom-pixel.inc
+require firmware-qcom-pixel.inc

dynamic-layers/openembedded-layer/recipes-bsp/firmware-nexus/firmware-qcom-pixel5.bb

@@ -6,4 +6,4 @@ CHECKSUM_vendor = "2ab4bdce"
 
 SRC_URI[vendor.sha256sum] = "8c2bc955e6ca0e32f7460b669a972e8dfac85fe3b649e0bed47c5ef9790ebb53"
 
-require recipes-bsp/firmware-nexus/firmware-qcom-pixel.inc
+require firmware-qcom-pixel.inc

dynamic-layers/openembedded-layer/recipes-bsp/firmware-nexus/firmware-qcom-pixel5a-5g.bb

@@ -6,4 +6,4 @@ CHECKSUM_vendor = "c3cdaef9"
 
 SRC_URI[vendor.sha256sum] = "93b12611038f8c54d3a57f95906839ed1c3315a6b47e0883cf1890dfca6eb728"
 
-require recipes-bsp/firmware-nexus/firmware-qcom-pixel.inc
+require firmware-qcom-pixel.inc

dynamic-layers/openembedded-layer/recipes-test/images/initramfs-firmware-nexus-image.bbappend

@@ -0,0 +1,13 @@
+PACKAGE_INSTALL += " \
+    firmware-qcom-nexus5x \
+    firmware-qcom-nexus6p \
+    firmware-qcom-pixel \
+    firmware-qcom-pixel2 \
+    firmware-qcom-pixel3 \
+    firmware-qcom-pixel3a \
+    firmware-qcom-pixel4 \
+    firmware-qcom-pixel4a \
+    firmware-qcom-pixel4a-5g \
+    firmware-qcom-pixel5 \
+    firmware-qcom-pixel5a-5g \
+"

recipes-test/images/initramfs-firmware-nexus-image.bb

@@ -4,22 +4,14 @@ DESCRIPTION = "Tiny ramdisk image with all Nexus and Pixel devices firmware file
 # dependency on the kernel
 KERNELDEPMODDEPEND = ""
 
+# Firmware support for newer Nexus and Pixel devices depends on simg2img, which
+# is provided by the meta-oe only. So they are split into the bbappend in
+# dynamic-layers/openembedded-layer.
 PACKAGE_INSTALL += " \
     firmware-qcom-nexus4 \
     firmware-qcom-nexus5 \
-    firmware-qcom-nexus5x \
     firmware-qcom-nexus6 \
-    firmware-qcom-nexus6p \
     firmware-qcom-nexus7-2013 \
-    firmware-qcom-pixel \
-    firmware-qcom-pixel2 \
-    firmware-qcom-pixel3 \
-    firmware-qcom-pixel3a \
-    firmware-qcom-pixel4 \
-    firmware-qcom-pixel4a \
-    firmware-qcom-pixel4a-5g \
-    firmware-qcom-pixel5 \
-    firmware-qcom-pixel5a-5g \
 "
 
 IMAGE_LINGUAS = ""