From 0090b549c02f0b710a3a13b500da4578b12dc774 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 26 Feb 2013 09:44:19 +0100
Subject: [PATCH] systemd: do not run machine-id-setup nor enable getty@tty1 at
 post-install.

Reason: systemctl can't know exactly what's the rootdir to enable services,
and/or hardcodes the location for the machine-id(5) file.

Use default systemd symlinks for getty@tty1 and let systemd generate the
machine-id(5) at boot time.
---
 srcpkgs/systemd/INSTALL  | 4 ----
 srcpkgs/systemd/template | 9 ++-------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/systemd/INSTALL b/srcpkgs/systemd/INSTALL
index d7b0c609800..47637d01989 100644
--- a/srcpkgs/systemd/INSTALL
+++ b/srcpkgs/systemd/INSTALL
@@ -2,10 +2,6 @@ case "${ACTION}" in
 post)
 	setcap cap_dac_override,cap_sys_ptrace+ep usr/bin/systemd-detect-virt || :
 
-	if [ -c dev/urandom -a ! -f etc/machine-id ]; then
-		systemd-machine-id-setup
-		systemctl enable getty@.service || :
-	fi
 	if [ "$UPDATE" = "yes" -a -e sys/fs/cgroup/systemd ]; then
 		udevadm hwdb --update
 		journalctl --update-catalog
diff --git a/srcpkgs/systemd/template b/srcpkgs/systemd/template
index aa07cf2d60d..78b86ef74b9 100644
--- a/srcpkgs/systemd/template
+++ b/srcpkgs/systemd/template
@@ -1,7 +1,7 @@
 # Template file for 'systemd'
 pkgname=systemd
 version=197
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--libexecdir=/usr/lib
  --disable-selinux --disable-tcpwrap --with-rootprefix=/usr
@@ -44,9 +44,7 @@ if [ -n "$XBPS_CROSS_TRIPLET" ]; then
 	configure_args="${configure_args} --without-python --disable-gudev
 			--enable-introspection=no
 			ac_cv_func_malloc_0_nonnull=yes
-			ac_cv_func_realloc_0_nonnull=yes
-			PKG_CONFIG_SYSROOT_DIR=/usr/$XBPS_CROSS_TRIPLET
-			PKG_CONFIG_LIBDIR=/usr/$XBPS_CROSS_TRIPLET/lib/pkgconfig"
+			ac_cv_func_realloc_0_nonnull=yes"
 	pre_configure() {
 		autoreconf -fi
 	}
@@ -84,9 +82,6 @@ post_install() {
 	# Remove RPM stuff.
 	rm -rf ${DESTDIR}/etc/rpm
 
-	# Disable units in /etc; we do this at post-install time.
-	rm -rf ${DESTDIR}/etc/systemd/system/getty.target.wants
-
 	# Create /usr/sbin/udev symlink just for compatibility.
 	ln -sf /usr/lib/systemd/systemd-udevd ${DESTDIR}/usr/sbin/udevd