Skip to content

Commit 8a048b1

Browse files
lumaglumag
authored
Merge pull request #8 from lumag/restructure-packages
packagegroups: follow the meta-qcom packagegroup rework
2 parents 068097c + a0e6825 commit 8a048b1

20 files changed

+71
-35
lines changed

‎recipes-bsp/images-woa/initramfs-firmware-ecs-liva-qc710-image.bb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
DESCRIPTION = "Tiny ramdisk image with ECS Liva QC710 devices firmware files"
22

33
PACKAGE_INSTALL += " \
4-
packagegroup-firmware-ecs-liva-qc710 \
4+
packagegroup-ecs-liva-qc710-firmware \
55
"
66

77
require recipes-bsp/images/initramfs-firmware-image.inc

‎recipes-bsp/images-woa/initramfs-firmware-lenovo-miix-630-image.bb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
DESCRIPTION = "Tiny ramdisk image with Lenovo Miix 630 firmware files"
22

33
PACKAGE_INSTALL += " \
4-
packagegroup-firmware-lenovo-miix-630 \
4+
packagegroup-lenovo-miix-630-firmware \
55
"
66

77
require recipes-bsp/images/initramfs-firmware-image.inc

‎recipes-bsp/images-woa/initramfs-firmware-lenovo-t14s-g6-image.bb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
DESCRIPTION = "Tiny ramdisk image with Lenovo T14s G6 firmware files"
22

33
PACKAGE_INSTALL += " \
4-
packagegroup-firmware-lenovo-t14s-g6 \
4+
packagegroup-lenovo-t14s-g6-firmware \
55
"
66

77
require recipes-bsp/images/initramfs-firmware-image.inc

‎recipes-bsp/images-woa/initramfs-firmware-lenovo-x13s-image.bb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
DESCRIPTION = "Tiny ramdisk image with Lenovo X13s firmware files"
22

33
PACKAGE_INSTALL += " \
4-
packagegroup-firmware-lenovo-x13s \
4+
packagegroup-lenovo-x13s-firmware \
55
"
66

77
require recipes-bsp/images/initramfs-firmware-image.inc

‎recipes-bsp/images-woa/initramfs-firmware-lenovo-yoga-c630-image.bb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
DESCRIPTION = "Tiny ramdisk image with Lenovo Yoga C630 firmware files"
22

33
PACKAGE_INSTALL += " \
4-
packagegroup-firmware-lenovo-yoga-c630 \
4+
packagegroup-lenovo-yoga-c630-firmware \
55
"
66

77
require recipes-bsp/images/initramfs-firmware-image.inc

‎recipes-bsp/images-woa/initramfs-firmware-mega-image.bbappend

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# WoA devices
22
PACKAGE_INSTALL += " \
3-
packagegroup-firmware-ecs-liva-qc710 \
4-
packagegroup-firmware-lenovo-miix-630 \
5-
packagegroup-firmware-lenovo-yoga-c630 \
6-
packagegroup-firmware-lenovo-x13s \
7-
packagegroup-firmware-sc8180x \
8-
packagegroup-firmware-x1e80100-crd \
3+
packagegroup-ecs-liva-qc710-firmware \
4+
packagegroup-lenovo-miix-630-firmware \
5+
packagegroup-lenovo-yoga-c630-firmware \
6+
packagegroup-lenovo-x13s-firmware \
7+
packagegroup-sc8180x-firmware \
8+
packagegroup-x1e80100-crd-firmware \
99
"

‎recipes-bsp/images-woa/initramfs-firmware-sc8180x-image.bb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
DESCRIPTION = "Tiny ramdisk image with SC8180X devices firmware files"
22

33
PACKAGE_INSTALL += " \
4-
packagegroup-firmware-sc8180x \
4+
packagegroup-sc8180x-firmware \
55
"
66

77
BAD_RECOMMENDATIONS = " \

‎recipes-bsp/images-woa/initramfs-firmware-x1e80100-crd-image.bb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
DESCRIPTION = "Tiny ramdisk image with X1E80100 CRD devices firmware files"
22

33
PACKAGE_INSTALL += " \
4-
packagegroup-firmware-x1e80100-crd \
4+
packagegroup-x1e80100-crd-firmware \
55
"
66

77
BAD_RECOMMENDATIONS = " \

‎recipes-bsp/images/initramfs-firmware-ifc6410-image.bb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
DESCRIPTION = "Tiny ramdisk image with IFC6410 firmware files"
22

33
PACKAGE_INSTALL += " \
4-
packagegroup-firmware-ifc6410 \
4+
packagegroup-ifc6410-firmware \
55
"
66

77
require recipes-bsp/images/initramfs-firmware-image.inc

‎recipes-bsp/images/initramfs-firmware-ifc6560-image.bb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
DESCRIPTION = "Tiny ramdisk image with all Nexus and Pixel devices firmware files"
22

33
PACKAGE_INSTALL += " \
4-
packagegroup-firmware-ifc6560 \
4+
packagegroup-ifc6560-firmware \
55
"
66

77
BAD_RECOMMENDATIONS = "\

‎recipes-bsp/images/initramfs-firmware-mega-image.bbappend

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Inforce / Penguin Edge devkits
22
PACKAGE_INSTALL += " \
3-
packagegroup-firmware-ifc6410 \
4-
packagegroup-firmware-ifc6560 \
3+
packagegroup-ifc6410-firmware \
4+
packagegroup-ifc6560-firmware \
55
"

‎recipes-bsp/packagegroups-woa/packagegroup-firmware-ecs-liva-qc710.bb renamed to ‎recipes-bsp/packagegroups-woa/packagegroup-ecs-liva-qc710.bb

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
SUMMARY = "Firmware packages for the ECS LIVA QC710 devices"
1+
SUMMARY = "Packages for the ECS LIVA QC710 devices"
22

33
inherit packagegroup
44

5-
RRECOMMENDS:${PN} += " \
5+
PACKAGES = " \
6+
${PN}-firmware \
7+
"
8+
9+
RRECOMMENDS:${PN}-firmware = " \
610
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'linux-firmware-qcom-adreno-a630 linux-firmware-qcom-ecs-liva-qc710-adreno', '', d)} \
711
${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'linux-firmware-qca-wcn399x', '', d)} \
812
${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'linux-firmware-ath10k-wcn3990 linux-firmware-qcom-ecs-liva-qc710-wifi', '', d)} \

‎recipes-bsp/packagegroups-woa/packagegroup-firmware-lenovo-miix-630.bb renamed to ‎recipes-bsp/packagegroups-woa/packagegroup-lenovo-miix-630.bb

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
SUMMARY = "Firmware packages for the Lenogo Miix 630 laptop"
1+
SUMMARY = "Packages for the Lenogo Miix 630 laptop"
22

33
inherit packagegroup
44

5-
RRECOMMENDS:${PN} += " \
5+
PACKAGES = " \
6+
${PN}-firmware \
7+
"
8+
9+
RRECOMMENDS:${PN}-firmware = " \
610
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'linux-firmware-qcom-adreno-a630 linux-firmware-qcom-lenovo-miix-630-adreno', '', d)} \
711
${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'linux-firmware-qca-wcn399x', '', d)} \
812
${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'linux-firmware-ath10k-wcn3990', '', d)} \

‎recipes-bsp/packagegroups-woa/packagegroup-firmware-lenovo-t14s-g6.bb renamed to ‎recipes-bsp/packagegroups-woa/packagegroup-lenovo-t14s-g6.bb

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
SUMMARY = "Firmware packages for the Lenovo T14s G6 laptop"
1+
SUMMARY = "Packages for the Lenovo T14s G6 laptop"
22

33
inherit packagegroup
44

5-
RRECOMMENDS:${PN} += " \
5+
PACKAGES = " \
6+
${PN}-firmware \
7+
"
8+
9+
RRECOMMENDS:${PN}-firmware = " \
610
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'linux-firmware-qcom-adreno-g750 linux-firmware-qcom-x1e80100-lenovo-t14s-g6-adreno', '', d)} \
711
${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'linux-firmware-ath12k-wcn7850', '', d)} \
812
${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'linux-firmware-qca-wcn7850', '', d)} \

‎recipes-bsp/packagegroups-woa/packagegroup-firmware-lenovo-x13s.bb renamed to ‎recipes-bsp/packagegroups-woa/packagegroup-lenovo-x13s.bb

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
SUMMARY = "Firmware packages for the Lenovo X13s laptop"
1+
SUMMARY = "Packages for the Lenovo X13s laptop"
22

33
inherit packagegroup
44

5-
RRECOMMENDS:${PN} += " \
5+
PACKAGES = " \
6+
${PN}-firmware \
7+
"
8+
9+
RRECOMMENDS:${PN}-firmware = " \
610
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'linux-firmware-qcom-adreno-a660 linux-firmware-qcom-sc8280xp-lenovo-x13s-adreno', '', d)} \
711
${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'linux-firmware-ath11k-wcn6855', '', d)} \
812
${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'linux-firmware-qca-qca2066', '', d)} \

‎recipes-bsp/packagegroups-woa/packagegroup-firmware-lenovo-yoga-c630.bb renamed to ‎recipes-bsp/packagegroups-woa/packagegroup-lenovo-yoga-c630.bb

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
SUMMARY = "Firmware packages for the Lenogo Yoga C630 laptop"
1+
SUMMARY = "Packages for the Lenogo Yoga C630 laptop"
22

33
inherit packagegroup
44

5-
RRECOMMENDS:${PN} += " \
5+
PACKAGES = " \
6+
${PN}-firmware \
7+
"
8+
9+
RRECOMMENDS:${PN}-firmware = " \
610
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'linux-firmware-qcom-adreno-a630 linux-firmware-qcom-lenovo-yoga-c630-adreno', '', d)} \
711
${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'linux-firmware-qca-wcn399x', '', d)} \
812
${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'linux-firmware-ath10k-wcn3990', '', d)} \

‎recipes-bsp/packagegroups-woa/packagegroup-firmware-sc8180x.bb renamed to ‎recipes-bsp/packagegroups-woa/packagegroup-sc8180x.bb

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
SUMMARY = "Firmware packages for the SC8180X devices"
1+
SUMMARY = "Packages for the SC8180X devices"
22

33
inherit packagegroup
44

5-
RRECOMMENDS:${PN} += " \
5+
PACKAGES = " \
6+
${PN}-firmware \
7+
"
8+
9+
RRECOMMENDS:${PN}-firmware = " \
610
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'linux-firmware-qcom-adreno-a640 linux-firmware-qcom-sc8180x-adreno', '', d)} \
711
${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'linux-firmware-qca-wcn399x', '', d)} \
812
${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'linux-firmware-ath10k-wcn3990', '', d)} \

‎recipes-bsp/packagegroups-woa/packagegroup-firmware-x1e80100-crd.bb renamed to ‎recipes-bsp/packagegroups-woa/packagegroup-x1e80100-crd.bb

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
SUMMARY = "Firmware packages for the X1E80100 CRD devices"
1+
SUMMARY = "Packages for the X1E80100 CRD devices"
22

33
inherit packagegroup
44

5-
RRECOMMENDS:${PN} += " \
5+
PACKAGES = " \
6+
${PN}-firmware \
7+
"
8+
9+
RRECOMMENDS:${PN}-firmware = " \
610
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'linux-firmware-qcom-adreno-g750 linux-firmware-qcom-x1e80100-adreno', '', d)} \
711
${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'linux-firmware-qca-wcn7850', '', d)} \
812
${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'linux-firmware-ath12k-wcn7850 linux-firmware-qcom-x1e80100-wifi', '', d)} \

‎recipes-bsp/packagegroups/packagegroup-firmware-ifc6410.bb renamed to ‎recipes-bsp/packagegroups/packagegroup-ifc6410.bb

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
SUMMARY = "Firmware packages for the IFC6410 board"
1+
SUMMARY = "Packages for the IFC6410 board"
22

33
inherit packagegroup
44

5-
RRECOMMENDS:${PN} += " \
5+
PACKAGES = " \
6+
${PN}-firmware \
7+
"
8+
9+
RRECOMMENDS:${PN}-firmware = " \
610
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'linux-firmware-qcom-adreno-a3xx', '', d)} \
711
${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'linux-firmware-ath6k firmware-ath6kl', '', d)} \
812
${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'linux-firmware-ar3k', '', d)} \

‎recipes-bsp/packagegroups/packagegroup-firmware-ifc6560.bb renamed to ‎recipes-bsp/packagegroups/packagegroup-ifc6560.bb

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
SUMMARY = "Firmware packages for the IFC6560 board"
1+
SUMMARY = "Packages for the IFC6560 board"
22

33
inherit packagegroup
44

5-
RRECOMMENDS:${PN} += " \
5+
PACKAGES = " \
6+
${PN}-firmware \
7+
"
8+
9+
RRECOMMENDS:${PN}-firmware = " \
610
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'linux-firmware-qcom-adreno-a530 linux-firmware-qcom-sda660-adreno', '', d)} \
711
${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'linux-firmware-qca', '', d)} \
812
${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'linux-firmware-ath10k-wcn3990', '', d)} \

0 commit comments

Comments
 (0)