Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=97be8a167278915f4217b32ffc88103c03d700eb

commit 97be8a167278915f4217b32ffc88103c03d700eb
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Sun Apr 24 11:34:32 2011 +0200

udev-168-1-i686

- version bump

diff --git a/source/base/udev/FrugalBuild b/source/base/udev/FrugalBuild
index 4a0f625..9c3e1f5 100644
--- a/source/base/udev/FrugalBuild
+++ b/source/base/udev/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Miklos Vajna <vmik...@frugalware.org>

pkgname=udev
-pkgver=167
+pkgver=168
pkgrel=1
pkgdesc="A userspace implementation of devfs"
url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/";
@@ -16,8 +16,8 @@ conflicts=('devfsd' 'pcmcia-cs' 'hotplug')
replaces=('hotplug' 'devicekit')
up2date="lynx -dump '$url?C=M;O=D'|grep 'udev-.*tar.bz2 '|sed -n 
's/.*-\(.*\)\.t.*/\1/;1 p'"
source=($url/$pkgname-$pkgver.tar.gz rc.udev blacklist \
-       README.Frugalware 65-permissions.rules revert-ide-changes.patch)
-signatures=("${source[0]}.sign" '' '' '' '' '')
+       README.Frugalware 65-permissions.rules)
+signatures=("${source[0]}.sign" '' '' '' '')

subpkgs=('libgudev')
subdescs=('Libraries for adding libudev support to applications that use glib.')
diff --git a/source/base/udev/revert-ide-changes.patch 
b/source/base/udev/revert-ide-changes.patch
deleted file mode 100644
index 7fa4334..0000000
--- a/source/base/udev/revert-ide-changes.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur udev-151/rules/rules.d/50-udev-default.rules 
udev-151-p/rules/rules.d/50-udev-default.rules
---- udev-151/rules/rules.d/50-udev-default.rules       2010-01-21 
14:21:42.000000000 +0100
-+++ udev-151-p/rules/rules.d/50-udev-default.rules     2010-02-19 
21:17:23.000000000 +0100
-@@ -77,9 +77,11 @@
-
- # floppy
- SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy"
-+KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="floppy", 
OPTIONS+="all_partitions"
-
- # cdrom
- SUBSYSTEM=="block", KERNEL=="sr[0-9]*", SYMLINK+="scd%n", GROUP="cdrom"
-+SUBSYSTEM=="block", KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="cdrom", 
GROUP="cdrom"
- SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", 
GROUP="cdrom"
- KERNEL=="pktcdvd[0-9]*", GROUP="cdrom"
- KERNEL=="pktcdvd", GROUP="cdrom"
diff --git a/source/base/udev/udev.install b/source/base/udev/udev.install
index 134edc0..595c014 100644
--- a/source/base/udev/udev.install
+++ b/source/base/udev/udev.install
@@ -1,7 +1,17 @@
-post_install()
+pre_upgrade()
{
-       cd /etc/rc.d/rcS.d
-       ln -sf ../rc.udev S00rc.udev
+       # stop daemon if we are not in a chroot
+       if test -f /proc/1/exe -a -d /proc/1/root; then
+               if test "$(stat -Lc '%D-%i' /)" = "$(stat -Lc '%D-%i' 
/proc/1/root)"; then
+                       /bin/systemctl stop udev.socket udev.service >/dev/null 
2>&1 || :
+                       /sbin/udevadm control --exit >/dev/null 2>&1 || :
+               fi
+       fi
+}
+
+pre_remove()
+{
+       pre_upgrade
}

post_upgrade()
@@ -25,21 +35,22 @@ post_upgrade()
# /lib/udev/rules.d/50-udev-default.rules
[ -e /etc/udev/rules.d/50-udev-default.rules ] && mv 
/etc/udev/rules.d/50-udev-default.rules{,.pacsave}

-       pid=$(pidof udevd 2>/dev/null)
-       if [ -n "$pid" ]; then
-               echo -n "restarting udev... "
-               kill $pid
-               udevd --daemon
-               mkdir -p /dev/.udev/queue
-               udevadm trigger
-               udevadm settle --timeout=5
-               echo "done."
+       # remove after Frugalware-1.5
+       rm -f /etc/rc.d/rcS.d/S00rc.udev
+
+       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+       # start daemon if we are not in a chroot
+       if test -f /proc/1/exe -a -d /proc/1/root; then
+               if test "$(stat -Lc '%D-%i' /)" = "$(stat -Lc '%D-%i' 
/proc/1/root)"; then
+                       /bin/systemctl start udev.service >/dev/null 2>&1 || :
+                       /sbin/udevd --daemon >/dev/null 2>&1 || :
+               fi
fi
}

-pre_remove()
+post_install()
{
-       rm /etc/rc.d/rcS.d/S00rc.udev
+       post_upgrade
}

op=$1
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to