systemd: update to systemd-215

This commit is contained in:
Stefan Saraev 2014-07-04 15:44:53 +03:00 committed by Stephan Raue
parent f1ca57d51e
commit 14116ea19e
2 changed files with 24 additions and 28 deletions

View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="systemd"
PKG_VERSION="214"
PKG_VERSION="215"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
@ -55,6 +55,7 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
--disable-smack \
--disable-gcrypt \
--disable-audit \
--disable-elfutils \
--disable-libcryptsetup \
--disable-qrencode \
--disable-microhttpd \
@ -65,6 +66,7 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
--disable-bootchart \
--disable-quotacheck \
--enable-tmpfiles \
--disable-sysusers \
--disable-randomseed \
--disable-backlight \
--disable-rfkill \
@ -186,6 +188,15 @@ post_makeinstall_target() {
rm -rf $INSTALL/usr/lib/systemd/system/getty.target
rm -rf $INSTALL/usr/lib/systemd/system/multi-user.target.wants/getty.target
# remove other notused or nonsense stuff (our /etc is ro)
rm -rf $INSTALL/usr/lib/systemd/system/systemd-update-done.service
rm -rf $INSTALL/usr/lib/systemd/system/sysinit.target.wants/systemd-update-done.service
rm -rf $INSTALL/usr/lib/systemd/system/ldconfig.service
rm -rf $INSTALL/usr/lib/systemd/system/sysinit.target.wants/ldconfig.service
rm -rf $INSTALL/usr/lib/systemd/system/systemd-udev-hwdb-update.service
rm -rf $INSTALL/usr/lib/systemd/system/sysinit.target.wants/systemd-udev-hwdb-update.service
rm -rf $INSTALL/usr/lib/tmpfiles.d/etc.conf
# remove rootfs fsck
rm -rf $INSTALL/usr/lib/systemd/system/systemd-fsck-root.service
rm -rf $INSTALL/usr/lib/systemd/system/local-fs.target.wants/systemd-fsck-root.service
@ -218,6 +229,7 @@ post_install() {
add_group tty 5
add_group video 39
add_group utmp 22
add_group input 199 # TODO change gid
enable_service machine-id.service
enable_service debugconfig.service

View File

@ -1,6 +1,6 @@
From 2444e6fe823939dd80b24913a1327218bf37a88c Mon Sep 17 00:00:00 2001
From de36fe2075662ab3c37cc000d217be16d8de9016 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Wed, 28 May 2014 20:53:33 +0300
Date: Fri, 4 Jul 2014 13:52:55 +0300
Subject: [PATCH] nah. no ln --relative
It is unclear that systemd now requires very recent coreutils
@ -10,15 +10,15 @@ I will not upgrade my debian wheezy machines to jessie,
nor I will switch to fedora for no good reason. We are not going
to tell our users to do so just to be able to build OpenELEC.
---
Makefile.am | 21 ++++++---------------
Makefile.am | 12 ++++++------
configure.ac | 2 --
2 files changed, 6 insertions(+), 17 deletions(-)
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 6ff3489..8a45728 100644
index fe8f8d7..8fa0896 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -212,8 +212,8 @@ define move-to-rootlibdir
@@ -219,8 +219,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 6ff3489..8a45728 100644
mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \
fi
endef
@@ -272,9 +272,9 @@ install-aliases-hook:
@@ -279,9 +279,9 @@ install-aliases-hook:
set -- $(SYSTEM_UNIT_ALIASES) && \
dir=$(systemunitdir) && $(install-aliases)
set -- $(USER_UNIT_ALIASES) && \
@ -41,23 +41,7 @@ index 6ff3489..8a45728 100644
define install-aliases
while [ -n "$$1" ]; do \
@@ -285,15 +285,6 @@ define install-aliases
done
endef
-define install-relative-aliases
- while [ -n "$$1" ]; do \
- $(MKDIR_P) `dirname $(DESTDIR)$$dir/$$2` && \
- rm -f $(DESTDIR)$$dir/$$2 && \
- $(LN_S) --relative $(DESTDIR)$$1 $(DESTDIR)$$dir/$$2 && \
- shift 2 || exit $$?; \
- done
-endef
-
INSTALL_EXEC_HOOKS += \
install-target-wants-hook \
install-directories-hook \
@@ -1908,7 +1899,7 @@ systemd_dbus1_generator_LDADD = \
@@ -2034,7 +2034,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
@ -66,7 +50,7 @@ index 6ff3489..8a45728 100644
dbus1-generator-uninstall-hook:
rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
@@ -2042,7 +2033,7 @@ systemd_bus_proxyd_LDADD = \
@@ -2188,7 +2188,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
@ -76,10 +60,10 @@ index 6ff3489..8a45728 100644
bus-proxyd-uninstall-hook:
rm -f $(DESTDIR)$(bindir)/systemd-stdio-bridge
diff --git a/configure.ac b/configure.ac
index 5133c12..7e3938e 100644
index ae88382..ec220af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,8 +76,6 @@ AC_PATH_PROG([KMOD], [kmod], [/usr/bin/kmod], [$PATH:/usr/sbin:/sbin])
@@ -96,8 +96,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])