[arch-commits] Commit in systemd/trunk (3 files)

[Dave Reisner]

    Date: Saturday, May 26, 2012 @ 21:00:36
  Author: dreisner
Revision: 159785

upgpkg: systemd 183-2

- move more bins to systemd-tools
- add timestamp mkinitcpio hook
- fix udev rules dir in udev.pc

Added:
  systemd/trunk/initcpio-install-timestamp
Modified:
  systemd/trunk/PKGBUILD
  systemd/trunk/systemd.install

----------------------------+
 PKGBUILD                   |   42 ++++++++++++++++++++++++++++--------------
 initcpio-install-timestamp |   14 ++++++++++++++
 systemd.install            |    4 +++-
 3 files changed, 45 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-05-26 23:49:07 UTC (rev 159784)
+++ PKGBUILD	2012-05-27 01:00:36 UTC (rev 159785)
@@ -3,7 +3,7 @@
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-tools' 'udev')
 pkgver=183
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 license=('GPL2' 'LGPL2.1' 'MIT')
@@ -13,19 +13,25 @@
 source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
         'initcpio-hook-udev'
         'initcpio-install-udev'
+        'initcpio-install-timestamp'
         '0001-Reinstate-TIMEOUT-handling.patch'
         'os-release')
 md5sums=('e1e5e0f376fa2a4cb4bc31a2161c09f2'
          'e99e9189aa2f6084ac28b8ddf605aeb8'
          '59e91c4d7a69b7bf12c86a9982e37ced'
+         'df69615503ad293c9ddf9d8b7755282d'
          '5543be25f205f853a21fa5ee68e03f0d'
          '752636def0db3c03f121f8b4f44a63cd')
 
 build() {
   cd "$pkgname-$pkgver"
 
+  # still waiting on ipw2x00 to get fixed...
   patch -Np1 <"$srcdir/0001-Reinstate-TIMEOUT-handling.patch"
 
+  # fix udev rules dir
+  sed -i 's/pkglibexecdir/udevlibexecdir/' src/udev/udev.pc.in
+
   ./configure \
       --libexecdir=/usr/lib \
       --localstatedir=/var \
@@ -122,16 +128,16 @@
   ### split out udev
   rm -rf "$srcdir/_udev"
   install -dm755 \
-    "$srcdir"/_udev/etc/udev \
-    "$srcdir"/_udev/usr/bin \
-    "$srcdir"/_udev/usr/include \
-    "$srcdir"/_udev/usr/lib/{systemd/system,udev} \
-    "$srcdir"/_udev/usr/lib/systemd/system/{sysinit,sockets}.target.wants \
-    "$srcdir"/_udev/usr/lib/girepository-1.0 \
-    "$srcdir"/_udev/usr/{lib,share}/pkgconfig \
-    "$srcdir"/_udev/usr/share/gir-1.0 \
-    "$srcdir"/_udev/usr/share/gtk-doc/html/{g,lib}udev \
-    "$srcdir"/_udev/usr/share/man/man{7,8}
+      "$srcdir"/_udev/etc/udev \
+      "$srcdir"/_udev/usr/bin \
+      "$srcdir"/_udev/usr/include \
+      "$srcdir"/_udev/usr/lib/{systemd/system,udev} \
+      "$srcdir"/_udev/usr/lib/systemd/system/{sysinit,sockets}.target.wants \
+      "$srcdir"/_udev/usr/lib/girepository-1.0 \
+      "$srcdir"/_udev/usr/{lib,share}/pkgconfig \
+      "$srcdir"/_udev/usr/share/gir-1.0 \
+      "$srcdir"/_udev/usr/share/gtk-doc/html/{g,lib}udev \
+      "$srcdir"/_udev/usr/share/man/man{7,8}
 
   cd "$srcdir"/_udev
   mv "$pkgdir"/etc/udev etc
@@ -153,10 +159,16 @@
 
   ### split out systemd-tools
   rm -rf "$srcdir/_tools"
-  install -dm755 "$srcdir/_tools/usr/lib/systemd" "$srcdir/_tools/usr/bin" "$srcdir"/_tools/usr/share/man/man5
+  install -dm755 \
+      "$srcdir/_tools/usr/lib/systemd" \
+      "$srcdir/_tools/usr/bin" \
+      "$srcdir"/_tools/etc/{binfmt,modules-load,sysctl}.d \
+      "$srcdir"/_tools/usr/share/man/man{1,5}
+
   cd "$srcdir/_tools"
-  mv "$pkgdir"/usr/bin/systemd-tmpfiles usr/bin
-  mv "$pkgdir"/usr/lib/systemd/systemd-{binfmt,modules-load,random-seed,sysctl,vconsole-setup} usr/lib/systemd
+  mv "$pkgdir"/usr/bin/systemd-{ask-password,delta,detect-virt,tmpfiles,tty-ask-password-agent} usr/bin
+  mv "$pkgdir"/usr/lib/systemd/systemd-{ac-power,binfmt,cryptsetup,modules-load,random-seed,remount-fs,reply-password,sysctl,timestamp,vconsole-setup} usr/lib/systemd
+  mv "$pkgdir"/usr/share/man/man1/systemd-{ask-password,delta,detect-virt}.1 usr/share/man/man1
   mv "$pkgdir"/usr/share/man/man5/{binfmt,modules-load,sysctl,tmpfiles}.d.5 usr/share/man/man5
   mv "$pkgdir"/usr/share/man/man5/systemd.vconsole.conf.5 usr/share/man/man5
 }
@@ -172,8 +184,10 @@
   pkgdesc='standalone tools from systemd'
   url='http://www.freedesktop.org/wiki/Software/systemd'
   depends=('glibc' 'kmod')
+  conflicts=('systemd<183')
 
   mv "$srcdir/_tools/"* "$pkgdir"
+  install -Dm644 "$srcdir/initcpio-install-timestamp" "$pkgdir/usr/lib/initcpio/install/timestamp"
 }
 
 package_udev() {

Added: initcpio-install-timestamp
===================================================================
--- initcpio-install-timestamp	                        (rev 0)
+++ initcpio-install-timestamp	2012-05-27 01:00:36 UTC (rev 159785)
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+build() {
+    add_binary /usr/lib/systemd/systemd-timestamp /usr/bin/systemd-timestamp
+}
+
+help() {
+    cat <<HELPEOF
+Provides support for RD_TIMESTAMP in early userspace, which can be read by a
+program such as systemd-analyze to determine boot time.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:

Modified: systemd.install
===================================================================
--- systemd.install	2012-05-26 23:49:07 UTC (rev 159784)
+++ systemd.install	2012-05-27 01:00:36 UTC (rev 159785)
@@ -46,7 +46,9 @@
   # getty at tty1.service is no longer enabled by default, but we don't want to break
   # existing setups.
   if [ "$(vercmp 183 "$2")" -eq 1 ]; then
-    systemctl -q enable getty at .service
+    # systemctl seems to be whiny on sysvinit. this will succeed unless something
+    # horrific happens, so just mask the error.
+    systemctl -q enable getty at .service || true
   fi
 }