Skip to contentSkip to conversation

lxc: upgrade to 4.0.5

PATCH In review Yu, Mingli 2 participants 2 messages Jan 25, 2021 – Feb 7, 2021

lore
Share & tools
lore

Yu, Mingli

author
#0 lore raw

PATCH 1/1 lxc: upgrade to 4.0.5

From: Mingli Yu <[email protected]>

Remove 2 backported patches.

---
 ...setting-regarding-the-Standard-Outpu.patch | 35 -------------------
 ...ed-options-in-lxc.service-fixes-3527.patch | 31 ----------------
 .../lxc/{lxc_4.0.4.bb => lxc_4.0.5.bb}        |  5 +--
 3 files changed, 1 insertion(+), 70 deletions(-)
 delete mode 100644 recipes-containers/lxc/files/0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch
 delete mode 100644 recipes-containers/lxc/files/0001-remove-deprecated-options-in-lxc.service-fixes-3527.patch
 rename recipes-containers/lxc/{lxc_4.0.4.bb => lxc_4.0.5.bb} (95%)
recipes-containers/lxc/files/0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch deleted +0 -35
deleted file mode 100644
index ab97422..0000000
@@ -1,35 +0,0 @@
-From a7a92a06a47322dee45664db5c7bfa68b2b95edb Mon Sep 17 00:00:00 2001
-From: Mingli Yu <[email protected]>
-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 <[email protected]>
----
- config/init/systemd/[email protected]         | 2 --
- 1 files changed, 2 deletions(-)
-
-diff --git a/config/init/systemd/[email protected] b/config/init/systemd/[email protected]
-index a2aa2211f..21ce64aef 100644
---- a/config/init/systemd/[email protected]
-+++ b/config/init/systemd/[email protected]
-@@ -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
-
recipes-containers/lxc/files/0001-remove-deprecated-options-in-lxc.service-fixes-3527.patch deleted +0 -31
deleted file mode 100644
index 2957680..0000000
@@ -1,31 +0,0 @@
-From 0c4cd88d4a19d27ba9b5d2c8fa4d482d78211c35 Mon Sep 17 00:00:00 2001
-From: graysky <[email protected]>
-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 <[email protected]>
-Signed-off-by: Mingli Yu <[email protected]>
----
- 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
-
recipes-containers/lxc/lxc_4.0.5.bb renamed from recipes-containers/lxc/lxc_4.0.4.bb +1 -4
similarity index 95%
rename from recipes-containers/lxc/lxc_4.0.4.bb
rename to recipes-containers/lxc/lxc_4.0.5.bb
index 19b40f6..384736b 100644
@@ -47,14 +47,11 @@ SRC_URI = "http://linuxcontainers.org/downloads/${BPN}-${PV}.tar.gz \
 	file://templates-use-curl-instead-of-wget.patch \
 	file://tests-our-init-is-not-busybox.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://lxc-net \
 	"
 
-SRC_URI[md5sum] = "6197096cf11da286b9f9ee02dee9dc50"
-SRC_URI[sha256sum] = "3c65a8ba20ed2b66c2075dc914aa632f76d0137af707b851b62b5555fed7d995"
+SRC_URI[sha256sum] = "af2cd616d5ab689e5d2305361c6571b5e632afd7eaab1754cca1670446a2e6a4"
 
 
 
Signature · 1 line
2.17.1
#1 lore raw

My apologies, I was doing a set of queued uprevs this weekend, and moved lxc to 4.0.6, so I jumped right over this version before I checked my pending queue.

Thanks for the version bump though, it is appreciated.

Bruce

In message: [meta-virtualization] [PATCH] lxc: upgrade to 4.0.5

Quoted 122 lines · Mingli

From: Mingli Yu <[email protected]>

Remove 2 backported patches.

---
 ...setting-regarding-the-Standard-Outpu.patch | 35 -------------------
 ...ed-options-in-lxc.service-fixes-3527.patch | 31 ----------------
 .../lxc/{lxc_4.0.4.bb => lxc_4.0.5.bb}        |  5 +--
 3 files changed, 1 insertion(+), 70 deletions(-)
 delete mode 100644 recipes-containers/lxc/files/0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch
 delete mode 100644 recipes-containers/lxc/files/0001-remove-deprecated-options-in-lxc.service-fixes-3527.patch
 rename recipes-containers/lxc/{lxc_4.0.4.bb => lxc_4.0.5.bb} (95%)
recipes-containers/lxc/files/0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch deleted +0 -35
deleted file mode 100644
index ab97422..0000000
@@ -1,35 +0,0 @@
-From a7a92a06a47322dee45664db5c7bfa68b2b95edb Mon Sep 17 00:00:00 2001
-From: Mingli Yu <[email protected]>
-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 <[email protected]>
----
- config/init/systemd/[email protected]         | 2 --
- 1 files changed, 2 deletions(-)
-
-diff --git a/config/init/systemd/[email protected] b/config/init/systemd/[email protected]
-index a2aa2211f..21ce64aef 100644
---- a/config/init/systemd/[email protected]
-+++ b/config/init/systemd/[email protected]
-@@ -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
-
recipes-containers/lxc/files/0001-remove-deprecated-options-in-lxc.service-fixes-3527.patch deleted +0 -31
deleted file mode 100644
index 2957680..0000000
@@ -1,31 +0,0 @@
-From 0c4cd88d4a19d27ba9b5d2c8fa4d482d78211c35 Mon Sep 17 00:00:00 2001
-From: graysky <[email protected]>
-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 <[email protected]>
-Signed-off-by: Mingli Yu <[email protected]>
----
- 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
-
recipes-containers/lxc/lxc_4.0.5.bb renamed from recipes-containers/lxc/lxc_4.0.4.bb +1 -4
similarity index 95%
rename from recipes-containers/lxc/lxc_4.0.4.bb
rename to recipes-containers/lxc/lxc_4.0.5.bb
index 19b40f6..384736b 100644
@@ -47,14 +47,11 @@ SRC_URI = "http://linuxcontainers.org/downloads/${BPN}-${PV}.tar.gz \
 	file://templates-use-curl-instead-of-wget.patch \
 	file://tests-our-init-is-not-busybox.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://lxc-net \
 	"
 
-SRC_URI[md5sum] = "6197096cf11da286b9f9ee02dee9dc50"
-SRC_URI[sha256sum] = "3c65a8ba20ed2b66c2075dc914aa632f76d0137af707b851b62b5555fed7d995"
+SRC_URI[sha256sum] = "af2cd616d5ab689e5d2305361c6571b5e632afd7eaab1754cca1670446a2e6a4"
 
 
 
Signature · 1 line
2.17.1