sys-fs/udev: add --with-udev-prefix to econf, fixes hal mounting, see bug #236635 (ebuild is p.masked for now)

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.25-gentoo-r3 i686

3 files changed, 342 insertions, 12 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index e6fb3c819f47..e8664c6127d5 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.407 2008/09/02 15:21:45 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.408 2008/09/13 10:41:14 remi Exp $
+
+*udev-127-r1 (13 Sep 2008)
+
+  13 Sep 2008; Rémi Cardona <remi@gentoo.org> +udev-127-r1.ebuild:
+  add --with-udev-prefix to econf, fixes hal mounting, see bug #236635
 
 *udev-127 (02 Sep 2008)
 
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index cf021b39eaa3..84fd09a9b603 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX blacklist-110 854 RMD160 6cb0acd91dad5c86c47b41f06f74a8529de08b8e SHA1 aa2c3c8340517053151ee687d76d4de05e28ac51 SHA256 438020f3499a2e10a19ba8d3fe7d567572322093ea878e8c18336b067442bcdd
 AUX modprobe-114.sh 2106 RMD160 7b40f1d0c7e41aa51100c99d1b4accafe9309f00 SHA1 d8d3a6b047a416bf4a80a9dde6eddbcc1e7abb1b SHA256 acfff1be773352f71b7e68ec12aafa113150f76ecb1daa03088842d449df9d6b
 AUX modprobe-115.sh 2280 RMD160 effe6766adfff5733d396dbffe00827e61280c5b SHA1 dd9331410db47ce8cfb5ab2d9af8d420905313d6 SHA256 22ab8b9f68bfe6d0acb8d2aec70870700ca03ab80341734cbd059c680473739f
@@ -50,13 +47,7 @@ EBUILD udev-124.ebuild 10693 RMD160 39379d2d1ac8f019826fdf0002deb55463ff0ab8 SHA
 EBUILD udev-125-r1.ebuild 10697 RMD160 d5cd2ef4bf95948d196920d079fae8c67c8af141 SHA1 870e2ef37d41e44c09348fc64ca042ee15706027 SHA256 fa388302ff376b21d2b286c85e7389282b382f0ceb88dd68f4c6c6455a02cac8
 EBUILD udev-125-r2.ebuild 10732 RMD160 58b821e085c1fc3f28772b9ab3e72adfa268a1cf SHA1 d88144b2b150f4eda308a37a8cc06d760ef1cc20 SHA256 fb7efdc754565d7ae3e6e5922aa9919cd23c37ca23b0174493c743b180a91bdf
 EBUILD udev-126.ebuild 9580 RMD160 07dc014843de05d647bdcf6d7838e43adae30bdf SHA1 5cb251781dcfd58652de34d44fbad2e641792181 SHA256 5a3503d8c99947d4eb5438ed5bc786eb7ca1d2f9768c5cf8838f0b2c036e3ffb
+EBUILD udev-127-r1.ebuild 9590 RMD160 6ddbd78500ec9a60c51b5db73d70a90bd16d76e5 SHA1 79fdf7c08fed2786af3b5fcb60e2e06a33fb60d9 SHA256 4ccd0f7a3c75c873ae3826acfa79b3eb0f18ae0706861fe54a7393ce42a1e209
 EBUILD udev-127.ebuild 9563 RMD160 b125e2cbe3c31a430634f95179f6e2ebb0b42d12 SHA1 2f210e312bf21eb9de3a885f0304c380fe9e3e09 SHA256 6c52a10e33d4c1a6ca5bde90c02617498a244293a5be01abc139a18afbedd306
-MISC ChangeLog 83053 RMD160 03ad1d2bd3d2e89355b7134f09d96fc433729528 SHA1 628f4a1aab5c735f887faf8ef29a094a97091f4d SHA256 8298c474af401aa11cfbad0255cf88867e1090a894aeb826b44352009f3422ef
+MISC ChangeLog 83221 RMD160 60ad24a244d93056e6448cf5e2485da3962c7781 SHA1 7e933ef353cfa3ccdab7f791f22c712d818a773a SHA256 305f1cfa94674703dd43287c30b115691fb635972287356ef1ec639d78458293
 MISC metadata.xml 225 RMD160 9459d2b2027607874431067a9100c48a0a128ffa SHA1 d9fad1caa18dd065595932b9e5d6c18098f3dfad SHA256 dd3c55c5a5c97678030df2554192894d849cdd4845d6fec1c8259d7bf263cd46
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAki9WhEACgkQt2vP6XvVdOeBLACcC8MDE4NE/R6cHplMbACoK4nf
-KT4AoJA2bkLGj8kIdHsuFSaMgtEvTxEl
-=UoUp
------END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-127-r1.ebuild b/sys-fs/udev/udev-127-r1.ebuild
new file mode 100644
index 000000000000..8fcbc608deb8
--- /dev/null
+++ b/sys-fs/udev/udev-127-r1.ebuild
@@ -0,0 +1,334 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-127-r1.ebuild,v 1.1 2008/09/13 10:41:14 remi Exp $
+
+inherit eutils flag-o-matic multilib toolchain-funcs versionator autotools
+
+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
+	!<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"
+
+	# 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 18 ]]
+	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 reliable you should update"
+		ewarn "to at least kernel version 2.6.18!"
+		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 "${FILESDIR}/${P}-disable-logging-compile-fix.patch"
+
+	# 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} != 54f1df55e8c531cc8926db44a3b4b979 ]]
+	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 \
+		rules/rules.d/50-udev-default.rules \
+		extras/rule_generator/write_*_rules \
+		udev/udev_rules_parse.c \
+		udev/udev_rules.c \
+		$(find -name "Makefile.*")
+
+	# fix version of volume_id lib
+	sed -e 's/-version-info/-version-number/' -i extras/volume_id/lib/Makefile.am
+
+	eautoreconf
+}
+
+src_compile() {
+	filter-flags -fprefetch-loop-arrays
+
+	econf \
+		--exec-prefix=/ \
+		--with-udev-prefix= \
+		--with-libdir-name=$(get_libdir) \
+		--disable-debug \
+		--disable-logging \
+		$(use_with selinux)
+
+	emake || die "compiling udev failed"
+}
+
+src_install() {
+	into /
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	exeinto "${udev_helper_dir}"
+	newexe "${FILESDIR}"/net-118-r1.sh net.sh	|| die "net.sh not installed properly"
+	newexe "${FILESDIR}"/move_tmp_persistent_rules-112-r1.sh move_tmp_persistent_rules.sh \
+		|| die "move_tmp_persistent_rules.sh not installed properly"
+	newexe "${FILESDIR}"/write_root_link_rule-125 write_root_link_rule \
+		|| die "write_root_link_rule not installed properly"
+	newexe "${FILESDIR}"/shell-compat-118-r3.sh shell-compat.sh \
+		|| die "shell-compat.sh 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
+
+	# Add gentoo stuff to udev.conf
+	echo "# If you need to change mount-options, do it in /etc/fstab" \
+	>> "${D}"/etc/udev/udev.conf
+
+	# let the dir exist at least
+	keepdir /etc/udev/rules.d
+
+	# Now installing rules
+	cd "${S}"/rules
+	insinto "${udev_helper_dir}"/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-126.sh udev-start.sh
+	newins "${FILESDIR}"/udev-stop-126.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 README TODO || die "failed installing docs"
+
+	cd docs/writing_udev_rules
+	mv index.html writing_udev_rules.html
+	dohtml *.html
+
+	cd "${S}"
+
+	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 &&
+	     ! -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
+
+	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=$?
+}
+
+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 [[ $previous_equal_to_103_r3 = 0 ]] &&
+		[[ -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
+
+	# 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 [[ $previous_less_than_104_r5 = 0 ]]
+	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 [[ $previous_less_than_106_r5 = 0 ]] &&
+		[[ -e ${ROOT}/etc/udev/rules.d/95-net.rules ]]
+	then
+		rm -f "${ROOT}"/etc/udev/rules.d/95-net.rules
+	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 [[ $previous_less_than_113 = 0 ]] &&
+		[[ -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
+
+	# requested in Bug #225033:
+	elog
+	elog "persistent-net does assigning fixed names to network devices."
+	elog "If you have problems with persistent-net rules,"
+	elog "just delete the rules file"
+	elog "\trm ${ROOT}etc/udev/rules.d/70-persistent-net.rules"
+	elog "and then trigger udev by either running"
+	elog "\tudevadm trigger --subsystem-match=net"
+	elog "or by rebooting."
+	elog
+	elog "This may number your devices in a different way than it is now."
+
+	if [[ ${ROOT} == / ]]
+	then
+		# check if root of init-process is identical to ours
+		if [[ -r /proc/1/root && /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
+
+	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."
+
+	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"
+}