summaryrefslogtreecommitdiff
path: root/package/systemd
diff options
context:
space:
mode:
Diffstat (limited to 'package/systemd')
-rw-r--r--package/systemd/Makefile9
-rw-r--r--package/systemd/patches/patch-Makefile_am54
-rw-r--r--package/systemd/patches/patch-src_journal_journald-server_c6
3 files changed, 55 insertions, 14 deletions
diff --git a/package/systemd/Makefile b/package/systemd/Makefile
index 9d0b90649..8ae4433fa 100644
--- a/package/systemd/Makefile
+++ b/package/systemd/Makefile
@@ -16,8 +16,7 @@ PKG_URL:= https://wiki.freedesktop.org/www/Software/systemd/
PKG_SITES:= https://github.com/systemd/systemd/archive/
PKG_CFLINE_SYSTEMD:= select BUSYBOX_SULOGIN
-
-PKG_LIBC_DEPENDS:= glibc
+PKG_LIBC_DEPENDS:= !musl
DISTFILES:= v$(PKG_VERSION).tar.gz
@@ -70,11 +69,13 @@ CONFIGURE_ARGS+= --disable-static \
--disable-audit \
--disable-hwdb \
--disable-machined \
+ --disable-myhostname \
+ --disable-resolved \
--disable-importd \
+ --disable-sysusers \
--enable-randomseed \
--enable-timedated \
--enable-timesyncd \
- --enable-sysusers \
--enable-tmpfiles \
--enable-firstboot
@@ -86,7 +87,7 @@ systemd-install:
$(INSTALL_DIR) $(IDIR_SYSTEMD)/usr/lib
$(CP) $(WRKINST)/usr/lib/*.so* \
$(IDIR_SYSTEMD)/usr/lib
- $(CP) $(WRKINST)/usr/lib/{systemd,sysusers.d,kernel,udev,sysctl.d,tmpfiles.d} \
+ $(CP) $(WRKINST)/usr/lib/{systemd,kernel,udev,sysctl.d,tmpfiles.d} \
$(IDIR_SYSTEMD)/usr/lib
$(INSTALL_DIR) $(IDIR_SYSTEMD)/usr/bin
$(CP) $(WRKINST)/usr/bin/* \
diff --git a/package/systemd/patches/patch-Makefile_am b/package/systemd/patches/patch-Makefile_am
index a41947910..775a6e660 100644
--- a/package/systemd/patches/patch-Makefile_am
+++ b/package/systemd/patches/patch-Makefile_am
@@ -1,6 +1,6 @@
---- systemd-231.orig/Makefile.am 2016-07-25 21:49:47.000000000 +0200
-+++ systemd-231/Makefile.am 2016-11-24 02:37:14.165088827 +0100
-@@ -312,9 +312,9 @@ install-aliases-hook:
+--- systemd-232.orig/Makefile.am 2016-11-03 18:16:42.000000000 +0100
++++ systemd-232/Makefile.am 2016-12-27 19:28:30.933147951 +0100
+@@ -303,9 +303,9 @@ install-aliases-hook:
set -- $(SYSTEM_UNIT_ALIASES) && \
dir=$(systemunitdir) && $(install-aliases)
set -- $(USER_UNIT_ALIASES) && \
@@ -12,11 +12,10 @@
define install-aliases
while [ -n "$$1" ]; do \
-@@ -324,15 +324,6 @@ define install-aliases
- shift 2 || exit $$?; \
+@@ -316,15 +316,6 @@ define install-aliases
done
endef
--
+
-define install-relative-aliases
- while [ -n "$$1" ]; do \
- $(MKDIR_P) `dirname $(DESTDIR)$$dir/$$2` && \
@@ -25,6 +24,47 @@
- shift 2 || exit $$?; \
- done
-endef
-
+-
install-touch-usr-hook:
touch -c $(DESTDIR)/$(prefix)
+
+@@ -5014,39 +5005,6 @@ EXTRA_DIST += \
+ src/timesync/timesyncd.conf.in
+
+ # ------------------------------------------------------------------------------
+-test_nss_SOURCES = \
+- src/test/test-nss.c
+-
+-test_nss_LDADD = \
+- libsystemd-internal.la \
+- libbasic.la \
+- -ldl
+-
+-manual_tests += \
+- test-nss
+-
+-# ------------------------------------------------------------------------------
+-libnss_systemd_la_SOURCES = \
+- src/nss-systemd/nss-systemd.sym \
+- src/nss-systemd/nss-systemd.c
+-
+-libnss_systemd_la_LDFLAGS = \
+- $(AM_LDFLAGS) \
+- -module \
+- -export-dynamic \
+- -avoid-version \
+- -shared \
+- -shrext .so.2 \
+- -Wl,--version-script=$(top_srcdir)/src/nss-systemd/nss-systemd.sym
+-
+-libnss_systemd_la_LIBADD = \
+- libsystemd-internal.la \
+- libbasic.la
+-
+-rootlib_LTLIBRARIES += \
+- libnss_systemd.la
+-
+-# ------------------------------------------------------------------------------
+ if HAVE_MYHOSTNAME
+ libnss_myhostname_la_SOURCES = \
+ src/nss-myhostname/nss-myhostname.sym \
diff --git a/package/systemd/patches/patch-src_journal_journald-server_c b/package/systemd/patches/patch-src_journal_journald-server_c
index 704de9126..835df1f06 100644
--- a/package/systemd/patches/patch-src_journal_journald-server_c
+++ b/package/systemd/patches/patch-src_journal_journald-server_c
@@ -1,6 +1,6 @@
---- systemd-231.orig/src/journal/journald-server.c 2016-07-25 21:49:47.000000000 +0200
-+++ systemd-231/src/journal/journald-server.c 2016-11-25 00:47:51.392883508 +0100
-@@ -1347,7 +1347,7 @@ static int setup_signals(Server *s) {
+--- systemd-232.orig/src/journal/journald-server.c 2016-11-03 18:16:42.000000000 +0100
++++ systemd-232/src/journal/journald-server.c 2016-12-27 18:24:54.072301007 +0100
+@@ -1480,7 +1480,7 @@ static int setup_signals(Server *s) {
assert(s);