systemd: update to systemd-218

This commit is contained in:
Stefan Saraev 2014-12-11 19:48:11 +02:00
parent 62a25586c7
commit 98ae1135a4
11 changed files with 150 additions and 103 deletions

View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="systemd"
PKG_VERSION="217"
PKG_VERSION="218"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
@ -44,6 +44,7 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
--disable-compat-libs \
--disable-coverage \
--enable-kmod \
--disable-xkbcommon \
--enable-blkid \
--disable-seccomp \
--disable-ima \
@ -94,6 +95,7 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
--disable-ldconfig \
--enable-split-usr \
--disable-tests \
--disable-hashmap-debug \
--without-python \
--disable-python-devel \
--with-sysvinit-path= \
@ -141,6 +143,8 @@ post_makeinstall_target() {
# replace systemd-machine-id-setup with ours
mkdir -p $INSTALL/usr/bin
rm -rf $INSTALL/usr/lib/systemd/systemd-machine-id-commit
rm -rf $INSTALL/usr/lib/systemd/system/systemd-machine-id-commit.service
rm -rf $INSTALL/usr/bin/systemd-machine-id-setup
cp $PKG_DIR/scripts/systemd-machine-id-setup $INSTALL/usr/bin

View File

@ -1,36 +0,0 @@
From 0ffce503cd6e5a5ff5ba5cd1cc23684cfb8bb9e3 Mon Sep 17 00:00:00 2001
From: Dave Reisner <dreisner@archlinux.org>
Date: Thu, 30 Oct 2014 20:12:05 -0400
Subject: shared/install: avoid prematurely rejecting "missing" units
f7101b7368df copied some logic to prevent enabling masked units, but
also added a check which causes attempts to enable templated units to
fail. Since we know the logic beyond this check will properly handle
units which truly do not exist, we can rely on the unit file state
comparison to suffice for expressing the intent of f7101b7368df.
ref: https://bugs.archlinux.org/task/42616
diff --git a/src/shared/install.c b/src/shared/install.c
index 035b44c..cab93e8 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -1620,12 +1620,10 @@ int unit_file_enable(
STRV_FOREACH(i, files) {
UnitFileState state;
+ /* We only want to know if this unit is masked, so we ignore
+ * errors from unit_file_get_state, deferring other checks.
+ * This allows templated units to be enabled on the fly. */
state = unit_file_get_state(scope, root_dir, *i);
- if (state < 0) {
- log_error("Failed to get unit file state for %s: %s", *i, strerror(-state));
- return state;
- }
-
if (state == UNIT_FILE_MASKED || state == UNIT_FILE_MASKED_RUNTIME) {
log_error("Failed to enable unit: Unit %s is masked", *i);
return -ENOTSUP;
--
cgit v0.10.2

View File

@ -1,18 +1,18 @@
From 1550bc60a53e4812723db5d7a8aefa825d4e9c78 Mon Sep 17 00:00:00 2001
From fcccd4547215855cc2d931546172f936a570ae01 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sat, 30 Nov 2013 13:16:37 +0200
Subject: [PATCH] journald: decrease limits
Subject: [PATCH 2/8] journald: decrease limits
reallly? I mean really?? y u no care about embedded / lowmem devices...
happy rpi users...
---
src/journal/journal-file.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index 1236403..87dc1ae 100644
index c5d2d19..8ffcb04 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -44,11 +44,11 @@
@@ -41,11 +41,11 @@
#define COMPRESSION_SIZE_THRESHOLD (512ULL)
/* This is the minimum journal file size */
@ -27,5 +27,5 @@ index 1236403..87dc1ae 100644
/* This is the upper bound if we deduce max_size from max_use */
--
1.7.2.5
1.7.10.4

View File

@ -1,7 +1,7 @@
From 3bda4f376063971ad068f9c26edbec9029cfa7e6 Mon Sep 17 00:00:00 2001
From 0fe627a4c4a10f5ed7aee8372cee7956aa1ccb80 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Thu, 19 Dec 2013 11:21:13 +0200
Subject: [PATCH] move /etc/systemd/system to /storage/.config/system.d
Subject: [PATCH 3/8] move /etc/systemd/system to /storage/.config/system.d
---
Makefile.am | 4 ++--
@ -9,10 +9,10 @@ Subject: [PATCH] move /etc/systemd/system to /storage/.config/system.d
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 8d9c587..93e9c6d 100644
index ac7924e..8288850 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -144,7 +144,7 @@ udevlibexec_PROGRAMS =
@@ -164,7 +164,7 @@ udevlibexec_PROGRAMS =
AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
-DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
@ -21,7 +21,7 @@ index 8d9c587..93e9c6d 100644
-DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \
-DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" \
-DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \
@@ -4209,7 +4209,7 @@ substitutions = \
@@ -5838,7 +5838,7 @@ substitutions = \
'|SYSTEMCTL=$(rootbindir)/systemctl|' \
'|SYSTEMD_NOTIFY=$(rootbindir)/systemd-notify|' \
'|pkgsysconfdir=$(pkgsysconfdir)|' \
@ -31,10 +31,10 @@ index 8d9c587..93e9c6d 100644
'|pkgdatadir=$(pkgdatadir)|' \
'|systemunitdir=$(systemunitdir)|' \
diff --git a/Makefile.in b/Makefile.in
index 6f3d475..66c4c22 100644
index 3b35030..f0ad455 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3744,7 +3744,7 @@ manual_tests = test-engine test-ns test-loopback test-hostname \
@@ -5435,7 +5435,7 @@ manual_tests = test-ns test-loopback test-hostname test-daemon \
AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
-DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
@ -43,7 +43,7 @@ index 6f3d475..66c4c22 100644
-DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \
-DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" \
-DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \
@@ -6269,7 +6269,7 @@ substitutions = \
@@ -8954,7 +8954,7 @@ substitutions = \
'|SYSTEMCTL=$(rootbindir)/systemctl|' \
'|SYSTEMD_NOTIFY=$(rootbindir)/systemd-notify|' \
'|pkgsysconfdir=$(pkgsysconfdir)|' \
@ -53,5 +53,5 @@ index 6f3d475..66c4c22 100644
'|pkgdatadir=$(pkgdatadir)|' \
'|systemunitdir=$(systemunitdir)|' \
--
1.7.2.5
1.7.10.4

View File

@ -1,7 +1,7 @@
From de36fe2075662ab3c37cc000d217be16d8de9016 Mon Sep 17 00:00:00 2001
From 419e20f0b7d2edaadf39a9724960ca22c473b4e8 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Fri, 4 Jul 2014 13:52:55 +0300
Subject: [PATCH] nah. no ln --relative
Subject: [PATCH 4/8] nah. no ln --relative
It is unclear that systemd now requires very recent coreutils
in order to compile.
@ -15,10 +15,10 @@ to tell our users to do so just to be able to build OpenELEC.
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index fe8f8d7..8fa0896 100644
index 8288850..bb9ba9c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -219,8 +219,8 @@ define move-to-rootlibdir
@@ -229,8 +229,8 @@ define move-to-rootlibdir
if test "$(libdir)" != "$(rootlibdir)"; then \
$(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \
@ -29,7 +29,7 @@ index fe8f8d7..8fa0896 100644
mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \
fi
endef
@@ -279,9 +279,9 @@ install-aliases-hook:
@@ -293,9 +293,9 @@ install-aliases-hook:
set -- $(SYSTEM_UNIT_ALIASES) && \
dir=$(systemunitdir) && $(install-aliases)
set -- $(USER_UNIT_ALIASES) && \
@ -41,7 +41,7 @@ index fe8f8d7..8fa0896 100644
define install-aliases
while [ -n "$$1" ]; do \
@@ -2034,7 +2034,7 @@ systemd_dbus1_generator_LDADD = \
@@ -2427,7 +2427,7 @@ systemd_dbus1_generator_LDADD = \
dbus1-generator-install-hook:
$(AM_V_at)$(MKDIR_P) $(DESTDIR)$(usergeneratordir)
$(AM_V_RM)rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
@ -50,7 +50,7 @@ index fe8f8d7..8fa0896 100644
dbus1-generator-uninstall-hook:
rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
@@ -2188,7 +2188,7 @@ systemd_bus_proxyd_LDADD = \
@@ -2584,7 +2584,7 @@ systemd_bus_proxyd_LDADD = \
bus-proxyd-install-hook:
$(AM_V_at)$(MKDIR_P) $(DESTDIR)$(bindir)
$(AM_V_RM)rm -f $(DESTDIR)$(bindir)/systemd-stdio-bridge
@ -60,10 +60,10 @@ index fe8f8d7..8fa0896 100644
bus-proxyd-uninstall-hook:
rm -f $(DESTDIR)$(bindir)/systemd-stdio-bridge
diff --git a/configure.ac b/configure.ac
index ae88382..ec220af 100644
index 9218ed3..fc557f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,8 +96,6 @@ AC_PATH_PROG([KMOD], [kmod], [/usr/bin/kmod], [$PATH:/usr/sbin:/sbin])
@@ -98,8 +98,6 @@ AC_PATH_PROG([KMOD], [kmod], [/usr/bin/kmod], [$PATH:/usr/sbin:/sbin])
AC_PATH_PROG([KEXEC], [kexec], [/usr/sbin/kexec], [$PATH:/usr/sbin:/sbin])
@ -73,5 +73,5 @@ index ae88382..ec220af 100644
# gtkdocize greps for '^GTK_DOC_CHECK', so it needs to be on its own line
--
1.7.2.5
1.7.10.4

View File

@ -0,0 +1,31 @@
From 346874b53f85c06876e793629d8f71ac940da05a Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Mon, 28 Jul 2014 21:22:10 +0300
Subject: [PATCH 5/8] autoreconf: remove gcrypt dependency
---
configure.ac | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/configure.ac b/configure.ac
index fc557f7..45c68fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -687,13 +687,7 @@ AC_ARG_ENABLE([gcrypt],
[have_gcrypt=auto])
if test "x${have_gcrypt}" != xno ; then
- AM_PATH_LIBGCRYPT(
- [1.4.5],
- [have_gcrypt=yes],
- [if test "x$have_gcrypt" = xyes ; then
- AC_MSG_ERROR([*** GCRYPT headers not found.])
- fi])
-
+ have_gcrypt=no
if test "x$have_gcrypt" = xyes ; then
GCRYPT_LIBS="$LIBGCRYPT_LIBS"
GCRYPT_CFLAGS="$LIBGCRYPT_CFLAGS"
--
1.7.10.4

View File

@ -1,20 +1,20 @@
From c75953c2010b9932bd921096523e190cbaf3b578 Mon Sep 17 00:00:00 2001
From b400665ba497837e9743fe83f500a95ccb94d224 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Tue, 28 Oct 2014 22:32:18 +0200
Subject: [PATCH] stop unit_file_preset_all doing stupid things
Subject: [PATCH 6/8] stop unit_file_preset_all doing stupid things
populating shitload of useless symlinks into /storage/.config/system.d
is not so-nice fuckery. and systemctl preset-all is useless on an
embedded distro like openelec anyway.
---
src/shared/install.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
1 file changed, 5 insertions(+)
diff --git a/src/shared/install.c b/src/shared/install.c
index 035b44c..74aa7c5 100644
index efbe61e..47213f4 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -2043,6 +2043,11 @@ int unit_file_preset_all(
@@ -2049,6 +2049,11 @@ int unit_file_preset_all(
UnitFileChange **changes,
unsigned *n_changes) {
@ -27,5 +27,5 @@ index 035b44c..74aa7c5 100644
_cleanup_lookup_paths_free_ LookupPaths paths = {};
_cleanup_free_ char *config_path = NULL;
--
1.7.2.5
1.7.10.4

View File

@ -0,0 +1,22 @@
From d49c0c7bd4a901f0f5b93abffb75a5fd4a1aac26 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Thu, 11 Dec 2014 21:00:47 +0200
Subject: [PATCH 7/8] remove nonexistant dependency
---
units/graphical.target | 1 -
1 file changed, 1 deletion(-)
diff --git a/units/graphical.target b/units/graphical.target
index a2c4532..6e581c6 100644
--- a/units/graphical.target
+++ b/units/graphical.target
@@ -11,5 +11,4 @@ Documentation=man:systemd.special(7)
Requires=multi-user.target
After=multi-user.target
Conflicts=rescue.target
-Wants=display-manager.service
AllowIsolate=yes
--
1.7.10.4

View File

@ -0,0 +1,60 @@
From cc63846c3f3151b0acd37a45bbdd47a4d814689f Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Thu, 11 Dec 2014 21:36:36 +0200
Subject: [PATCH 8/8] systemctl: disable dangerous options
---
src/systemctl/systemctl.c | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index b1441ad..b81beb3 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -6217,6 +6217,11 @@ end:
return r;
}
+static int nope(sd_bus *bus, char **args) {
+ printf("nope. don't do that\n");
+ return 0;
+}
+
static void systemctl_help(void) {
pager_open_if_enabled();
@@ -7310,21 +7315,21 @@ static int systemctl_main(sd_bus *bus, int argc, char *argv[], int bus_error) {
{ "enable", MORE, 2, enable_unit, NOBUS },
{ "disable", MORE, 2, enable_unit, NOBUS },
{ "is-enabled", MORE, 2, unit_is_enabled, NOBUS },
- { "reenable", MORE, 2, enable_unit, NOBUS },
- { "preset", MORE, 2, enable_unit, NOBUS },
- { "preset-all", EQUAL, 1, preset_all, NOBUS },
- { "mask", MORE, 2, enable_unit, NOBUS },
- { "unmask", MORE, 2, enable_unit, NOBUS },
- { "link", MORE, 2, enable_unit, NOBUS },
+ { "reenable", MORE, 2, nope, NOBUS },
+ { "preset", MORE, 2, nope, NOBUS },
+ { "preset-all", EQUAL, 1, nope, NOBUS },
+ { "mask", MORE, 2, nope, NOBUS },
+ { "unmask", MORE, 2, nope, NOBUS },
+ { "link", MORE, 2, nope, NOBUS },
{ "switch-root", MORE, 2, switch_root },
{ "list-dependencies", LESS, 2, list_dependencies },
- { "set-default", EQUAL, 2, set_default, NOBUS },
+ { "set-default", EQUAL, 2, nope, NOBUS },
{ "get-default", EQUAL, 1, get_default, NOBUS },
{ "set-property", MORE, 3, set_property },
{ "is-system-running", EQUAL, 1, is_system_running },
- { "add-wants", MORE, 3, add_dependency, NOBUS },
- { "add-requires", MORE, 3, add_dependency, NOBUS },
- { "edit", MORE, 2, edit, NOBUS },
+ { "add-wants", MORE, 3, nope, NOBUS },
+ { "add-requires", MORE, 3, nope, NOBUS },
+ { "edit", MORE, 2, nope, NOBUS },
{}
}, *verb = verbs;
--
1.7.10.4

View File

@ -1,8 +0,0 @@
--- a/units/graphical.target 2014-09-12 03:41:47.194979504 +0100
--- b/units/graphical.target 2014-09-12 03:41:47.194979504 +0100
@@ -11,5 +11,4 @@
Requires=multi-user.target
After=multi-user.target
Conflicts=rescue.target
-Wants=display-manager.service
AllowIsolate=yes

View File

@ -1,26 +0,0 @@
From 9e666841d238bbb4854ceb1bb306367a33f509c8 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Fri, 7 Nov 2014 22:40:33 +0200
Subject: [PATCH] units: make systemd-journald.service Type=notify
source: http://cgit.freedesktop.org/systemd/systemd/commit/?id=a87a38c20196a4aeb56b6ba71d688eefd0b21c30
---
units/systemd-journald.service.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in
index 4de38fa..441d5b1 100644
--- a/units/systemd-journald.service.in
+++ b/units/systemd-journald.service.in
@@ -14,6 +14,7 @@ After=systemd-journald.socket systemd-journald-dev-log.socket syslog.socket
Before=sysinit.target
[Service]
+Type=notify
Sockets=systemd-journald.socket systemd-journald-dev-log.socket
ExecStart=@rootlibexecdir@/systemd-journald
Restart=always
--
1.7.10.4