version 20130802-1

5 files changed, 50 insertions, 62 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6bb5a2670b7f..feb2e7c3e48a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = eudev-git
 	pkgdesc = The userspace dev tools (udev) forked by Gentoo
-	pkgver = 20150211
+	pkgver = 20130802
 	pkgrel = 1
 	url = https://github.com/gentoo/eudev
 	install = eudev-git.install
@@ -18,13 +18,15 @@ pkgbase = eudev-git
 	depends = kmod
 	depends = hwids
 	depends = bash
-	provides = eudev
-	conflicts = eudev
+	depends = acl
+	provides = udev=206
+	provides = systemd=206
+	provides = libsystemd=206
+	provides = systemd-tools=206
 	conflicts = udev
 	conflicts = systemd
 	conflicts = libsystemd
 	conflicts = systemd-tools
-	replaces = eudev
 	replaces = udev
 	replaces = systemd
 	replaces = libsystemd
@@ -39,13 +41,8 @@ pkgbase = eudev-git
 	source = 80-net-name-slot.rules
 	md5sums = SKIP
 	md5sums = e99e9189aa2f6084ac28b8ddf605aeb8
-	md5sums = d3a7b1d77e53d401ed37827ad297846a
-	md5sums = d83a59d647b511b815ee0e8c85dcd54a
+	md5sums = 825af8cce7dd73ed4ce1a8289e3bdad8
+	md5sums = 372d60f89f626629005bb755be259a20
 
 pkgname = eudev-git
-	provides = eudev
-	provides = udev=
-	provides = systemd=
-	provides = libsystemd=
-	provides = systemd-tools=
 
diff --git a/80-net-name-slot.rules b/80-net-name-slot.rules
index fdb87a82dee1..e0990de2d3a8 100644
--- a/80-net-name-slot.rules
+++ b/80-net-name-slot.rules
@@ -1,10 +1,7 @@
-ACTION!="add", GOTO="net_name_slot_end"
+ACTION=="remove", GOTO="net_name_slot_end"
 SUBSYSTEM!="net", GOTO="net_name_slot_end"
 NAME!="", GOTO="net_name_slot_end"
 
-IMPORT{cmdline}="net.ifnames"
-ENV{net.ifnames}=="0", GOTO="net_name_slot_end"
-
 #NAME=="", ENV{ID_NET_NAME_ONBOARD}!="", NAME="$env{ID_NET_NAME_ONBOARD}"
 #NAME=="", ENV{ID_NET_NAME_SLOT}!="", NAME="$env{ID_NET_NAME_SLOT}"
 #NAME=="", ENV{ID_NET_NAME_PATH}!="", NAME="$env{ID_NET_NAME_PATH}"
diff --git a/PKGBUILD b/PKGBUILD
index 6ec7515ccb47..3f0ca0b71eeb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,16 +2,17 @@
 # Contributor: Ivailo Monev <xakepa10@gmail.com>
 pkgname='eudev-git'
 pkgdesc="The userspace dev tools (udev) forked by Gentoo"
-pkgver=20150211
+pkgver=20130802
 pkgrel=1
-provides=('eudev')
-replaces=('eudev' 'udev' 'systemd' 'libsystemd' 'systemd-tools')
-conflicts=('eudev' 'udev' 'systemd' 'libsystemd' 'systemd-tools')
+_udevver=206
+provides=("udev=${_udevver}" "systemd=${_udevver}" "libsystemd=${_udevver}" "systemd-tools=${_udevver}")
+replaces=('udev' 'systemd' 'libsystemd' 'systemd-tools')
+conflicts=('udev' 'systemd' 'libsystemd' 'systemd-tools')
 groups=('base')
 arch=('i686' 'x86_64')
 url="https://github.com/gentoo/eudev"
 license=('GPL')
-depends=('util-linux' 'glib2' 'kmod' 'hwids' 'bash')
+depends=('util-linux' 'glib2' 'kmod' 'hwids' 'bash' 'acl')
 makedepends=('git' 'gobject-introspection' 'gperf' 'libxslt' 'docbook-xsl')
 options=(!makeflags !libtool)
 install="${pkgname}.install"
@@ -19,31 +20,32 @@ backup=('etc/udev/udev.conf' 'etc/udev/rules.d/80-net-name-slot.rules')
 source=('git://github.com/gentoo/eudev.git'
         'initcpio_hooks'
         'initcpio_install'
-        '80-net-name-slot.rules')
+	'80-net-name-slot.rules')
+options=(!makeflags !libtool)
 md5sums=('SKIP'
          'e99e9189aa2f6084ac28b8ddf605aeb8'
-         'd3a7b1d77e53d401ed37827ad297846a'
-         'd83a59d647b511b815ee0e8c85dcd54a')
-_gitname="eudev"
-
-pkgver()
-{
-  cd "${srcdir}/${_gitname}"
-
-  # Date of last commit
-  git log -1 --format="%ci" HEAD | cut -d\  -f1 | tr -d '-'
-}
-
+         '825af8cce7dd73ed4ce1a8289e3bdad8'
+         '372d60f89f626629005bb755be259a20')
+#_gitroot=('git://github.com/gentoo/eudev.git')
+_gitname=('eudev')
+         
 build() {
+  #if [ -d "${_gitname}" ] ; then
+  #  cd "${srcdir}/${_gitname}"
+  #  msg2 "Updating local tree..."
+  #  git pull origin master
+  #else
+  #  cd "${srcdir}"
+  #  msg2 "Cloning initial copy of ${_gitname}..."
+  #  git clone --depth=1 "${_gitroot}" "${_gitname}"
+  #  cd "${srcdir}/${_gitname}"
+  #fi
   cd "${srcdir}/${_gitname}"
 
   if [ -f "Makefile" ];then
     msg2 "Cleaning up..."
     make clean
   fi
-
-  # Temporary workaround for bug #87
-  #sed /"#include <linux\/fcntl.h>"/d -i src/*/*.c
   
   msg2 "Configuring sources..."
   ./autogen.sh
@@ -51,7 +53,9 @@ build() {
               --with-rootprefix=/usr \
               --sysconfdir=/etc \
               --libdir=/usr/lib \
-              --sbindir=/usr/bin \
+	      --sbindir=/usr/bin \
+              --with-firmware-path=/usr/lib/firmware/updates:/lib/firmware/updates:/usr/lib/firmware:/lib/firmware \
+              --with-modprobe=/sbin/modprobe \
               --enable-gudev \
               --enable-introspection
 
@@ -64,7 +68,7 @@ package() {
   cd "${srcdir}/${_gitname}"
   make DESTDIR="${pkgdir}" install
 
-  # Install the mkinitpcio hook
+  # install the mkinitpcio hook
   install -Dm644 "${srcdir}/initcpio_hooks" "${pkgdir}/usr/lib/initcpio/hooks/udev"
   install -Dm644 "${srcdir}/initcpio_install" "${pkgdir}/usr/lib/initcpio/install/udev"
 
@@ -75,18 +79,16 @@ package() {
                s#GROUP="cdrom"#GROUP="optical"#g' "${i}"
   done
 
-  # input group is not used in Arch Linux at this moment
-  sed '/GROUP="input"/d' -i "${pkgdir}/usr/lib/udev/rules.d/50-udev-default.rules"
-
   # Make new interface naming policy disabled by default
   rm -f "${pkgdir}/usr/lib/udev/rules.d/80-net-name-slot.rules"
   install -Dm644 "${srcdir}/80-net-name-slot.rules" "${pkgdir}/etc/udev/rules.d/80-net-name-slot.rules"
+}
 
-  # Getting udev version
-  udevver=$(grep UDEV_VERSION configure.ac | egrep -o "[0-9]{3}")
-  provides+=("udev=$udevver")
-  provides+=("systemd=$udevver")
-  provides+=("libsystemd=$udevver")
-  provides+=("systemd-tools=$udevver")
+pkgver()
+{
+  cd "${srcdir}/${_gitname}"
+
+  # Date of last commit
+  git log -1 --format="%ci" HEAD | cut -d\  -f1 | tr -d '-'
 }
 
diff --git a/eudev-git.install b/eudev-git.install
index d54362973835..baedb7ed5376 100755
--- a/eudev-git.install
+++ b/eudev-git.install
@@ -1,14 +1,6 @@
 # arg 1:  the new package version
 # arg 2:  the old package version
 
-netdev_warn() {
-  echo " * Now eudev supports predictable network interface names."
-  echo " * You can enable it by uncommenting lines into"
-  echo " * /etc/udev/rules.d/80-net-name-slot.rules"
-  echo
-  echo " * See http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
-}
-
 post_upgrade() {
   if [ "$(vercmp $2 181-3)" -lt 0 ]; then
     echo "udev changes:"
@@ -62,13 +54,13 @@ post_upgrade() {
       echo " * binaries moved from /sbin to /usr/bin"
     fi
     if [ "$(vercmp $2 20130128)" -lt 0 ]; then
-      netdev_warn
+      echo " * Now eudev supports predictable network interface names."
+      echo " * You can enable it by uncommenting lines into"
+      echo " * /etc/udev/rules.d/80-net-name-slot.rules"
+      echo
+      echo " * See http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
     fi 
     echo " * if your kernel does not provide /dev/loop-control, you need to manually"
     echo "   load the 'loop' module before using losetup"
   fi
 }
-
-post_install() {
-  netdev_warn
-}
diff --git a/initcpio_install b/initcpio_install
index 033e9ea6e22a..b280d8dceb5b 100755
--- a/initcpio_install
+++ b/initcpio_install
@@ -5,8 +5,8 @@ build() {
     add_binary /usr/bin/udevd
     add_binary /usr/bin/udevadm
 
-    for rule in 50-udev-default.rules 60-persistent-storage.rules 64-btrfs.rules 80-drivers.rules; do
-        add_file "/usr/lib/udev/rules.d/$rule"
+    for rule in /usr/lib/udev/rules.d/*.rules; do
+        add_file "$rule"
     done
     
     for tool in ata_id scsi_id; do