jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2791 from HiassofT/le9-systemd-239

Browse Source 
systemd: update to 239
This commit is contained in:
Christian Hewitt 2018-07-15 07:31:10 +04:00 committed by GitHub
commit b862b263fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 77 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
packages/devel/autoconf/patches/autoconf-0100-backport-runstatedir.patch Normal file
View File

@ -0,0 +1,59 @@
From 8e269b13bc042bc2504d5860e0d453b4aac32909 Mon Sep 17 00:00:00 2001
From: Matthias Reichl <hias@horus.com>
Date: Sun, 24 Jun 2018 13:45:26 +0200
Subject: [PATCH] backport AC_INIT: add --runstatedir option to configure
Backport of a197431414088a417b407b9b20583b2e8f7363bd.
Changes to NEWS and doc/autoconf.tex have been dropped.
---
lib/autoconf/general.m4 | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index adfae1db..1437c0ca 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -586,6 +586,7 @@ AC_SUBST([datadir], ['${datarootdir}'])dnl
AC_SUBST([sysconfdir], ['${prefix}/etc'])dnl
AC_SUBST([sharedstatedir], ['${prefix}/com'])dnl
AC_SUBST([localstatedir], ['${prefix}/var'])dnl
+AC_SUBST([runstatedir], ['${localstatedir}/run'])dnl
AC_SUBST([includedir], ['${prefix}/include'])dnl
AC_SUBST([oldincludedir], ['/usr/include'])dnl
AC_SUBST([docdir], [m4_ifset([AC_PACKAGE_TARNAME],
@@ -812,6 +813,15 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
+ | --runstate | --runstat | --runsta | --runst | --runs \
+ | --run | --ru | --r)
+ ac_prev=runstatedir ;;
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+ | --run=* | --ru=* | --r=*)
+ runstatedir=$ac_optarg ;;
+
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -921,7 +931,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir
+ libdir localedir mandir runstatedir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1058,6 +1068,7 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
--
2.11.0

1
packages/sysutils/busybox/tmpfiles.d/z_01_busybox.conf
View File

@ -18,7 +18,6 @@
d /var/media 0755 root root - -
f /var/run/utmp 1777 root root - -
d /storage/backup 0755 root root - -
d /storage/.update 0755 root root - -
d /storage/.cache/cores 0755 root root - -

4
packages/sysutils/dbus/package.mk
View File

@ -46,7 +46,9 @@ PKG_CONFIGURE_OPTS_TARGET="export ac_cv_have_abstract_sockets=yes \
--enable-inotify \
--without-valgrind \
--without-x \
--with-dbus-user=dbus"
--with-dbus-user=dbus \
--runstatedir=/run \
--with-system-socket=/run/dbus/system_bus_socket"
post_makeinstall_target() {
rm -rf $INSTALL/etc/rc.d

2
packages/sysutils/dbus/tmpfiles.d/z_02_dbus.conf
View File

@ -17,6 +17,6 @@
################################################################################
d /var/lib/dbus 0755 root root - -
d /var/run/dbus 0755 root root - -
d /run/dbus 0755 root root - -
L /var/lib/dbus/machine-id - - - - /etc/machine-id

3
packages/sysutils/eventlircd/package.mk
View File

@ -30,7 +30,8 @@ PKG_SHORTDESC="eventlircd:The eventlircd daemon provides various functions for L
PKG_LONGDESC="The eventlircd daemon provides four functions for LIRC devices"
PKG_TOOLCHAIN="autotools"
PKG_CONFIGURE_OPTS_TARGET="--with-udev-dir=/usr/lib/udev"
PKG_CONFIGURE_OPTS_TARGET="--with-udev-dir=/usr/lib/udev \
--with-lircd-socket=/run/lirc/lircd"
post_makeinstall_target() {
# install our own evmap files and udev rules

4
packages/sysutils/lirc/config/lirc_options.conf
View File

@ -10,8 +10,8 @@
nodaemon = False
driver = default
device = /dev/lirc0
output = /var/run/lirc/lircd.socket
pidfile = /var/run/lirc/lircd.pid
output = /run/lirc/lircd.socket
pidfile = /run/lirc/lircd.pid
plugindir = /usr/lib/lirc/plugins
permission = 666
allow-simulate = No

3
packages/sysutils/lirc/package.mk
View File

@ -33,7 +33,8 @@ PKG_PYTHON_WANTED=Python2
PKG_CONFIGURE_OPTS_TARGET="--enable-devinput \
--with-gnu-ld \
--without-x"
--without-x \
--runstatedir=/run"
pre_configure_target() {
export HAVE_WORKING_POLL=yes

2
packages/sysutils/lirc/system.d/lircd.socket
View File

@ -1,5 +1,5 @@
[Socket]
ListenStream=/var/run/lirc/lircd.socket
ListenStream=/run/lirc/lircd.socket
[Install]
WantedBy=sockets.target

2
packages/sysutils/lirc/tmpfiles.d/z_61_lirc.conf
View File

@ -16,4 +16,4 @@
# along with OpenELEC. If not, see <http://www.gnu.org/licenses/>.
################################################################################
d /var/run/lirc 0755 root root - -
d /run/lirc 0755 root root - -

9
packages/sysutils/systemd/package.mk
View File

@ -17,8 +17,8 @@
################################################################################
PKG_NAME="systemd"
PKG_VERSION="238"
PKG_SHA256="bbc8599bab2e3c4273886dfab12464e488ecdaf20b8284949e50f8858de3e022"
PKG_VERSION="239"
PKG_SHA256="8a11b1b07d620f4c06a16e95bba4dd2a97e90efdf2a5ba47ed0a935085787a14"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.freedesktop.org/wiki/Software/systemd"
@ -76,7 +76,7 @@ PKG_MESON_OPTS_TARGET="--libdir=/usr/lib \
-Dmachined=false \
-Dnetworkd=false \
-Dtimedated=false \
-Dtimesyncd=false \
-Dtimesyncd=true \
-Dmyhostname=false \
-Dfirstboot=false \
-Drandomseed=false \
@ -247,6 +247,9 @@ post_makeinstall_target() {
post_install() {
add_group systemd-journal 190
add_group systemd-timesync 191
add_user systemd-timesync x 191 191 "systemd-timesync" "/" "/bin/false"
add_group systemd-network 193
add_user systemd-network x 193 193 "systemd-network" "/" "/bin/sh"

42
packages/sysutils/systemd/patches/systemd-0201-fix-segfaults-in-libc-after-mounting-cgroup.patch
View File

@ -1,42 +0,0 @@
https://github.com/systemd/systemd/pull/8391
From 3b3a93045c3e35b45e410d765eaad78300104cec Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 8 Mar 2018 15:22:59 +0900
Subject: [PATCH] core: do not free heap-allocated strings
Fixes #8387.
---
src/core/mount-setup.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
index 536c17b4d56..9c27972aff5 100644
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -248,6 +248,7 @@ int mount_setup_early(void) {
int mount_cgroup_controllers(char ***join_controllers) {
_cleanup_set_free_free_ Set *controllers = NULL;
+ bool has_argument = !!join_controllers;
int r;
if (!cg_is_legacy_wanted())
@@ -255,7 +256,7 @@ int mount_cgroup_controllers(char ***join_controllers) {
/* Mount all available cgroup controllers that are built into the kernel. */
- if (!join_controllers)
+ if (!has_argument)
/* The defaults:
* mount "cpu" + "cpuacct" together, and "net_cls" + "net_prio".
*
@@ -300,7 +301,8 @@ int mount_cgroup_controllers(char ***join_controllers) {
t = set_remove(controllers, *i);
if (!t) {
- free(*i);
+ if (has_argument)
+ free(*i);
continue;
}
}

38
packages/sysutils/systemd/patches/systemd-0202-fix-_nr_statx-buildspam-aml.patch
View File

@ -1,38 +0,0 @@
https://github.com/systemd/systemd/pull/8872
From 773c84349d80c7a6f818f5909a160ddb7337987f Mon Sep 17 00:00:00 2001
From: Adam Duskett <Aduskett@gmail.com>
Date: Wed, 2 May 2018 04:04:50 -0400
Subject: [PATCH] add __nr_statx defines for extra architectures (#8872)
This includes:
- arm
- arm64
- alpha
- powerpc64
- sparc
Taken from kernel 4.16.6
---
src/basic/missing_syscall.h | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h
index 2948f789b51..42ada30d524 100644
--- a/src/basic/missing_syscall.h
+++ b/src/basic/missing_syscall.h
@@ -403,8 +403,14 @@ static inline int missing_bpf(int cmd, union bpf_attr *attr, size_t size) {
#if !HAVE_STATX
# ifndef __NR_statx
-# if defined __i386__
+# if defined __aarch64__ || defined __arm__
+# define __NR_statx 397
+# elif defined __alpha__
+# define __NR_statx 522
+# elif defined __i386__ || defined __powerpc64__
# define __NR_statx 383
+# elif defined __sparc__
+# define __NR_statx 360
# elif defined __x86_64__
# define __NR_statx 332
# else