From 5b4c077e6f8a22f62944c745249676612fc40a81 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sat, 19 Jan 2013 14:42:56 +0100
Subject: [PATCH] systemd: update to systemd-197

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/sysutils/systemd/build   |  9 +++++++--
 packages/sysutils/systemd/install | 33 +++++++++++--------------------
 packages/sysutils/systemd/meta    |  2 +-
 3 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/packages/sysutils/systemd/build b/packages/sysutils/systemd/build
index 815d8332bc..eff6154fb6 100755
--- a/packages/sysutils/systemd/build
+++ b/packages/sysutils/systemd/build
@@ -32,6 +32,7 @@
   export CPP=${TARGET_PREFIX}cpp
 
 cd $PKG_BUILD
+ac_cv_func_malloc_0_nonnull=yes \
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
             --prefix=/usr \
@@ -47,6 +48,11 @@ cd $PKG_BUILD
             --disable-ima \
             --disable-selinux \
             --disable-xz \
+             --enable-kmod \
+             --enable-blkid \
+             --disable-chkconfig \
+             --disable-bootchart \
+             --disable-myhostname \
             --disable-tcpwrap \
             --disable-pam \
             --disable-acl \
@@ -72,9 +78,8 @@ cd $PKG_BUILD
             --disable-manpages \
             --enable-split-usr \
             --with-firmware-path="/storage/.config/firmware:/lib/firmware" \
-            --with-distro=other \
             --with-sysvinit-path="" \
-            --with-sysvrcd-path="" \
+            --with-sysvrcnd-path="" \
             --with-tty-gid="5" \
             --with-rootprefix="/" \
             --with-rootlibdir="/lib"
diff --git a/packages/sysutils/systemd/install b/packages/sysutils/systemd/install
index 571b8e5556..636c100056 100755
--- a/packages/sysutils/systemd/install
+++ b/packages/sysutils/systemd/install
@@ -34,42 +34,33 @@ add_group video 39
 # install udev
 
 mkdir -p $INSTALL/usr/bin
-  cp $PKG_BUILD/udevadm $INSTALL/usr/bin
+  cp $PKG_BUILD/.libs/udevadm $INSTALL/usr/bin
 
 mkdir -p $INSTALL/lib
+  cp -PR $PKG_BUILD/.libs/libsystemd-daemon.so* $INSTALL/lib
   cp -PR $PKG_BUILD/.libs/libudev.so* $INSTALL/lib
   cp -PR $PKG_BUILD/.libs/libgudev*.so* $INSTALL/lib
   rm -rf $INSTALL/lib/libgudev*.*T
 
 mkdir -p $INSTALL/lib/systemd
-  cp $PKG_BUILD/systemd-udevd $INSTALL/lib/systemd
+  cp $PKG_BUILD/.libs/systemd-udevd $INSTALL/lib/systemd
 
   cp $PKG_BUILD/.libs/accelerometer $INSTALL/lib/udev
   cp $PKG_BUILD/.libs/cdrom_id $INSTALL/lib/udev
   cp $PKG_BUILD/.libs/v4l_id $INSTALL/lib/udev
-  for i in ata_id collect mtd_probe scsi_id; do
-    cp $PKG_BUILD/$i $INSTALL/lib/udev
+
+  for i in ata_id collect scsi_id; do
+    cp $PKG_BUILD/.libs/$i $INSTALL/lib/udev
   done
+  cp $PKG_BUILD/mtd_probe $INSTALL/lib/udev
 
 mkdir -p $INSTALL/lib/udev/rules.d
-  cp $PKG_BUILD/rules/50-udev-default.rules $INSTALL/lib/udev/rules.d
-  cp $PKG_BUILD/rules/60-cdrom_id.rules $INSTALL/lib/udev/rules.d
-  cp $PKG_BUILD/rules/60-persistent-alsa.rules $INSTALL/lib/udev/rules.d
-  cp $PKG_BUILD/rules/60-persistent-input.rules $INSTALL/lib/udev/rules.d
-  cp $PKG_BUILD/rules/60-persistent-serial.rules $INSTALL/lib/udev/rules.d
-  cp $PKG_BUILD/rules/60-persistent-storage-tape.rules $INSTALL/lib/udev/rules.d
-  cp $PKG_BUILD/rules/60-persistent-storage.rules $INSTALL/lib/udev/rules.d
-  cp $PKG_BUILD/rules/60-persistent-v4l.rules $INSTALL/lib/udev/rules.d
-  cp $PKG_BUILD/rules/61-accelerometer.rules $INSTALL/lib/udev/rules.d
-  cp $PKG_BUILD/rules/64-btrfs.rules $INSTALL/lib/udev/rules.d
-  cp $PKG_BUILD/rules/75-net-description.rules $INSTALL/lib/udev/rules.d
-  cp $PKG_BUILD/rules/75-probe_mtd.rules $INSTALL/lib/udev/rules.d
-  cp $PKG_BUILD/rules/75-tty-description.rules $INSTALL/lib/udev/rules.d
-  cp $PKG_BUILD/rules/78-sound-card.rules $INSTALL/lib/udev/rules.d
-  cp $PKG_BUILD/rules/80-drivers.rules $INSTALL/lib/udev/rules.d
-  cp $PKG_BUILD/rules/95-udev-late.rules $INSTALL/lib/udev/rules.d
+  cp $PKG_BUILD/rules/*.rules $INSTALL/lib/udev/rules.d
+  rm -rf $INSTALL/lib/udev/rules.d/80-net-name-slot.rules
+  rm -rf $INSTALL/lib/udev/rules.d/99-systemd.rules
 
-mkdir -p $INSTALL/lib/udev/devices
+mkdir -p $INSTALL/lib/udev/hwdb.d
+  cp $PKG_BUILD/hwdb/*.hwdb $INSTALL/lib/udev/hwdb.d
 
 mkdir -p $INSTALL/etc/udev
   cp $PKG_BUILD/src/udev/udev.conf $INSTALL/etc/udev
diff --git a/packages/sysutils/systemd/meta b/packages/sysutils/systemd/meta
index e0e88d17db..46e6e8082f 100644
--- a/packages/sysutils/systemd/meta
+++ b/packages/sysutils/systemd/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="systemd"
-PKG_VERSION="196"
+PKG_VERSION="197"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"