diff --git a/meta-openeuler/recipes-kernel/linux/linux-openeuler.inc b/meta-openeuler/recipes-kernel/linux/linux-openeuler.inc index 2e0e7979eea8e5143cc3c88de3fe222606e70028..9fbdddc6ec177a5d9ef3a6cd1dacf83e46674bec 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 @@ -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) }