[arch-commits] Commit in udev/repos (9 files)

Tom Gundersen tomegun at archlinux.org
Wed Mar 14 19:26:13 EDT 2012


    Date: Wednesday, March 14, 2012 @ 19:26:13
  Author: tomegun
Revision: 153479

db-move: moved udev from [testing] to [core] (i686)

Added:
  udev/repos/core-i686/PKGBUILD
    (from rev 153478, udev/repos/testing-i686/PKGBUILD)
  udev/repos/core-i686/initcpio-hooks-udev
    (from rev 153478, udev/repos/testing-i686/initcpio-hooks-udev)
  udev/repos/core-i686/initcpio-install-udev
    (from rev 153478, udev/repos/testing-i686/initcpio-install-udev)
  udev/repos/core-i686/udev.install
    (from rev 153478, udev/repos/testing-i686/udev.install)
Deleted:
  udev/repos/core-i686/PKGBUILD
  udev/repos/core-i686/initcpio-hooks-udev
  udev/repos/core-i686/initcpio-install-udev
  udev/repos/core-i686/udev.install
  udev/repos/testing-i686/

-----------------------+
 PKGBUILD              |  127 ++++++++++++++++++++++------------------------
 initcpio-hooks-udev   |   18 +++---
 initcpio-install-udev |   52 +++++++++---------
 udev.install          |  132 +++++++++++++++++++++---------------------------
 4 files changed, 156 insertions(+), 173 deletions(-)

Deleted: core-i686/PKGBUILD
===================================================================
--- core-i686/PKGBUILD	2012-03-14 22:43:14 UTC (rev 153478)
+++ core-i686/PKGBUILD	2012-03-14 23:26:13 UTC (rev 153479)
@@ -1,65 +0,0 @@
-# $Id$
-# Maintainer: Tom Gundersen <teg at jklm.no>
-# Contributor: Aaron Griffin <aaron at archlinux.org>
-# Contributor: Tobias Powalowski <tpowa at archlinux.org>
-# Contributor: Thomas Bächler <thomas at archlinux.org>
-
-pkgname=udev
-pkgver=181
-pkgrel=2
-pkgdesc="The userspace dev tools (udev)"
-depends=('util-linux' 'libusb-compat' 'glib2' 'kmod' 'pciutils' 'usbutils' 'pciutils')
-install=udev.install
-arch=(i686 x86_64)
-license=('GPL')
-makedepends=('gobject-introspection' 'gperf' 'libxslt' 'usbutils' 'kmod')
-source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.xz
-	initcpio-hooks-udev
-	initcpio-install-udev)
-url="http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary"
-backup=(etc/udev/udev.conf)
-groups=('base')
-options=(!makeflags !libtool)
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  ./configure --prefix=/usr \
-              --with-rootprefix= \
-              --sysconfdir=/etc \
-              --libdir=/usr/lib \
-              --libexecdir=/lib \
-              --with-systemdsystemunitdir=/lib/systemd/system \
-              --enable-udev_acl
-
-  make
-}
-  
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=${pkgdir} install
-
-  # /dev/loop0 is created for convenience, to autoload the module if necessary
-  # this is no longer needed when util-linux-2.21 is released as /dev/loop-control
-  # will be used instead. Support for this will go away in a future version of udev
-  install -d -m755 ${pkgdir}/lib/udev/devices/
-  mknod ${pkgdir}/lib/udev/devices/loop0 b 7 0
-  chgrp disk ${pkgdir}/lib/udev/devices/loop0
- 
-  # udevd moved, symlink to make life easy for restarting udevd manually
-  ln -s /lib/udev/udevd ${pkgdir}/usr/bin/udevd
-
-  # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
-  for i in $pkgdir/lib/udev/rules.d/*.rules; do
-    sed -i -e 's#GROUP="dialout"#GROUP="uucp"#g;
-               s#GROUP="tape"#GROUP="storage"#g;
-               s#GROUP="cdrom"#GROUP="optical"#g' $i
-  done
-
-  # install the mkinitpcio hook
-  install -D -m644 ../initcpio-hooks-udev ${pkgdir}/lib/initcpio/hooks/udev
-  install -D -m644 ../initcpio-install-udev ${pkgdir}/lib/initcpio/install/udev
-}
-md5sums=('0d7af750702620a871b9f9b98d8ad859'
-         'a4dd853050bf2e0ae6b2e3d2c75499c2'
-         'ee0bfe91a20fff12cc25ab1d1e024853')

Copied: udev/repos/core-i686/PKGBUILD (from rev 153478, udev/repos/testing-i686/PKGBUILD)
===================================================================
--- core-i686/PKGBUILD	                        (rev 0)
+++ core-i686/PKGBUILD	2012-03-14 23:26:13 UTC (rev 153479)
@@ -0,0 +1,62 @@
+# $Id$
+# Maintainer: Tom Gundersen <teg at jklm.no>
+# Contributor: Aaron Griffin <aaron at archlinux.org>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: Thomas Bächler <thomas at archlinux.org>
+
+pkgname=udev
+pkgver=181
+pkgrel=4
+pkgdesc="The userspace dev tools (udev)"
+depends=('util-linux' 'libusb-compat' 'glib2' 'kmod' 'pciutils' 'usbutils' 'pciutils' 'acl')
+install=udev.install
+arch=(i686 x86_64)
+license=('GPL')
+makedepends=('gobject-introspection' 'gperf' 'libxslt' 'usbutils' 'kmod')
+source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.xz
+	initcpio-hooks-udev
+	initcpio-install-udev)
+url="http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary"
+backup=(etc/udev/udev.conf)
+groups=('base')
+options=(!makeflags !libtool)
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  ./configure --prefix=/usr \
+              --with-rootprefix= \
+              --sysconfdir=/etc \
+              --libdir=/usr/lib \
+              --libexecdir=/lib \
+              --with-systemdsystemunitdir=/lib/systemd/system \
+              --enable-udev_acl
+
+  make
+}
+  
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=${pkgdir} install
+
+  # udevd moved, symlink to make life easy for restarting udevd manually
+  ln -s ../../lib/udev/udevd ${pkgdir}/usr/bin/udevd
+
+  # the path to udevadm is hardcoded in some places
+  install -d ${pkgdir}/sbin
+  ln -s ../usr/bin/udevadm ${pkgdir}/sbin/udevadm
+
+  # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
+  for i in $pkgdir/lib/udev/rules.d/*.rules; do
+    sed -i -e 's#GROUP="dialout"#GROUP="uucp"#g;
+               s#GROUP="tape"#GROUP="storage"#g;
+               s#GROUP="cdrom"#GROUP="optical"#g' $i
+  done
+
+  # install the mkinitpcio hook
+  install -D -m644 ../initcpio-hooks-udev ${pkgdir}/lib/initcpio/hooks/udev
+  install -D -m644 ../initcpio-install-udev ${pkgdir}/lib/initcpio/install/udev
+}
+md5sums=('0d7af750702620a871b9f9b98d8ad859'
+         'a4dd853050bf2e0ae6b2e3d2c75499c2'
+         'ee0bfe91a20fff12cc25ab1d1e024853')

Deleted: core-i686/initcpio-hooks-udev
===================================================================
--- core-i686/initcpio-hooks-udev	2012-03-14 22:43:14 UTC (rev 153478)
+++ core-i686/initcpio-hooks-udev	2012-03-14 23:26:13 UTC (rev 153479)
@@ -1,9 +0,0 @@
-# vim: set ft=sh:
-run_hook ()
-{
-    msg -n ":: Triggering uevents..."
-    udevadm trigger --action=add --type=subsystems
-    udevadm trigger --action=add --type=devices
-    udevadm settle
-    msg "done."
-}

Copied: udev/repos/core-i686/initcpio-hooks-udev (from rev 153478, udev/repos/testing-i686/initcpio-hooks-udev)
===================================================================
--- core-i686/initcpio-hooks-udev	                        (rev 0)
+++ core-i686/initcpio-hooks-udev	2012-03-14 23:26:13 UTC (rev 153479)
@@ -0,0 +1,9 @@
+# vim: set ft=sh:
+run_hook ()
+{
+    msg -n ":: Triggering uevents..."
+    udevadm trigger --action=add --type=subsystems
+    udevadm trigger --action=add --type=devices
+    udevadm settle
+    msg "done."
+}

Deleted: core-i686/initcpio-install-udev
===================================================================
--- core-i686/initcpio-install-udev	2012-03-14 22:43:14 UTC (rev 153478)
+++ core-i686/initcpio-install-udev	2012-03-14 23:26:13 UTC (rev 153479)
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-build() {
-    FILES="/etc/udev/udev.conf"
-    SCRIPT="udev"
-
-    add_binary /lib/udev/udevd
-    add_binary /usr/bin/udevadm
-
-    for rules in 50-udev-default.rules 60-persistent-storage.rules 80-drivers.rules; do
-        add_file "/lib/udev/rules.d/$rules"
-    done
-    for tool in ata_id scsi_id; do
-        add_file "/lib/udev/$tool"
-    done
-}
-
-help() {
-    cat <<HELPEOF
-This hook will use udev to create your root device node and detect the needed
-modules for your root device. It is also required for firmware loading in
-initramfs. It is recommended to use this hook.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:

Copied: udev/repos/core-i686/initcpio-install-udev (from rev 153478, udev/repos/testing-i686/initcpio-install-udev)
===================================================================
--- core-i686/initcpio-install-udev	                        (rev 0)
+++ core-i686/initcpio-install-udev	2012-03-14 23:26:13 UTC (rev 153479)
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+build() {
+    FILES="/etc/udev/udev.conf"
+    SCRIPT="udev"
+
+    add_binary /lib/udev/udevd
+    add_binary /usr/bin/udevadm
+
+    for rules in 50-udev-default.rules 60-persistent-storage.rules 80-drivers.rules; do
+        add_file "/lib/udev/rules.d/$rules"
+    done
+    for tool in ata_id scsi_id; do
+        add_file "/lib/udev/$tool"
+    done
+}
+
+help() {
+    cat <<HELPEOF
+This hook will use udev to create your root device node and detect the needed
+modules for your root device. It is also required for firmware loading in
+initramfs. It is recommended to use this hook.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:

Deleted: core-i686/udev.install
===================================================================
--- core-i686/udev.install	2012-03-14 22:43:14 UTC (rev 153478)
+++ core-i686/udev.install	2012-03-14 23:26:13 UTC (rev 153479)
@@ -1,73 +0,0 @@
-# arg 1:  the new package version
-# arg 2:  the old package version
-
-post_upgrade() {
-  if [ "$(vercmp $2 181)" -lt 0 ]; then
-    echo "ATTENTION UDEV:"
-    echo "----------"
-    if [ "$(vercmp $2 168)" -lt 0 ]; then
-      echo "Kernel 2.6.32 or newer is now required."
-      echo "  --"
-      echo "OSS emulation modules are not loaded by default, add to rc.conf if needed."
-      echo "  --"
-      echo "Arch specific cd symlinks are now no longer created."
-      echo "  --"
-      echo "cd and net persistent rules will no longer be autogenerated,"
-      echo "see <https://wiki.archlinux.org/index.php/Udev> for details."
-      echo "  --"
-      echo "Errors are now logged (possibly to the console) by default."
-      echo "  --"
-    fi
-    if [ "$(vercmp $2 171)" -lt 0 ]; then
-      echo "Arch's custom blacklisting logic has been removed. MOD_AUTOLOAD and"
-      echo "blacklisting in MODULES no longer works."
-      echo "See 'man modprobe.conf' for a replacement to blacklisting."
-      echo "To disable a module mod1 on the kernel command line, use"
-      echo "mod1.disable=1"
-      echo "or"
-      echo "modprobe.blacklist=mod1"
-      echo "  --"
-      echo "The following modules are no longer unconditionally loaded:"
-      echo "  pcspkr irtty-sir analog lp ppdev ide-generic"
-      echo "Add them to MODULES in rc.conf if you need them."
-      echo "  --"
-    fi
-    if [ "$(vercmp $2 172)" -lt 0 ]; then
-      echo "Blacklisting of framebuffer devices has moved from /etc/modprobe.d to"
-      echo "/lib/modprobe.d. Any customizations shoud be done to the file in /etc, as it"
-      echo "takes precedence."
-      echo "  --"
-      echo "kbd and rtc devices are no longer world readable."
-      echo "  --"
-      echo "rtc is no longer in the audio group and fb devices are no longer in"
-      echo "the video group, as permissions and ownership of fb devices are controlled"
-      echo "by X."
-      echo "  --"
-    fi
-    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 "  --"
-      echo "We no longer create symlinks from /dev/<dev> to /dev/<dev>0."
-      echo "  --"
-      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 " --"
-      echo "We no longer create the static nodes on install needed for an initrd-less boot"
-      echo "where devtmpfs is not mounted by the kernel, this only affects fresh installs."
-      echo " --"
-    fi
-    if [ "$(vercmp $2 175)" -lt 0 ]; then
-      echo "devtmpfs support is now a hard requirement. Users of the official Arch kernels"
-      echo "have this enabled."
-      echo " --"
-    fi
-    echo "udev-compat has been removed, and should be uninstalled."
-    echo " --"
-    echo "Framebuffers are no longer blacklisted by default."
-    echo " --"
-    echo "binaries moved from /sbin to /usr/bin"
-    echo "---------------"
-  fi
-}

Copied: udev/repos/core-i686/udev.install (from rev 153478, udev/repos/testing-i686/udev.install)
===================================================================
--- core-i686/udev.install	                        (rev 0)
+++ core-i686/udev.install	2012-03-14 23:26:13 UTC (rev 153479)
@@ -0,0 +1,59 @@
+# arg 1:  the new package version
+# arg 2:  the old package version
+
+post_upgrade() {
+  if [ "$(vercmp $2 181-3)" -lt 0 ]; then
+    echo "udev changes:"
+    if [ "$(vercmp $2 168)" -lt 0 ]; then
+      echo " * Kernel 2.6.32 or newer is now required."
+      echo " * OSS emulation modules are not loaded by default, add to rc.conf if needed."
+      echo " * Arch specific cd symlinks are now no longer created."
+      echo " * cd and net persistent rules will no longer be autogenerated,"
+      echo "   see <https://wiki.archlinux.org/index.php/Udev> for details."
+      echo " * Errors are now logged (possibly to the console) by default."
+    fi
+    if [ "$(vercmp $2 171)" -lt 0 ]; then
+      echo " * Arch's custom blacklisting logic has been removed. MOD_AUTOLOAD and"
+      echo "   blacklisting in MODULES no longer works."
+      echo "   See 'man modprobe.conf' for a replacement to blacklisting."
+      echo "   To disable a module mod1 on the kernel command line, use"
+      echo "     mod1.disable=1"
+      echo "   or"
+      echo "     modprobe.blacklist=mod1"
+      echo " * The following modules are no longer unconditionally loaded:"
+      echo "     pcspkr irtty-sir analog lp ppdev ide-generic"
+      echo "   Add them to MODULES in rc.conf if you need them."
+    fi
+    if [ "$(vercmp $2 172)" -lt 0 ]; then
+      echo " * Blacklisting of framebuffer devices has moved from /etc/modprobe.d to"
+      echo "   /lib/modprobe.d. Any customizations shoud be done to the file in /etc, as it"
+      echo "   takes precedence."
+      echo " * kbd and rtc devices are no longer world readable."
+      echo " * rtc is no longer in the audio group and fb devices are no longer in"
+      echo "   the video group, as permissions and ownership of fb devices are controlled"
+      echo "   by X."
+    fi
+    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
+    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