diff options
author | Mingli Yu <Mingli.Yu@windriver.com> | 2018-10-22 16:12:51 +0800 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2018-10-22 04:41:50 -0400 |
commit | 87526423d572b435002f54c6e9e28e4591c53447 (patch) | |
tree | ffed2d291a84427256d6a47677977186bf38ef02 | |
parent | ce8f6fe10682d85f7e26ceb3e8ccbc6e01d2b869 (diff) | |
download | meta-virtualization-87526423d572b435002f54c6e9e28e4591c53447.tar.gz |
lxc: Upgrade to 3.0.2
* Refresh patch to avoid fuzz warnings
* Update to 3.0.2 as lxc-destroy failed when
system boot in nfs rootfs in lxc 3.0.1 as below:
# lxc-destroy -n test9
lxc-destroy: test9: utils.c: _recursive_rmdir: 149 Failed to delete /var/lib/lxc/test9
lxc-destroy: test9: lxccontainer.c: container_destroy: 2946 Failed to destroy directory "/var/lib/lxc/test9" for "test9"
Destroying test9 failed
Update to 3.0.2 to fix the above issue
Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r-- | recipes-containers/lxc/files/logs-optionally-use-base-filenames-to-report-src-fil.patch | 19 | ||||
-rw-r--r-- | recipes-containers/lxc/files/lxc-1.0.0-disable-udhcp-from-busybox-template.patch | 7 | ||||
-rw-r--r-- | recipes-containers/lxc/files/lxc-doc-upgrade-to-use-docbook-3.1-DTD.patch | 13 | ||||
-rw-r--r-- | recipes-containers/lxc/files/lxc-fix-B-S.patch | 18 | ||||
-rw-r--r-- | recipes-containers/lxc/files/template-make-busybox-template-compatible-with-core-.patch | 13 | ||||
-rw-r--r-- | recipes-containers/lxc/files/templates-actually-create-DOWNLOAD_TEMP-directory.patch | 6 | ||||
-rw-r--r-- | recipes-containers/lxc/files/tests-add-no-validate-when-using-download-template.patch | 12 | ||||
-rw-r--r-- | recipes-containers/lxc/files/tests-our-init-is-not-busybox.patch | 10 | ||||
-rw-r--r-- | recipes-containers/lxc/lxc_3.0.2.bb (renamed from recipes-containers/lxc/lxc_3.0.1.bb) | 4 |
9 files changed, 48 insertions, 54 deletions
diff --git a/recipes-containers/lxc/files/logs-optionally-use-base-filenames-to-report-src-fil.patch b/recipes-containers/lxc/files/logs-optionally-use-base-filenames-to-report-src-fil.patch index f430601a..648193b4 100644 --- a/recipes-containers/lxc/files/logs-optionally-use-base-filenames-to-report-src-fil.patch +++ b/recipes-containers/lxc/files/logs-optionally-use-base-filenames-to-report-src-fil.patch | |||
@@ -1,8 +1,9 @@ | |||
1 | From 4729d0f4c4d1dacd150ddfd7061dda875eb94e34 Mon Sep 17 00:00:00 2001 | 1 | From c50ddb2b2cf22a29e4c671b1efbd338eeba694aa Mon Sep 17 00:00:00 2001 |
2 | Message-Id: <4729d0f4c4d1dacd150ddfd7061dda875eb94e34.1443216870.git.Jim.Somerville@windriver.com> | ||
3 | From: Jim Somerville <Jim.Somerville@windriver.com> | 2 | From: Jim Somerville <Jim.Somerville@windriver.com> |
4 | Date: Fri, 25 Sep 2015 15:08:17 -0400 | 3 | Date: Fri, 25 Sep 2015 15:08:17 -0400 |
5 | Subject: [PATCH 1/1] logs: optionally use base filenames to report src files | 4 | Subject: [PATCH] logs: optionally use base filenames to report src files |
5 | |||
6 | Message-Id: <4729d0f4c4d1dacd150ddfd7061dda875eb94e34.1443216870.git.Jim.Somerville@windriver.com> | ||
6 | 7 | ||
7 | Problem: Logs are nice in that they report the source file, | 8 | Problem: Logs are nice in that they report the source file, |
8 | routine, and line number where an issue occurs. But the | 9 | routine, and line number where an issue occurs. But the |
@@ -22,16 +23,17 @@ machinery, and that may still be the absolute pathname to | |||
22 | the file. | 23 | the file. |
23 | 24 | ||
24 | Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com> | 25 | Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com> |
26 | |||
25 | --- | 27 | --- |
26 | configure.ac | 9 +++++++++ | 28 | configure.ac | 9 +++++++++ |
27 | src/lxc/log.h | 5 +++++ | 29 | src/lxc/log.h | 5 +++++ |
28 | 2 files changed, 14 insertions(+) | 30 | 2 files changed, 14 insertions(+) |
29 | 31 | ||
30 | diff --git a/configure.ac b/configure.ac | 32 | diff --git a/configure.ac b/configure.ac |
31 | index deba90b..c1ed67b 100644 | 33 | index 74b976a..9c561f7 100644 |
32 | --- a/configure.ac | 34 | --- a/configure.ac |
33 | +++ b/configure.ac | 35 | +++ b/configure.ac |
34 | @@ -356,6 +356,15 @@ AM_COND_IF([ENABLE_PYTHON], | 36 | @@ -356,6 +356,15 @@ AC_ARG_ENABLE([examples], |
35 | [], [enable_examples=yes]) | 37 | [], [enable_examples=yes]) |
36 | AM_CONDITIONAL([ENABLE_EXAMPLES], [test "x$enable_examples" = "xyes"]) | 38 | AM_CONDITIONAL([ENABLE_EXAMPLES], [test "x$enable_examples" = "xyes"]) |
37 | 39 | ||
@@ -48,11 +50,11 @@ index deba90b..c1ed67b 100644 | |||
48 | AC_ARG_ENABLE([mutex-debugging], | 50 | AC_ARG_ENABLE([mutex-debugging], |
49 | [AC_HELP_STRING([--enable-mutex-debugging], [Makes mutexes to report error and provide stack trace [default=no]])], | 51 | [AC_HELP_STRING([--enable-mutex-debugging], [Makes mutexes to report error and provide stack trace [default=no]])], |
50 | diff --git a/src/lxc/log.h b/src/lxc/log.h | 52 | diff --git a/src/lxc/log.h b/src/lxc/log.h |
51 | index 76bd4df..4365977 100644 | 53 | index 4654fd9..6885d78 100644 |
52 | --- a/src/lxc/log.h | 54 | --- a/src/lxc/log.h |
53 | +++ b/src/lxc/log.h | 55 | +++ b/src/lxc/log.h |
54 | @@ -77,8 +77,13 @@ struct lxc_log_locinfo { | 56 | @@ -77,8 +77,13 @@ struct lxc_log_locinfo { |
55 | int line; | 57 | int line; |
56 | }; | 58 | }; |
57 | 59 | ||
58 | +#ifdef LXC_LOG_USE_BASENAME | 60 | +#ifdef LXC_LOG_USE_BASENAME |
@@ -65,6 +67,3 @@ index 76bd4df..4365977 100644 | |||
65 | 67 | ||
66 | /* brief logging event object */ | 68 | /* brief logging event object */ |
67 | struct lxc_log_event { | 69 | struct lxc_log_event { |
68 | -- | ||
69 | 1.8.3.2 | ||
70 | |||
diff --git a/recipes-containers/lxc/files/lxc-1.0.0-disable-udhcp-from-busybox-template.patch b/recipes-containers/lxc/files/lxc-1.0.0-disable-udhcp-from-busybox-template.patch index 07a12ff7..85177c8f 100644 --- a/recipes-containers/lxc/files/lxc-1.0.0-disable-udhcp-from-busybox-template.patch +++ b/recipes-containers/lxc/files/lxc-1.0.0-disable-udhcp-from-busybox-template.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d7e07e7acb1cbad33806f49143a2a30b4468c369 Mon Sep 17 00:00:00 2001 | 1 | From 74efbe7f47379375c51948dd0f86248fb9429a1b Mon Sep 17 00:00:00 2001 |
2 | From: Bogdan Purcareata <bogdan.purcareata@freescale.com> | 2 | From: Bogdan Purcareata <bogdan.purcareata@freescale.com> |
3 | Date: Mon, 8 Apr 2013 18:30:19 +0300 | 3 | Date: Mon, 8 Apr 2013 18:30:19 +0300 |
4 | Subject: [PATCH] lxc-0.9.0-disable-udhcp-from-busybox-template | 4 | Subject: [PATCH] lxc-0.9.0-disable-udhcp-from-busybox-template |
@@ -8,7 +8,7 @@ Subject: [PATCH] lxc-0.9.0-disable-udhcp-from-busybox-template | |||
8 | 1 file changed, 1 deletion(-) | 8 | 1 file changed, 1 deletion(-) |
9 | 9 | ||
10 | diff --git a/templates/lxc-busybox.in b/templates/lxc-busybox.in | 10 | diff --git a/templates/lxc-busybox.in b/templates/lxc-busybox.in |
11 | index cb425ec..bb8c951 100644 | 11 | index 7243b36..9637a71 100644 |
12 | --- a/templates/lxc-busybox.in | 12 | --- a/templates/lxc-busybox.in |
13 | +++ b/templates/lxc-busybox.in | 13 | +++ b/templates/lxc-busybox.in |
14 | @@ -111,7 +111,6 @@ EOF | 14 | @@ -111,7 +111,6 @@ EOF |
@@ -19,6 +19,3 @@ index cb425ec..bb8c951 100644 | |||
19 | EOF | 19 | EOF |
20 | 20 | ||
21 | # executable | 21 | # executable |
22 | --- | ||
23 | 1.7.11.7 | ||
24 | |||
diff --git a/recipes-containers/lxc/files/lxc-doc-upgrade-to-use-docbook-3.1-DTD.patch b/recipes-containers/lxc/files/lxc-doc-upgrade-to-use-docbook-3.1-DTD.patch index 5f9d7718..085ffe80 100644 --- a/recipes-containers/lxc/files/lxc-doc-upgrade-to-use-docbook-3.1-DTD.patch +++ b/recipes-containers/lxc/files/lxc-doc-upgrade-to-use-docbook-3.1-DTD.patch | |||
@@ -1,8 +1,7 @@ | |||
1 | From 4cf207ffd64c6f815e62ecbbf25b5a378e707182 Mon Sep 17 00:00:00 2001 | 1 | From 5190dce1a675dfcdf88e3b94bd48070ac180bacc Mon Sep 17 00:00:00 2001 |
2 | Message-Id: <4cf207ffd64c6f815e62ecbbf25b5a378e707182.1439319694.git.Jim.Somerville@windriver.com> | ||
3 | From: Jim Somerville <Jim.Somerville@windriver.com> | 2 | From: Jim Somerville <Jim.Somerville@windriver.com> |
4 | Date: Tue, 11 Aug 2015 14:05:00 -0400 | 3 | Date: Tue, 11 Aug 2015 14:05:00 -0400 |
5 | Subject: [PATCH 1/1] lxc: doc: upgrade to use docbook 3.1 DTD | 4 | Subject: [PATCH] lxc: doc: upgrade to use docbook 3.1 DTD |
6 | 5 | ||
7 | docbook2man fails to build the man pages in poky | 6 | docbook2man fails to build the man pages in poky |
8 | due to missing the ancient Davenport 3.0 DTD. | 7 | due to missing the ancient Davenport 3.0 DTD. |
@@ -10,15 +9,16 @@ Poky meta has the Oasis 3.1 version so upgrade | |||
10 | to use that instead. | 9 | to use that instead. |
11 | 10 | ||
12 | Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com> | 11 | Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com> |
12 | |||
13 | --- | 13 | --- |
14 | configure.ac | 2 +- | 14 | configure.ac | 2 +- |
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | 15 | 1 file changed, 1 insertion(+), 1 deletion(-) |
16 | 16 | ||
17 | diff --git a/configure.ac b/configure.ac | 17 | diff --git a/configure.ac b/configure.ac |
18 | index 4972803..2e67b5e 100644 | 18 | index 1acc461..74b976a 100644 |
19 | --- a/configure.ac | 19 | --- a/configure.ac |
20 | +++ b/configure.ac | 20 | +++ b/configure.ac |
21 | @@ -179,7 +179,7 @@ AM_CONDITIONAL([ENABLE_DOCBOOK], [test "x$db2xman" != "x"]) | 21 | @@ -213,7 +213,7 @@ AM_CONDITIONAL([ENABLE_DOCBOOK], [test "x$db2xman" != "x"]) |
22 | AM_CONDITIONAL([USE_DOCBOOK2X], [test "x$db2xman" != "xdocbook2man"]) | 22 | AM_CONDITIONAL([USE_DOCBOOK2X], [test "x$db2xman" != "xdocbook2man"]) |
23 | 23 | ||
24 | if test "x$db2xman" = "xdocbook2man"; then | 24 | if test "x$db2xman" = "xdocbook2man"; then |
@@ -27,6 +27,3 @@ index 4972803..2e67b5e 100644 | |||
27 | else | 27 | else |
28 | docdtd="\"-//OASIS//DTD DocBook XML\" \"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd\"" | 28 | docdtd="\"-//OASIS//DTD DocBook XML\" \"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd\"" |
29 | fi | 29 | fi |
30 | -- | ||
31 | 1.8.3.2 | ||
32 | |||
diff --git a/recipes-containers/lxc/files/lxc-fix-B-S.patch b/recipes-containers/lxc/files/lxc-fix-B-S.patch index a776b4f8..6b09193a 100644 --- a/recipes-containers/lxc/files/lxc-fix-B-S.patch +++ b/recipes-containers/lxc/files/lxc-fix-B-S.patch | |||
@@ -1,8 +1,16 @@ | |||
1 | Index: lxc-2.0.0/config/init/upstart/Makefile.am | 1 | From 2fa77a1803939de2d155a14cf680b53140b92f06 Mon Sep 17 00:00:00 2001 |
2 | =================================================================== | 2 | From: Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com> |
3 | --- lxc-2.0.0.orig/config/init/upstart/Makefile.am | 3 | Date: Thu, 9 Apr 2015 23:01:48 +0300 |
4 | +++ lxc-2.0.0/config/init/upstart/Makefile.am | 4 | |
5 | @@ -3,9 +3,9 @@ | 5 | --- |
6 | config/init/upstart/Makefile.am | 4 ++-- | ||
7 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
8 | |||
9 | diff --git a/config/init/upstart/Makefile.am b/config/init/upstart/Makefile.am | ||
10 | index 5552d32..186ae3d 100644 | ||
11 | --- a/config/init/upstart/Makefile.am | ||
12 | +++ b/config/init/upstart/Makefile.am | ||
13 | @@ -3,9 +3,9 @@ EXTRA_DIST = lxc.conf lxc-instance.conf lxc-net.conf.in | ||
6 | if INIT_SCRIPT_UPSTART | 14 | if INIT_SCRIPT_UPSTART |
7 | install-upstart: lxc.conf lxc-instance.conf lxc-net.conf | 15 | install-upstart: lxc.conf lxc-instance.conf lxc-net.conf |
8 | $(MKDIR_P) $(DESTDIR)$(sysconfdir)/init/ | 16 | $(MKDIR_P) $(DESTDIR)$(sysconfdir)/init/ |
diff --git a/recipes-containers/lxc/files/template-make-busybox-template-compatible-with-core-.patch b/recipes-containers/lxc/files/template-make-busybox-template-compatible-with-core-.patch index 1c6022b7..e4bb72a0 100644 --- a/recipes-containers/lxc/files/template-make-busybox-template-compatible-with-core-.patch +++ b/recipes-containers/lxc/files/template-make-busybox-template-compatible-with-core-.patch | |||
@@ -1,7 +1,8 @@ | |||
1 | From 0990db9b9723589606104d42ac2cf865b78e50a1 Mon Sep 17 00:00:00 2001 | 1 | From 3a7112a38d2c44b6fa49e0da1dc4765defd88dbb Mon Sep 17 00:00:00 2001 |
2 | From: Mark Asselstine <mark.asselstine@windriver.com> | 2 | From: Mark Asselstine <mark.asselstine@windriver.com> |
3 | Date: Thu, 31 May 2018 11:44:44 -0400 | 3 | Date: Thu, 31 May 2018 11:44:44 -0400 |
4 | Subject: [PATCH] template: make busybox template compatible with | 4 | Subject: [PATCH] template: make busybox template compatible with |
5 | |||
5 | core-image-minimal | 6 | core-image-minimal |
6 | 7 | ||
7 | The busybox template makes a lot of assumptions about how the busybox | 8 | The busybox template makes a lot of assumptions about how the busybox |
@@ -16,12 +17,13 @@ core-image-minimal to be able to demonstrate that it can work as well | |||
16 | as to have it available for the ptests. | 17 | as to have it available for the ptests. |
17 | 18 | ||
18 | Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> | 19 | Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> |
20 | |||
19 | --- | 21 | --- |
20 | templates/lxc-busybox.in | 16 +++++++++++++--- | 22 | templates/lxc-busybox.in | 16 +++++++++++++--- |
21 | 1 file changed, 13 insertions(+), 3 deletions(-) | 23 | 1 file changed, 13 insertions(+), 3 deletions(-) |
22 | 24 | ||
23 | diff --git a/templates/lxc-busybox.in b/templates/lxc-busybox.in | 25 | diff --git a/templates/lxc-busybox.in b/templates/lxc-busybox.in |
24 | index 7d00bf5..5a99103 100644 | 26 | index 9637a71..45b386f 100644 |
25 | --- a/templates/lxc-busybox.in | 27 | --- a/templates/lxc-busybox.in |
26 | +++ b/templates/lxc-busybox.in | 28 | +++ b/templates/lxc-busybox.in |
27 | @@ -181,6 +181,19 @@ configure_busybox() | 29 | @@ -181,6 +181,19 @@ configure_busybox() |
@@ -44,8 +46,8 @@ index 7d00bf5..5a99103 100644 | |||
44 | # symlink busybox for the commands it supports | 46 | # symlink busybox for the commands it supports |
45 | # it would be nice to just use "chroot $rootfs busybox --install -s /bin" | 47 | # it would be nice to just use "chroot $rootfs busybox --install -s /bin" |
46 | # but that only works right in a chroot with busybox >= 1.19.0 | 48 | # but that only works right in a chroot with busybox >= 1.19.0 |
47 | @@ -191,9 +204,6 @@ configure_busybox() | 49 | @@ -189,9 +202,6 @@ configure_busybox() |
48 | xargs -n1 ln -s busybox | 50 | ./busybox --list | grep -v busybox | xargs -n1 ln -s busybox |
49 | ) | 51 | ) |
50 | 52 | ||
51 | - # relink /sbin/init | 53 | - # relink /sbin/init |
@@ -54,6 +56,3 @@ index 7d00bf5..5a99103 100644 | |||
54 | # /etc/fstab must exist for "mount -a" | 56 | # /etc/fstab must exist for "mount -a" |
55 | touch "${rootfs}/etc/fstab" | 57 | touch "${rootfs}/etc/fstab" |
56 | 58 | ||
57 | -- | ||
58 | 2.7.4 | ||
59 | |||
diff --git a/recipes-containers/lxc/files/templates-actually-create-DOWNLOAD_TEMP-directory.patch b/recipes-containers/lxc/files/templates-actually-create-DOWNLOAD_TEMP-directory.patch index 44959db5..756cddc3 100644 --- a/recipes-containers/lxc/files/templates-actually-create-DOWNLOAD_TEMP-directory.patch +++ b/recipes-containers/lxc/files/templates-actually-create-DOWNLOAD_TEMP-directory.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 1d83b86a9bf017257c068c662ec3bf52ec0cfe90 Mon Sep 17 00:00:00 2001 | 1 | From 68b0dd97130ffc5776de9219a42188b4a140d446 Mon Sep 17 00:00:00 2001 |
2 | From: Mark Asselstine <mark.asselstine@windriver.com> | 2 | From: Mark Asselstine <mark.asselstine@windriver.com> |
3 | Date: Thu, 31 May 2018 16:21:45 -0400 | 3 | Date: Thu, 31 May 2018 16:21:45 -0400 |
4 | Subject: [PATCH] templates: actually create DOWNLOAD_TEMP directory | 4 | Subject: [PATCH] templates: actually create DOWNLOAD_TEMP directory |
@@ -17,6 +17,7 @@ location and DOWNLOAD_TEMP will be consistent with this location. | |||
17 | Upstream-Status: Pending | 17 | Upstream-Status: Pending |
18 | 18 | ||
19 | Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> | 19 | Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> |
20 | |||
20 | --- | 21 | --- |
21 | templates/lxc-download.in | 2 +- | 22 | templates/lxc-download.in | 2 +- |
22 | 1 file changed, 1 insertion(+), 1 deletion(-) | 23 | 1 file changed, 1 insertion(+), 1 deletion(-) |
@@ -34,6 +35,3 @@ index 973783b..015a679 100644 | |||
34 | fi | 35 | fi |
35 | 36 | ||
36 | # Simply list images | 37 | # Simply list images |
37 | -- | ||
38 | 2.11.1 | ||
39 | |||
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 index 81fd15d6..abddef6e 100644 --- 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From 0dad69a3bd306cc701c8bd4df4ea47f0ec5f9150 Mon Sep 17 00:00:00 2001 | 1 | From 1b334bdaf598600314a678509a702728721001a2 Mon Sep 17 00:00:00 2001 |
2 | From: Mark Asselstine <mark.asselstine@windriver.com> | 2 | From: Mark Asselstine <mark.asselstine@windriver.com> |
3 | Date: Thu, 31 May 2018 15:14:26 -0400 | 3 | Date: Thu, 31 May 2018 15:14:26 -0400 |
4 | Subject: [PATCH] tests: add '--no-validate' when using download template | 4 | Subject: [PATCH] tests: add '--no-validate' when using download template |
@@ -9,6 +9,7 @@ interest to this test at any rate so simply add '--no-validate' to | |||
9 | avoid failing due to no GPG validation. | 9 | avoid failing due to no GPG validation. |
10 | 10 | ||
11 | Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> | 11 | Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> |
12 | |||
12 | --- | 13 | --- |
13 | src/tests/lxc-test-apparmor-mount | 2 +- | 14 | src/tests/lxc-test-apparmor-mount | 2 +- |
14 | src/tests/lxc-test-autostart | 2 +- | 15 | src/tests/lxc-test-autostart | 2 +- |
@@ -18,10 +19,10 @@ Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> | |||
18 | 5 files changed, 5 insertions(+), 5 deletions(-) | 19 | 5 files changed, 5 insertions(+), 5 deletions(-) |
19 | 20 | ||
20 | diff --git a/src/tests/lxc-test-apparmor-mount b/src/tests/lxc-test-apparmor-mount | 21 | diff --git a/src/tests/lxc-test-apparmor-mount b/src/tests/lxc-test-apparmor-mount |
21 | index ddcee8a..d3d2c49 100755 | 22 | index 56d598f..573cff8 100755 |
22 | --- a/src/tests/lxc-test-apparmor-mount | 23 | --- a/src/tests/lxc-test-apparmor-mount |
23 | +++ b/src/tests/lxc-test-apparmor-mount | 24 | +++ b/src/tests/lxc-test-apparmor-mount |
24 | @@ -157,7 +157,7 @@ if [ -f /etc/lsb-release ]; then | 25 | @@ -169,7 +169,7 @@ if [ -f /etc/lsb-release ]; then |
25 | done | 26 | done |
26 | fi | 27 | fi |
27 | 28 | ||
@@ -29,7 +30,7 @@ index ddcee8a..d3d2c49 100755 | |||
29 | +run_cmd lxc-create -t download -n $cname -- --no-validate -d ubuntu -r $release -a $ARCH | 30 | +run_cmd lxc-create -t download -n $cname -- --no-validate -d ubuntu -r $release -a $ARCH |
30 | 31 | ||
31 | echo "test default confined container" | 32 | echo "test default confined container" |
32 | run_cmd lxc-start -n $cname -d | 33 | run_cmd lxc-start -n $cname -d -lDEBUG -o "$logfile" |
33 | diff --git a/src/tests/lxc-test-autostart b/src/tests/lxc-test-autostart | 34 | diff --git a/src/tests/lxc-test-autostart b/src/tests/lxc-test-autostart |
34 | index e5b651b..d15b79b 100755 | 35 | index e5b651b..d15b79b 100755 |
35 | --- a/src/tests/lxc-test-autostart | 36 | --- a/src/tests/lxc-test-autostart |
@@ -82,6 +83,3 @@ index 3e35008..f489286 100755 | |||
82 | run_cmd "lxc-start -n b1 -d" | 83 | run_cmd "lxc-start -n b1 -d" |
83 | p1=$(run_cmd "lxc-info -n b1 -p -H") | 84 | p1=$(run_cmd "lxc-info -n b1 -p -H") |
84 | 85 | ||
85 | -- | ||
86 | 2.7.4 | ||
87 | |||
diff --git a/recipes-containers/lxc/files/tests-our-init-is-not-busybox.patch b/recipes-containers/lxc/files/tests-our-init-is-not-busybox.patch index 4c9bf652..e6c71d3d 100644 --- a/recipes-containers/lxc/files/tests-our-init-is-not-busybox.patch +++ b/recipes-containers/lxc/files/tests-our-init-is-not-busybox.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b53169dc4c53f9ef64f8cb06dd9af97182577698 Mon Sep 17 00:00:00 2001 | 1 | From 51d88d9741c30ff4a798698514cac831ae61680b Mon Sep 17 00:00:00 2001 |
2 | From: Mark Asselstine <mark.asselstine@windriver.com> | 2 | From: Mark Asselstine <mark.asselstine@windriver.com> |
3 | Date: Thu, 31 May 2018 15:00:34 -0400 | 3 | Date: Thu, 31 May 2018 15:00:34 -0400 |
4 | Subject: [PATCH] tests: our init is not busybox | 4 | Subject: [PATCH] tests: our init is not busybox |
@@ -9,15 +9,16 @@ really only interested in the fact 'cmp' is being run and not the | |||
9 | result, so simplify by comparing '/sbin/init' to itself. | 9 | result, so simplify by comparing '/sbin/init' to itself. |
10 | 10 | ||
11 | Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> | 11 | Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> |
12 | |||
12 | --- | 13 | --- |
13 | src/tests/attach.c | 2 +- | 14 | src/tests/attach.c | 2 +- |
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 15 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 16 | ||
16 | diff --git a/src/tests/attach.c b/src/tests/attach.c | 17 | diff --git a/src/tests/attach.c b/src/tests/attach.c |
17 | index 2c77127..1c182d6 100644 | 18 | index 07e641d..aac609f 100644 |
18 | --- a/src/tests/attach.c | 19 | --- a/src/tests/attach.c |
19 | +++ b/src/tests/attach.c | 20 | +++ b/src/tests/attach.c |
20 | @@ -251,7 +251,7 @@ static int test_attach_cmd(struct lxc_container *ct) | 21 | @@ -248,7 +248,7 @@ static int test_attach_cmd(struct lxc_container *ct) |
21 | { | 22 | { |
22 | int ret; | 23 | int ret; |
23 | pid_t pid; | 24 | pid_t pid; |
@@ -26,6 +27,3 @@ index 2c77127..1c182d6 100644 | |||
26 | lxc_attach_command_t command = {"cmp", argv}; | 27 | lxc_attach_command_t command = {"cmp", argv}; |
27 | lxc_attach_options_t attach_options = LXC_ATTACH_OPTIONS_DEFAULT; | 28 | lxc_attach_options_t attach_options = LXC_ATTACH_OPTIONS_DEFAULT; |
28 | 29 | ||
29 | -- | ||
30 | 2.7.4 | ||
31 | |||
diff --git a/recipes-containers/lxc/lxc_3.0.1.bb b/recipes-containers/lxc/lxc_3.0.2.bb index d4bfd924..9bb28663 100644 --- a/recipes-containers/lxc/lxc_3.0.1.bb +++ b/recipes-containers/lxc/lxc_3.0.2.bb | |||
@@ -48,8 +48,8 @@ SRC_URI = "http://linuxcontainers.org/downloads/${BPN}-${PV}.tar.gz \ | |||
48 | file://lxc-net \ | 48 | file://lxc-net \ |
49 | " | 49 | " |
50 | 50 | ||
51 | SRC_URI[md5sum] = "8eb396dde561e5832ba2d505513a1935" | 51 | SRC_URI[md5sum] = "72e2f1e718c7ddf3ffa9b18ec0328d8f" |
52 | SRC_URI[sha256sum] = "45986c49be1c048fa127bd3e7ea1bd3347e25765c008a09a2e4c233151a2d5db" | 52 | SRC_URI[sha256sum] = "6ab7117b17066220da450c55ed77953998cf2336d415143b879554364af12f5c" |
53 | 53 | ||
54 | S = "${WORKDIR}/${BPN}-${PV}" | 54 | S = "${WORKDIR}/${BPN}-${PV}" |
55 | 55 | ||