From 1b82ab75cc4200eaa16b9f69008fe3752e907fd1 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Thu, 12 Sep 2024 10:18:18 +0300 Subject: [PATCH 1/2] firmware-woa: move WoA firmware to dynamic-layers/openembedded-layer WoA firmware depends on cabextract-native, which is a part of meta-oe layer. Move WoA firmware to be dynamically enabled only if meta-oe is a part of the build. Closes #636 Signed-off-by: Dmitry Baryshkov --- .../recipes-bsp}/firmware-woa/files/adspr.jsn | 0 .../recipes-bsp}/firmware-woa/files/adspua.jsn | 0 .../recipes-bsp}/firmware-woa/files/battmgr.jsn | 0 .../recipes-bsp}/firmware-woa/files/cdspr.jsn | 0 .../recipes-bsp}/firmware-woa/files/modemr.jsn | 0 .../recipes-bsp}/firmware-woa/files/modemuw.jsn | 0 .../recipes-bsp}/firmware-woa/files/slpir.jsn | 0 .../recipes-bsp}/firmware-woa/files/slpius.jsn | 0 .../firmware-qcom-ecs-liva-qc710_200.0.10.0.bb | 0 .../firmware-qcom-lenovo-miix-630_200.0.6.0.bb | 0 .../firmware-qcom-lenovo-yoga-c630_200.0.19.0.bb | 0 .../firmware-woa/firmware-qcom-sc8180x_200.0.111.0.bb | 0 .../firmware-woa/firmware-qcom-x1e80100_200.0.32.0.bb | 0 .../recipes-bsp}/firmware-woa/firmware-woa.inc | 0 .../images/initramfs-firmware-ecs-liva-qc710-image.bb | 2 +- .../images/initramfs-firmware-lenovo-miix-630-image.bb | 2 +- .../initramfs-firmware-lenovo-yoga-c630-image.bb | 2 +- .../images/initramfs-firmware-mega-image.bbappend | 9 +++++++++ .../images/initramfs-firmware-sc8180x-image.bb | 2 +- .../images/initramfs-firmware-x1e80100-crd-image.bb | 2 +- .../packagegroup-firmware-ecs-liva-qc710.bb | 0 .../packagegroup-firmware-lenovo-miix-630.bb | 0 .../packagegroup-firmware-lenovo-yoga-c630.bb | 0 .../packagegroups/packagegroup-firmware-sc8180x.bb | 0 .../packagegroup-firmware-x1e80100-crd.bb | 0 recipes-bsp/images/initramfs-firmware-mega-image.bb | 10 ---------- 26 files changed, 14 insertions(+), 15 deletions(-) rename {recipes-bsp => dynamic-layers/openembedded-layer/recipes-bsp}/firmware-woa/files/adspr.jsn (100%) rename {recipes-bsp => dynamic-layers/openembedded-layer/recipes-bsp}/firmware-woa/files/adspua.jsn (100%) rename {recipes-bsp => dynamic-layers/openembedded-layer/recipes-bsp}/firmware-woa/files/battmgr.jsn (100%) rename {recipes-bsp => dynamic-layers/openembedded-layer/recipes-bsp}/firmware-woa/files/cdspr.jsn (100%) rename {recipes-bsp => dynamic-layers/openembedded-layer/recipes-bsp}/firmware-woa/files/modemr.jsn (100%) rename {recipes-bsp => dynamic-layers/openembedded-layer/recipes-bsp}/firmware-woa/files/modemuw.jsn (100%) rename {recipes-bsp => dynamic-layers/openembedded-layer/recipes-bsp}/firmware-woa/files/slpir.jsn (100%) rename {recipes-bsp => dynamic-layers/openembedded-layer/recipes-bsp}/firmware-woa/files/slpius.jsn (100%) rename {recipes-bsp => dynamic-layers/openembedded-layer/recipes-bsp}/firmware-woa/firmware-qcom-ecs-liva-qc710_200.0.10.0.bb (100%) rename {recipes-bsp => dynamic-layers/openembedded-layer/recipes-bsp}/firmware-woa/firmware-qcom-lenovo-miix-630_200.0.6.0.bb (100%) rename {recipes-bsp => dynamic-layers/openembedded-layer/recipes-bsp}/firmware-woa/firmware-qcom-lenovo-yoga-c630_200.0.19.0.bb (100%) rename {recipes-bsp => dynamic-layers/openembedded-layer/recipes-bsp}/firmware-woa/firmware-qcom-sc8180x_200.0.111.0.bb (100%) rename {recipes-bsp => dynamic-layers/openembedded-layer/recipes-bsp}/firmware-woa/firmware-qcom-x1e80100_200.0.32.0.bb (100%) rename {recipes-bsp => dynamic-layers/openembedded-layer/recipes-bsp}/firmware-woa/firmware-woa.inc (100%) rename {recipes-bsp => dynamic-layers/openembedded-layer/recipes-bsp}/images/initramfs-firmware-ecs-liva-qc710-image.bb (72%) rename {recipes-bsp => dynamic-layers/openembedded-layer/recipes-bsp}/images/initramfs-firmware-lenovo-miix-630-image.bb (71%) rename {recipes-bsp => dynamic-layers/openembedded-layer/recipes-bsp}/images/initramfs-firmware-lenovo-yoga-c630-image.bb (72%) create mode 100644 dynamic-layers/openembedded-layer/recipes-bsp/images/initramfs-firmware-mega-image.bbappend rename {recipes-bsp => dynamic-layers/openembedded-layer/recipes-bsp}/images/initramfs-firmware-sc8180x-image.bb (84%) rename {recipes-bsp => dynamic-layers/openembedded-layer/recipes-bsp}/images/initramfs-firmware-x1e80100-crd-image.bb (83%) rename {recipes-bsp => dynamic-layers/openembedded-layer/recipes-bsp}/packagegroups/packagegroup-firmware-ecs-liva-qc710.bb (100%) rename {recipes-bsp => dynamic-layers/openembedded-layer/recipes-bsp}/packagegroups/packagegroup-firmware-lenovo-miix-630.bb (100%) rename {recipes-bsp => dynamic-layers/openembedded-layer/recipes-bsp}/packagegroups/packagegroup-firmware-lenovo-yoga-c630.bb (100%) rename {recipes-bsp => dynamic-layers/openembedded-layer/recipes-bsp}/packagegroups/packagegroup-firmware-sc8180x.bb (100%) rename {recipes-bsp => dynamic-layers/openembedded-layer/recipes-bsp}/packagegroups/packagegroup-firmware-x1e80100-crd.bb (100%) diff --git a/recipes-bsp/firmware-woa/files/adspr.jsn b/dynamic-layers/openembedded-layer/recipes-bsp/firmware-woa/files/adspr.jsn similarity index 100% rename from recipes-bsp/firmware-woa/files/adspr.jsn rename to dynamic-layers/openembedded-layer/recipes-bsp/firmware-woa/files/adspr.jsn diff --git a/recipes-bsp/firmware-woa/files/adspua.jsn b/dynamic-layers/openembedded-layer/recipes-bsp/firmware-woa/files/adspua.jsn similarity index 100% rename from recipes-bsp/firmware-woa/files/adspua.jsn rename to dynamic-layers/openembedded-layer/recipes-bsp/firmware-woa/files/adspua.jsn diff --git a/recipes-bsp/firmware-woa/files/battmgr.jsn b/dynamic-layers/openembedded-layer/recipes-bsp/firmware-woa/files/battmgr.jsn similarity index 100% rename from recipes-bsp/firmware-woa/files/battmgr.jsn rename to dynamic-layers/openembedded-layer/recipes-bsp/firmware-woa/files/battmgr.jsn diff --git a/recipes-bsp/firmware-woa/files/cdspr.jsn b/dynamic-layers/openembedded-layer/recipes-bsp/firmware-woa/files/cdspr.jsn similarity index 100% rename from recipes-bsp/firmware-woa/files/cdspr.jsn rename to dynamic-layers/openembedded-layer/recipes-bsp/firmware-woa/files/cdspr.jsn diff --git a/recipes-bsp/firmware-woa/files/modemr.jsn b/dynamic-layers/openembedded-layer/recipes-bsp/firmware-woa/files/modemr.jsn similarity index 100% rename from recipes-bsp/firmware-woa/files/modemr.jsn rename to dynamic-layers/openembedded-layer/recipes-bsp/firmware-woa/files/modemr.jsn diff --git a/recipes-bsp/firmware-woa/files/modemuw.jsn b/dynamic-layers/openembedded-layer/recipes-bsp/firmware-woa/files/modemuw.jsn similarity index 100% rename from recipes-bsp/firmware-woa/files/modemuw.jsn rename to dynamic-layers/openembedded-layer/recipes-bsp/firmware-woa/files/modemuw.jsn diff --git a/recipes-bsp/firmware-woa/files/slpir.jsn b/dynamic-layers/openembedded-layer/recipes-bsp/firmware-woa/files/slpir.jsn similarity index 100% rename from recipes-bsp/firmware-woa/files/slpir.jsn rename to dynamic-layers/openembedded-layer/recipes-bsp/firmware-woa/files/slpir.jsn diff --git a/recipes-bsp/firmware-woa/files/slpius.jsn b/dynamic-layers/openembedded-layer/recipes-bsp/firmware-woa/files/slpius.jsn similarity index 100% rename from recipes-bsp/firmware-woa/files/slpius.jsn rename to dynamic-layers/openembedded-layer/recipes-bsp/firmware-woa/files/slpius.jsn diff --git a/recipes-bsp/firmware-woa/firmware-qcom-ecs-liva-qc710_200.0.10.0.bb b/dynamic-layers/openembedded-layer/recipes-bsp/firmware-woa/firmware-qcom-ecs-liva-qc710_200.0.10.0.bb similarity index 100% rename from recipes-bsp/firmware-woa/firmware-qcom-ecs-liva-qc710_200.0.10.0.bb rename to dynamic-layers/openembedded-layer/recipes-bsp/firmware-woa/firmware-qcom-ecs-liva-qc710_200.0.10.0.bb diff --git a/recipes-bsp/firmware-woa/firmware-qcom-lenovo-miix-630_200.0.6.0.bb b/dynamic-layers/openembedded-layer/recipes-bsp/firmware-woa/firmware-qcom-lenovo-miix-630_200.0.6.0.bb similarity index 100% rename from recipes-bsp/firmware-woa/firmware-qcom-lenovo-miix-630_200.0.6.0.bb rename to dynamic-layers/openembedded-layer/recipes-bsp/firmware-woa/firmware-qcom-lenovo-miix-630_200.0.6.0.bb diff --git a/recipes-bsp/firmware-woa/firmware-qcom-lenovo-yoga-c630_200.0.19.0.bb b/dynamic-layers/openembedded-layer/recipes-bsp/firmware-woa/firmware-qcom-lenovo-yoga-c630_200.0.19.0.bb similarity index 100% rename from recipes-bsp/firmware-woa/firmware-qcom-lenovo-yoga-c630_200.0.19.0.bb rename to dynamic-layers/openembedded-layer/recipes-bsp/firmware-woa/firmware-qcom-lenovo-yoga-c630_200.0.19.0.bb diff --git a/recipes-bsp/firmware-woa/firmware-qcom-sc8180x_200.0.111.0.bb b/dynamic-layers/openembedded-layer/recipes-bsp/firmware-woa/firmware-qcom-sc8180x_200.0.111.0.bb similarity index 100% rename from recipes-bsp/firmware-woa/firmware-qcom-sc8180x_200.0.111.0.bb rename to dynamic-layers/openembedded-layer/recipes-bsp/firmware-woa/firmware-qcom-sc8180x_200.0.111.0.bb diff --git a/recipes-bsp/firmware-woa/firmware-qcom-x1e80100_200.0.32.0.bb b/dynamic-layers/openembedded-layer/recipes-bsp/firmware-woa/firmware-qcom-x1e80100_200.0.32.0.bb similarity index 100% rename from recipes-bsp/firmware-woa/firmware-qcom-x1e80100_200.0.32.0.bb rename to dynamic-layers/openembedded-layer/recipes-bsp/firmware-woa/firmware-qcom-x1e80100_200.0.32.0.bb diff --git a/recipes-bsp/firmware-woa/firmware-woa.inc b/dynamic-layers/openembedded-layer/recipes-bsp/firmware-woa/firmware-woa.inc similarity index 100% rename from recipes-bsp/firmware-woa/firmware-woa.inc rename to dynamic-layers/openembedded-layer/recipes-bsp/firmware-woa/firmware-woa.inc diff --git a/recipes-bsp/images/initramfs-firmware-ecs-liva-qc710-image.bb b/dynamic-layers/openembedded-layer/recipes-bsp/images/initramfs-firmware-ecs-liva-qc710-image.bb similarity index 72% rename from recipes-bsp/images/initramfs-firmware-ecs-liva-qc710-image.bb rename to dynamic-layers/openembedded-layer/recipes-bsp/images/initramfs-firmware-ecs-liva-qc710-image.bb index 04de5f5ae..7569f3e3a 100644 --- a/recipes-bsp/images/initramfs-firmware-ecs-liva-qc710-image.bb +++ b/dynamic-layers/openembedded-layer/recipes-bsp/images/initramfs-firmware-ecs-liva-qc710-image.bb @@ -4,4 +4,4 @@ PACKAGE_INSTALL += " \ packagegroup-firmware-ecs-liva-qc710 \ " -require initramfs-firmware-image.inc +require recipes-bsp/images/initramfs-firmware-image.inc diff --git a/recipes-bsp/images/initramfs-firmware-lenovo-miix-630-image.bb b/dynamic-layers/openembedded-layer/recipes-bsp/images/initramfs-firmware-lenovo-miix-630-image.bb similarity index 71% rename from recipes-bsp/images/initramfs-firmware-lenovo-miix-630-image.bb rename to dynamic-layers/openembedded-layer/recipes-bsp/images/initramfs-firmware-lenovo-miix-630-image.bb index b4607be1c..9fef6d9dd 100644 --- a/recipes-bsp/images/initramfs-firmware-lenovo-miix-630-image.bb +++ b/dynamic-layers/openembedded-layer/recipes-bsp/images/initramfs-firmware-lenovo-miix-630-image.bb @@ -4,4 +4,4 @@ PACKAGE_INSTALL += " \ packagegroup-firmware-lenovo-miix-630 \ " -require initramfs-firmware-image.inc +require recipes-bsp/images/initramfs-firmware-image.inc diff --git a/recipes-bsp/images/initramfs-firmware-lenovo-yoga-c630-image.bb b/dynamic-layers/openembedded-layer/recipes-bsp/images/initramfs-firmware-lenovo-yoga-c630-image.bb similarity index 72% rename from recipes-bsp/images/initramfs-firmware-lenovo-yoga-c630-image.bb rename to dynamic-layers/openembedded-layer/recipes-bsp/images/initramfs-firmware-lenovo-yoga-c630-image.bb index 96514bf76..b42f6cb66 100644 --- a/recipes-bsp/images/initramfs-firmware-lenovo-yoga-c630-image.bb +++ b/dynamic-layers/openembedded-layer/recipes-bsp/images/initramfs-firmware-lenovo-yoga-c630-image.bb @@ -4,4 +4,4 @@ PACKAGE_INSTALL += " \ packagegroup-firmware-lenovo-yoga-c630 \ " -require initramfs-firmware-image.inc +require recipes-bsp/images/initramfs-firmware-image.inc diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/images/initramfs-firmware-mega-image.bbappend b/dynamic-layers/openembedded-layer/recipes-bsp/images/initramfs-firmware-mega-image.bbappend new file mode 100644 index 000000000..eec5c54f1 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-bsp/images/initramfs-firmware-mega-image.bbappend @@ -0,0 +1,9 @@ +# WoA devices +PACKAGE_INSTALL += " \ + packagegroup-firmware-ecs-liva-qc710 \ + packagegroup-firmware-lenovo-miix-630 \ + packagegroup-firmware-lenovo-yoga-c630 \ + packagegroup-firmware-lenovo-x13s \ + packagegroup-firmware-sc8180x \ + packagegroup-firmware-x1e80100-crd \ +" diff --git a/recipes-bsp/images/initramfs-firmware-sc8180x-image.bb b/dynamic-layers/openembedded-layer/recipes-bsp/images/initramfs-firmware-sc8180x-image.bb similarity index 84% rename from recipes-bsp/images/initramfs-firmware-sc8180x-image.bb rename to dynamic-layers/openembedded-layer/recipes-bsp/images/initramfs-firmware-sc8180x-image.bb index 24dec4f4b..51dd59772 100644 --- a/recipes-bsp/images/initramfs-firmware-sc8180x-image.bb +++ b/dynamic-layers/openembedded-layer/recipes-bsp/images/initramfs-firmware-sc8180x-image.bb @@ -11,4 +11,4 @@ BAD_RECOMMENDATIONS = " \ linux-firmware-qcom-sc8180x-venus \ " -require initramfs-firmware-image.inc +require recipes-bsp/images/initramfs-firmware-image.inc diff --git a/recipes-bsp/images/initramfs-firmware-x1e80100-crd-image.bb b/dynamic-layers/openembedded-layer/recipes-bsp/images/initramfs-firmware-x1e80100-crd-image.bb similarity index 83% rename from recipes-bsp/images/initramfs-firmware-x1e80100-crd-image.bb rename to dynamic-layers/openembedded-layer/recipes-bsp/images/initramfs-firmware-x1e80100-crd-image.bb index 69085c83e..655ce9141 100644 --- a/recipes-bsp/images/initramfs-firmware-x1e80100-crd-image.bb +++ b/dynamic-layers/openembedded-layer/recipes-bsp/images/initramfs-firmware-x1e80100-crd-image.bb @@ -10,4 +10,4 @@ BAD_RECOMMENDATIONS = " \ linux-firmware-qcom-x1e80100-crd-venus \ " -require initramfs-firmware-image.inc +require recipes-bsp/images/initramfs-firmware-image.inc diff --git a/recipes-bsp/packagegroups/packagegroup-firmware-ecs-liva-qc710.bb b/dynamic-layers/openembedded-layer/recipes-bsp/packagegroups/packagegroup-firmware-ecs-liva-qc710.bb similarity index 100% rename from recipes-bsp/packagegroups/packagegroup-firmware-ecs-liva-qc710.bb rename to dynamic-layers/openembedded-layer/recipes-bsp/packagegroups/packagegroup-firmware-ecs-liva-qc710.bb diff --git a/recipes-bsp/packagegroups/packagegroup-firmware-lenovo-miix-630.bb b/dynamic-layers/openembedded-layer/recipes-bsp/packagegroups/packagegroup-firmware-lenovo-miix-630.bb similarity index 100% rename from recipes-bsp/packagegroups/packagegroup-firmware-lenovo-miix-630.bb rename to dynamic-layers/openembedded-layer/recipes-bsp/packagegroups/packagegroup-firmware-lenovo-miix-630.bb diff --git a/recipes-bsp/packagegroups/packagegroup-firmware-lenovo-yoga-c630.bb b/dynamic-layers/openembedded-layer/recipes-bsp/packagegroups/packagegroup-firmware-lenovo-yoga-c630.bb similarity index 100% rename from recipes-bsp/packagegroups/packagegroup-firmware-lenovo-yoga-c630.bb rename to dynamic-layers/openembedded-layer/recipes-bsp/packagegroups/packagegroup-firmware-lenovo-yoga-c630.bb diff --git a/recipes-bsp/packagegroups/packagegroup-firmware-sc8180x.bb b/dynamic-layers/openembedded-layer/recipes-bsp/packagegroups/packagegroup-firmware-sc8180x.bb similarity index 100% rename from recipes-bsp/packagegroups/packagegroup-firmware-sc8180x.bb rename to dynamic-layers/openembedded-layer/recipes-bsp/packagegroups/packagegroup-firmware-sc8180x.bb diff --git a/recipes-bsp/packagegroups/packagegroup-firmware-x1e80100-crd.bb b/dynamic-layers/openembedded-layer/recipes-bsp/packagegroups/packagegroup-firmware-x1e80100-crd.bb similarity index 100% rename from recipes-bsp/packagegroups/packagegroup-firmware-x1e80100-crd.bb rename to dynamic-layers/openembedded-layer/recipes-bsp/packagegroups/packagegroup-firmware-x1e80100-crd.bb diff --git a/recipes-bsp/images/initramfs-firmware-mega-image.bb b/recipes-bsp/images/initramfs-firmware-mega-image.bb index 4df211003..b6285a2b8 100644 --- a/recipes-bsp/images/initramfs-firmware-mega-image.bb +++ b/recipes-bsp/images/initramfs-firmware-mega-image.bb @@ -51,14 +51,4 @@ PACKAGE_INSTALL += " \ firmware-qcom-pixel5a-5g \ " -# WoA devices -PACKAGE_INSTALL += " \ - packagegroup-firmware-ecs-liva-qc710 \ - packagegroup-firmware-lenovo-miix-630 \ - packagegroup-firmware-lenovo-yoga-c630 \ - packagegroup-firmware-lenovo-x13s \ - packagegroup-firmware-sc8180x \ - packagegroup-firmware-x1e80100-crd \ -" - require initramfs-firmware-image.inc From e0ac10913df6ed96784c3549926c16a44a4205fe Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Thu, 12 Sep 2024 10:21:25 +0300 Subject: [PATCH 2/2] layer.conf: add openembedded-layer to LAYERRECOMMENDS The meta-qcom layer has enough optional features that depend on the meta-oe layer (WoA firmware, gpsd, adbd). Specify that it's recommented to use meta-oe layer. Signed-off-by: Dmitry Baryshkov --- conf/layer.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/layer.conf b/conf/layer.conf index 47d3b0d07..151086f54 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -10,6 +10,7 @@ BBFILE_PATTERN_qcom := "^${LAYERDIR}/" BBFILE_PRIORITY_qcom = "5" LAYERDEPENDS_qcom = "core" +LAYERRECOMMENDS_qcom = "openembedded-layer" LAYERSERIES_COMPAT_qcom = "styhead" BBFILES_DYNAMIC += " \