mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-08-05 17:07:49 +00:00
systemd: update to 253.6
This commit is contained in:
parent
ac382aef2e
commit
9d8dae397c
@ -3,8 +3,8 @@
|
|||||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||||
|
|
||||||
PKG_NAME="systemd"
|
PKG_NAME="systemd"
|
||||||
PKG_VERSION="253.5"
|
PKG_VERSION="253.6"
|
||||||
PKG_SHA256="544220ae46d96919dbb1d67a4bbbf7b4c054f0099d8bbc8b0c0ae3af492ee493"
|
PKG_SHA256="a0aebcfaa2e001a4d846691631d1722c4cfa1a175e4ea62db6edca0ea3cf1e3e"
|
||||||
PKG_LICENSE="LGPL2.1+"
|
PKG_LICENSE="LGPL2.1+"
|
||||||
PKG_SITE="http://www.freedesktop.org/wiki/Software/systemd"
|
PKG_SITE="http://www.freedesktop.org/wiki/Software/systemd"
|
||||||
PKG_URL="https://github.com/systemd/systemd-stable/archive/v${PKG_VERSION}.tar.gz"
|
PKG_URL="https://github.com/systemd/systemd-stable/archive/v${PKG_VERSION}.tar.gz"
|
||||||
|
@ -1,32 +1,19 @@
|
|||||||
From bf2776b7f9403057cb82c2697e4fca8b554db4bd Mon Sep 17 00:00:00 2001
|
From dd8a6a2af24e2d24fcc5cb9b114f8da05a69bdd0 Mon Sep 17 00:00:00 2001
|
||||||
From: MilhouseVH <milhouseVH.github@nmacleod.com>
|
From: Rudi Heitbaum <rudi@heitbaum.com>
|
||||||
Date: Thu, 11 Apr 2019 20:00:05 +0100
|
Date: Fri, 7 Jul 2023 11:44:05 +0000
|
||||||
Subject: [PATCH] move hwdb.bin to /run
|
Subject: [PATCH] move hwdb.bin to /run
|
||||||
|
|
||||||
---
|
---
|
||||||
src/shared/hwdb-util.c | 2 +-
|
src/libsystemd/sd-hwdb/hwdb-internal.h | 2 +-
|
||||||
src/libsystemd/sd-hwdb/hwdb-internal.h | 2 +-
|
src/shared/hwdb-util.c | 2 +-
|
||||||
units/systemd-hwdb-update.service.in | 2 +-
|
units/systemd-hwdb-update.service.in | 2 +-
|
||||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
3 files changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
diff --git a/src/shared/hwdb-util.c b/src/shared/hwdb-util.c
|
|
||||||
index c83575c..6285f3d 100644
|
|
||||||
--- a/src/shared/hwdb-util.c
|
|
||||||
+++ b/src/shared/hwdb-util.c
|
|
||||||
@@ -21,7 +21,7 @@
|
|
||||||
#include "strv.h"
|
|
||||||
#include "tmpfile-util.h"
|
|
||||||
|
|
||||||
-static const char *default_hwdb_bin_dir = "/etc/udev";
|
|
||||||
+static const char *default_hwdb_bin_dir = "/run";
|
|
||||||
static const char * const conf_file_dirs[] = {
|
|
||||||
"/etc/udev/hwdb.d",
|
|
||||||
UDEVLIBEXECDIR "/hwdb.d",
|
|
||||||
diff --git a/src/libsystemd/sd-hwdb/hwdb-internal.h b/src/libsystemd/sd-hwdb/hwdb-internal.h
|
diff --git a/src/libsystemd/sd-hwdb/hwdb-internal.h b/src/libsystemd/sd-hwdb/hwdb-internal.h
|
||||||
index 79fe1a8..0acbf71 100644
|
index 5302679a62..4afdd6e306 100644
|
||||||
--- a/src/libsystemd/sd-hwdb/hwdb-internal.h 2021-07-07 17:41:29.000000000 +0000
|
--- a/src/libsystemd/sd-hwdb/hwdb-internal.h
|
||||||
+++ b/src/libsystemd/sd-hwdb/hwdb-internal.h 2021-07-08 10:59:13.723718762 +0000
|
+++ b/src/libsystemd/sd-hwdb/hwdb-internal.h
|
||||||
@@ -83,7 +83,7 @@
|
@@ -84,7 +84,7 @@ struct trie_value_entry2_f {
|
||||||
|
|
||||||
#define hwdb_bin_paths \
|
#define hwdb_bin_paths \
|
||||||
"/etc/systemd/hwdb/hwdb.bin\0" \
|
"/etc/systemd/hwdb/hwdb.bin\0" \
|
||||||
@ -35,19 +22,32 @@ index 79fe1a8..0acbf71 100644
|
|||||||
"/usr/lib/systemd/hwdb/hwdb.bin\0" \
|
"/usr/lib/systemd/hwdb/hwdb.bin\0" \
|
||||||
_CONF_PATHS_SPLIT_USR_NULSTR("systemd/hwdb/hwdb.bin") \
|
_CONF_PATHS_SPLIT_USR_NULSTR("systemd/hwdb/hwdb.bin") \
|
||||||
UDEVLIBEXECDIR "/hwdb.bin\0"
|
UDEVLIBEXECDIR "/hwdb.bin\0"
|
||||||
|
diff --git a/src/shared/hwdb-util.c b/src/shared/hwdb-util.c
|
||||||
|
index 12621b7f89..552b1dc008 100644
|
||||||
|
--- a/src/shared/hwdb-util.c
|
||||||
|
+++ b/src/shared/hwdb-util.c
|
||||||
|
@@ -587,7 +587,7 @@ int hwdb_update(const char *root, const char *hwdb_bin_dir, bool strict, bool co
|
||||||
|
* source. If true, then hwdb.bin will be created without the information. systemd-hwdb command
|
||||||
|
* should set the argument false, and 'udevadm hwdb' command should set it true. */
|
||||||
|
|
||||||
|
- hwdb_bin = path_join(root, hwdb_bin_dir ?: "/etc/udev", "hwdb.bin");
|
||||||
|
+ hwdb_bin = path_join(root, hwdb_bin_dir ?: "/run", "hwdb.bin");
|
||||||
|
if (!hwdb_bin)
|
||||||
|
return -ENOMEM;
|
||||||
|
|
||||||
diff --git a/units/systemd-hwdb-update.service.in b/units/systemd-hwdb-update.service.in
|
diff --git a/units/systemd-hwdb-update.service.in b/units/systemd-hwdb-update.service.in
|
||||||
index 259fe0d..18d617f 100644
|
index 4ba36d1fc6..4848ae9661 100644
|
||||||
--- a/units/systemd-hwdb-update.service.in
|
--- a/units/systemd-hwdb-update.service.in
|
||||||
+++ b/units/systemd-hwdb-update.service.in
|
+++ b/units/systemd-hwdb-update.service.in
|
||||||
@@ -16,7 +16,7 @@
|
@@ -13,7 +13,7 @@ Documentation=man:hwdb(7) man:systemd-hwdb(8)
|
||||||
Before=sysinit.target shutdown.target systemd-update-done.service
|
|
||||||
ConditionNeedsUpdate=/etc
|
ConditionNeedsUpdate=/etc
|
||||||
ConditionPathExists=|!{{UDEVLIBEXECDIR}}/hwdb.bin
|
ConditionPathExists=|!{{UDEVLIBEXECDIR}}/hwdb.bin
|
||||||
-ConditionPathExists=|/etc/udev/hwdb.bin
|
-ConditionPathExists=|/etc/udev/hwdb.bin
|
||||||
+ConditionPathExists=|/run/hwdb.bin
|
+ConditionPathExists=|/run/hwdb.bin
|
||||||
ConditionDirectoryNotEmpty=|/etc/udev/hwdb.d/
|
ConditionDirectoryNotEmpty=|/etc/udev/hwdb.d/
|
||||||
|
|
||||||
[Service]
|
DefaultDependencies=no
|
||||||
--
|
--
|
||||||
2.14.1
|
2.34.1
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user