diff options
-rw-r--r-- | recipes-containers/lxc/files/0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch | 35 | ||||
-rw-r--r-- | recipes-containers/lxc/files/0001-remove-deprecated-options-in-lxc.service-fixes-3527.patch | 31 | ||||
-rw-r--r-- | recipes-containers/lxc/lxc_4.0.6.bb (renamed from recipes-containers/lxc/lxc_4.0.4.bb) | 6 |
3 files changed, 2 insertions, 70 deletions
diff --git a/recipes-containers/lxc/files/0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch b/recipes-containers/lxc/files/0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch deleted file mode 100644 index ab974224..00000000 --- a/recipes-containers/lxc/files/0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From a7a92a06a47322dee45664db5c7bfa68b2b95edb Mon Sep 17 00:00:00 2001 | ||
2 | From: Mingli Yu <mingli.yu@windriver.com> | ||
3 | Date: Wed, 23 Sep 2020 07:03:02 +0000 | ||
4 | Subject: [PATCH] Remove obsolete setting regarding the Standard Output | ||
5 | |||
6 | The Standard output type "syslog" is obsolete, causing a warning since systemd | ||
7 | version 246 [1]. | ||
8 | |||
9 | Please consider using "journal" or "journal+console" | ||
10 | |||
11 | [1] https://github.com/systemd/systemd/blob/master/NEWS#L202 | ||
12 | |||
13 | Upstream-Status: Submitted [https://github.com/lxc/lxc/pull/3541] | ||
14 | |||
15 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
16 | --- | ||
17 | config/init/systemd/lxc@.service.in | 2 -- | ||
18 | 1 files changed, 2 deletions(-) | ||
19 | |||
20 | diff --git a/config/init/systemd/lxc@.service.in b/config/init/systemd/lxc@.service.in | ||
21 | index a2aa2211f..21ce64aef 100644 | ||
22 | --- a/config/init/systemd/lxc@.service.in | ||
23 | +++ b/config/init/systemd/lxc@.service.in | ||
24 | @@ -14,8 +14,6 @@ ExecStop=@BINDIR@/lxc-stop -n %i | ||
25 | # Environment=BOOTUP=serial | ||
26 | # Environment=CONSOLETYPE=serial | ||
27 | Delegate=yes | ||
28 | -StandardOutput=syslog | ||
29 | -StandardError=syslog | ||
30 | |||
31 | [Install] | ||
32 | WantedBy=multi-user.target | ||
33 | -- | ||
34 | 2.26.2 | ||
35 | |||
diff --git a/recipes-containers/lxc/files/0001-remove-deprecated-options-in-lxc.service-fixes-3527.patch b/recipes-containers/lxc/files/0001-remove-deprecated-options-in-lxc.service-fixes-3527.patch deleted file mode 100644 index 29576809..00000000 --- a/recipes-containers/lxc/files/0001-remove-deprecated-options-in-lxc.service-fixes-3527.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From 0c4cd88d4a19d27ba9b5d2c8fa4d482d78211c35 Mon Sep 17 00:00:00 2001 | ||
2 | From: graysky <graysky@archlinux.us> | ||
3 | Date: Fri, 21 Aug 2020 06:33:49 -0400 | ||
4 | Subject: [PATCH] remove deprecated options in lxc.service fixes #3527 | ||
5 | |||
6 | Remove deprecated options in lxc.service fixes #3527 | ||
7 | |||
8 | Upstream-Status: Backport | ||
9 | |||
10 | Signed-off-by: graysky <graysky@archlinux.us> | ||
11 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
12 | --- | ||
13 | config/init/systemd/lxc.service.in | 2 -- | ||
14 | 1 file changed, 2 deletions(-) | ||
15 | |||
16 | diff --git a/config/init/systemd/lxc.service.in b/config/init/systemd/lxc.service.in | ||
17 | index e3745dc2d..397a6c4d0 100644 | ||
18 | --- a/config/init/systemd/lxc.service.in | ||
19 | +++ b/config/init/systemd/lxc.service.in | ||
20 | @@ -14,8 +14,6 @@ ExecReload=@LIBEXECDIR@/lxc/lxc-apparmor-load | ||
21 | # Environment=BOOTUP=serial | ||
22 | # Environment=CONSOLETYPE=serial | ||
23 | Delegate=yes | ||
24 | -StandardOutput=syslog | ||
25 | -StandardError=syslog | ||
26 | |||
27 | [Install] | ||
28 | WantedBy=multi-user.target | ||
29 | -- | ||
30 | 2.26.2 | ||
31 | |||
diff --git a/recipes-containers/lxc/lxc_4.0.4.bb b/recipes-containers/lxc/lxc_4.0.6.bb index 19b40f6b..ddff9af1 100644 --- a/recipes-containers/lxc/lxc_4.0.4.bb +++ b/recipes-containers/lxc/lxc_4.0.6.bb | |||
@@ -47,14 +47,12 @@ SRC_URI = "http://linuxcontainers.org/downloads/${BPN}-${PV}.tar.gz \ | |||
47 | file://templates-use-curl-instead-of-wget.patch \ | 47 | file://templates-use-curl-instead-of-wget.patch \ |
48 | file://tests-our-init-is-not-busybox.patch \ | 48 | file://tests-our-init-is-not-busybox.patch \ |
49 | file://tests-add-no-validate-when-using-download-template.patch \ | 49 | file://tests-add-no-validate-when-using-download-template.patch \ |
50 | file://0001-remove-deprecated-options-in-lxc.service-fixes-3527.patch \ | ||
51 | file://0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch \ | ||
52 | file://dnsmasq.conf \ | 50 | file://dnsmasq.conf \ |
53 | file://lxc-net \ | 51 | file://lxc-net \ |
54 | " | 52 | " |
55 | 53 | ||
56 | SRC_URI[md5sum] = "6197096cf11da286b9f9ee02dee9dc50" | 54 | SRC_URI[md5sum] = "732571c7cb4ab845068afb227bf35256" |
57 | SRC_URI[sha256sum] = "3c65a8ba20ed2b66c2075dc914aa632f76d0137af707b851b62b5555fed7d995" | 55 | SRC_URI[sha256sum] = "9165dabc0bb6ef7f2fda2009aee90b20fbefe77ed8008347e9f06048eba1e463" |
58 | 56 | ||
59 | 57 | ||
60 | 58 | ||