summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/systemd/Makefile5
-rw-r--r--package/systemd/patches/patch-Makefile_am54
-rw-r--r--package/systemd/patches/patch-configure_ac30
-rw-r--r--package/systemd/patches/patch-src_basic_socket-util_c15
-rw-r--r--package/systemd/patches/patch-units_console-getty_service_m4_in11
-rw-r--r--package/systemd/patches/patch-units_getty@_service_m411
-rw-r--r--package/systemd/patches/patch-units_serial-getty@_service_m414
7 files changed, 31 insertions, 109 deletions
diff --git a/package/systemd/Makefile b/package/systemd/Makefile
index be860b8de..78616b450 100644
--- a/package/systemd/Makefile
+++ b/package/systemd/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= systemd
-PKG_VERSION:= 233
+PKG_VERSION:= 234
PKG_RELEASE:= 1
-PKG_HASH:= 8b3e99da3d4164b66581830a7f2436c0c8fe697b5fbdc3927bdb960646be0083
+PKG_HASH:= da3e69d10aa1c983d33833372ad4929037b411ac421fb085c8cee79ae1d80b6a
PKG_DESCR:= system and service manager
PKG_SECTION:= base/init
PKG_DEPENDS:= libcap libmount libuuid libblkid libncurses libkmod
@@ -76,6 +76,7 @@ CONFIGURE_ARGS+= --disable-static \
--disable-resolved \
--disable-importd \
--disable-sysusers \
+ --disable-nss-systemd \
--enable-randomseed \
--enable-timedated \
--enable-timesyncd \
diff --git a/package/systemd/patches/patch-Makefile_am b/package/systemd/patches/patch-Makefile_am
index fd2cddfb2..a75c96f55 100644
--- a/package/systemd/patches/patch-Makefile_am
+++ b/package/systemd/patches/patch-Makefile_am
@@ -1,6 +1,6 @@
---- systemd-233.orig/Makefile.am 2017-03-01 22:43:06.000000000 +0100
-+++ systemd-233/Makefile.am 2017-06-07 22:02:15.904940794 +0200
-@@ -320,9 +320,9 @@ install-aliases-hook:
+--- systemd-234.orig/Makefile.am 2017-07-12 16:01:10.000000000 +0200
++++ systemd-234/Makefile.am 2017-08-05 00:41:34.167419565 +0200
+@@ -325,9 +325,9 @@ install-aliases-hook:
set -- $(SYSTEM_UNIT_ALIASES) && \
dir=$(systemunitdir) && $(install-aliases)
set -- $(USER_UNIT_ALIASES) && \
@@ -12,10 +12,11 @@
define install-aliases
while [ -n "$$1" ]; do \
-@@ -333,15 +333,6 @@ define install-aliases
+@@ -337,15 +337,6 @@ define install-aliases
+ shift 2 || exit $$?; \
done
endef
-
+-
-define install-relative-aliases
- while [ -n "$$1" ]; do \
- $(MKDIR_P) `dirname $(DESTDIR)$$dir/$$2` && \
@@ -24,47 +25,6 @@
- shift 2 || exit $$?; \
- done
-endef
--
+
install-touch-usr-hook:
touch -c $(DESTDIR)/$(prefix)
-
-@@ -5183,39 +5174,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-configure_ac b/package/systemd/patches/patch-configure_ac
index 526191bbb..f41aa4191 100644
--- a/package/systemd/patches/patch-configure_ac
+++ b/package/systemd/patches/patch-configure_ac
@@ -1,6 +1,6 @@
---- systemd-233.orig/configure.ac 2017-03-01 22:43:06.000000000 +0100
-+++ systemd-233/configure.ac 2017-06-15 08:42:17.595843900 +0200
-@@ -108,8 +108,6 @@ AC_PATH_PROG([SULOGIN], [sulogin], [/usr
+--- systemd-234.orig/configure.ac 2017-07-12 16:01:10.000000000 +0200
++++ systemd-234/configure.ac 2017-08-05 00:41:34.135401520 +0200
+@@ -109,8 +109,6 @@ AC_PATH_PROG([SULOGIN], [sulogin], [/usr
AC_PATH_PROG([MOUNT_PATH], [mount], [/usr/bin/mount], [$PATH:/usr/sbin:/sbin])
AC_PATH_PROG([UMOUNT_PATH], [umount], [/usr/bin/umount], [$PATH:/usr/sbin:/sbin])
@@ -9,27 +9,3 @@
M4_DEFINES=
AC_CHECK_TOOL(OBJCOPY, objcopy)
-@@ -1012,6 +1010,15 @@ fi
- AM_CONDITIONAL(HAVE_LIBIDN, [test "$have_libidn" = "yes"])
-
- # ------------------------------------------------------------------------------
-+have_idn=no
-+AC_ARG_ENABLE(idn, AS_HELP_STRING([--disable-idn], [disable optional IDN support]))
-+if test "x$enable_idn" != "xno"; then
-+ have_idn=yes
-+ AC_DEFINE(HAVE_IDN, [1], [IDN is enabled])
-+fi
-+AM_CONDITIONAL(ENABLE_IDN, [test "$have_idn" = "yes"])
-+
-+# ------------------------------------------------------------------------------
- have_libiptc=no
- AC_ARG_ENABLE(libiptc, AS_HELP_STRING([--disable-libiptc], [disable optional LIBIPTC support]))
- if test "x$enable_libiptc" != "xno"; then
-@@ -1672,6 +1679,7 @@ AC_MSG_RESULT([
- GNUTLS: ${have_gnutls}
- libcurl: ${have_libcurl}
- libidn: ${have_libidn}
-+ IDN: ${have_idn}
- libiptc: ${have_libiptc}
- ELFUTILS: ${have_elfutils}
- binfmt: ${have_binfmt}
diff --git a/package/systemd/patches/patch-src_basic_socket-util_c b/package/systemd/patches/patch-src_basic_socket-util_c
deleted file mode 100644
index 6a47d4d7c..000000000
--- a/package/systemd/patches/patch-src_basic_socket-util_c
+++ /dev/null
@@ -1,15 +0,0 @@
---- systemd-233.orig/src/basic/socket-util.c 2017-03-01 22:43:06.000000000 +0100
-+++ systemd-233/src/basic/socket-util.c 2017-06-15 08:42:17.623845703 +0200
-@@ -723,8 +723,12 @@ int socknameinfo_pretty(union sockaddr_u
-
- assert(_ret);
-
-+#ifdef HAVE_IDN
- r = getnameinfo(&sa->sa, salen, host, sizeof(host), NULL, 0,
- NI_IDN|NI_IDN_USE_STD3_ASCII_RULES);
-+#else
-+ r = getnameinfo(&sa->sa, salen, host, sizeof(host), NULL, 0, 0);
-+#endif
- if (r != 0) {
- int saved_errno = errno;
-
diff --git a/package/systemd/patches/patch-units_console-getty_service_m4_in b/package/systemd/patches/patch-units_console-getty_service_m4_in
deleted file mode 100644
index 3ffd541c6..000000000
--- a/package/systemd/patches/patch-units_console-getty_service_m4_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- systemd-232.orig/units/console-getty.service.m4.in 2016-11-03 18:16:42.000000000 +0100
-+++ systemd-232/units/console-getty.service.m4.in 2016-11-19 08:53:54.070304206 +0100
-@@ -16,7 +16,7 @@ After=rc-local.service
- Before=getty.target
-
- [Service]
--ExecStart=-/sbin/agetty --noclear --keep-baud console 115200,38400,9600 $TERM
-+ExecStart=-/sbin/getty -L %I 115200 vt100
- Type=idle
- Restart=always
- RestartSec=0
diff --git a/package/systemd/patches/patch-units_getty@_service_m4 b/package/systemd/patches/patch-units_getty@_service_m4
new file mode 100644
index 000000000..aa58ad8fb
--- /dev/null
+++ b/package/systemd/patches/patch-units_getty@_service_m4
@@ -0,0 +1,11 @@
+--- systemd-234.orig/units/getty@.service.m4 2017-07-12 16:01:10.000000000 +0200
++++ systemd-234/units/getty@.service.m4 2017-08-05 00:42:14.790312223 +0200
+@@ -36,7 +36,7 @@ ConditionPathExists=/dev/tty0
+ # The '-o' option value tells agetty to replace 'login' arguments with an
+ # option to preserve environment (-p), followed by '--' for safety, and then
+ # the entered username.
+-ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear %I $TERM
++ExecStart=-/sbin/getty -L %I 115200 vt100
+ Type=idle
+ Restart=always
+ RestartSec=0
diff --git a/package/systemd/patches/patch-units_serial-getty@_service_m4 b/package/systemd/patches/patch-units_serial-getty@_service_m4
index 3767b53c2..74ef3ed8e 100644
--- a/package/systemd/patches/patch-units_serial-getty@_service_m4
+++ b/package/systemd/patches/patch-units_serial-getty@_service_m4
@@ -1,10 +1,10 @@
---- systemd-232.orig/units/serial-getty@.service.m4 2016-11-03 18:16:42.000000000 +0100
-+++ systemd-232/units/serial-getty@.service.m4 2016-11-19 08:53:35.509582664 +0100
-@@ -22,7 +22,7 @@ Before=getty.target
- IgnoreOnIsolate=yes
-
- [Service]
--ExecStart=-/sbin/agetty --keep-baud 115200,38400,9600 %I $TERM
+--- systemd-234.orig/units/serial-getty@.service.m4 2017-07-12 16:01:10.000000000 +0200
++++ systemd-234/units/serial-getty@.service.m4 2017-08-05 00:42:27.573516075 +0200
+@@ -31,7 +31,7 @@ Before=rescue.service
+ # The '-o' option value tells agetty to replace 'login' arguments with an
+ # option to preserve environment (-p), followed by '--' for safety, and then
+ # the entered username.
+-ExecStart=-/sbin/agetty -o '-p -- \\u' --keep-baud 115200,38400,9600 %I $TERM
+ExecStart=-/sbin/getty -L %I 115200 vt100
Type=idle
Restart=always