mirror of
https://github.com/home-assistant/operating-system.git
synced 2025-07-28 15:36:29 +00:00
Bump systemd to latest stable release 246.9 (#1110)
This commit is contained in:
Stefan Agner
parent
45d6d287e8
commit
5f41501292
@ -0,0 +1,82 @@
|
|||||||
|
From a19d20fdbeab82cfe0c972ef6b2a292b582011cb Mon Sep 17 00:00:00 2001
|
||||||
|
Message-Id: <a19d20fdbeab82cfe0c972ef6b2a292b582011cb.1608480376.git.stefan@agner.ch>
|
||||||
|
In-Reply-To: <dd83e231779b8daaeaa0a78d6686b80eeb49c12b.1608480376.git.stefan@agner.ch>
|
||||||
|
References: <dd83e231779b8daaeaa0a78d6686b80eeb49c12b.1608480376.git.stefan@agner.ch>
|
||||||
|
From: Stefan Agner <stefan@agner.ch>
|
||||||
|
Date: Sun, 20 Dec 2020 16:57:09 +0100
|
||||||
|
Subject: [PATCH 8/8] systemd: Bump to latest systemd-stable release 246.9
|
||||||
|
|
||||||
|
---
|
||||||
|
...o-not-fail-with-read-only-etc-or-var.patch | 34 -------------------
|
||||||
|
package/systemd/systemd.hash | 2 +-
|
||||||
|
package/systemd/systemd.mk | 2 +-
|
||||||
|
3 files changed, 2 insertions(+), 36 deletions(-)
|
||||||
|
delete mode 100644 package/systemd/0001-update-done-Do-not-fail-with-read-only-etc-or-var.patch
|
||||||
|
|
||||||
|
diff --git a/package/systemd/0001-update-done-Do-not-fail-with-read-only-etc-or-var.patch b/package/systemd/0001-update-done-Do-not-fail-with-read-only-etc-or-var.patch
|
||||||
|
deleted file mode 100644
|
||||||
|
index 01e7f1e906..0000000000
|
||||||
|
--- a/package/systemd/0001-update-done-Do-not-fail-with-read-only-etc-or-var.patch
|
||||||
|
+++ /dev/null
|
||||||
|
@@ -1,34 +0,0 @@
|
||||||
|
-From e2a23672a1bbf4d3411dce0289051b5a72bd4a67 Mon Sep 17 00:00:00 2001
|
||||||
|
-From: Felix Riemann <felix.riemann@sma.de>
|
||||||
|
-Date: Mon, 19 Oct 2020 18:54:53 +0200
|
||||||
|
-Subject: [PATCH] update-done: Do not fail with read-only /etc or /var
|
||||||
|
-
|
||||||
|
-With the switch from log_debug() to log_debug_errno() in commit c413bb28df
|
||||||
|
-systemd-update-done would fail without any error message if /etc
|
||||||
|
-or /var were read-only. This restores the previous behaviour to
|
||||||
|
-silently ignore these directories again.
|
||||||
|
-
|
||||||
|
-[Romain: backport from 1eee15c3885fcc9f6a40df7e42347cb8fca71280]
|
||||||
|
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
||||||
|
----
|
||||||
|
- src/update-done/update-done.c | 4 ++--
|
||||||
|
- 1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
-
|
||||||
|
-diff --git a/src/update-done/update-done.c b/src/update-done/update-done.c
|
||||||
|
-index e9d589e0e5..92c348d83b 100644
|
||||||
|
---- a/src/update-done/update-done.c
|
||||||
|
-+++ b/src/update-done/update-done.c
|
||||||
|
-@@ -31,8 +31,8 @@ static int apply_timestamp(const char *path, struct timespec *ts) {
|
||||||
|
-
|
||||||
|
- r = write_string_file_atomic_label_ts(path, message, ts);
|
||||||
|
- if (r == -EROFS)
|
||||||
|
-- return log_debug_errno(r, "Cannot create \"%s\", file system is read-only.", path);
|
||||||
|
-- if (r < 0)
|
||||||
|
-+ log_debug_errno(r, "Cannot create \"%s\", file system is read-only.", path);
|
||||||
|
-+ else if (r < 0)
|
||||||
|
- return log_error_errno(r, "Failed to write \"%s\": %m", path);
|
||||||
|
- return 0;
|
||||||
|
- }
|
||||||
|
---
|
||||||
|
-2.25.4
|
||||||
|
-
|
||||||
|
diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash
|
||||||
|
index cad249199c..2b41ee55f9 100644
|
||||||
|
--- a/package/systemd/systemd.hash
|
||||||
|
+++ b/package/systemd/systemd.hash
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
# sha256 locally computed
|
||||||
|
-sha256 f45c5a98d3be7dd05ed7f1e1a0ab00c7ba52602aa2dc42615bf74be61fcbe178 systemd-246.5.tar.gz
|
||||||
|
+sha256 944f264141ee12199124fe09e811173a3cec72f3db195844707260ee56ad9220 systemd-246.9.tar.gz
|
||||||
|
sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2
|
||||||
|
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1
|
||||||
|
sha256 b142af99a3d950fb465326d6fd5a49d348523dc0d216682880527264d0a011e9 README
|
||||||
|
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
|
||||||
|
index cb12f667d6..1e4171a9e2 100644
|
||||||
|
--- a/package/systemd/systemd.mk
|
||||||
|
+++ b/package/systemd/systemd.mk
|
||||||
|
@@ -4,7 +4,7 @@
|
||||||
|
#
|
||||||
|
################################################################################
|
||||||
|
|
||||||
|
-SYSTEMD_VERSION = 246.5
|
||||||
|
+SYSTEMD_VERSION = 246.9
|
||||||
|
SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION))
|
||||||
|
SYSTEMD_LICENSE = LGPL-2.1+, GPL-2.0+ (udev), Public Domain (few source files, see README), BSD-3-Clause (tools/chromiumos)
|
||||||
|
SYSTEMD_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 README tools/chromiumos/LICENSE
|
||||||
|
--
|
||||||
|
2.29.2
|
||||||
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
From e2a23672a1bbf4d3411dce0289051b5a72bd4a67 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Felix Riemann <felix.riemann@sma.de>
|
|
||||||
Date: Mon, 19 Oct 2020 18:54:53 +0200
|
|
||||||
Subject: [PATCH] update-done: Do not fail with read-only /etc or /var
|
|
||||||
|
|
||||||
With the switch from log_debug() to log_debug_errno() in commit c413bb28df
|
|
||||||
systemd-update-done would fail without any error message if /etc
|
|
||||||
or /var were read-only. This restores the previous behaviour to
|
|
||||||
silently ignore these directories again.
|
|
||||||
|
|
||||||
[Romain: backport from 1eee15c3885fcc9f6a40df7e42347cb8fca71280]
|
|
||||||
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
|
||||||
---
|
|
||||||
src/update-done/update-done.c | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/update-done/update-done.c b/src/update-done/update-done.c
|
|
||||||
index e9d589e0e5..92c348d83b 100644
|
|
||||||
--- a/src/update-done/update-done.c
|
|
||||||
+++ b/src/update-done/update-done.c
|
|
||||||
@@ -31,8 +31,8 @@ static int apply_timestamp(const char *path, struct timespec *ts) {
|
|
||||||
|
|
||||||
r = write_string_file_atomic_label_ts(path, message, ts);
|
|
||||||
if (r == -EROFS)
|
|
||||||
- return log_debug_errno(r, "Cannot create \"%s\", file system is read-only.", path);
|
|
||||||
- if (r < 0)
|
|
||||||
+ log_debug_errno(r, "Cannot create \"%s\", file system is read-only.", path);
|
|
||||||
+ else if (r < 0)
|
|
||||||
return log_error_errno(r, "Failed to write \"%s\": %m", path);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
--
|
|
||||||
2.25.4
|
|
||||||
|
|
||||||
@ -1,5 +1,5 @@
|
|||||||
# sha256 locally computed
|
# sha256 locally computed
|
||||||
sha256 f45c5a98d3be7dd05ed7f1e1a0ab00c7ba52602aa2dc42615bf74be61fcbe178 systemd-246.5.tar.gz
|
sha256 944f264141ee12199124fe09e811173a3cec72f3db195844707260ee56ad9220 systemd-246.9.tar.gz
|
||||||
sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2
|
sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2
|
||||||
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1
|
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1
|
||||||
sha256 b142af99a3d950fb465326d6fd5a49d348523dc0d216682880527264d0a011e9 README
|
sha256 b142af99a3d950fb465326d6fd5a49d348523dc0d216682880527264d0a011e9 README
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
SYSTEMD_VERSION = 246.5
|
SYSTEMD_VERSION = 246.9
|
||||||
SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION))
|
SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION))
|
||||||
SYSTEMD_LICENSE = LGPL-2.1+, GPL-2.0+ (udev), Public Domain (few source files, see README), BSD-3-Clause (tools/chromiumos)
|
SYSTEMD_LICENSE = LGPL-2.1+, GPL-2.0+ (udev), Public Domain (few source files, see README), BSD-3-Clause (tools/chromiumos)
|
||||||
SYSTEMD_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 README tools/chromiumos/LICENSE
|
SYSTEMD_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 README tools/chromiumos/LICENSE
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user