From adef68414f3ff580429eff30f15f9d17b34acad8 Mon Sep 17 00:00:00 2001 From: "Xu, Yanfei" Date: Mon, 1 Nov 2021 18:13:19 +0800 Subject: lxc: update to 4.0.11 update to 4.0.11 1.drop two patches that have been integrated to upstream repo. 2.drop tests-add-no-validate-when-using-download-template.patch because it is no longer appropriate as the "download" has been replaced with "busybox" 3.fix the apply failure of templates-use-curl-instead-of-wget.patch 4.update lxc from 4.0.10 to 4.0.11 Signed-off-by: Yanfei Xu Signed-off-by: Bruce Ashfield --- ...-no-validate-when-using-download-template.patch | 85 ---------------------- 1 file changed, 85 deletions(-) delete mode 100644 recipes-containers/lxc/files/tests-add-no-validate-when-using-download-template.patch (limited to 'recipes-containers/lxc/files/tests-add-no-validate-when-using-download-template.patch') diff --git a/recipes-containers/lxc/files/tests-add-no-validate-when-using-download-template.patch b/recipes-containers/lxc/files/tests-add-no-validate-when-using-download-template.patch deleted file mode 100644 index f335e796..00000000 --- a/recipes-containers/lxc/files/tests-add-no-validate-when-using-download-template.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 1c2506434e744d8c6a86e42c9d8bae4cde7553f6 Mon Sep 17 00:00:00 2001 -From: Mark Asselstine -Date: Thu, 31 May 2018 15:14:26 -0400 -Subject: [PATCH] tests: add '--no-validate' when using download template - -We are usually running the ptests with core-image-minimal which has no -mechanism to validate the downloads. Validation isn't really of -interest to this test at any rate so simply add '--no-validate' to -avoid failing due to no GPG validation. - -Signed-off-by: Mark Asselstine - ---- - src/tests/lxc-test-apparmor-mount | 2 +- - src/tests/lxc-test-autostart | 2 +- - src/tests/lxc-test-no-new-privs | 2 +- - src/tests/lxc-test-unpriv | 2 +- - src/tests/lxc-test-usernic.in | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - -Index: lxc-4.0.9/src/tests/lxc-test-apparmor-mount -=================================================================== ---- lxc-4.0.9.orig/src/tests/lxc-test-apparmor-mount -+++ lxc-4.0.9/src/tests/lxc-test-apparmor-mount -@@ -170,7 +170,7 @@ - done - fi - --run_cmd lxc-create -t download -n $cname -- -d ubuntu -r $release -a $ARCH -+run_cmd lxc-create -t download -n $cname -- --no-validate -d ubuntu -r $release -a $ARCH - - echo "test default confined container" - run_cmd lxc-start -n $cname -d -lDEBUG -o "$logfile" -Index: lxc-4.0.9/src/tests/lxc-test-autostart -=================================================================== ---- lxc-4.0.9.orig/src/tests/lxc-test-autostart -+++ lxc-4.0.9/src/tests/lxc-test-autostart -@@ -55,7 +55,7 @@ - done - fi - --lxc-create -t download -n $CONTAINER_NAME -B dir -- -d ubuntu -r $release -a $ARCH -+lxc-create -t download -n $CONTAINER_NAME -B dir -- --no-validate -d ubuntu -r $release -a $ARCH - CONTAINER_PATH=$(dirname $(lxc-info -n $CONTAINER_NAME -c lxc.rootfs.path -H) | sed -e 's/dir://') - cp $CONTAINER_PATH/config $CONTAINER_PATH/config.bak - -Index: lxc-4.0.9/src/tests/lxc-test-no-new-privs -=================================================================== ---- lxc-4.0.9.orig/src/tests/lxc-test-no-new-privs -+++ lxc-4.0.9/src/tests/lxc-test-no-new-privs -@@ -49,7 +49,7 @@ - ARCH=$(dpkg --print-architecture) - fi - --lxc-create -t download -n c1 -- -d ubuntu -r xenial -a $ARCH -+lxc-create -t download -n c1 -- --no-validate -d ubuntu -r xenial -a $ARCH - echo "lxc.no_new_privs = 1" >> /var/lib/lxc/c1/config - - lxc-start -n c1 -Index: lxc-4.0.9/src/tests/lxc-test-unpriv -=================================================================== ---- lxc-4.0.9.orig/src/tests/lxc-test-unpriv -+++ lxc-4.0.9/src/tests/lxc-test-unpriv -@@ -178,7 +178,7 @@ - cp -R /var/cache/lxc/download $HDIR/.cache/lxc && \ - chown -R $TUSER: $HDIR/.cache/lxc - --run_cmd lxc-create -t download -n c1 -l trace -o "${UNPRIV_LOG}" -- -d ubuntu -r $release -a $ARCH -+run_cmd lxc-create -t download -n c1 -l trace -o "${UNPRIV_LOG}" -- --no-validate -d ubuntu -r $release -a $ARCH - - # Make sure we can start it - twice - -Index: lxc-4.0.9/src/tests/lxc-test-usernic.in -=================================================================== ---- lxc-4.0.9.orig/src/tests/lxc-test-usernic.in -+++ lxc-4.0.9/src/tests/lxc-test-usernic.in -@@ -147,7 +147,7 @@ - fi - - # Create three containers --run_cmd "lxc-create -t download -n b1 -- -d ubuntu -r $release -a $ARCH" -+run_cmd "lxc-create -t download -n b1 -- --no-validate -d ubuntu -r $release -a $ARCH" - run_cmd "lxc-start -n b1 -d" - p1=$(run_cmd "lxc-info -n b1 -p -H") - -- cgit v1.2.3-54-g00ecf