Sun Sep 22 02:53:38 PDT 2013

4 files changed, 20 insertions, 12 deletions

diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index 6a84686ad..e5f054629 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -4,13 +4,13 @@
 pkgbase=systemd
 pkgname=('systemd' 'systemd-sysvcompat')
 pkgver=207
-pkgrel=3
+pkgrel=5
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf'
              'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt'  'libmicrohttpd' 'libxslt'
              'linux-api-headers' 'pam' 'python' 'quota-tools' 'xz')
-options=('!libtool')
+options=('!libtool' 'strip' 'debug')
 source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
         'initcpio-hook-udev'
         'initcpio-install-systemd'
@@ -19,9 +19,9 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
         0001-swap-fix-reverse-dependencies.patch
         0002-swap-create-.wants-symlink-to-auto-swap-devices.patch)
 md5sums=('7799f3cc9d289b8db1c1fa56ae7ecd88'
-         '2de72238ed5c0df62a7c3b6bdaf8cb7c'
-         '9027b31a875e74a45623954b3b23d09f'
-         'd83d45e67cd75cdbafb81c96a7485319'
+         '29245f7a240bfba66e2b1783b63b6b40'
+         '8b68b0218a3897d4d37a6ccf47914774'
+         'bde43090d4ac0ef048e3eaee8202a407'
          '9eb0a46aa2a3a6d74117f9a174dbe168'
          '182be4c729aaecde249b7b05b48a481f'
          'b54fbe35e2689ac36cda9ac4a5a86f24')
@@ -37,6 +37,8 @@ prepare() {
 build() {
   cd "$pkgname-$pkgver"
 
+  CFLAGS+=' -g'
+
   ./configure \
       --libexecdir=/usr/lib \
       --localstatedir=/var \
diff --git a/core/systemd/initcpio-hook-udev b/core/systemd/initcpio-hook-udev
index 227a8d034..0bc32e008 100644
--- a/core/systemd/initcpio-hook-udev
+++ b/core/systemd/initcpio-hook-udev
@@ -1,6 +1,8 @@
 #!/usr/bin/ash
 
 run_earlyhook() {
+    kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf
+    systemd-tmpfiles --prefix=/dev --create
     /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never
     udevd_running=1
 }
diff --git a/core/systemd/initcpio-install-systemd b/core/systemd/initcpio-install-systemd
index ac86d338d..2c59074a7 100644
--- a/core/systemd/initcpio-install-systemd
+++ b/core/systemd/initcpio-install-systemd
@@ -101,6 +101,7 @@ build() {
 
     # systemd
     add_binary /usr/lib/systemd/systemd /init
+    add_binary /usr/bin/systemd-tmpfiles
 
     # generate sysroot.mount and sysroot-usr.mount
     add_file "/usr/lib/systemd/system-generators/systemd-fstab-generator"
@@ -114,12 +115,7 @@ build() {
             99-systemd.rules \
 
     map add_systemd_unit \
-            systemd-udevd-control.socket \
-            systemd-udevd-kernel.socket \
-            sockets.target \
-            systemd-journald.service \
-            systemd-udevd.service \
-            systemd-udev-trigger.service \
+            ctrl-alt-del.target \
             initrd-cleanup.service \
             initrd-fs.target \
             initrd-parse-etc.service \
@@ -128,8 +124,15 @@ build() {
             initrd-switch-root.target \
             initrd-udevadm-cleanup-db.service \
             initrd.target \
+            kmod-static-nodes.service \
+            sockets.target \
             systemd-fsck@.service \
-            ctrl-alt-del.target
+            systemd-journald.service \
+            systemd-tmpfiles-setup-dev.service \
+            systemd-udev-trigger.service \
+            systemd-udevd-control.socket \
+            systemd-udevd-kernel.socket \
+            systemd-udevd.service
 
     add_symlink "/usr/lib/systemd/system/default.target" "initrd.target"
 
diff --git a/core/systemd/initcpio-install-udev b/core/systemd/initcpio-install-udev
index 2f6f15d0b..419c19e58 100644
--- a/core/systemd/initcpio-install-udev
+++ b/core/systemd/initcpio-install-udev
@@ -6,6 +6,7 @@ build() {
     add_file "/etc/udev/udev.conf"
     add_binary /usr/lib/systemd/systemd-udevd
     add_binary /usr/bin/udevadm
+    add_binary /usr/bin/systemd-tmpfiles
 
     for rules in 50-udev-default.rules 60-persistent-storage.rules 64-btrfs.rules 80-drivers.rules; do
         add_file "/usr/lib/udev/rules.d/$rules"