[arch-commits] Commit in systemd/trunk (PKGBUILD systemd-tools.install udev.install)

Dave Reisner dreisner at archlinux.org
Mon May 28 02:02:24 UTC 2012


    Date: Sunday, May 27, 2012 @ 22:02:23
  Author: dreisner
Revision: 160015

upgpkg: systemd 183-3

- absorb udev into systemd-tools (FS#30039)

Added:
  systemd/trunk/systemd-tools.install
    (from rev 159998, systemd/trunk/udev.install)
Modified:
  systemd/trunk/PKGBUILD
Deleted:
  systemd/trunk/udev.install

-----------------------+
 PKGBUILD              |   78 +++++++++++++++++-------------------------------
 systemd-tools.install |   29 +++++++++++++++++
 udev.install          |   29 -----------------
 3 files changed, 57 insertions(+), 79 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-05-28 01:48:30 UTC (rev 160014)
+++ PKGBUILD	2012-05-28 02:02:23 UTC (rev 160015)
@@ -1,9 +1,9 @@
 # Maintainer: Dave Reisner <dreisner at archlinux.org>
 
 pkgbase=systemd
-pkgname=('systemd' 'libsystemd' 'systemd-tools' 'udev')
+pkgname=('systemd' 'libsystemd' 'systemd-tools')
 pkgver=183
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 license=('GPL2' 'LGPL2.1' 'MIT')
@@ -52,8 +52,8 @@
 
 package_systemd() {
   pkgdesc="system and service manager"
-  depends=('acl' 'dbus-core' "libsystemd=$pkgver" 'kbd' 'kmod' 'libcap' 'pam' "systemd-tools=$pkgver"
-           'util-linux' "udev=$pkgver" 'xz')
+  depends=('acl' 'dbus-core' "libsystemd=$pkgver" 'kbd' 'kmod' 'libcap' 'pam'
+           "systemd-tools=$pkgver" 'util-linux' 'xz')
   optdepends=('cryptsetup: required for encrypted block devices'
               'dbus-python: systemd-analyze'
               'initscripts: legacy support for hostname and vconsole setup'
@@ -79,11 +79,6 @@
   install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release"
   printf "d /run/console 0755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf"
 
-  # install external sd-{daemon,readahead} libraries
-  install -m644 -t "$pkgdir/usr/share/doc/systemd" \
-    src/systemd/sd-daemon.[ch] \
-    src/readahead/sd-readahead.[ch]
-
   install -dm755 "$pkgdir/bin"
   ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd"
 
@@ -125,21 +120,22 @@
   mv "$pkgdir/usr/include/systemd" usr/include
   mv "$pkgdir/usr/lib/pkgconfig"/libsystemd-*.pc usr/lib/pkgconfig
 
-  ### split out udev
-  rm -rf "$srcdir/_udev"
+  ### split out systemd-tools/udev
+  rm -rf "$srcdir/_tools"
   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"/_tools/etc/udev \
+      "$srcdir"/_tools/usr/bin \
+      "$srcdir"/_tools/usr/include \
+      "$srcdir"/_tools/usr/lib/{systemd/system,udev} \
+      "$srcdir"/_tools/usr/lib/systemd/system/{sysinit,sockets}.target.wants \
+      "$srcdir"/_tools/usr/lib/girepository-1.0 \
+      "$srcdir"/_tools/usr/{lib,share}/pkgconfig \
+      "$srcdir"/_tools/usr/share/gir-1.0 \
+      "$srcdir"/_tools/usr/share/gtk-doc/html/{g,lib}udev \
+      "$srcdir"/_tools/etc/{binfmt,modules-load,sysctl}.d \
+      "$srcdir"/_tools/usr/share/man/man{1,5,7,8}
 
-  cd "$srcdir"/_udev
+  cd "$srcdir/_tools"
   mv "$pkgdir"/etc/udev etc
   mv "$pkgdir"/usr/bin/udevadm usr/bin
   mv "$pkgdir"/usr/lib/pkgconfig/*udev*.pc usr/lib/pkgconfig
@@ -155,22 +151,12 @@
   mv "$pkgdir"/usr/share/gir-1.0 usr/share
   mv "$pkgdir"/usr/share/gtk-doc/html/{g,lib}udev usr/share/gtk-doc/html
   mv "$pkgdir"/usr/share/man/man7/udev.7 usr/share/man/man7
+  mv "$pkgdir"/usr/share/man/man5/systemd.vconsole.conf.5 usr/share/man/man5
   mv "$pkgdir"/usr/share/man/man8/{systemd-udevd,udevadm}.8 usr/share/man/man8
-
-  ### split out systemd-tools
-  rm -rf "$srcdir/_tools"
-  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/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/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
 }
 
 package_libsystemd() {
@@ -183,23 +169,14 @@
 package_systemd-tools() {
   pkgdesc='standalone tools from systemd'
   url='http://www.freedesktop.org/wiki/Software/systemd'
-  depends=('glibc' 'kmod')
-  conflicts=('systemd<183')
+  depends=('acl' 'bash' 'glibc' 'glib2' 'kmod' 'hwids' 'util-linux')
+  provides=("udev=$pkgver")
+  conflicts=('udev')
+  replaces=('udev')
+  install='systemd-tools.install'
 
   mv "$srcdir/_tools/"* "$pkgdir"
-  install -Dm644 "$srcdir/initcpio-install-timestamp" "$pkgdir/usr/lib/initcpio/install/timestamp"
-}
 
-package_udev() {
-  pkgdesc='userspace dev tools'
-  url='http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary'
-  groups=('base')
-  depends=('acl' 'util-linux' 'glibc' 'glib2' 'kmod' 'hwids' 'bash')
-  backup=('etc/udev/udev.conf')
-  install='udev.install'
-
-  mv "$srcdir/_udev"/* "$pkgdir"
-
   # the path to udevadm is hardcoded in some places
   install -d "$pkgdir/sbin"
   ln -s ../usr/bin/udevadm "$pkgdir/sbin/udevadm"
@@ -213,9 +190,10 @@
           s#GROUP="tape"#GROUP="storage"#g;
           s#GROUP="cdrom"#GROUP="optical"#g' "$pkgdir"/usr/lib/udev/rules.d/*.rules
 
-  # add mkinitcpio hooks for udev
+  # add mkinitcpio hooks
   install -Dm644 "$srcdir/initcpio-install-udev" "$pkgdir/usr/lib/initcpio/install/udev"
   install -Dm644 "$srcdir/initcpio-hook-udev" "$pkgdir/usr/lib/initcpio/hooks/udev"
+  install -Dm644 "$srcdir/initcpio-install-timestamp" "$pkgdir/usr/lib/initcpio/install/timestamp"
 }
 
 # vim: ft=sh syn=sh et

Copied: systemd/trunk/systemd-tools.install (from rev 159998, systemd/trunk/udev.install)
===================================================================
--- systemd-tools.install	                        (rev 0)
+++ systemd-tools.install	2012-05-28 02:02:23 UTC (rev 160015)
@@ -0,0 +1,29 @@
+# arg 1:  the new package version
+# arg 2:  the old package version
+
+post_upgrade() {
+  if [ "$(vercmp $2 174)" -lt 0 ]; then
+    echo " * We now use upstream rules for assigning devices to the 'disk', 'optical',"
+    echo "   'scanner' and 'video' groups. Beware of any changes."
+    echo " * We no longer create symlinks from /dev/<dev> to /dev/<dev>0."
+    echo " * For security reasons, we no longer add devices to the 'storage' group. Use"
+    echo "   udisks and friends, or add custom rules to /etc/udev.d/rules/, if you want"
+    echo "   this functionality back."
+    echo " * We no longer create the static nodes on install needed for an initrd-less"
+    echo "   boot where devtmpfs is not mounted by the kernel, this only affects fresh"
+    echo "   installs."
+  fi
+  if [ "$(vercmp $2 175)" -lt 0 ]; then
+    echo " * devtmpfs support is now a hard requirement. Users of the official Arch"
+    echo "   kernels have this enabled."
+  fi
+  if [ "$(vercmp $2 181)" -lt 0 ]; then
+    echo " * udev-compat has been removed, and should be uninstalled."
+    echo " * Framebuffers are no longer blacklisted by default."
+    echo " * binaries moved from /sbin to /usr/bin"
+  fi
+  if [ "$(vercmp $2 181-3)" -lt 0 ]; then
+    echo " * if your kernel does not provide /dev/loop-control, you need to manually"
+    echo "   load the 'loop' module before using losetup"
+  fi
+}

Deleted: udev.install
===================================================================
--- udev.install	2012-05-28 01:48:30 UTC (rev 160014)
+++ udev.install	2012-05-28 02:02:23 UTC (rev 160015)
@@ -1,29 +0,0 @@
-# arg 1:  the new package version
-# arg 2:  the old package version
-
-post_upgrade() {
-  if [ "$(vercmp $2 174)" -lt 0 ]; then
-    echo " * We now use upstream rules for assigning devices to the 'disk', 'optical',"
-    echo "   'scanner' and 'video' groups. Beware of any changes."
-    echo " * We no longer create symlinks from /dev/<dev> to /dev/<dev>0."
-    echo " * For security reasons, we no longer add devices to the 'storage' group. Use"
-    echo "   udisks and friends, or add custom rules to /etc/udev.d/rules/, if you want"
-    echo "   this functionality back."
-    echo " * We no longer create the static nodes on install needed for an initrd-less"
-    echo "   boot where devtmpfs is not mounted by the kernel, this only affects fresh"
-    echo "   installs."
-  fi
-  if [ "$(vercmp $2 175)" -lt 0 ]; then
-    echo " * devtmpfs support is now a hard requirement. Users of the official Arch"
-    echo "   kernels have this enabled."
-  fi
-  if [ "$(vercmp $2 181)" -lt 0 ]; then
-    echo " * udev-compat has been removed, and should be uninstalled."
-    echo " * Framebuffers are no longer blacklisted by default."
-    echo " * binaries moved from /sbin to /usr/bin"
-  fi
-  if [ "$(vercmp $2 181-3)" -lt 0 ]; then
-    echo " * if your kernel does not provide /dev/loop-control, you need to manually"
-    echo "   load the 'loop' module before using losetup"
-  fi
-}




More information about the arch-commits mailing list