Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

systemd: update to 239 #2791

Merged
merged 8 commits into from
Jul 15, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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 change: 0 additions & 1 deletion packages/sysutils/busybox/tmpfiles.d/z_01_busybox.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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 - -
Expand Down
4 changes: 3 additions & 1 deletion packages/sysutils/dbus/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/sysutils/dbus/tmpfiles.d/z_02_dbus.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 2 additions & 1 deletion packages/sysutils/eventlircd/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions packages/sysutils/lirc/config/lirc_options.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion packages/sysutils/lirc/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/sysutils/lirc/system.d/lircd.socket
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[Socket]
ListenStream=/var/run/lirc/lircd.socket
ListenStream=/run/lirc/lircd.socket

[Install]
WantedBy=sockets.target
Expand Down
2 changes: 1 addition & 1 deletion packages/sysutils/lirc/tmpfiles.d/z_61_lirc.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 6 additions & 3 deletions packages/sysutils/systemd/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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"

Expand Down

This file was deleted.

This file was deleted.