MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 12:50:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

lxc: refresh patches to remove fuzz

Browse Source 
The recent uprev of lxc left some fuzz in a patches. devtool refresh
cleans this up, and no runtime issues have been detected.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Bruce Ashfield 2020-04-14 15:57:16 -04:00
parent 660ffa675e
commit a24ce339fd
9 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
recipes-containers/lxc/files/logs-optionally-use-base-filenames-to-report-src-fil.patch
View File

@ -1,4 +1,4 @@
From c50ddb2b2cf22a29e4c671b1efbd338eeba694aa Mon Sep 17 00:00:00 2001 From 0cfa202f5d96a35692f063f35bf4706f310b17e4 Mon Sep 17 00:00:00 2001
From: Jim Somerville <Jim.Somerville@windriver.com> From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Fri, 25 Sep 2015 15:08:17 -0400 Date: Fri, 25 Sep 2015 15:08:17 -0400
Subject: [PATCH] logs: optionally use base filenames to report src files Subject: [PATCH] logs: optionally use base filenames to report src files
@ -30,11 +30,11 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
2 files changed, 14 insertions(+) 2 files changed, 14 insertions(+)
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index 74b976a..9c561f7 100644 index a3272e9..a2d4c29 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -356,6 +356,15 @@ AC_ARG_ENABLE([examples], @@ -378,6 +378,15 @@ AC_ARG_ENABLE([examples],
[], [enable_examples=yes]) [enable_examples=$enableval], [enable_examples=yes])
AM_CONDITIONAL([ENABLE_EXAMPLES], [test "x$enable_examples" = "xyes"]) AM_CONDITIONAL([ENABLE_EXAMPLES], [test "x$enable_examples" = "xyes"])
+# Enable basenames in the logs for source files +# Enable basenames in the logs for source files
@ -48,12 +48,12 @@ index 74b976a..9c561f7 100644
+ +
# Enable dumping stack traces # Enable dumping stack traces
AC_ARG_ENABLE([mutex-debugging], AC_ARG_ENABLE([mutex-debugging],
[AC_HELP_STRING([--enable-mutex-debugging], [Makes mutexes to report error and provide stack trace [default=no]])], [AS_HELP_STRING([--enable-mutex-debugging], [Makes mutexes to report error and provide stack trace [default=no]])],
diff --git a/src/lxc/log.h b/src/lxc/log.h diff --git a/src/lxc/log.h b/src/lxc/log.h
index 4654fd9..6885d78 100644 index d280656..62cbf4f 100644
--- a/src/lxc/log.h --- a/src/lxc/log.h
+++ b/src/lxc/log.h +++ b/src/lxc/log.h
@@ -77,8 +77,13 @@ struct lxc_log_locinfo { @@ -47,8 +47,13 @@ struct lxc_log_locinfo {
int line; int line;
}; };

6
recipes-containers/lxc/files/lxc-1.0.0-disable-udhcp-from-busybox-template.patch
View File

@ -1,4 +1,4 @@
From 74efbe7f47379375c51948dd0f86248fb9429a1b Mon Sep 17 00:00:00 2001 From 8227e720438ff0bdfe45d7307de85f660e491d49 Mon Sep 17 00:00:00 2001
From: Bogdan Purcareata <bogdan.purcareata@freescale.com> From: Bogdan Purcareata <bogdan.purcareata@freescale.com>
Date: Mon, 8 Apr 2013 18:30:19 +0300 Date: Mon, 8 Apr 2013 18:30:19 +0300
Subject: [PATCH] lxc-0.9.0-disable-udhcp-from-busybox-template Subject: [PATCH] lxc-0.9.0-disable-udhcp-from-busybox-template
@ -8,10 +8,10 @@ Subject: [PATCH] lxc-0.9.0-disable-udhcp-from-busybox-template
1 file changed, 1 deletion(-) 1 file changed, 1 deletion(-)
diff --git a/templates/lxc-busybox.in b/templates/lxc-busybox.in diff --git a/templates/lxc-busybox.in b/templates/lxc-busybox.in
index 7243b36..9637a71 100644 index 1a8618b..8ba7cfe 100644
--- a/templates/lxc-busybox.in --- a/templates/lxc-busybox.in
+++ b/templates/lxc-busybox.in +++ b/templates/lxc-busybox.in
@@ -111,7 +111,6 @@ EOF @@ -120,7 +120,6 @@ EOF
#!/bin/sh #!/bin/sh
/bin/syslogd /bin/syslogd
/bin/mount -a /bin/mount -a

6
recipes-containers/lxc/files/lxc-doc-upgrade-to-use-docbook-3.1-DTD.patch
View File

@ -1,4 +1,4 @@
From 5190dce1a675dfcdf88e3b94bd48070ac180bacc Mon Sep 17 00:00:00 2001 From 85d1e77acbfde2aa1045cfda877a91a9e57c405d Mon Sep 17 00:00:00 2001
From: Jim Somerville <Jim.Somerville@windriver.com> From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Tue, 11 Aug 2015 14:05:00 -0400 Date: Tue, 11 Aug 2015 14:05:00 -0400
Subject: [PATCH] lxc: doc: upgrade to use docbook 3.1 DTD Subject: [PATCH] lxc: doc: upgrade to use docbook 3.1 DTD
@ -15,10 +15,10 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index 1acc461..74b976a 100644 index 90a4bd4..a3272e9 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -213,7 +213,7 @@ AM_CONDITIONAL([ENABLE_DOCBOOK], [test "x$db2xman" != "x"]) @@ -227,7 +227,7 @@ AM_CONDITIONAL([ENABLE_DOCBOOK], [test "x$db2xman" != "x"])
AM_CONDITIONAL([USE_DOCBOOK2X], [test "x$db2xman" != "xdocbook2man"]) AM_CONDITIONAL([USE_DOCBOOK2X], [test "x$db2xman" != "xdocbook2man"])
if test "x$db2xman" = "xdocbook2man"; then if test "x$db2xman" = "xdocbook2man"; then

2
recipes-containers/lxc/files/lxc-fix-B-S.patch
View File

@ -1,4 +1,4 @@
From 2fa77a1803939de2d155a14cf680b53140b92f06 Mon Sep 17 00:00:00 2001 From 1cdadc8d6f7ccaf398a95af920b7c49514ee62ef Mon Sep 17 00:00:00 2001
From: Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com> From: Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com>
Date: Thu, 9 Apr 2015 23:01:48 +0300 Date: Thu, 9 Apr 2015 23:01:48 +0300

8
recipes-containers/lxc/files/template-make-busybox-template-compatible-with-core-.patch
View File

@ -1,4 +1,4 @@
From 3a7112a38d2c44b6fa49e0da1dc4765defd88dbb Mon Sep 17 00:00:00 2001 From 96bf043ec0ed93613036c324174c149655cf52be Mon Sep 17 00:00:00 2001
From: Mark Asselstine <mark.asselstine@windriver.com> From: Mark Asselstine <mark.asselstine@windriver.com>
Date: Thu, 31 May 2018 11:44:44 -0400 Date: Thu, 31 May 2018 11:44:44 -0400
Subject: [PATCH] template: make busybox template compatible with Subject: [PATCH] template: make busybox template compatible with
@ -23,10 +23,10 @@ Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
1 file changed, 13 insertions(+), 3 deletions(-) 1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/templates/lxc-busybox.in b/templates/lxc-busybox.in diff --git a/templates/lxc-busybox.in b/templates/lxc-busybox.in
index 9637a71..45b386f 100644 index 8ba7cfe..effdb73 100644
--- a/templates/lxc-busybox.in --- a/templates/lxc-busybox.in
+++ b/templates/lxc-busybox.in +++ b/templates/lxc-busybox.in
@@ -181,6 +181,19 @@ configure_busybox() @@ -194,6 +194,19 @@ configure_busybox()
return 1 return 1
fi fi
@ -46,7 +46,7 @@ index 9637a71..45b386f 100644
# symlink busybox for the commands it supports # symlink busybox for the commands it supports
# it would be nice to just use "chroot $rootfs busybox --install -s /bin" # it would be nice to just use "chroot $rootfs busybox --install -s /bin"
# but that only works right in a chroot with busybox >= 1.19.0 # but that only works right in a chroot with busybox >= 1.19.0
@@ -189,9 +202,6 @@ configure_busybox() @@ -202,9 +215,6 @@ configure_busybox()
./busybox --list | grep -v busybox | xargs -n1 ln -s busybox ./busybox --list | grep -v busybox | xargs -n1 ln -s busybox
) )

6
recipes-containers/lxc/files/templates-actually-create-DOWNLOAD_TEMP-directory.patch
View File

@ -1,4 +1,4 @@
From 68b0dd97130ffc5776de9219a42188b4a140d446 Mon Sep 17 00:00:00 2001 From 7c1c597592694d1f3e652657b1cc642a8990f8a0 Mon Sep 17 00:00:00 2001
From: Mark Asselstine <mark.asselstine@windriver.com> From: Mark Asselstine <mark.asselstine@windriver.com>
Date: Thu, 31 May 2018 16:21:45 -0400 Date: Thu, 31 May 2018 16:21:45 -0400
Subject: [PATCH] templates: actually create DOWNLOAD_TEMP directory Subject: [PATCH] templates: actually create DOWNLOAD_TEMP directory
@ -23,10 +23,10 @@ Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/lxc-download.in b/templates/lxc-download.in diff --git a/templates/lxc-download.in b/templates/lxc-download.in
index 973783b..015a679 100644 index 58d063f..d7e6128 100644
--- a/templates/lxc-download.in --- a/templates/lxc-download.in
+++ b/templates/lxc-download.in +++ b/templates/lxc-download.in
@@ -323,7 +323,7 @@ elif [ -n "${DOWNLOAD_TEMP}" ]; then @@ -329,7 +329,7 @@ elif [ -n "${DOWNLOAD_TEMP}" ]; then
mkdir -p "${DOWNLOAD_TEMP}" mkdir -p "${DOWNLOAD_TEMP}"
DOWNLOAD_TEMP="$(mktemp -p ${DOWNLOAD_TEMP} -d)" DOWNLOAD_TEMP="$(mktemp -p ${DOWNLOAD_TEMP} -d)"
else else

7
recipes-containers/lxc/files/templates-use-curl-instead-of-wget.patch
View File

@ -1,4 +1,4 @@
From dd7b0a2e4542c352456747a45d7eeb11e9fdec26 Mon Sep 17 00:00:00 2001 From 07890dd8ffdcd08b7be1ddbd9f56ac55482c76bb Mon Sep 17 00:00:00 2001
From: Joakim Roubert <joakimr@axis.com> From: Joakim Roubert <joakimr@axis.com>
Date: Fri, 16 Aug 2019 07:52:48 +0200 Date: Fri, 16 Aug 2019 07:52:48 +0200
Subject: [PATCH] Use curl instead of wget Subject: [PATCH] Use curl instead of wget
@ -7,12 +7,13 @@ When curl's MIT license is preferable to wget's GPLv3.
Change-Id: I4684ae7569704514fdcc63e0655c556efcaf44f8 Change-Id: I4684ae7569704514fdcc63e0655c556efcaf44f8
Signed-off-by: Joakim Roubert <joakimr@axis.com> Signed-off-by: Joakim Roubert <joakimr@axis.com>
--- ---
templates/lxc-download.in | 10 +++++----- templates/lxc-download.in | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-) 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/templates/lxc-download.in b/templates/lxc-download.in diff --git a/templates/lxc-download.in b/templates/lxc-download.in
index b70daaf..9526eae 100644 index d7e6128..8a4b567 100644
--- a/templates/lxc-download.in --- a/templates/lxc-download.in
+++ b/templates/lxc-download.in +++ b/templates/lxc-download.in
@@ -74,9 +74,9 @@ cleanup() { @@ -74,9 +74,9 @@ cleanup() {
@ -38,7 +39,7 @@ index b70daaf..9526eae 100644
if [ "$3" = "noexit" ]; then if [ "$3" = "noexit" ]; then
return 1 return 1
else else
@@ -266,7 +266,7 @@ while :; do @@ -271,7 +271,7 @@ while :; do
done done
# Check for required binaries # Check for required binaries

4
recipes-containers/lxc/files/tests-add-no-validate-when-using-download-template.patch
View File

@ -1,4 +1,4 @@
From 1b334bdaf598600314a678509a702728721001a2 Mon Sep 17 00:00:00 2001 From 1c2506434e744d8c6a86e42c9d8bae4cde7553f6 Mon Sep 17 00:00:00 2001
From: Mark Asselstine <mark.asselstine@windriver.com> From: Mark Asselstine <mark.asselstine@windriver.com>
Date: Thu, 31 May 2018 15:14:26 -0400 Date: Thu, 31 May 2018 15:14:26 -0400
Subject: [PATCH] tests: add '--no-validate' when using download template Subject: [PATCH] tests: add '--no-validate' when using download template
@ -19,7 +19,7 @@ Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
5 files changed, 5 insertions(+), 5 deletions(-) 5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/tests/lxc-test-apparmor-mount b/src/tests/lxc-test-apparmor-mount diff --git a/src/tests/lxc-test-apparmor-mount b/src/tests/lxc-test-apparmor-mount
index 56d598f..573cff8 100755 index d21c948..9e1969b 100755
--- a/src/tests/lxc-test-apparmor-mount --- a/src/tests/lxc-test-apparmor-mount
+++ b/src/tests/lxc-test-apparmor-mount +++ b/src/tests/lxc-test-apparmor-mount
@@ -169,7 +169,7 @@ if [ -f /etc/lsb-release ]; then @@ -169,7 +169,7 @@ if [ -f /etc/lsb-release ]; then

2
recipes-containers/lxc/files/tests-our-init-is-not-busybox.patch
View File

@ -1,4 +1,4 @@
From 51d88d9741c30ff4a798698514cac831ae61680b Mon Sep 17 00:00:00 2001 From 06b2a3054b9526c89d5abc314c7d7cda35ddb6a5 Mon Sep 17 00:00:00 2001
From: Mark Asselstine <mark.asselstine@windriver.com> From: Mark Asselstine <mark.asselstine@windriver.com>
Date: Thu, 31 May 2018 15:00:34 -0400 Date: Thu, 31 May 2018 15:00:34 -0400
Subject: [PATCH] tests: our init is not busybox Subject: [PATCH] tests: our init is not busybox