diff options
Diffstat (limited to 'sys-fs/udev')
| -rw-r--r-- | sys-fs/udev/ChangeLog | 10 | ||||
| -rw-r--r-- | sys-fs/udev/files/digest-udev-115-r6 | 6 | ||||
| -rw-r--r-- | sys-fs/udev/files/udev-115-update-gentoo-rules-2.diff | 11 | ||||
| -rw-r--r-- | sys-fs/udev/files/udev-start-115-r6.sh | 197 | ||||
| -rw-r--r-- | sys-fs/udev/files/udev.conf.115-r6 | 6 | ||||
| -rw-r--r-- | sys-fs/udev/udev-115-r6.ebuild | 330 |
6 files changed, 559 insertions, 1 deletions
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index 7823afe2ca1d..99bd942b281f 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.351 2007/09/20 20:28:42 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.352 2007/09/24 19:59:37 zzam Exp $ + +*udev-115-r6 (24 Sep 2007) + + 24 Sep 2007; Matthias Schwarzott <zzam@gentoo.org> + +files/udev-start-115-r6.sh, +files/udev-115-update-gentoo-rules-2.diff, + +files/udev.conf.115-r6, +udev-115-r6.ebuild: + Simplified rules a bit. Let user configure max inode nr of /dev, solving bug + #193586. *udev-115-r5 (20 Sep 2007) diff --git a/sys-fs/udev/files/digest-udev-115-r6 b/sys-fs/udev/files/digest-udev-115-r6 new file mode 100644 index 000000000000..b90097101aff --- /dev/null +++ b/sys-fs/udev/files/digest-udev-115-r6 @@ -0,0 +1,6 @@ +MD5 ac62cf56468db05bd37a5e7fed2823f6 udev-115-update-20070924.diff.bz2 22390 +RMD160 3ce46440aba43088d1319ad5eb627c66abb75099 udev-115-update-20070924.diff.bz2 22390 +SHA256 18e726afd833a827faf2ec7620051b7a142a50d712de132dbda213fc9d3e8021 udev-115-update-20070924.diff.bz2 22390 +MD5 39bbe5ddcd62d35cd56b184d6862c540 udev-115.tar.bz2 198893 +RMD160 bf72a4e20b9ba50a5b0c3da09f77e67ec819b9fa udev-115.tar.bz2 198893 +SHA256 e35bb5662d2ad692a24adc5bb1d10b065e4657bcb68f20c8ef98d892bfc8dc93 udev-115.tar.bz2 198893 diff --git a/sys-fs/udev/files/udev-115-update-gentoo-rules-2.diff b/sys-fs/udev/files/udev-115-update-gentoo-rules-2.diff new file mode 100644 index 000000000000..f1457c1f50a3 --- /dev/null +++ b/sys-fs/udev/files/udev-115-update-gentoo-rules-2.diff @@ -0,0 +1,11 @@ +diff --git a/etc/udev/gentoo/65-permissions.rules b/etc/udev/gentoo/65-permissions.rules +index 1cc31af..1db0aa7 100644 +--- a/etc/udev/gentoo/65-permissions.rules ++++ b/etc/udev/gentoo/65-permissions.rules +@@ -18,3 +18,6 @@ SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="[18]", GROUP="tape", MODE= + KERNEL=="ippp*|isdn*|dcbri*", GROUP="uucp" + KERNEL=="pilot", GROUP="uucp" + ++# sound devices (sound=alsa, snd=oss) ++SUBSYSTEM=="sound", GROUP="audio" ++SUBSYSTEM=="snd", GROUP="audio" diff --git a/sys-fs/udev/files/udev-start-115-r6.sh b/sys-fs/udev/files/udev-start-115-r6.sh new file mode 100644 index 000000000000..7f5f06a0a85f --- /dev/null +++ b/sys-fs/udev/files/udev-start-115-r6.sh @@ -0,0 +1,197 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +tmpfs_size="10M" + +[ -e /etc/udev/udev.conf ] && . /etc/udev/udev.conf + +mount_dev_directory() { + # 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 + mntopts="exec,nosuid,mode=0755,size=${tmpfs_size}" + [ -n "${tmpfs_inodes}" ] && mntopts="${mntopts},nr_inodes=${tmpfs_inodes}" + 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 "${mntopts}" udev /dev + fi + eend $? +} + +populate_udev() { + # populate /dev with devices already found by the kernel + + if get_bootparam "nocoldplug" ; then + RC_COLDPLUG="no" + ewarn "Skipping udev coldplug as requested in kernel cmdline" + fi + + # at this point we are already sure to use kernel 2.6.15 or newer + ebegin "Populating /dev with existing devices through uevents" + if [ "${RC_COLDPLUG}" = "yes" ]; then + /sbin/udevtrigger + else + # only create device nodes + /sbin/udevtrigger --attr-match=dev + # run persistent-net stuff, bug 191466 + /sbin/udevtrigger --subsystem-match=net + fi + eend $? + + # 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" + + # creating /dev/console and /dev/tty1 to be able to write + # to $CONSOLE with/without bootsplash before udevd creates it + [ ! -c /dev/console ] && mknod /dev/console c 5 1 + [ ! -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 +} + +unpack_device_tarball() { + # 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 +} + +check_persistent_net() { + # check if there are problems with persistent-net + local syspath= + local devs= + local problem_found=0 + for syspath in /sys/class/net/*_rename*; do + if [ -d "${syspath}" ]; then + devs="${devs} ${syspath##*/}" + problem_found=1 + fi + done + + [ "${problem_found}" = 0 ] && return 0 + + eerror "UDEV: Your system has a problem assigning persistent names" + eerror "to these network interfaces: ${devs}" + + einfo "Checking persistent-net rules:" + # the sed-expression lists all duplicate lines + # from the input, like "uniq -d" does, but uniq + # is installed into /usr/bin and not available at boot. + dups=$( + RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules' + . /lib/udev/rule_generator.functions + find_all_rules 'NAME=' '.*'|tr ' ' '\n'|sort|sed '$!N; s/^\(.*\)\n\1$/\1/; t; D' + ) + if [ -n "${dups}" ]; then + ewarn "The rules create multiple entries assigning these names:" + eindent + ewarn "${dups}" + eoutdent + else + ewarn "Found no duplicate names in persistent-net rules," + ewarn "there must be some other problem!" + fi + return 1 +} + +main() { + if [ $(get_KV) -le $(KV_to_int '2.6.14') ] ; then + eerror "Your kernel is too old to work with this version of udev." + eerror "Current udev only supports Linux kernel 2.6.15 and newer." + return 1 + fi + + mount_dev_directory + + # 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 -a -c /selinux/null ] ; then + restorecon /dev > /selinux/null + fi + + unpack_device_tarball + seed_dev + + if [ -e /proc/sys/kernel/hotplug ] ; then + echo "" > /proc/sys/kernel/hotplug + fi + + ebegin "Starting udevd" + /sbin/udevd --daemon + eend $? + + /lib/udev/write_root_link_rule + populate_udev + + # Only do this for baselayout-1* + if [ ! -e /lib/librc.so ]; then + + # Create nodes that udev can't + ebegin "Finalizing udev configuration" + [ -x /sbin/lvm ] && \ + /sbin/lvm vgscan -P --mknodes --ignorelockingfailure &>/dev/null + # Running evms_activate on a LiveCD causes lots of headaches + [ -z "${CDBOOT}" -a -x /sbin/evms_activate ] && \ + /sbin/evms_activate -q &>/dev/null + eend 0 + fi + + check_persistent_net + + # trigger executing initscript when /etc is writable + IN_HOTPLUG=1 /etc/init.d/udev-postmount start >/dev/null 2>/dev/null + + # udev started successfully + return 0 +} + +main + +# vim:ts=4 diff --git a/sys-fs/udev/files/udev.conf.115-r6 b/sys-fs/udev/files/udev.conf.115-r6 new file mode 100644 index 000000000000..9dd04613a4ea --- /dev/null +++ b/sys-fs/udev/files/udev.conf.115-r6 @@ -0,0 +1,6 @@ +# The maximum size reserved for the tmpfs mounted on /dev +tmpfs_size="10M" + +# The maximum number of inodes reserved for the tmpfs mounted on /dev +#tmpfs_inodes="4k" + diff --git a/sys-fs/udev/udev-115-r6.ebuild b/sys-fs/udev/udev-115-r6.ebuild new file mode 100644 index 000000000000..c62c6efd11ee --- /dev/null +++ b/sys-fs/udev/udev-115-r6.ebuild @@ -0,0 +1,330 @@ +# 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-115-r6.ebuild,v 1.1 2007/09/24 19:59:37 zzam Exp $ + +inherit eutils flag-o-matic multilib toolchain-funcs versionator + +PATCH="${P}-update-20070924.diff" +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 + mirror://gentoo/${PATCH}.bz2 + http://dev.gentoo.org/~zzam/distfiles/${PATCH}.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 + !<sys-fs/device-mapper-1.02.19-r1" +RDEPEND="${DEPEND} ${RDEPEND} + >=sys-apps/baselayout-1.12.5" +# We need the lib/rcscripts/addon support +PROVIDE="virtual/dev-manager" + +pkg_setup() { + udev_helper_dir="/$(get_libdir)/udev" + + myconf= + extras="extras/ata_id \ + extras/cdrom_id \ + extras/edd_id \ + extras/firmware \ + extras/floppy \ + extras/path_id \ + extras/scsi_id \ + extras/usb_id \ + extras/volume_id \ + extras/collect \ + extras/rule_generator \ + extras/root_link" + + use selinux && myconf="${myconf} USE_SELINUX=true" + + # comparing kernel version without linux-info.eclass to not pull + # virtual/linux-sources + + local KV=$(uname -r) + local KV_MAJOR=$(get_major_version ${KV}) + local KV_MINOR=$(get_version_component_range 2 ${KV}) + local KV_MICRO=$(get_version_component_range 3 ${KV}) + + local ok=0 + if [[ "${KV_MAJOR}" == 2 ]] && [[ "${KV_MINOR}" == 6 ]] && [[ "${KV_MICRO}" -ge 15 ]]; then + ok=1 + fi + + if [[ "$ok" = "0" ]]; then + ewarn + ewarn "${P} does not support Linux kernel before version 2.6.15!" + ewarn "If you want to use udev you need to update" + ewarn "to kernel >=2.6.15!" + ewarn + ebeep + fi +} + +sed_helper_dir() { + sed -e "s#/lib/udev#${udev_helper_dir}#" -i "$@" +} + +src_unpack() { + unpack ${A} + + cd "${S}" + + # patches go here... + epatch "${WORKDIR}/${PATCH}" + EPATCH_OPTS="-p1" epatch "${FILESDIR}/${PN}-114-root-link-2.diff" + epatch "${FILESDIR}"/udev-115-update-gentoo-rules-2.diff + rm etc/udev/gentoo/40-audio.rules + + # add blacklisting option where needed + #sed -e '/MODALIAS/s#modprobe#modprobe --use-blacklist#' \ + # -e '/while read id/s#modprobe#modprobe --use-blacklist#' \ + # -i etc/udev/rules.d/80-drivers.rules + + # 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 + # Do not require xmlto to refresh manpages + sed -ie 's|$(MAN_PAGES)||g' Makefile + + # Make sure there is no sudden changes to upstream rules file + # (more for my own needs than anything else ...) + MD5=`md5sum < "${S}/etc/udev/rules.d/50-udev-default.rules"` + MD5=${MD5/ -/} + if [ "${MD5}" != "644e3c77eb866dee4ff8dda2e95cd187" ] + then + echo + eerror "50-udev-default.rules has been updated, please validate!" + die "50-udev-default.rules has been updated, please validate!" + fi + + sed_helper_dir \ + etc/udev/rules.d/50-udev-default.rules \ + extras/rule_generator/write_*_rules \ + udev_rules_parse.c \ + udev_rules.c + + # Use correct multilib dir + sed -i extras/volume_id/lib/Makefile \ + -e "/ =/s-/lib-/$(get_libdir)-" +} + +src_compile() { + filter-flags -fprefetch-loop-arrays + + # Not everyone has full $CHOST-{ld,ar,etc...} yet + local mycross="" + type -p ${CHOST}-ar && mycross=${CHOST}- + + emake \ + EXTRAS="${extras}" \ + libudevdir=${udev_helper_dir} \ + CROSS_COMPILE=${mycross} \ + OPTFLAGS="" \ + ${myconf} || die +} + +src_install() { + into / + emake \ + DESTDIR="${D}" \ + libudevdir=${udev_helper_dir} \ + EXTRAS="${extras}" \ + ${myconf} \ + install || die + + # make install does not install this + dosbin udevstart || die "Required binary not installed properly" + doman udevstart.8 + + exeinto "${udev_helper_dir}" + newexe "${FILESDIR}"/net-104-r10.sh net.sh || die "Required binary not installed properly" + newexe "${FILESDIR}"/move_tmp_persistent_rules-112-r1.sh move_tmp_persistent_rules.sh \ + || die "Required binary not installed properly" + + keepdir "${udev_helper_dir}"/state + keepdir "${udev_helper_dir}"/devices + + # create symlinks for these utilities to /sbin + # where multipath-tools expect them to be (Bug #168588) + dosym "..${udev_helper_dir}/vol_id" /sbin/vol_id + dosym "..${udev_helper_dir}/scsi_id" /sbin/scsi_id + + # vol_id library (needed by mount and HAL) + into / + rm "${D}/$(get_libdir)"/libvolume_id.so* 2>/dev/null + dolib extras/volume_id/lib/*.so* || die "Failed installing libvolume_id.so" + into /usr + dolib extras/volume_id/lib/*.a || die "Failed installing libvolume_id.a" + + # handle static linking bug #4411 + rm -f "${D}/usr/$(get_libdir)/libvolume_id.so" + gen_usr_ldscript libvolume_id.so + + # Add gentoo stuff to udev.conf + cat "${FILESDIR}"/udev.conf.115-r6 >> "${D}"/etc/udev/udev.conf + + # Now installing rules + cd etc/udev + insinto /etc/udev/rules.d/ + + # Our rules files + doins gentoo/??-*.rules + doins packages/40-alsa.rules + + # Adding arch specific rules + if [[ -f "packages/40-${ARCH}.rules" ]]; then + doins "packages/40-${ARCH}.rules" + fi + cd "${S}" + + # our udev hooks into the rc system + insinto /$(get_libdir)/rcscripts/addons + newins "${FILESDIR}"/udev-start-115-r6.sh udev-start.sh + newins "${FILESDIR}"/udev-stop-111-r2.sh udev-stop.sh + + # The udev-post init-script + newinitd "${FILESDIR}"/udev-postmount-initd-111-r2 udev-postmount + + insinto /etc/modprobe.d + newins ${FILESDIR}/blacklist-110 blacklist + doins ${FILESDIR}/pnp-aliases + + # convert /lib/udev to real used dir + sed_helper_dir \ + "${D}/$(get_libdir)"/rcscripts/addons/*.sh \ + "${D}"/etc/init.d/udev* \ + "${D}"/etc/modprobe.d/* + + # documentation + 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 + + echo "CONFIG_PROTECT_MASK=\"/etc/udev/rules.d\"" > 20udev + doenvd 20udev +} + +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() { + # 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 2>/dev/null + fi + + if has_version "<sys-fs/udev-106-r5"; then + if [[ -e "${ROOT}"/etc/udev/rules.d/95-net.rules ]]; then + rm -f "${ROOT}"/etc/udev/rules.d/95-net.rules + fi + fi + + # Try to remove /etc/dev.d as that is obsolete + if [[ -d "${ROOT}"/etc/dev.d ]]; then + rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/default "${ROOT}"/etc/dev.d 2>/dev/null + if [[ -d "${ROOT}"/etc/dev.d ]]; then + ewarn "You still have the directory /etc/dev.d on your system." + ewarn "This is no longer used by udev and can be removed." + fi + fi + + # 64-device-mapper.rules now gets installed by sys-fs/device-mapper + # remove it if user don't has sys-fs/device-mapper installed + if has_version "<sys-fs/udev-113" && + [[ -f "${ROOT}"/etc/udev/rules.d/64-device-mapper.rules ]] && + ! has_version sys-fs/device-mapper + then + rm -f "${ROOT}"/etc/udev/rules.d/64-device-mapper.rules + einfo "Removed unneeded file 64-device-mapper.rules" + fi + + 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 + + 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" +} |