Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

systemd-git: assorted updates

  • Loading branch information...
commit e4df5871b66c9326f26f73b577a99b729d0623aa 1 parent 5fe06ca
Dave Reisner authored May 19, 2012
15  systemd-git/PKGBUILD
@@ -33,8 +33,7 @@ backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
33 33
 install='systemd.install'
34 34
 source=('os-release'
35 35
         'initcpio-hooks-udev'
36  
-        'initcpio-install-udev'
37  
-        0001-udev-read-from-lib-udev-rules.d-for-compat.patch)
  36
+        'initcpio-install-udev')
38 37
 md5sums=('752636def0db3c03f121f8b4f44a63cd'
39 38
          'a4dd853050bf2e0ae6b2e3d2c75499c2'
40 39
          'd2b16edc6d806b5dafdbbad43ae5a3de'
@@ -60,9 +59,6 @@ build() {
60 59
   git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
61 60
   cd "$srcdir/$_gitname-build"
62 61
 
63  
-  # allow udev to read from /lib and /usr/lib
64  
-  patch -Np1 <"$srcdir/0001-udev-read-from-lib-udev-rules.d-for-compat.patch"
65  
-
66 62
   ./autogen.sh
67 63
   ./configure --libexecdir=/usr/lib \
68 64
               --localstatedir=/var \
@@ -71,9 +67,10 @@ build() {
71 67
               --enable-introspection \
72 68
               --enable-gtk-doc \
73 69
               --disable-audit \
74  
-              --with-pamlibdir=/lib/security \
  70
+              --disable-ima \
  71
+              --with-pamlibdir=/usr/lib/security \
75 72
               --with-distro=arch \
76  
-              --with-firmware-path=/usr/lib/firmware/updates:/lib/firmware/updates:/usr/lib/firmware:/lib/firmware \
  73
+              --with-firmware-path=/usr/lib/firmware/updates:/usr/lib/firmware \
77 74
               --with-sysvinit-path= \
78 75
               --with-sysvrcd-path=
79 76
 
@@ -93,9 +90,8 @@ package() {
93 90
     src/systemd/sd-daemon.[ch] \
94 91
     src/readahead/sd-readahead.[ch]
95 92
 
96  
-  install -dm755 "$pkgdir/bin" "$pkgdir/lib/systemd"
  93
+  install -dm755 "$pkgdir/bin"
97 94
   ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd"
98  
-  ln -s ../../usr/lib/systemd/systemd "$pkgdir/lib/systemd/systemd"
99 95
 
100 96
   # fix systemd-analyze for python2
101 97
   sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
@@ -114,6 +110,7 @@ package() {
114 110
     IFS='/' read section page <<< "$manpage"
115 111
     mv "$manpage" "$section/systemd.$page"
116 112
   done
  113
+  sed -i '1s|/\([^/]\+\)|/systemd.\1|' "$pkgdir"/usr/share/man/man8/systemd.{poweroff,reboot}.8
117 114
 
118 115
   # move bash-completion and symlink for loginctl
119 116
   install -Dm644 "$pkgdir/etc/bash_completion.d/systemd-bash-completion.sh" \
21  systemd-git/initcpio-hooks-udev
... ...
@@ -1,9 +1,20 @@
1  
-# vim: set ft=sh:
2  
-run_hook ()
3  
-{
4  
-    msg -n ":: Triggering uevents..."
  1
+#!/usr/bin/ash
  2
+
  3
+run_earlyhook() {
  4
+    /usr/lib/udev/udevd --daemon --resolve-names=never
  5
+    udevd_running=1
  6
+}
  7
+
  8
+run_hook() {
  9
+    msg ":: Triggering uevents..."
5 10
     udevadm trigger --action=add --type=subsystems
6 11
     udevadm trigger --action=add --type=devices
7 12
     udevadm settle
8  
-    msg "done."
9 13
 }
  14
+
  15
+run_cleanuphook() {
  16
+    udevadm control --exit
  17
+    udevadm info --cleanup-db
  18
+}
  19
+
  20
+# vim: set ft=sh ts=4 sw=4 et:
6  systemd-git/initcpio-install-udev
... ...
@@ -1,9 +1,7 @@
1 1
 #!/bin/bash
2 2
 
3 3
 build() {
4  
-    FILES="/etc/udev/udev.conf"
5  
-    SCRIPT="udev"
6  
-
  4
+    add_file "/etc/udev/udev.conf"
7 5
     add_binary /usr/lib/udev/udevd
8 6
     add_binary /usr/bin/udevadm
9 7
 
@@ -13,6 +11,8 @@ build() {
13 11
     for tool in ata_id scsi_id; do
14 12
         add_file "/usr/lib/udev/$tool"
15 13
     done
  14
+
  15
+    add_runscript
16 16
 }
17 17
 
18 18
 help() {

0 notes on commit e4df587

Please sign in to comment.
Something went wrong with that request. Please try again.