diff options
author | 2007-07-24 19:19:31 +0000 | |
---|---|---|
committer | 2007-07-24 19:19:31 +0000 | |
commit | f582cc5bcb44db9c3f888e90d3bfe0ec105d05d6 (patch) | |
tree | 38e86623f5f53e3046c44b868efec7e6ced3934d /sys-fs | |
parent | Drop keyword for live ebuild (diff) | |
download | historical-f582cc5bcb44db9c3f888e90d3bfe0ec105d05d6.tar.gz historical-f582cc5bcb44db9c3f888e90d3bfe0ec105d05d6.tar.bz2 historical-f582cc5bcb44db9c3f888e90d3bfe0ec105d05d6.zip |
Backported creation of /dev/root from udev-110-r1 to 104-r12 as this is needed for sys-apps/hal that is already stable.
Package-Manager: portage-2.1.3_rc9
Diffstat (limited to 'sys-fs')
-rw-r--r-- | sys-fs/udev/ChangeLog | 10 | ||||
-rw-r--r-- | sys-fs/udev/Manifest | 33 | ||||
-rw-r--r-- | sys-fs/udev/files/digest-udev-104-r13 | 3 | ||||
-rw-r--r-- | sys-fs/udev/files/udev-start-104-r13.sh | 167 | ||||
-rwxr-xr-x | sys-fs/udev/files/udev-stop-104-r13.sh | 114 | ||||
-rw-r--r-- | sys-fs/udev/udev-104-r13.ebuild | 285 |
6 files changed, 607 insertions, 5 deletions
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index 9e765f0f6003..6394c6df55b2 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sys-fs/udev # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.316 2007/07/12 15:07:40 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.317 2007/07/24 19:19:31 zzam Exp $ + +*udev-104-r13 (24 Jul 2007) + + 24 Jul 2007; Matthias Schwarzott <zzam@gentoo.org> + +files/udev-start-104-r13.sh, +files/udev-stop-104-r13.sh, + +udev-104-r13.ebuild: + Backported creation of /dev/root from udev-110-r1 to 104-r12 as this is + needed for sys-apps/hal that is already stable. 12 Jul 2007; Matthias Schwarzott <zzam@gentoo.org> files/modprobe-113-r2.sh: diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index 367c5384f9f4..67c7e5886281 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 05-udev-early.rules-104-r5 567 RMD160 8c7e021cc1f733d59c21f7f09ff74471b15f3ade SHA1 842021003645319d163202ab00aae39f219261ea SHA256 ecbcbbdb32c7530f2cadba10590826cc1abd176cc52cece7c53a5bd821a65bc8 MD5 f10916c6977dc9cbd935154358974196 files/05-udev-early.rules-104-r5 567 RMD160 8c7e021cc1f733d59c21f7f09ff74471b15f3ade files/05-udev-early.rules-104-r5 567 @@ -98,6 +101,10 @@ AUX udev-start-104-r12.sh 4251 RMD160 576db5d8b2e7c2b8753e0544e3c8506525b54fc3 S MD5 7e7ec7b4c208e51dab865a791edc4b83 files/udev-start-104-r12.sh 4251 RMD160 576db5d8b2e7c2b8753e0544e3c8506525b54fc3 files/udev-start-104-r12.sh 4251 SHA256 45ebbd670f439ae92da9f311488ba6382ca174c429a32cdb163f07083b091be5 files/udev-start-104-r12.sh 4251 +AUX udev-start-104-r13.sh 4414 RMD160 ab908683db17233d40ee1d5a0333a787a1779058 SHA1 4cffd9d09a58fb7a0e6d65fde1ea3bf4cdfa97ed SHA256 781e1303ea55505a5c42ed9ed1b1d706fcae8465954143cc3b9eb5811a84dcb4 +MD5 b2a83652601c56469437f53a31df967a files/udev-start-104-r13.sh 4414 +RMD160 ab908683db17233d40ee1d5a0333a787a1779058 files/udev-start-104-r13.sh 4414 +SHA256 781e1303ea55505a5c42ed9ed1b1d706fcae8465954143cc3b9eb5811a84dcb4 files/udev-start-104-r13.sh 4414 AUX udev-start-110-r1.sh 5327 RMD160 caeac2277a26017330b9c626976842eadfb0b11f SHA1 875243c2724691ec583c4a5d5f17d7da1dbde438 SHA256 7845199f72bc41f440da36a8a3e44c92b943fdbb84241f13c073961246190ad7 MD5 07f7b394707e9c1a70e7511a4fd5f810 files/udev-start-110-r1.sh 5327 RMD160 caeac2277a26017330b9c626976842eadfb0b11f files/udev-start-110-r1.sh 5327 @@ -110,6 +117,10 @@ AUX udev-start-113-r2.sh 6515 RMD160 2ecaa37fd9e498e60f8cd5978cb4f7930594cf99 SH MD5 6b7cd53c08b86df1dd767c3592e68b58 files/udev-start-113-r2.sh 6515 RMD160 2ecaa37fd9e498e60f8cd5978cb4f7930594cf99 files/udev-start-113-r2.sh 6515 SHA256 438bc31605c8d2e50bebedd7fbff1410845738372ab3bc03d6f5ed1427ddd046 files/udev-start-113-r2.sh 6515 +AUX udev-stop-104-r13.sh 3213 RMD160 aedef1ca5fe853eb3f5a774f354dc36dccbd31e5 SHA1 0ced2a331cf516019326d87e2b3c7978d2c02d23 SHA256 2762507dc5a640eb66823a87402d1ddae9c3430b47f69ff95a7e55f7c2f95be9 +MD5 b61e1aa841f294d09b73ca53ae22d81e files/udev-stop-104-r13.sh 3213 +RMD160 aedef1ca5fe853eb3f5a774f354dc36dccbd31e5 files/udev-stop-104-r13.sh 3213 +SHA256 2762507dc5a640eb66823a87402d1ddae9c3430b47f69ff95a7e55f7c2f95be9 files/udev-stop-104-r13.sh 3213 AUX udev-stop-104-r8.sh 3208 RMD160 76a1fa5ce68250710c79e141d76d83b3331a4f2e SHA1 78ec2b84513e9acba286dd5abb95e21f6d54d999 SHA256 5b1eb2912a33987eae9502297f804a189e14e41498b7ea08d97423bcfb2e2f2c MD5 cbc06136105b520864575794e0dc3de7 files/udev-stop-104-r8.sh 3208 RMD160 76a1fa5ce68250710c79e141d76d83b3331a4f2e files/udev-stop-104-r8.sh 3208 @@ -146,6 +157,10 @@ EBUILD udev-104-r12.ebuild 9539 RMD160 3ea7426633221cc11168e6f67872318e55b6295e MD5 aa5803220fb1e030e862367e978100bd udev-104-r12.ebuild 9539 RMD160 3ea7426633221cc11168e6f67872318e55b6295e udev-104-r12.ebuild 9539 SHA256 0cf0d7a65976ebaaa287ac3eb39b32ff91f553de5af91ad01dc5a170c97bfbe5 udev-104-r12.ebuild 9539 +EBUILD udev-104-r13.ebuild 9734 RMD160 a6070144a38f1bc01abdcc64271b48364d8e8cce SHA1 45f63b7c5bb4d288dc77264c969ec2c41e049421 SHA256 7a525d7c2544de442d3520fd1a6e36b0bbfb1eaa175be5ccf908a0bb51e6666a +MD5 b1ecbcb4293c5c47442a2c6b97f4d412 udev-104-r13.ebuild 9734 +RMD160 a6070144a38f1bc01abdcc64271b48364d8e8cce udev-104-r13.ebuild 9734 +SHA256 7a525d7c2544de442d3520fd1a6e36b0bbfb1eaa175be5ccf908a0bb51e6666a udev-104-r13.ebuild 9734 EBUILD udev-111-r1.ebuild 10293 RMD160 96f2dc5d9e13bbdb5d2100995e017690575cd571 SHA1 18b7bba96545a095db5bc203e7ea9fdb4ab85812 SHA256 a31d50734d6a52e4c36c400ea4aca7aef4d3eb7195c1075bdd98055fa8a08360 MD5 4c6986fc644cc32e53ac6054f3e615ae udev-111-r1.ebuild 10293 RMD160 96f2dc5d9e13bbdb5d2100995e017690575cd571 udev-111-r1.ebuild 10293 @@ -178,10 +193,10 @@ EBUILD udev-113.ebuild 8996 RMD160 fa4abc2291b5944bf318a1c3b56e882a4b41ba63 SHA1 MD5 5e44719b30fc7810407546fd9c6cddb3 udev-113.ebuild 8996 RMD160 fa4abc2291b5944bf318a1c3b56e882a4b41ba63 udev-113.ebuild 8996 SHA256 7e50c34420cf8740805d58e12e00caba5ae7aa59e3faa84f356e867f0a28c384 udev-113.ebuild 8996 -MISC ChangeLog 64074 RMD160 c6f462257ce2c5567c40883be515de638abee58d SHA1 f27e29053f38f338084e298a160af17cdd142fa7 SHA256 d332ab5395af5ac551e78257fdd154aba8d9d72158442907dc766c039c4dd4fd -MD5 6f0db411bdef144ed3c499ce396364b2 ChangeLog 64074 -RMD160 c6f462257ce2c5567c40883be515de638abee58d ChangeLog 64074 -SHA256 d332ab5395af5ac551e78257fdd154aba8d9d72158442907dc766c039c4dd4fd ChangeLog 64074 +MISC ChangeLog 64366 RMD160 904840118a8ee2389ed73a32c14cd68df5696b1c SHA1 9b8f823b30c2afffd17577b7be414233c4e7c314 SHA256 7a86a30a3a2665c54df1d02c0a57b7c24f04d0709d862ea76bca4b954b7c8635 +MD5 60493b5e3d4eff3b793c2f89fa32d283 ChangeLog 64366 +RMD160 904840118a8ee2389ed73a32c14cd68df5696b1c ChangeLog 64366 +SHA256 7a86a30a3a2665c54df1d02c0a57b7c24f04d0709d862ea76bca4b954b7c8635 ChangeLog 64366 MISC metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be SHA1 70c43d2863c09958849bfce8c5bb97d406a0662b SHA256 a9881de1424ac71191111bd30c7c1253589673b0cdce13c352204f1499e9d884 MD5 f74bee0505505c00e76da6313db29e49 metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be metadata.xml 447 @@ -189,6 +204,9 @@ SHA256 a9881de1424ac71191111bd30c7c1253589673b0cdce13c352204f1499e9d884 metadata MD5 834e944e237e0d9501aac75e61c50eb1 files/digest-udev-104-r12 229 RMD160 7fd47bd560da91a9953657f31d6cd2383d2032cb files/digest-udev-104-r12 229 SHA256 36aae1151cda7c7f51bfb8204b7cef8301f80ea336086802f1a8c495a7eb7749 files/digest-udev-104-r12 229 +MD5 834e944e237e0d9501aac75e61c50eb1 files/digest-udev-104-r13 229 +RMD160 7fd47bd560da91a9953657f31d6cd2383d2032cb files/digest-udev-104-r13 229 +SHA256 36aae1151cda7c7f51bfb8204b7cef8301f80ea336086802f1a8c495a7eb7749 files/digest-udev-104-r13 229 MD5 f972e05a59a06d7a8f0558e95c815023 files/digest-udev-111 229 RMD160 e3d3502313bf0cc5c20e675bc2ed2dfc7a26487f files/digest-udev-111 229 SHA256 e9b70d3341d67047bbc63a8b60a403fffce01a30974814a50e4e05aa15d80603 files/digest-udev-111 229 @@ -213,3 +231,10 @@ SHA256 64c3a37d941e4b18999d5848050520182dc7d2096da5fd08b8d3c40928445154 files/di MD5 06ae5eaf2ef4822f6277a5c4e2361438 files/digest-udev-113-r2 229 RMD160 44acd6ea09ff5ec7f54376dd33c1db09e18a1fb1 files/digest-udev-113-r2 229 SHA256 64c3a37d941e4b18999d5848050520182dc7d2096da5fd08b8d3c40928445154 files/digest-udev-113-r2 229 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.5 (GNU/Linux) + +iD8DBQFGplDNt2vP6XvVdOcRAoGPAKCGVen3amwVwmpGnCcPl2pBcwPVVQCdF/FL +45bjbE9fxYqN0jJK6F1XR9c= +=xJ8K +-----END PGP SIGNATURE----- diff --git a/sys-fs/udev/files/digest-udev-104-r13 b/sys-fs/udev/files/digest-udev-104-r13 new file mode 100644 index 000000000000..1d88fbeee74a --- /dev/null +++ b/sys-fs/udev/files/digest-udev-104-r13 @@ -0,0 +1,3 @@ +MD5 9bcfc782d40db2b406a9c1172defda8f udev-104.tar.bz2 187574 +RMD160 269aeb9a0b2043d18c274fde749d2e0d30398b73 udev-104.tar.bz2 187574 +SHA256 ec0e7bd0c322dce6149d5f94185aa477659f5030a3d684ff5428124eca684ea1 udev-104.tar.bz2 187574 diff --git a/sys-fs/udev/files/udev-start-104-r13.sh b/sys-fs/udev/files/udev-start-104-r13.sh new file mode 100644 index 000000000000..2cdfa84cad4e --- /dev/null +++ b/sys-fs/udev/files/udev-start-104-r13.sh @@ -0,0 +1,167 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +udev_version() { + # Version number copied in by ebuild + local version=@@UDEV_VERSION@@ + version=${version##0} + + echo "${version}" +} + +populate_udev() { + # populate /dev with devices already found by the kernel + + # tell modprobe.sh to be verbose to $CONSOLE + echo CONSOLE=${CONSOLE} > /dev/.udev_populate + + if [ $(get_KV) -gt $(KV_to_int '2.6.14') ] ; then + ebegin "Populating /dev with existing devices through uevents" + local opts= + [ ${RC_COLDPLUG} != "yes" ] && [ $(udev_version) -ge 96 ] && \ + opts="--attr-match=dev" + /sbin/udevtrigger ${opts} + eend $? + else + ebegin "Populating /dev with existing devices with udevstart" + /sbin/udevstart + eend $? + fi + + # loop until everything is finished + # there's gotta be a better way... + ebegin "Letting udev process events" + /sbin/udevsettle --timeout=60 + eend $? + + rm -f /dev/.udev_populate + return 0 +} + +seed_dev() { + # Seed /dev with some things that we know we need + ebegin "Seeding /dev with needed nodes" + + # if /dev/console is missing on root-partition, + # kernel could not open it and we need to do that for + # udevd (Bug #151414) + [ ! -c /dev/console ] && mknod /dev/console c 5 1 + + # creating /dev/tty1 as it is used by bootsplash + # (to allow us to write to $CONSOLE before udev has + # created it) + [ ! -c /dev/tty1 ] && mknod /dev/tty1 c 4 1 + + # udevd will dup its stdin/stdout/stderr to /dev/null + # and we do not want a file which gets buffered in ram + [ ! -c /dev/null ] && mknod /dev/null c 1 3 + + # copy over any persistant things + if [ -d /lib/udev/devices ] ; then + cp --preserve=all --recursive --update /lib/udev/devices/* /dev 2>/dev/null + fi + + # Not provided by sysfs but needed + ln -snf /proc/self/fd /dev/fd + ln -snf fd/0 /dev/stdin + ln -snf fd/1 /dev/stdout + ln -snf fd/2 /dev/stderr + [ -e /proc/kcore ] && ln -snf /proc/kcore /dev/core + + # Create problematic directories + mkdir -p /dev/pts /dev/shm + eend 0 +} + +make_dev_root() { + local DEV=$(/lib/udev/get_dir_major_minor "/") + if [ $? == 0 ] && [ -n "${DEV}" ]; then + mknod -m 600 /dev/root b ${DEV} + fi +} + +main() { + # check if /dev/console exists outside tmpfs + [ -c /dev/console ] ; local need_redirect=$? + + # Setup temporary storage for /dev + ebegin "Mounting /dev for udev" + if [ "${RC_USE_FSTAB}" = "yes" ] ; then + mntcmd=$(get_mount_fstab /dev) + else + unset mntcmd + fi + if [ -n "${mntcmd}" ] ; then + try mount -n ${mntcmd} + else + if grep -Eq "[[:space:]]+tmpfs$" /proc/filesystems ; then + mntcmd="tmpfs" + else + mntcmd="ramfs" + fi + # many video drivers require exec access in /dev #92921 + try mount -n -t "${mntcmd}" -o exec,nosuid,mode=0755 udev /dev + fi + eend $? + + # Create a file so that our rc system knows it's still in sysinit. + # Existance means init scripts will not directly run. + # rc will remove the file when done with sysinit. + touch /dev/.rcsysinit + + # Selinux lovin; /selinux should be mounted by selinux-patched init + if [ -x /sbin/restorecon ] && [ -c /selinux/null ] ; then + restorecon /dev > /selinux/null + fi + + # Actually get udev rolling + if [ "${RC_DEVICE_TARBALL}" = "yes" ] && \ + [ -s /lib/udev/state/devices.tar.bz2 ] ; then + ebegin "Populating /dev with saved device nodes" + try tar -jxpf /lib/udev/state/devices.tar.bz2 -C /dev + eend $? + fi + + seed_dev + + # Setup hotplugging (if possible) + if [ -e /proc/sys/kernel/hotplug ] ; then + ebegin "Setting up proper hotplug agent" + eindent + if [ $(get_KV) -gt $(KV_to_int '2.6.14') ] ; then + einfo "Using netlink for hotplug events..." + echo "" > /proc/sys/kernel/hotplug + else + einfo "Setting /sbin/udevsend as hotplug agent ..." + echo "/sbin/udevsend" > /proc/sys/kernel/hotplug + fi + eoutdent + eend 0 + fi + + ebegin "Starting udevd" + if [ ${need_redirect} -eq 1 ]; then + # we need to open fds 0 1 2 to solve Bug #151414 + /sbin/udevd --daemon </dev/console >/dev/console 2>/dev/console + else + /sbin/udevd --daemon + fi + eend $? + + populate_udev + make_dev_root + + # Create nodes that udev can't + ebegin "Finalizing udev configuration" + [ -x /sbin/dmsetup ] && /sbin/dmsetup mknodes &>/dev/null + [ -x /sbin/lvm ] && \ + /sbin/lvm vgscan -P --mknodes --ignorelockingfailure &>/dev/null + # Running evms_activate on a LiveCD causes lots of headaches + [ -z "${CDBOOT}" ] && [ -x /sbin/evms_activate ] && \ + /sbin/evms_activate -q &>/dev/null + eend 0 +} + +main + +# vim:ts=4 diff --git a/sys-fs/udev/files/udev-stop-104-r13.sh b/sys-fs/udev/files/udev-stop-104-r13.sh new file mode 100755 index 000000000000..7a9937fed81d --- /dev/null +++ b/sys-fs/udev/files/udev-stop-104-r13.sh @@ -0,0 +1,114 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +udev_version() { + # Version number copied in by ebuild + local version=@@UDEV_VERSION@@ + version=${version##0} + + echo "${version}" +} + +# store persistent-rules that got created while booting +# when / was still read-only +store_persistent_rules() { + local type base tmp_rules real_rules + + for type in cd net; do + base=70-persistent-${type}.rules + tmp_rules=/dev/.udev/tmp-rules--${base} + real_rules=/etc/udev/rules.d/${base} + + if [ -f ${tmp_rules} ]; then + einfo "Saving udev persistent ${type} rules to /etc/udev/rules.d" + cat ${tmp_rules} >> ${real_rules} + rm ${tmp_rules} + fi + done +} + +main() { + store_persistent_rules + + if [ -e /dev/.devfsd ] || [ ! -e /dev/.udev ] || [ ! -z "${CDBOOT}" ] || \ + [ "${RC_DEVICE_TARBALL}" != "yes" ] || \ + ! touch /lib/udev/state/devices.tar.bz2 2>/dev/null + then + return 0 + fi + + ebegin "Saving device nodes" + # Handle our temp files + save_tmp_base=/tmp/udev.savedevices."$$" + devices_udev="${save_tmp_base}"/devices.udev + devices_real="${save_tmp_base}"/devices.real + devices_totar="${save_tmp_base}"/devices.totar + device_tarball="${save_tmp_base}"/devices + + rm -rf "${save_tmp_base}" + mkdir "${save_tmp_base}" + touch "${devices_udev}" "${devices_real}" \ + "${devices_totar}" "${device_tarball}" + + if [ -f ${devices_udev} ] && [ -f ${devices_real} ] && \ + [ -f ${devices_totar} ] && [ -f ${device_tarball} ] ; then + cd /dev + # Find all devices + find . -xdev -type b -or -type c -or -type l | cut -d/ -f2- > \ + "${devices_real}" + # Figure out what udev created + eval $(grep '^[[:space:]]*udev_db=' /etc/udev/udev.conf) + if [ -d ${udev_db} ]; then + # New udev_db is clear text ... + udevinfo=$(cat "${udev_db}"/*) + else + # if no udev_db + if [ $(udev_version) -ge 104 ]; then + udevinfo=$(udevinfo --export-db) + else + # Old one is not ... + udevinfo=$(udevinfo -d) + fi + fi + # This basically strips 'S:' and 'N:' from the db output, and then + # print all the nodes/symlinks udev created ... + echo "${udevinfo}" | gawk ' + /^(N|S):.+/ { + sub(/^(N|S):/, "") + split($0, nodes) + for (x in nodes) + print nodes[x] + }' > "${devices_udev}" + # These ones we also do not want in there + for x in MAKEDEV core fd initctl pts shm stderr stdin stdout root; do + echo "${x}" >> "${devices_udev}" + done + if [ -d /lib/udev/devices ]; then + cd /lib/udev/devices + find . -xdev -type b -or -type c -or -type l | cut -d/ -f2- >> "${devices_udev}" + fi + cd /dev + fgrep -x -v -f "${devices_udev}" < "${devices_real}" | \ + grep -v ^\\.udev > "${devices_totar}" + + # Now only tarball those not created by udev if we have any + if [ -s ${devices_totar} ]; then + # we dont want to descend into mounted filesystems (e.g. devpts) + # looking up username may involve NIS/network, and net may be down + tar --one-file-system --numeric-owner -jcpf "${device_tarball}" -T "${devices_totar}" + mv -f "${device_tarball}" /lib/udev/state/devices.tar.bz2 + else + rm -f /lib/udev/state/devices.tar.bz2 + fi + eend 0 + else + eend 1 "Could not create temporary files!" + fi + + rm -rf "${save_tmp_base}" +} + +main + + +# vim:ts=4 diff --git a/sys-fs/udev/udev-104-r13.ebuild b/sys-fs/udev/udev-104-r13.ebuild new file mode 100644 index 000000000000..e0e5ad8b2cde --- /dev/null +++ b/sys-fs/udev/udev-104-r13.ebuild @@ -0,0 +1,285 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-104-r13.ebuild,v 1.1 2007/07/24 19:19:31 zzam Exp $ + +inherit eutils flag-o-matic multilib toolchain-funcs + +DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" +HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" +SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="selinux" + +DEPEND="selinux? ( sys-libs/libselinux )" +RDEPEND="!sys-apps/coldplug" +RDEPEND="${DEPEND} ${RDEPEND} + >=sys-apps/baselayout-1.12.5" +# We need the lib/rcscripts/addon support +PROVIDE="virtual/dev-manager" + +src_unpack() { + unpack ${A} + + cd "${S}" + + # patches go here... + epatch ${FILESDIR}/${P}-netif-rename-busywait.patch + epatch ${FILESDIR}/${PN}-104-peristent-net-disable-xen.patch + epatch ${FILESDIR}/${PN}-104-persistent-net-fix-name-dups.patch + epatch ${FILESDIR}/${PN}-105-vol_id-fix.patch + epatch ${FILESDIR}/${PN}-105-unlink-db-files.patch + EPATCH_OPTS="-p1" epatch ${FILESDIR}/${PN}-110-root-link-1.diff + + # No need to clutter the logs ... + sed -ie '/^DEBUG/ c\DEBUG = false' Makefile + # Do not use optimization flags from the package + sed -ie 's|$(OPTIMIZATION)||g' Makefile + + # Make sure there is no sudden changes to udev.rules.gentoo + # (more for my own needs than anything else ...) + MD5=`md5sum < "${S}/etc/udev/gentoo/udev.rules"` + MD5=${MD5/ -/} + if [ "${MD5}" != "295a9b7bdc8bdb239f8860d14af761b0" ] + then + echo + eerror "gentoo/udev.rules has been updated, please validate!" + die "gentoo/udev.rules has been updated, please validate!" + fi +} + +src_compile() { + filter-flags -fprefetch-loop-arrays + local myconf= + local extras="extras/ata_id \ + extras/cdrom_id \ + extras/dasd_id \ + extras/edd_id \ + extras/firmware \ + extras/floppy \ + extras/path_id \ + extras/run_directory \ + extras/scsi_id \ + extras/usb_id \ + extras/volume_id \ + extras/rule_generator \ + extras/root_link" + + use selinux && myconf="${myconf} USE_SELINUX=true" + + # Not everyone has full $CHOST-{ld,ar,etc...} yet + local mycross="" + type -p ${CHOST}-ar && mycross=${CHOST}- + + echo "get_libdir = $(get_libdir)" + # Do not work with emake + make \ + EXTRAS="${extras}" \ + udevdir="/dev/" \ + CROSS_COMPILE=${mycross} \ + ${myconf} || die +} + +src_install() { + # we install everything by "hand" and don't rely on the udev Makefile to do + # it for us (why? it's easier that way...) + dobin udevinfo || die "Required binary not installed properly" + dobin udevtest || die "Required binary not installed properly" + dobin udevmonitor || die "Required binary not installed properly" + into / + dosbin udevd || die "Required binary not installed properly" + dosbin udevstart || die "Required binary not installed properly" + dosbin udevtrigger || die "Required binary not installed properly" + dosbin udevcontrol || die "Required binary not installed properly" + dosbin udevsettle || die "Required binary not installed properly" + + # Helpers + exeinto /lib/udev + doexe extras/run_directory/udev_run_devd || die "Required helper not installed properly" + doexe extras/run_directory/udev_run_hotplugd || die "Required helper not installed properly" + doexe extras/ata_id/ata_id || die "Required helper not installed properly" + doexe extras/volume_id/vol_id || die "Required helper not installed properly" + doexe extras/scsi_id/scsi_id || die "Required helper not installed properly" + doexe extras/usb_id/usb_id || die "Required helper not installed properly" + doexe extras/path_id/path_id || die "Required helper not installed properly" + doexe extras/cdrom_id/cdrom_id || die "Required helper not installed properly" + doexe extras/dasd_id/dasd_id || die "Required helper not installed properly" + doexe extras/edd_id/edd_id || die "Required helper not installed properly" + doexe extras/rule_generator/write_cd_rules || die "Required helper not installed properly" + doexe extras/rule_generator/write_net_rules || die "Required helper not installed properly" + doexe extras/rule_generator/rule_generator.functions || die "Required helper not installed properly" + doexe extras/root_link/get_dir_major_minor || die "Required helper not installed properly" + keepdir /lib/udev/state + keepdir /lib/udev/devices + + # vol_id library (needed by mount and HAL) + dolib extras/volume_id/lib/*.a extras/volume_id/lib/*.so* + # move the .a files to /usr/lib + dodir /usr/$(get_libdir) + mv -f "${D}"/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ + + # handle static linking bug #4411 + gen_usr_ldscript libvolume_id.so + + # save pkgconfig info + insinto /usr/$(get_libdir)/pkgconfig + doins extras/volume_id/lib/*.pc + + #exeinto /etc/udev/scripts + exeinto /lib/udev + #doexe extras/ide-devfs.sh + #doexe extras/scsi-devfs.sh + #doexe extras/raid-devfs.sh + doexe extras/floppy/create_floppy_devices || die "Required binary not installed properly" + doexe extras/firmware/firmware.sh || die "Required binary not installed properly" + newexe ${FILESDIR}/net-104-r10.sh net.sh || die "Required binary not installed properly" + newexe ${FILESDIR}/modprobe-104-r12.sh modprobe.sh || die "Required binary not installed properly" + doexe ${FILESDIR}/seq_node.sh || die "Required binary not installed properly" + + # Our udev config file + insinto /etc/udev + newins ${FILESDIR}/udev.conf.post_081 udev.conf + + # Our rules files + insinto /etc/udev/rules.d/ + newins etc/udev/gentoo/udev.rules 50-udev.rules + newins ${FILESDIR}/udev.rules-104-r10 50-udev.rules + newins ${FILESDIR}/05-udev-early.rules-104-r5 05-udev-early.rules + doins ${FILESDIR}/95-net.rules + # Use upstream's persistent rules for devices + doins etc/udev/rules.d/60-*.rules + doins extras/rule_generator/75-*.rules || die "rules not installed properly" + + # scsi_id configuration + insinto /etc + doins extras/scsi_id/scsi_id.config + + # set up the /etc/dev.d directory tree + keepdir /etc/dev.d + + # all of the man pages + doman *.7 + doman *.8 + doman extras/ata_id/ata_id.8 + doman extras/edd_id/edd_id.8 + doman extras/scsi_id/scsi_id.8 + doman extras/volume_id/vol_id.8 + doman extras/dasd_id/dasd_id.8 + doman extras/cdrom_id/cdrom_id.8 + # create a extra symlink for udevcontrol + dosym udevd.8 /usr/share/man/man8/udevcontrol.8 + + # our udev hooks into the rc system + insinto /$(get_libdir)/rcscripts/addons + newins "${FILESDIR}"/udev-start-104-r13.sh udev-start.sh + newins "${FILESDIR}"/udev-stop-104-r13.sh udev-stop.sh + + # Insert udev-version number into udev-rcscript addon + sed -e "s/@@UDEV_VERSION@@/${PV}/" \ + -i "${D}"/$(get_libdir)/rcscripts/addons/udev-start.sh \ + -i "${D}"/$(get_libdir)/rcscripts/addons/udev-stop.sh + + # needed to compile latest Hal + insinto /usr/include + doins extras/volume_id/lib/libvolume_id.h + + dodoc ChangeLog FAQ README TODO RELEASE-NOTES + dodoc docs/{overview,udev_vs_devfs} + dodoc docs/writing_udev_rules/* + + newdoc extras/volume_id/README README_volume_id + +} + +pkg_preinst() { + if [[ -d ${ROOT}/lib/udev-state ]] ; then + mv -f "${ROOT}"/lib/udev-state/* "${D}"/lib/udev/state/ + rm -r "${ROOT}"/lib/udev-state + fi + + if [ -f "${ROOT}/etc/udev/udev.config" -a \ + ! -f "${ROOT}/etc/udev/udev.rules" ] + then + mv -f ${ROOT}/etc/udev/udev.config ${ROOT}/etc/udev/udev.rules + fi + + # delete the old udev.hotplug symlink if it is present + if [ -h "${ROOT}/etc/hotplug.d/default/udev.hotplug" ] + then + rm -f ${ROOT}/etc/hotplug.d/default/udev.hotplug + fi + + # delete the old wait_for_sysfs.hotplug symlink if it is present + if [ -h "${ROOT}/etc/hotplug.d/default/05-wait_for_sysfs.hotplug" ] + then + rm -f ${ROOT}/etc/hotplug.d/default/05-wait_for_sysfs.hotplug + fi + + # delete the old wait_for_sysfs.hotplug symlink if it is present + if [ -h "${ROOT}/etc/hotplug.d/default/10-udev.hotplug" ] + then + rm -f ${ROOT}/etc/hotplug.d/default/10-udev.hotplug + fi + + # is there a stale coldplug initscript? (CONFIG_PROTECT leaves it behind) + coldplug_stale="" + if [ -f "${ROOT}/etc/init.d/coldplug" ] + then + coldplug_stale="1" + fi +} + +pkg_postinst() { + if [[ ${ROOT} == "/" ]] ; then + # check if root of init-process is identical to ours + if [ -r /proc/1/root -a /proc/1/root/ -ef /proc/self/root/ ]; then + einfo "restarting udevd now." + if [[ -n $(pidof udevd) ]] ; then + killall -15 udevd &>/dev/null + sleep 1 + killall -9 udevd &>/dev/null + fi + /sbin/udevd --daemon + fi + fi + + # people want reminders, I'll give them reminders. Odds are they will + # just ignore them anyway... + + if [[ ${coldplug_stale} == "1" ]] ; then + ewarn "A stale coldplug init script found. You should run:" + ewarn + ewarn " rc-update del coldplug" + ewarn " rm -f /etc/init.d/coldplug" + ewarn + ewarn "udev now provides its own coldplug functionality." + fi + + # delete 40-scsi-hotplug.rules - all integrated in 50-udev.rules + if has_version "=sys-fs/udev-103-r3"; then + if [[ -e "${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules" ]] + then + ewarn "Deleting stray 40-scsi-hotplug.rules" + ewarn "installed by sys-fs/udev-103-r3" + rm -f ${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules + fi + fi + + # Removing some device-nodes we thought we need some time ago + if [[ -d "${ROOT}"/lib/udev/devices ]]; then + rm -f "${ROOT}"/lib/udev/devices/{null,zero,console,urandom} + fi + + # Removing some old file + if has_version "<sys-fs/udev-104-r5"; then + rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev + rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net + fi + + einfo + einfo "For more information on udev on Gentoo, writing udev rules, and" + einfo " fixing known issues visit:" + einfo " http://www.gentoo.org/doc/en/udev-guide.xml" +} |