mirror of
git://git.yoctoproject.org/meta-virtualization.git
synced 2025-07-19 20:59:41 +02:00
lxc: update to 4.0.6
Updating to the next minor revision in the LTS. We also drop two patches that are included in the main repository as partof this bump. Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
parent
cf80825a85
commit
d10f21a722
|
@ -1,35 +0,0 @@
|
||||||
From a7a92a06a47322dee45664db5c7bfa68b2b95edb Mon Sep 17 00:00:00 2001
|
|
||||||
From: Mingli Yu <mingli.yu@windriver.com>
|
|
||||||
Date: Wed, 23 Sep 2020 07:03:02 +0000
|
|
||||||
Subject: [PATCH] Remove obsolete setting regarding the Standard Output
|
|
||||||
|
|
||||||
The Standard output type "syslog" is obsolete, causing a warning since systemd
|
|
||||||
version 246 [1].
|
|
||||||
|
|
||||||
Please consider using "journal" or "journal+console"
|
|
||||||
|
|
||||||
[1] https://github.com/systemd/systemd/blob/master/NEWS#L202
|
|
||||||
|
|
||||||
Upstream-Status: Submitted [https://github.com/lxc/lxc/pull/3541]
|
|
||||||
|
|
||||||
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
|
|
||||||
---
|
|
||||||
config/init/systemd/lxc@.service.in | 2 --
|
|
||||||
1 files changed, 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/config/init/systemd/lxc@.service.in b/config/init/systemd/lxc@.service.in
|
|
||||||
index a2aa2211f..21ce64aef 100644
|
|
||||||
--- a/config/init/systemd/lxc@.service.in
|
|
||||||
+++ b/config/init/systemd/lxc@.service.in
|
|
||||||
@@ -14,8 +14,6 @@ ExecStop=@BINDIR@/lxc-stop -n %i
|
|
||||||
# Environment=BOOTUP=serial
|
|
||||||
# Environment=CONSOLETYPE=serial
|
|
||||||
Delegate=yes
|
|
||||||
-StandardOutput=syslog
|
|
||||||
-StandardError=syslog
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=multi-user.target
|
|
||||||
--
|
|
||||||
2.26.2
|
|
||||||
|
|
|
@ -1,31 +0,0 @@
|
||||||
From 0c4cd88d4a19d27ba9b5d2c8fa4d482d78211c35 Mon Sep 17 00:00:00 2001
|
|
||||||
From: graysky <graysky@archlinux.us>
|
|
||||||
Date: Fri, 21 Aug 2020 06:33:49 -0400
|
|
||||||
Subject: [PATCH] remove deprecated options in lxc.service fixes #3527
|
|
||||||
|
|
||||||
Remove deprecated options in lxc.service fixes #3527
|
|
||||||
|
|
||||||
Upstream-Status: Backport
|
|
||||||
|
|
||||||
Signed-off-by: graysky <graysky@archlinux.us>
|
|
||||||
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
|
|
||||||
---
|
|
||||||
config/init/systemd/lxc.service.in | 2 --
|
|
||||||
1 file changed, 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/config/init/systemd/lxc.service.in b/config/init/systemd/lxc.service.in
|
|
||||||
index e3745dc2d..397a6c4d0 100644
|
|
||||||
--- a/config/init/systemd/lxc.service.in
|
|
||||||
+++ b/config/init/systemd/lxc.service.in
|
|
||||||
@@ -14,8 +14,6 @@ ExecReload=@LIBEXECDIR@/lxc/lxc-apparmor-load
|
|
||||||
# Environment=BOOTUP=serial
|
|
||||||
# Environment=CONSOLETYPE=serial
|
|
||||||
Delegate=yes
|
|
||||||
-StandardOutput=syslog
|
|
||||||
-StandardError=syslog
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=multi-user.target
|
|
||||||
--
|
|
||||||
2.26.2
|
|
||||||
|
|
|
@ -47,14 +47,12 @@ SRC_URI = "http://linuxcontainers.org/downloads/${BPN}-${PV}.tar.gz \
|
||||||
file://templates-use-curl-instead-of-wget.patch \
|
file://templates-use-curl-instead-of-wget.patch \
|
||||||
file://tests-our-init-is-not-busybox.patch \
|
file://tests-our-init-is-not-busybox.patch \
|
||||||
file://tests-add-no-validate-when-using-download-template.patch \
|
file://tests-add-no-validate-when-using-download-template.patch \
|
||||||
file://0001-remove-deprecated-options-in-lxc.service-fixes-3527.patch \
|
|
||||||
file://0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch \
|
|
||||||
file://dnsmasq.conf \
|
file://dnsmasq.conf \
|
||||||
file://lxc-net \
|
file://lxc-net \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "6197096cf11da286b9f9ee02dee9dc50"
|
SRC_URI[md5sum] = "732571c7cb4ab845068afb227bf35256"
|
||||||
SRC_URI[sha256sum] = "3c65a8ba20ed2b66c2075dc914aa632f76d0137af707b851b62b5555fed7d995"
|
SRC_URI[sha256sum] = "9165dabc0bb6ef7f2fda2009aee90b20fbefe77ed8008347e9f06048eba1e463"
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user