diff options
author | William Hubbs <williamh@gentoo.org> | 2011-12-11 04:48:14 +0000 |
---|---|---|
committer | William Hubbs <williamh@gentoo.org> | 2011-12-11 04:48:14 +0000 |
commit | 8693cedd561615ac5034eae9243cb17a90b04ba0 (patch) | |
tree | 650d1e43fb9b9f8bec9895df0b0142e761214ff4 /sys-fs/udev | |
parent | missed an bug, add some post credits for politeness (diff) | |
download | historical-8693cedd561615ac5034eae9243cb17a90b04ba0.tar.gz historical-8693cedd561615ac5034eae9243cb17a90b04ba0.tar.bz2 historical-8693cedd561615ac5034eae9243cb17a90b04ba0.zip |
rev bump for #338257.
Package-Manager: portage-2.2.0_alpha79/cvs/Linux i686
Diffstat (limited to 'sys-fs/udev')
-rw-r--r-- | sys-fs/udev/ChangeLog | 8 | ||||
-rw-r--r-- | sys-fs/udev/Manifest | 10 | ||||
-rw-r--r-- | sys-fs/udev/files/shell-compat-KV.sh | 47 | ||||
-rw-r--r-- | sys-fs/udev/udev-171-r4.ebuild | 598 |
4 files changed, 658 insertions, 5 deletions
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index 88b48d79579a..d9353a8cc09b 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-fs/udev # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.619 2011/12/09 22:12:00 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.620 2011/12/11 04:48:14 williamh Exp $ + +*udev-171-r4 (11 Dec 2011) + + 11 Dec 2011; William Hubbs <williamh@gentoo.org> +files/shell-compat-KV.sh, + +udev-171-r4.ebuild: + rev bump for #338257. 09 Dec 2011; William Hubbs <williamh@gentoo.org> udev-9999.ebuild: sync live ebuild diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index ebbc49730529..9b17d914be75 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -72,6 +72,7 @@ AUX net-130-r1.sh 865 RMD160 0025caa63b4b57bac9d6d47a285e8593fd47fc21 SHA1 299b8 AUX pnp-aliases 537 RMD160 e0144801b7b9c77eb4897692678b75a661723725 SHA1 8276e2dd1a3be1aa2343797b3f9906606d58c9ca SHA256 690b32a166d060c1c663030c51d5b2298eb9d314c8cef737373e0b16ed751e99 AUX shell-compat-118-r2.sh 1050 RMD160 9cffc5b6b1159fcf87a6befbfaaf01a632828d9f SHA1 75b90a518372624a850c045993885104e27728dc SHA256 f3a71925ca6b99a34018150b3280c4990b465aa297de55f7784f90b1fe9b5e6a AUX shell-compat-118-r3.sh 1554 RMD160 4adb41f34c71704c03d241e291aba4529ee0c43c SHA1 a1bbf28acca0dd3189dba91bc876820364706cd8 SHA256 d5720dd2d572db98320d08572fa1d5f40037697d94e2db6bd7b51ba502fc2876 +AUX shell-compat-KV.sh 1076 RMD160 358d31712adc43d87c7428a4e8b2d3a985f0894b SHA1 0ee2eef68eda64bd63f3559a4b2570b27355a52c SHA256 4a8e1c8cba58676f44bc24e1635df5a64e841f04f95406c4647fe5833dce8ce5 AUX udev-110-root-link-1.diff 3412 RMD160 d4a61b2825ec593198c286622b5f9a188bd18e51 SHA1 06869481f097a09244de6ccb28e133ca03515fef SHA256 30e983bb086c40e0935680d46c172b3e737b2ad5bc134070451250ebcf39c8c8 AUX udev-114-root-link-2.diff 4677 RMD160 47b040b51ed0dc637ff2197373db5173bc59854e SHA1 be6ab3162682b4c4cd922d57d356eee4b35d352e SHA256 d212407420bb46a541e547d59862668745dd8b516b6be6e6619cf967ab2124f9 AUX udev-122-rules-update.diff 586 RMD160 5b9d086ac57ae282b5cd30eda375fc736b2c1af8 SHA1 91ed560c66a5619c7e6fe411a8802acc31682185 SHA256 1eaa8365efa69445e8a1e95c88f1fd411ed3b3f0b73e3d1c3798f0943c5584a8 @@ -132,15 +133,16 @@ EBUILD udev-164-r2.ebuild 15294 RMD160 2d7299b463cb765a58ec0840c4c86607fbf37e64 EBUILD udev-171-r1.ebuild 15984 RMD160 2f687585ae93014dbeaaa61e440e0f708ecd2b04 SHA1 92b4eee4956b24677d9e8251b29c40c300cf059c SHA256 9cf4a54cc9e34bf48c5299142a625d056869fbabcd683a233053e6fd04305218 EBUILD udev-171-r2.ebuild 16440 RMD160 6ec304fc5af203a47341ea50edbc43d4c2c71ec4 SHA1 f10745cdcb690db11e8de47c59c2011a7afcc9e8 SHA256 dec83333d70e1c0a2a22e13dc259dc4c0366f04beed6dc3b9a0ab84889c75224 EBUILD udev-171-r3.ebuild 16150 RMD160 7f45679842c2f1930aeb36efcc3dbe6cc5eefd32 SHA1 eeb3b063eb5e459bb8487a50126f3b993bb75f4a SHA256 0ccd9d05633c7287e49b4c971aa3d581c59a3196dd0250f4ac952824146a5e17 +EBUILD udev-171-r4.ebuild 16191 RMD160 b2effd1be10ab44f4a188777749d84495901eba8 SHA1 f5c0f2a0e8f28bfeae383e5e1cc459937da71782 SHA256 d39b9e9545b0c4ba7993fb5e786d1dff7d912e01a486716d17970806c4715747 EBUILD udev-175-r1.ebuild 12554 RMD160 6b2042c42100cc226bbd52e4bacb384ddd9ab8b4 SHA1 3ce7f532c80ac5e1d6cc3cd66835fcfe7097e0fe SHA256 58e3bdc7a16d314ab0315029dab844729f2d3521bb017efcd05c2e032b42d8c1 EBUILD udev-175.ebuild 12551 RMD160 1319b4043c1697b4dcc99e527e51de6b4a258323 SHA1 b4b6e4da36e49d54b48f20b4dac3114315acf09d SHA256 b8ee6e5f84e19854eea866d21b6a03765cc4c7e08fa99992a38c68985582554d EBUILD udev-9999.ebuild 12557 RMD160 193f5e9ba3158953a8021c7546ca5674d33e69e1 SHA1 31009ec00f8200d0b3b3397702ca8fad970df3f0 SHA256 b9bfc01f09d5f9afad739ad62ce260b7375b2548a68565ca471c8781505c0ffa -MISC ChangeLog 126471 RMD160 d9401f42ffefbbee570dcc3da3257c33f21945d0 SHA1 729cfbbd0b52b0102ba7cc390ebcd280d748a21f SHA256 bda12f6c471306fe39daff2848764c51aad9b88306deaffdca7f5e03ea8529e7 +MISC ChangeLog 126625 RMD160 8c0aabbfc18b484cce61994c4c7ce29d3d91cd09 SHA1 13348ec032fb3660248bf0eadcba8fdb23e6e57d SHA256 5c5d57b598f93de95d0ec47a8a5036093e9e0e73ed76f8136dc8c5fa410b5207 MISC metadata.xml 1235 RMD160 36ff4665ed99aa392ff8003e9351bd620cc79424 SHA1 3fd0e915598c248b5c7d609b6a98a4cde8431b05 SHA256 dbbbd093a910a5cb541d7be160f749dc87fc699d72165c184965fa056d60f24b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk7ih6QACgkQblQW9DDEZTjQKACggqQLZkFHD6TIQeHGoVIFayIQ -oi4An3yKCOIYzX0reKkuDO48z7+vCsKU -=1UBT +iEYEARECAAYFAk7kNXQACgkQblQW9DDEZTi1XQCePmzxF4bER+671AfMCFHbMK4H +huYAoIlXxPcOJNJ34VT/JtWABWNQEkJ+ +=55Nu -----END PGP SIGNATURE----- diff --git a/sys-fs/udev/files/shell-compat-KV.sh b/sys-fs/udev/files/shell-compat-KV.sh new file mode 100644 index 000000000000..d363ec65a2c2 --- /dev/null +++ b/sys-fs/udev/files/shell-compat-KV.sh @@ -0,0 +1,47 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# provides get_KV and KV_to_int as not all openrc-versions installed via ebuild have these + +cmd_exist() +{ + type "$1" >/dev/null 2>&1 +} + +# does exist in baselayout-1 +# does not exist in openrc, but is added by openrc-ebuild since some time +if ! cmd_exist KV_to_int; then + KV_to_int() { + [ -z $1 ] && return 1 + + local x=${1%%[!0-9.]*} y= z= + local KV_MAJOR=${x%%.*} + y=${x#*.} + [ "$x" = "$y" ] && y=0.0 + local KV_MINOR=${y%%.*} + z=${y#*.} + [ "$y" = "$z" ] && z=0 + local KV_MICRO=${z%%.*} + local KV_int=$((${KV_MAJOR} * 65536 + ${KV_MINOR} * 256 + ${KV_MICRO} )) + + # We make version 2.2.0 the minimum version we will handle as + # a sanity check ... if its less, we fail ... + [ "${KV_int}" -lt 131584 ] && return 1 + + echo "${KV_int}" + } +fi + +# same as KV_to_int +if ! cmd_exist get_KV; then + _RC_GET_KV_CACHE="" + get_KV() { + [ -z "${_RC_GET_KV_CACHE}" ] \ + && _RC_GET_KV_CACHE="$(uname -r)" + + echo "$(KV_to_int "${_RC_GET_KV_CACHE}")" + + return $? + } +fi + diff --git a/sys-fs/udev/udev-171-r4.ebuild b/sys-fs/udev/udev-171-r4.ebuild new file mode 100644 index 000000000000..ec923d24a67e --- /dev/null +++ b/sys-fs/udev/udev-171-r4.ebuild @@ -0,0 +1,598 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-171-r4.ebuild,v 1.1 2011/12/11 04:48:14 williamh Exp $ + +EAPI=4 + +KV_min=2.6.32 +KV_reliable=2.6.32 +PATCHSET=${P}-gentoo-patchset-v1 +scriptversion=6 +scriptname=udev-gentoo-scripts +[[ -n "${scriptversion}" ]] && scriptname="${scriptname}-${scriptversion}" + +if [[ ${PV} == "9999" ]] +then + EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git" + EGIT_BRANCH="master" + vcs="git-2 autotools" +fi + +inherit ${vcs} eutils flag-o-matic multilib toolchain-funcs linux-info systemd libtool + +if [[ ${PV} != "9999" ]] +then + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux" + # please update testsys-tarball whenever udev-xxx/test/sys/ is changed + SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2 + test? ( mirror://gentoo/${PN}-171-testsys.tar.bz2 )" + if [[ -n "${PATCHSET}" ]] + then + SRC_URI="${SRC_URI} mirror://gentoo/${PATCHSET}.tar.bz2" + fi +fi +SRC_URI="${SRC_URI} mirror://gentoo/${scriptname}.tar.bz2" + +DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" +HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" + +LICENSE="GPL-2" +SLOT="0" +IUSE="build selinux test debug +rule_generator hwdb acl gudev introspection + keymap floppy edd action_modeswitch extras" + +COMMON_DEPEND="selinux? ( sys-libs/libselinux ) + extras? ( sys-apps/acl + dev-libs/glib:2 + dev-libs/gobject-introspection + virtual/libusb:0 ) + acl? ( sys-apps/acl dev-libs/glib:2 ) + gudev? ( dev-libs/glib:2 ) + introspection? ( dev-libs/gobject-introspection ) + action_modeswitch? ( virtual/libusb:0 ) + >=sys-apps/util-linux-2.16 + >=sys-libs/glibc-2.10" + +DEPEND="${COMMON_DEPEND} + keymap? ( dev-util/gperf ) + extras? ( dev-util/gperf ) + dev-util/pkgconfig + virtual/os-headers + !<sys-kernel/linux-headers-2.6.34 + test? ( app-text/tree )" + +RDEPEND="${COMMON_DEPEND} + hwdb? + ( + >=sys-apps/usbutils-0.82 + sys-apps/pciutils[-zlib] + ) + extras? + ( + >=sys-apps/usbutils-0.82 + sys-apps/pciutils + ) + !sys-apps/coldplug + !<sys-fs/lvm2-2.02.45 + !sys-fs/device-mapper + >=sys-apps/baselayout-1.12.5" + +if [[ ${PV} == "9999" ]] +then + # for documentation processing with xsltproc + DEPEND="${DEPEND} + app-text/docbook-xsl-stylesheets + app-text/docbook-xml-dtd + dev-util/gtk-doc" +fi + +# required kernel options +CONFIG_CHECK="~INOTIFY_USER ~SIGNALFD ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 + ~!IDE ~BLK_DEV_BSG" + +# Return values: +# 2 - reliable +# 1 - unreliable +# 0 - too old +udev_check_KV() { + local ok=0 + if kernel_is -ge ${KV_reliable//./ } + then + ok=2 + elif kernel_is -ge ${KV_min//./ } + then + ok=1 + fi + return $ok +} + +pkg_setup() { + linux-info_pkg_setup + + # always print kernel version requirements + ewarn + ewarn "${P} does not support Linux kernel before version ${KV_min}!" + if [[ ${KV_min} != ${KV_reliable} ]] + then + ewarn "For a reliable udev, use at least kernel ${KV_reliable}" + fi + + udev_check_KV + case "$?" in + 2) einfo "Your kernel version (${KV_FULL}) is new enough to run ${P} reliably." ;; + 1) ewarn "Your kernel version (${KV_FULL}) is new enough to run ${P}," + ewarn "but it may be unreliable in some cases." + ;; + 0) eerror "Your kernel version (${KV_FULL}) is too old to run ${P}" + ;; + esac + + KV_FULL_SRC=${KV_FULL} + get_running_version + udev_check_KV + if [[ "$?" = "0" ]] + then + eerror + eerror "udev cannot be restarted after emerging," + eerror "as your running kernel version (${KV_FULL}) is too old." + eerror "You really need to use a newer kernel after a reboot!" + NO_RESTART=1 + fi +} + +src_unpack() { + unpack ${A} + if [[ ${PV} == "9999" ]] + then + git-2_src_unpack + fi +} + +src_prepare() { + if use test && [[ -d "${WORKDIR}"/test/sys ]] + then + mv "${WORKDIR}"/test/sys "${S}"/test/ + fi + + # patches go here... + + # backport some patches + if [[ -n "${PATCHSET}" ]] + then + EPATCH_SOURCE="${WORKDIR}/${PATCHSET}" EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" epatch + fi + + # change rules back to group uucp instead of dialout for now + sed -e 's/GROUP="dialout"/GROUP="uucp"/' \ + -i rules/{rules.d,arch}/*.rules \ + || die "failed to change group dialout to uucp" + + if [[ ${PV} != 9999 ]] + then + # Make sure there is no sudden changes to upstream rules file + # (more for my own needs than anything else ...) + MD5=$(md5sum < "${S}/rules/rules.d/50-udev-default.rules") + MD5=${MD5/ -/} + if [[ ${MD5} != a9954d57e97aa0ad2e0ed53899d9559a ]] + then + eerror "50-udev-default.rules has been updated, please validate!" + eerror "md5sum: ${MD5}" + die "50-udev-default.rules has been updated, please validate!" + fi + fi + + if [[ ${PV} == 9999 ]] + then + gtkdocize --copy || die "gtkdocize failed" + eautoreconf + else + elibtoolize + fi +} + +src_configure() { + if ! use extras + then + econf \ + --prefix="${EPREFIX}/usr" \ + --sysconfdir="${EPREFIX}/etc" \ + --sbindir="${EPREFIX}/sbin" \ + --libdir="${EPREFIX}/usr/$(get_libdir)" \ + --with-rootlibdir="${EPREFIX}/$(get_libdir)" \ + --libexecdir="${EPREFIX}/lib/udev" \ + --enable-logging \ + --enable-static \ + $(use_with selinux) \ + $(use_enable debug) \ + $(use_enable rule_generator) \ + $(use_enable hwdb) \ + --with-pci-ids-path="${EPREFIX}/usr/share/misc/pci.ids" \ + --with-usb-ids-path="${EPREFIX}/usr/share/misc/usb.ids" \ + $(use_enable acl udev_acl) \ + $(use_enable gudev) \ + $(use_enable introspection) \ + $(use_enable keymap) \ + $(use_enable floppy) \ + $(use_enable edd) \ + $(use_enable action_modeswitch) \ + $(systemd_with_unitdir) + else + econf \ + --prefix="${EPREFIX}/usr" \ + --sysconfdir="${EPREFIX}/etc" \ + --sbindir="${EPREFIX}/sbin" \ + --libdir="${EPREFIX}/usr/$(get_libdir)" \ + --with-rootlibdir="${EPREFIX}/$(get_libdir)" \ + --libexecdir="${EPREFIX}/lib/udev" \ + --enable-logging \ + --enable-static \ + $(use_with selinux) \ + $(use_enable debug) \ + --enable-rule_generator \ + --enable-hwdb \ + --with-pci-ids-path="${EPREFIX}/usr/share/misc/pci.ids" \ + --with-usb-ids-path="${EPREFIX}/usr/share/misc/usb.ids" \ + --enable-udev_acl \ + --enable-gudev \ + --enable-introspection \ + --enable-keymap \ + --enable-floppy \ + --enable-edd \ + --enable-action_modeswitch \ + $(systemd_with_unitdir) + fi +} + +src_compile() { + filter-flags -fprefetch-loop-arrays + + emake +} + +src_install() { + into / + emake DESTDIR="${D}" install + + exeinto /lib/udev + keepdir /lib/udev/state + keepdir /lib/udev/devices + + # create symlinks for these utilities to /sbin + # where multipath-tools expect them to be (Bug #168588) + dosym "../lib/udev/scsi_id" /sbin/scsi_id + + # Add gentoo stuff to udev.conf + echo "# If you need to change mount-options, do it in /etc/fstab" \ + >> "${ED}"/etc/udev/udev.conf + + # let the dir exist at least + keepdir /etc/udev/rules.d + + # Now installing rules + cd "${S}"/rules + insinto /lib/udev/rules.d/ + + # support older kernels + doins misc/30-kernel-compat.rules + + # Adding arch specific rules + if [[ -f arch/40-${ARCH}.rules ]] + then + doins "arch/40-${ARCH}.rules" + fi + cd "${S}" + + insinto /etc/modprobe.d + newins "${FILESDIR}"/blacklist-146 blacklist.conf + newins "${FILESDIR}"/pnp-aliases pnp-aliases.conf + + # documentation + dodoc ChangeLog README TODO + + # keep doc in just one directory, Bug #281137 + rm -rf "${ED}/usr/share/doc/${PN}" + if use keymap + then + dodoc extras/keymap/README.keymap.txt + fi + + cd "${WORKDIR}/${scriptname}" + sed -i -e 's/2.6.34/2.6.32/' init.d/udev + doconfd conf.d/* + exeinto /lib/udev + doexe helpers/* +doexe "${FILESDIR}"/shell-compat-KV.sh + doinitd init.d/* + insinto /etc/modprobe.d + doins modprobe.d/* + insinto /lib/udev/rules.d + doins rules.d/* +} + +src_test() { + local emake_cmd="${MAKE:-make} ${MAKEOPTS} ${EXTRA_EMAKE}" + + cd "${S}" + vecho ">>> Test phase [udev:check]: ${CATEGORY}/${PF}" + has userpriv $FEATURES && einfo "Disable FEATURES userpriv to run the udev tests" + if ! $emake_cmd -j1 check + then + has test $FEATURES && die "udev: Make test failed. See above for details." + has test $FEATURES || eerror "udev: Make test failed. See above for details." + fi +} + +pkg_preinst() { + # moving old files to support newer modprobe, 12 May 2009 + local f dir=${EROOT}/etc/modprobe.d/ + for f in pnp-aliases blacklist; do + if [[ -f $dir/$f && ! -f $dir/$f.conf ]] + then + elog "Moving $dir/$f to $f.conf" + mv -f "$dir/$f" "$dir/$f.conf" + fi + done + + if [[ -d ${EROOT}/lib/udev-state ]] + then + mv -f "${EROOT}"/lib/udev-state/* "${ED}"/lib/udev/state/ + rm -r "${EROOT}"/lib/udev-state + fi + + if [[ -f ${EROOT}/etc/udev/udev.config && + ! -f ${EROOT}/etc/udev/udev.rules ]] + then + mv -f "${EROOT}"/etc/udev/udev.config "${EROOT}"/etc/udev/udev.rules + fi + + # delete the old udev.hotplug symlink if it is present + if [[ -h ${EROOT}/etc/hotplug.d/default/udev.hotplug ]] + then + rm -f "${EROOT}"/etc/hotplug.d/default/udev.hotplug + fi + + # delete the old wait_for_sysfs.hotplug symlink if it is present + if [[ -h ${EROOT}/etc/hotplug.d/default/05-wait_for_sysfs.hotplug ]] + then + rm -f "${EROOT}"/etc/hotplug.d/default/05-wait_for_sysfs.hotplug + fi + + # delete the old wait_for_sysfs.hotplug symlink if it is present + if [[ -h ${EROOT}/etc/hotplug.d/default/10-udev.hotplug ]] + then + rm -f "${EROOT}"/etc/hotplug.d/default/10-udev.hotplug + fi + + has_version "=${CATEGORY}/${PN}-103-r3" + previous_equal_to_103_r3=$? + + has_version "<${CATEGORY}/${PN}-104-r5" + previous_less_than_104_r5=$? + + has_version "<${CATEGORY}/${PN}-106-r5" + previous_less_than_106_r5=$? + + has_version "<${CATEGORY}/${PN}-113" + previous_less_than_113=$? +} + +# 19 Nov 2008 +fix_old_persistent_net_rules() { + local rules=${EROOT}/etc/udev/rules.d/70-persistent-net.rules + [[ -f ${rules} ]] || return + + elog + elog "Updating persistent-net rules file" + + # Change ATTRS to ATTR matches, Bug #246927 + sed -i -e 's/ATTRS{/ATTR{/g' "${rules}" + + # Add KERNEL matches if missing, Bug #246849 + sed -ri \ + -e '/KERNEL/ ! { s/NAME="(eth|wlan|ath)([0-9]+)"/KERNEL=="\1*", NAME="\1\2"/}' \ + "${rules}" +} + +# See Bug #129204 for a discussion about restarting udevd +restart_udevd() { + if [[ ${NO_RESTART} = "1" ]] + then + ewarn "Not restarting udevd, as your kernel is too old!" + return + fi + + # need to merge to our system + [[ ${EROOT} = / ]] || return + + # check if root of init-process is identical to ours (not in chroot) + [[ -r /proc/1/root && /proc/1/root/ -ef /proc/self/root/ ]] || return + + # abort if there is no udevd running + [[ -n $(pidof udevd) ]] || return + + # abort if no /dev/.udev exists + [[ -e /dev/.udev ]] || return + + elog + elog "restarting udevd now." + + killall -15 udevd &>/dev/null + sleep 1 + killall -9 udevd &>/dev/null + + /sbin/udevd --daemon + sleep 3 + if [[ ! -n $(pidof udevd) ]] + then + eerror "FATAL: udev died, please check your kernel is" + eerror "new enough and configured correctly for ${P}." + eerror + eerror "Please have a look at this before rebooting." + eerror "If in doubt, please downgrade udev back to your old version" + fi +} + +postinst_init_scripts() { + local enable_postmount=false + + # FIXME: inconsistent handling of init-scripts here + # * udev is added to sysinit in openrc-ebuild + # * we add udev-postmount to default in here + # + + # If we are building stages, add udev to the sysinit runlevel automatically. + if use build + then + if [[ -x "${EROOT}"/etc/init.d/udev \ + && -d "${EROOT}"/etc/runlevels/sysinit ]] + then + ln -s "${EPREFIX}"/etc/init.d/udev "${EROOT}"/etc/runlevels/sysinit/udev + fi + enable_postmount=true + fi + + # migration to >=openrc-0.4 + if [[ -e "${EROOT}"/etc/runlevels/sysinit && ! -e "${EROOT}"/etc/runlevels/sysinit/udev ]] + then + ewarn + ewarn "You need to add the udev init script to the runlevel sysinit," + ewarn "else your system will not be able to boot" + ewarn "after updating to >=openrc-0.4.0" + ewarn "Run this to enable udev for >=openrc-0.4.0:" + ewarn "\trc-update add udev sysinit" + ewarn + fi + + # add udev-postmount to default runlevel instead of that ugly injecting + # like a hotplug event, 2009/10/15 + + # already enabled? + [[ -e "${EROOT}"/etc/runlevels/default/udev-postmount ]] && return + + [[ -e "${EROOT}"/etc/runlevels/sysinit/udev ]] && enable_postmount=true + [[ "${EROOT}" = "/" && -d /dev/.udev/ ]] && enable_postmount=true + + if $enable_postmount + then + local initd=udev-postmount + + if [[ -e ${EROOT}/etc/init.d/${initd} ]] && \ + [[ ! -e ${EROOT}/etc/runlevels/default/${initd} ]] + then + ln -snf "${EPREFIX}"/etc/init.d/${initd} "${EROOT}"/etc/runlevels/default/${initd} + elog "Auto-adding '${initd}' service to your default runlevel" + fi + else + elog "You should add the udev-postmount service to default runlevel." + elog "Run this to add it:" + elog "\trc-update add udev-postmount default" + fi +} + +pkg_postinst() { + fix_old_persistent_net_rules + + # "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766 + # So try to remove it here (will only work if empty). + rmdir "${EROOT}"/dev/loop 2>/dev/null + if [[ -d "${EROOT}"/dev/loop ]] + then + ewarn "Please make sure your remove /dev/loop," + ewarn "else losetup may be confused when looking for unused devices." + fi + + restart_udevd + + postinst_init_scripts + + # people want reminders, I'll give them reminders. Odds are they will + # just ignore them anyway... + + # delete 40-scsi-hotplug.rules, it is integrated in 50-udev.rules, 19 Jan 2007 + if [[ $previous_equal_to_103_r3 = 0 ]] && + [[ -e ${EROOT}/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 "${EROOT}"/etc/udev/rules.d/40-scsi-hotplug.rules + fi + + # Removing some device-nodes we thought we need some time ago, 25 Jan 2007 + if [[ -d ${EROOT}/lib/udev/devices ]] + then + rm -f "${EROOT}"/lib/udev/devices/{null,zero,console,urandom} + fi + + # Removing some old file, 29 Jan 2007 + if [[ $previous_less_than_104_r5 = 0 ]] + then + rm -f "${EROOT}"/etc/dev.d/net/hotplug.dev + rmdir --ignore-fail-on-non-empty "${EROOT}"/etc/dev.d/net 2>/dev/null + fi + + # 19 Mar 2007 + if [[ $previous_less_than_106_r5 = 0 ]] && + [[ -e ${EROOT}/etc/udev/rules.d/95-net.rules ]] + then + rm -f "${EROOT}"/etc/udev/rules.d/95-net.rules + fi + + # Try to remove /etc/dev.d as that is obsolete, 23 Apr 2007 + if [[ -d ${EROOT}/etc/dev.d ]] + then + rmdir --ignore-fail-on-non-empty "${EROOT}"/etc/dev.d/default "${EROOT}"/etc/dev.d 2>/dev/null + if [[ -d ${EROOT}/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, 27 Jun 2007 + if [[ $previous_less_than_113 = 0 ]] && + [[ -f ${EROOT}/etc/udev/rules.d/64-device-mapper.rules ]] && + ! has_version sys-fs/device-mapper + then + rm -f "${EROOT}"/etc/udev/rules.d/64-device-mapper.rules + einfo "Removed unneeded file 64-device-mapper.rules" + fi + + # requested in Bug #225033: + elog + elog "persistent-net does assigning fixed names to network devices." + elog "If you have problems with the persistent-net rules," + elog "just delete the rules file" + elog "\trm ${EROOT}etc/udev/rules.d/70-persistent-net.rules" + elog "and then reboot." + elog + elog "This may however number your devices in a different way than they are now." + + ewarn + ewarn "If you build an initramfs including udev, then please" + ewarn "make sure that the /sbin/udevadm binary gets included," + ewarn "and your scripts changed to use it,as it replaces the" + ewarn "old helper apps udevinfo, udevtrigger, ..." + + ewarn + ewarn "mount options for directory /dev are no longer" + ewarn "set in /etc/udev/udev.conf, but in /etc/fstab" + ewarn "as for other directories." + + ewarn + ewarn "If you use /dev/md/*, /dev/loop/* or /dev/rd/*," + ewarn "then please migrate over to using the device names" + ewarn "/dev/md*, /dev/loop* and /dev/ram*." + ewarn "The devfs-compat rules have been removed." + ewarn "For reference see Bug #269359." + + ewarn + ewarn "Rules for /dev/hd* devices have been removed" + ewarn "Please migrate to libata." + + elog + elog "For more information on udev on Gentoo, writing udev rules, and" + elog " fixing known issues visit:" + elog " http://www.gentoo.org/doc/en/udev-guide.xml" +} |