From bca86955dc3d340c857032d43d5e12fcbf0e7c07 Mon Sep 17 00:00:00 2001 From: egg12138 Date: Thu, 20 Nov 2025 11:12:08 +0800 Subject: [PATCH 1/2] fix: linux-openeuler task do_container_configs - add timeout for test script downloading Signed-off-by: egg12318 --- meta-openeuler/recipes-kernel/linux/linux-openeuler.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-openeuler/recipes-kernel/linux/linux-openeuler.inc b/meta-openeuler/recipes-kernel/linux/linux-openeuler.inc index 2e0e7979eea..4f3b4c5061d 100644 --- a/meta-openeuler/recipes-kernel/linux/linux-openeuler.inc +++ b/meta-openeuler/recipes-kernel/linux/linux-openeuler.inc @@ -211,7 +211,7 @@ SRC_URI:append:qemu-aarch64= "${@bb.utils.contains('DISTRO_FEATURES', 'oe-xfce', do_container_configs[doc] = "Checks the kernel configs required by container, parses the output, and issues warnings/notes for missing configs." do_container_configs() { - wget -P ${WORKDIR} https://github.com/moby/moby/raw/master/contrib/check-config.sh || true + wget --timeout=10 -P ${WORKDIR} https://github.com/moby/moby/raw/master/contrib/check-config.sh || true if [ -f ${WORKDIR}/check-config.sh ]; then sed -i 's,zcat "$2" | grep "$1", cat "$2" | grep "$1",g' ${WORKDIR}/check-config.sh chmod +x ${WORKDIR}/check-config.sh -- Gitee From 826e54d696084f6c527725359cba47f59b5cdc60 Mon Sep 17 00:00:00 2001 From: egg12138 Date: Thu, 27 Nov 2025 10:06:18 +0800 Subject: [PATCH 2/2] bitbake-task: update do_container_configs toggling * add some conditions to toggle do_container_configs realted DISTRO_FEATURES may not exist now but future Signed-off-by: egg12138 --- meta-openeuler/recipes-kernel/linux/linux-openeuler.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-openeuler/recipes-kernel/linux/linux-openeuler.inc b/meta-openeuler/recipes-kernel/linux/linux-openeuler.inc index 4f3b4c5061d..9fbdddc6ec1 100644 --- a/meta-openeuler/recipes-kernel/linux/linux-openeuler.inc +++ b/meta-openeuler/recipes-kernel/linux/linux-openeuler.inc @@ -245,6 +245,6 @@ do_container_configs() { } python () { - if bb.utils.contains_any('DISTRO_FEATURES', 'containerd k3s', True, False, d): + if bb.utils.contains_any('DISTRO_FEATURES', 'containerd k3s-agent k3s-server docker podman containers', True, False, d): bb.build.addtask('container_configs', 'do_compile', 'do_configure',d) } -- Gitee