Browse Source

Stefan Fiedler:


			
			
				rocklinux
			
			
		
Stefan Fiedler 18 years ago
parent
commit
1367c3eeb2
3 changed files with 18 additions and 33 deletions
  1. +0
    -25
      package/base/udev/dont-kill-and-restart-udevd.patch
  2. +14
    -7
      package/base/udev/udev.conf
  3. +4
    -1
      package/base/udev/udev.desc

+ 0
- 25
package/base/udev/dont-kill-and-restart-udevd.patch

@ -1,25 +0,0 @@
--- ./Makefile.orig 2006-03-14 23:08:37.000000000 +0100
+++ ./Makefile 2006-03-14 23:09:18.000000000 +0100
@@ -294,11 +294,6 @@
@extras="$(EXTRAS)"; for target in $$extras; do \
$(MAKE) -C $$target $@ || exit 1; \
done;
-ifndef DESTDIR
- - killall udevd
- - rm -rf /dev/.udev
- - $(sbindir)/udevd --daemon
-endif
.PHONY: install-bin
uninstall-bin:
@@ -307,10 +302,6 @@
- rm -f $(DESTDIR)$(usrsbindir)/udevmonitor
- rm -f $(DESTDIR)$(usrbindir)/udevinfo
- rm -f $(DESTDIR)$(usrbindir)/udevtest
-ifndef DESTDIR
- - killall udevd
- - rm -rf /dev/.udev
-endif
@extras="$(EXTRAS)"; for target in $$extras; do \
$(MAKE) -C $$target $@ || exit 1; \
done;

+ 14
- 7
package/base/udev/udev.conf

@ -21,8 +21,11 @@
# --- ROCK-COPYRIGHT-NOTE-END ---
udev_pm() {
mkdir -p $root/lib/udev/devices
# the deletion and re-creation is needed for stage 9 rebuilds
rm -rf $root/lib/{firmware,udev/devices/{pts,shm,bus/usb}}
mkdir -p $root/lib/{firmware,udev/devices/{pts,shm,bus/usb}}
rm -f $root/lib/udev/devices/null
mknod -m0666 $root/lib/udev/devices/null c 1 3
rm -f $root/lib/udev/devices/fd
ln -sv /proc/self/fd $root/lib/udev/devices/fd
rm -f $root/lib/udev/devices/core
@ -33,25 +36,29 @@ udev_pm() {
ln -sv /proc/self/fd/1 $root/lib/udev/devices/stdout
rm -f $root/lib/udev/devices/stderr
ln -sv /proc/self/fd/2 $root/lib/udev/devices/stderr
rm -rf $root/lib/udev/devices/{pts,shm}
mkdir -p $root/lib/udev/devices/{pts,shm,bus/usb}
# Somehow on boot-up this prevents errors like:
# cp: will not create hard link `/dev/pts' to directory `/dev/bus/usb'
touch $root/lib/udev/devices/{pts,shm,bus/usb}/.empty
# Install LFS-specific rules and docs.
# tar $taropt $archdir/udev-config-$udev_config_ver.tar.bz2
# cd udev-config-$udev_config_ver
# make install
# make install-doc
# make install-extra-doc
cp -v $confdir/rules/* $root/etc/udev/rules.d/
cp -v $confdir/scripts/*.sh $confdir/scripts/modalias_* $root/lib/udev/
chmod +x $root/lib/udev/*.sh $root/lib/udev/modalias_*
mkdir -p $root/lib/firmware
}
udev_prem() {
for i in $(find extras/ -name Makefile -maxdepth 2); do
for i in $(find extras/ -maxdepth 2 -name Makefile); do
udev_extras="${udev_extras} $(dirname ${i})"
done
# DESTDIR=/ prevents kill and restart of udev.
var_append makeopt " " 'EXTRAS="${udev_extras}"'
var_append makeinstopt " " 'EXTRAS="${udev_extras}"'
var_append makeinstopt " " 'DESTDIR=/ EXTRAS="${udev_extras}"'
}
prefix=""

+ 4
- 1
package/base/udev/udev.desc

@ -42,7 +42,10 @@
[L] GPL
[S] Beta
[V] 103
[V] 103 1
[P] X -X-3-----9 188.400
[D] 1588207467 udev-103.tar.bz2 ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/
# udev configuration from linuxfromscratch.org
# [O] udev_config_ver=20061021
# [D] 3022928461 udev-config-20061021.tar.bz2 http://www.linuxfromscratch.org/lfs/downloads/development/

Loading…
Cancel
Save