remove the rest of the layer meta-leda-backports

- remove llvm from backports layer (the correct version required by meta-clang is already present there.) - add BBMASK to poky llvm to avoid build time warnings Signed-off-by: Guenther Meyer <g.meyer@signum-media.de>
eclipse-leda · Dec 19, 2023 · 13b4f6c · 13b4f6c
1 parent a534db9
commit 13b4f6c
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 340 deletions.
diff --git a/.config.yaml b/.config.yaml
@@ -41,6 +41,9 @@ local_conf_header:
     RAUC_CERT_FILE = "${TOPDIR}/../examples/rauc/development-1.cert.pem"
     RAUC_KEYRING_URI = "file://${TOPDIR}/../examples/rauc/ca.cert.pem"
     RAUC_KEYRING_FILE = "${TOPDIR}/../examples/rauc/ca.cert.pem"
+  meta-clang: |
+    # mask the llvm recipe provided by kirkstone to avoid warnings:
+    BBMASK += "/poky/meta/recipes-devtools/llvm/"
 repos:
   # This entry includes the repository where the config file is located
   # to the bblayers.conf:
@@ -88,7 +91,6 @@ repos:
     path: ./
     layers:
       meta-leda-bsp:
-      meta-leda-backports:
       meta-leda-components:
       meta-leda-distro:
       meta-leda-distro-container:
diff --git a/kas/.config-components.yaml b/kas/.config-components.yaml
@@ -30,6 +30,9 @@ local_conf_header:
   needed-features: |
     DISTRO_FEATURES += " sdv rauc virtualization"
     INHERIT += " rm_work"
+  meta-clang: |
+    # mask the llvm recipe provided by kirkstone to avoid warnings:
+    BBMASK += "/poky/meta/recipes-devtools/llvm/"
 repos:
   poky:
     url: "https://git.yoctoproject.org/git/poky"
@@ -67,5 +70,4 @@ repos:
   meta-leda:
     path: ./
     layers:
-      meta-leda-backports:
       meta-leda-components:
diff --git a/kas/.config-kirkstone-rpi4.yaml b/kas/.config-kirkstone-rpi4.yaml
@@ -41,6 +41,9 @@ local_conf_header:
     RAUC_CERT_FILE = "${COREBASE}/../examples/rauc/development-1.cert.pem"
     RAUC_KEYRING_URI = "file://${TOPDIR}/../examples/rauc/ca.cert.pem"
     RAUC_KEYRING_FILE = "${TOPDIR}/../examples/rauc/ca.cert.pem"
+  meta-clang: |
+    # mask the llvm recipe provided by kirkstone to avoid warnings:
+    BBMASK += "/poky/meta/recipes-devtools/llvm/"
 repos:
   # This entry includes the repository where the config file is located
   # to the bblayers.conf:
@@ -91,7 +94,6 @@ repos:
     path: ./
     layers:
       meta-leda-bsp:
-      meta-leda-backports:
       meta-leda-components:
       meta-leda-distro:
       meta-leda-distro-container:
diff --git a/kas/.config-kirkstone.yaml b/kas/.config-kirkstone.yaml
@@ -41,6 +41,9 @@ local_conf_header:
     RAUC_CERT_FILE = "${TOPDIR}/../examples/rauc/development-1.cert.pem"
     RAUC_KEYRING_URI = "file://${TOPDIR}/../examples/rauc/ca.cert.pem"
     RAUC_KEYRING_FILE = "${TOPDIR}/../examples/rauc/ca.cert.pem"
+  meta-clang: |
+    # mask the llvm recipe provided by kirkstone to avoid warnings:
+    BBMASK += "/poky/meta/recipes-devtools/llvm/"
 repos:
   # This entry includes the repository where the config file is located
   # to the bblayers.conf:
@@ -88,7 +91,6 @@ repos:
     path: ./
     layers:
       meta-leda-bsp:
-      meta-leda-backports:
       meta-leda-components:
       meta-leda-distro:
       meta-leda-distro-container:
diff --git a/kas/.config-master.yaml b/kas/.config-master.yaml
@@ -41,6 +41,9 @@ local_conf_header:
     RAUC_CERT_FILE = "${TOPDIR}/../examples/rauc/development-1.cert.pem"
     RAUC_KEYRING_URI = "file://${TOPDIR}/../examples/rauc/ca.cert.pem"
     RAUC_KEYRING_FILE = "${TOPDIR}/../examples/rauc/ca.cert.pem"
+  meta-clang: |
+    # mask the llvm recipe provided by kirkstone to avoid warnings:
+    BBMASK += "/poky/meta/recipes-devtools/llvm/"
 repos:
   # This entry includes the repository where the config file is located
   # to the bblayers.conf:
@@ -88,7 +91,6 @@ repos:
     path: ./
     layers:
       meta-leda-bsp:
-      meta-leda-backports:
       meta-leda-components:
       meta-leda-distro:
       meta-leda-distro-container:
diff --git a/meta-leda-backports/conf/layer.conf b/meta-leda-backports/conf/layer.conf
diff --git a/meta-leda-backports/recipes-devtools/COPYING.MIT b/meta-leda-backports/recipes-devtools/COPYING.MIT
diff --git a/...ecipes-devtools/llvm/llvm/0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch b/...ecipes-devtools/llvm/llvm/0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch
diff --git a/...-leda-backports/recipes-devtools/llvm/llvm/0007-llvm-allow-env-override-of-exe-path.patch b/...-leda-backports/recipes-devtools/llvm/llvm/0007-llvm-allow-env-override-of-exe-path.patch
diff --git a/meta-leda-backports/recipes-devtools/llvm/llvm/llvm-config b/meta-leda-backports/recipes-devtools/llvm/llvm/llvm-config