mirror of
git://git.yoctoproject.org/meta-virtualization.git
synced 2025-07-19 20:59:41 +02:00
lxc: uprev to v3.0.0
Update to the latest lxc release. This requires some minor patch updates (fuzz and offset, not content) along with dropping a no longer needed fix for gcc7 (gcc 7.3 is everywhere and is patched). The ptests were already busted before the uprev so I was not able to run them but I will follow up with a fix for this. I did run against our usual usecases 'lxc-create', 'lxc-console', 'lxc-ls', 'lxc-destroy', 'lxc-start', 'lxc-execute', 'lxc-attach'... and there were no issues (outcomes matched v2.0.8). Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
This commit is contained in:
parent
4987f02577
commit
0d7cfe8660
|
@ -1,34 +0,0 @@
|
||||||
From 58a2d817a82100d287c60c63315d81445cdba3f9 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Mark Asselstine <mark.asselstine@windriver.com>
|
|
||||||
Date: Thu, 15 Jun 2017 15:12:08 -0400
|
|
||||||
Subject: [PATCH] cgroups: work around issue in gcc 7
|
|
||||||
|
|
||||||
This works around
|
|
||||||
https://bugzilla.yoctoproject.org/show_bug.cgi?id=11672
|
|
||||||
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=78969
|
|
||||||
|
|
||||||
By removing a single cgroup entry. For the majority of usecases this
|
|
||||||
loss of a single entry should not be an issue and once gcc 7 is fixed
|
|
||||||
we can revert this.
|
|
||||||
|
|
||||||
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
|
|
||||||
---
|
|
||||||
src/lxc/cgroups/cgfsng.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
|
|
||||||
index ebd548b..c520abd 100644
|
|
||||||
--- a/src/lxc/cgroups/cgfsng.c
|
|
||||||
+++ b/src/lxc/cgroups/cgfsng.c
|
|
||||||
@@ -1373,7 +1373,7 @@ static inline bool cgfsng_create(void *hdata)
|
|
||||||
offset = cgname + len - 5;
|
|
||||||
|
|
||||||
again:
|
|
||||||
- if (idx == 1000) {
|
|
||||||
+ if (idx == 999) {
|
|
||||||
ERROR("Too many conflicting cgroup names");
|
|
||||||
goto out_free;
|
|
||||||
}
|
|
||||||
--
|
|
||||||
2.7.4
|
|
||||||
|
|
|
@ -31,9 +31,9 @@ diff --git a/configure.ac b/configure.ac
|
||||||
index deba90b..c1ed67b 100644
|
index deba90b..c1ed67b 100644
|
||||||
--- a/configure.ac
|
--- a/configure.ac
|
||||||
+++ b/configure.ac
|
+++ b/configure.ac
|
||||||
@@ -357,6 +357,15 @@ AM_COND_IF([ENABLE_PYTHON],
|
@@ -356,6 +356,15 @@ AM_COND_IF([ENABLE_PYTHON],
|
||||||
PKG_CHECK_MODULES([PYTHONDEV], [python3 >= 3.2],[],[AC_MSG_ERROR([You must install python3-dev])])
|
[], [enable_examples=yes])
|
||||||
AC_DEFINE_UNQUOTED([ENABLE_PYTHON], 1, [Python3 is available])])
|
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
|
||||||
+AC_ARG_ENABLE([log-src-basename],
|
+AC_ARG_ENABLE([log-src-basename],
|
||||||
|
@ -51,7 +51,7 @@ diff --git a/src/lxc/log.h b/src/lxc/log.h
|
||||||
index 76bd4df..4365977 100644
|
index 76bd4df..4365977 100644
|
||||||
--- a/src/lxc/log.h
|
--- a/src/lxc/log.h
|
||||||
+++ b/src/lxc/log.h
|
+++ b/src/lxc/log.h
|
||||||
@@ -74,8 +74,13 @@ struct lxc_log_locinfo {
|
@@ -77,8 +77,13 @@ struct lxc_log_locinfo {
|
||||||
int line;
|
int line;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -11,14 +11,14 @@ diff --git a/templates/lxc-busybox.in b/templates/lxc-busybox.in
|
||||||
index cb425ec..bb8c951 100644
|
index cb425ec..bb8c951 100644
|
||||||
--- a/templates/lxc-busybox.in
|
--- a/templates/lxc-busybox.in
|
||||||
+++ b/templates/lxc-busybox.in
|
+++ b/templates/lxc-busybox.in
|
||||||
@@ -84,7 +84,6 @@ EOF
|
@@ -111,7 +111,6 @@ EOF
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
/bin/syslogd
|
/bin/syslogd
|
||||||
/bin/mount -a
|
/bin/mount -a
|
||||||
-/bin/udhcpc
|
-/bin/udhcpc
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
# executable
|
# executable
|
||||||
--
|
---
|
||||||
1.7.11.7
|
1.7.11.7
|
||||||
|
|
||||||
|
|
|
@ -40,13 +40,12 @@ SRC_URI = "http://linuxcontainers.org/downloads/${BPN}-${PV}.tar.gz \
|
||||||
file://lxc-fix-B-S.patch \
|
file://lxc-fix-B-S.patch \
|
||||||
file://lxc-doc-upgrade-to-use-docbook-3.1-DTD.patch \
|
file://lxc-doc-upgrade-to-use-docbook-3.1-DTD.patch \
|
||||||
file://logs-optionally-use-base-filenames-to-report-src-fil.patch \
|
file://logs-optionally-use-base-filenames-to-report-src-fil.patch \
|
||||||
file://cgroups-work-around-issue-in-gcc-7.patch \
|
|
||||||
file://dnsmasq.conf \
|
file://dnsmasq.conf \
|
||||||
file://lxc-net \
|
file://lxc-net \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "7bfd95280522d7936c0979dfea92cdb5"
|
SRC_URI[md5sum] = "ca1db4f9dc35df9203a58ab606cdfb7a"
|
||||||
SRC_URI[sha256sum] = "0d8e34b302cfe4c40c6c9ae5097096aa5cc2c1dfceea3f0f22e3e16c4a4e8494"
|
SRC_URI[sha256sum] = "6230224c27f050201b372b18a9f39cd220ed584899c5f0cf73c6b313dabc8d8a"
|
||||||
|
|
||||||
S = "${WORKDIR}/${BPN}-${PV}"
|
S = "${WORKDIR}/${BPN}-${PV}"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user