scripts: kas: update layers refspec

- Update revisions to the current master latest. - Replace the debug-tweaks image feature that isn't longer available. - Update the layer compatibility. - Set BBLAYERS_LAYERINDEX_NAME. - Remove recipes that are already provided by the required layers of OE / Yocto. - Update the distro configuration. - Enable premirror. Signed-off-by: Thomas Perrot <[email protected]>
sifive · Nov 27, 2024 · 46ad494 · 46ad494
1 parent 1b259f7
commit 46ad494
Show file tree

Hide file tree

Showing 16 changed files with 47 additions and 59 deletions.
diff --git a/conf/distro/freedom-u-sdk.conf b/conf/distro/freedom-u-sdk.conf
@@ -41,28 +41,33 @@ SDKPATHINSTALL = "/opt/${DISTRO}/${SDK_VERSION}"
 DISTRO_EXTRA_RDEPENDS += "${FREEDOM_DEFAULT_EXTRA_RDEPENDS}"
 DISTRO_EXTRA_RRECOMMENDS += "${FREEDOM_DEFAULT_EXTRA_RRECOMMENDS}"
 
-TCLIBCAPPEND = ""
-
 PACKAGE_CLASSES ?= "package_rpm"
 
 SANITY_TESTED_DISTROS ?= " \
-            poky-4.1 \n \
-            poky-4.2 \n \
-            ubuntu-18.04 \n \
+            poky-5.0 \n \
+            poky-5.1 \n \
             ubuntu-20.04 \n \
             ubuntu-22.04 \n \
-            fedora-36 \n \
-            fedora-37 \n \
+            ubuntu-24.04 \n \
+            ubuntu-24.10 \n \
+            fedora-38 \n \
+            fedora-39 \n \
+            fedora-40 \n \
+            centosstream-8 \n \
             debian-11 \n \
-            opensuseleap-15.3 \n \
+            debian-12 \n \
             opensuseleap-15.4 \n \
-            almalinux-8.7 \n \
-            almalinux-9.1 \n \
+            opensuseleap-15.5 \n \
+            opensuseleap-15.6 \n \
+            almalinux-8.8 \n \
+            almalinux-9.2 \n \
+            rocky-9 \n \
             "
 
 require conf/distro/include/no-static-libs.inc
 require conf/distro/include/yocto-uninative.inc
 require conf/distro/include/security_flags.inc
+require conf/distro/include/yocto-space-optimize.inc
 INHERIT += "uninative"
 
 BB_SIGNATURE_HANDLER ?= "OEEquivHash"

diff --git a/conf/layer.conf b/conf/layer.conf
@@ -9,12 +9,14 @@ BBFILE_COLLECTIONS += "freedom-u-sdk"
 BBFILE_PATTERN_freedom-u-sdk = "^${LAYERDIR}/"
 BBFILE_PRIORITY_freedom-u-sdk = "9"
 
-LAYERSERIES_CORENAMES = "styhead"
+LAYERSERIES_CORENAMES = "styhead walnascar"
 
 # This should only be incremented on significant changes that will
 # cause compatibility issues with other layers
 LAYERVERSION_freedom-u-sdk = "2"
-LAYERSERIES_COMPAT_freedom-u-sdk = "styhead"
+LAYERSERIES_COMPAT_freedom-u-sdk = "walnascar"
+
+BBLAYERS_LAYERINDEX_NAME_core = "freedom-u-sdk"
 
 LAYERDEPENDS_freedom-u-sdk = "\
     clang-layer \

diff --git a/conf/templates/default/local.conf.sample b/conf/templates/default/local.conf.sample
@@ -3,6 +3,13 @@ USER_CLASSES:append = " buildhistory buildstats buildstats-summary"
 INHERIT:append = " rm_work"
 RM_OLD_IMAGE = "1"
 
+# mirror
+PREMIRRORS:prepend = "\
+    git://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \
+    ftp://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \
+    http://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \
+    https://.*/.* https://downloads.yoctoproject.org/mirror/sources/ "
+
 # qemu-native
 PACKAGECONFIG:append:pn-qemu-system-native = " sdl"
 PACKAGECONFIG:append:pn-nativesdk-qemu = " sdl"
@@ -11,7 +18,7 @@ PACKAGECONFIG:append:pn-nativesdk-qemu = " sdl"
 CONF_VERSION = "2"
 
 # tensorflow
-BAZEL_TARGET_CPU = "riscv64"
+BAZEL_TARGET_CPU:riscv64 = "riscv64"
 
 MACHINE ??= "qemuriscv64"
 DISTRO ??= "freedom-u-sdk"

diff --git a/meta/recipes-devtools/tcltk8/tcl8_8.6.15.bbappend b/meta/recipes-devtools/tcltk8/tcl8_8.6.15.bbappend
@@ -0,0 +1 @@
+EXTRA_OECONF = "--enable-threads --disable-rpath --enable-man-suffix=tcl8"
diff --git a/recipes-connectivity/blueman/blueman_2.3.5.bbappend b/recipes-connectivity/blueman/blueman_2.3.5.bbappend
diff --git a/...tivity/nfs-utils/nfs-utils_2.6.4.bbappend → ...tivity/nfs-utils/nfs-utils_2.8.1.bbappend b/...tivity/nfs-utils/nfs-utils_2.6.4.bbappend → ...tivity/nfs-utils/nfs-utils_2.8.1.bbappend
diff --git a/recipes-devtools/gcc/libgfortran_14.1.bbappend b/recipes-devtools/gcc/libgfortran_14.1.bbappend
diff --git a/recipes-devtools/tcltk/tcl_9.0.0.bbappend b/recipes-devtools/tcltk/tcl_9.0.0.bbappend
@@ -0,0 +1 @@
+EXTRA_OECONF = "--disable-rpath --enable-man-suffix=tcl9"
diff --git a/recipes-gnome/gtk+/gtk4_4.14.4.bbappend b/recipes-gnome/gtk+/gtk4_4.14.4.bbappend
diff --git a/recipes-graphics/mesa/mesa-gl_24%.bbappend → recipes-graphics/mesa/mesa-gl.bbappend b/recipes-graphics/mesa/mesa-gl_24%.bbappend → recipes-graphics/mesa/mesa-gl.bbappend
diff --git a/recipes-graphics/mesa/mesa_24%.bbappend → recipes-graphics/mesa/mesa.bbappend b/recipes-graphics/mesa/mesa_24%.bbappend → recipes-graphics/mesa/mesa.bbappend
diff --git a/recipes-graphics/vdpauinfo/vdpauinfo_1.4.bb b/recipes-graphics/vdpauinfo/vdpauinfo_1.4.bb
diff --git a/recipes-support/nbd/nbd_3.24.bb b/recipes-support/nbd/nbd_3.24.bb
diff --git a/recipes-support/opencv/opencv_4.10.0.bbappend b/recipes-support/opencv/opencv_4.10.0.bbappend
@@ -0,0 +1,2 @@
+# modules/python/src2/cv2.hpp:39:10: fatal error: numpy/ndarrayobject.h: No such file or directory
+PACKAGECONFIG:remove = "python3"
diff --git a/scripts/kas/include/container.yml b/scripts/kas/include/container.yml
@@ -8,4 +8,4 @@ local_conf_header:
     PARALLEL_MAKE = "-j 4"
     ZSTD_THREADS = "4"
     XZ_THREADS = "4"
-    XZ_MEMLIMIT = "20%"
+    XZ_MEMLIMIT = "10%"
diff --git a/scripts/kas/include/freedom-u-sdk-common.yml b/scripts/kas/include/freedom-u-sdk-common.yml
@@ -7,33 +7,33 @@ repos:
 
   bitbake:
     url: https://git.openembedded.org/bitbake
-    refspec: 1d7360031164f04887c792fb0b2dd86c6ccfcc23
+    refspec: 06aa6c292813a28c84736193b550fb2d18884d43
     layers:
       .: excluded
 
   freedom-u-sdk:
 
   openembedded-core:
     url: https://git.openembedded.org/openembedded-core
-    refspec: bbcd56bace90f4a148960a7108dc8d0e6c364903
+    refspec: 84b407ca5542a6fa828c4b0c62ff60964db73901
     layers:
       meta:
 
   meta-clang:
     url: https://github.com/kraj/meta-clang.git
-    refspec: 79d26d1f33fe3a70cf8a24a74a93771edd18b4f0
+    refspec: 458566f290258d1fe63e95893bae143d9e2ab8e1
     layers:
       .:
 
   meta-sifive:
     url: https://github.com/sifive/meta-sifive.git
-    refspec: 5388bbcbcec0c787c6154b313a71b826a300e21a
+    refspec: 137b22ffc46b442974c4a0ae705366eff85dafa6
     layers:
       .:
 
   meta-openembedded:
     url: https://git.openembedded.org/meta-openembedded
-    refspec: f8342855a440fa5c4194fc57285e8db9e034fcaa
+    refspec: 5d28ad9899387c05805ff8c445bbce4ffe8ab2a6
     layers:
       meta-filesystems:
       meta-gnome:
@@ -45,11 +45,11 @@ repos:
 
   meta-tensorflow-lite:
     url: https://github.com/NobuoTsukamoto/meta-tensorflow-lite.git
-    refspec: e7a78b7d4a400f7b447c5ce6e2d837d6fa7b2341
+    refspec: c6f3a45ed7e41f290f942371bc1dc4354d700143
 
   meta-virtualization:
     url: https://git.yoctoproject.org/meta-virtualization
-    refspec: c138943fed29e768df990061c30d6f071b98ffc3
+    refspec: 1640a4dc81f5d06a1e43c9870fefb2a0d016ef81
     layers:
       .:
 
@@ -71,5 +71,13 @@ local_conf_header:
   sdk: |
     CONF_VERSION = "2"
 
+  mirror: |
+    PREMIRRORS:prepend = "\
+        git://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \
+        ftp://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \
+        http://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \
+        https://.*/.* https://downloads.yoctoproject.org/mirror/sources/ "
+
   tensorflow: |
     BAZEL_TARGET_CPU:riscv64 = "riscv64"
+
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		EXTRA_OECONF = "--enable-threads --disable-rpath --enable-man-suffix=tcl8"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		EXTRA_OECONF = "--disable-rpath --enable-man-suffix=tcl9"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# modules/python/src2/cv2.hpp:39:10: fatal error: numpy/ndarrayobject.h: No such file or directory
		PACKAGECONFIG:remove = "python3"