From: William Hubbs Date: Wed, 14 Dec 2011 22:06:39 +0000 (+0000) Subject: remove prefix support and use bindir to install udevadm in /bin. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=7031edb166b2d36f371bbe1ec3dcbcde4d7072f4;p=gentoo.git remove prefix support and use bindir to install udevadm in /bin. Package-Manager: portage-2.2.0_alpha80/cvs/Linux x86_64 --- diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index 3ed947130ade..1ada1ea406f6 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,9 @@ # 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.622 2011/12/14 20:53:06 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.623 2011/12/14 22:06:39 williamh Exp $ + + 14 Dec 2011; William Hubbs udev-9999.ebuild: + remove prefix support and use bindir to install udevadm in /bin. 14 Dec 2011; Mike Frysinger udev-171-r4.ebuild: Unify duplicate econf statements with a use_extras helper. diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index 63dff96921ac..6eb94172537c 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 AUX 136/shell-compat-KV.sh 1012 RMD160 5bc85047b4237d502f7b0ccc7181f9974c2b0898 SHA1 bbc58d6181f3fc8d623de1537eddcc1ede919202 SHA256 2393918bc65c69e1c19d7712292c945a4adfe45ce02b88ae7663167b8745cf8b AUX 136/shell-compat-addon.sh 930 RMD160 c96a77a2085698e4ca3636994d1b6d07326e4b5f SHA1 d696a1ff942d31b493d385cff27bc9cbacd3fa47 SHA256 94b1fe1f5ba892c82798cec6f15b5c5c76e1902ef2d13701ddfbb54f19079af9 @@ -130,13 +130,13 @@ EBUILD udev-151-r4.ebuild 16852 RMD160 e0d2c7041c102e0e5979a1ed5c99d9f4d5820842 EBUILD udev-164-r2.ebuild 15294 RMD160 2d7299b463cb765a58ec0840c4c86607fbf37e64 SHA1 cb4060adb3235d261f027be37e56272ac8f4755b SHA256 3f1b289c9c9c2d6ee6cd63b8db530240dcc9532dbc3ff273c052679b3062724b EBUILD udev-171-r4.ebuild 15559 RMD160 74fe6aa5874b266ec6dc1ee9d17b24d8320acaf5 SHA1 cdc7306e50ab0304d5bc8d292a6e3eaf32c01fc7 SHA256 5d523637e1ebf68c4c297362556f2daeda7360c3254c761ccf9a78f1a0fd69bf EBUILD udev-175-r1.ebuild 12554 RMD160 6b2042c42100cc226bbd52e4bacb384ddd9ab8b4 SHA1 3ce7f532c80ac5e1d6cc3cd66835fcfe7097e0fe SHA256 58e3bdc7a16d314ab0315029dab844729f2d3521bb017efcd05c2e032b42d8c1 -EBUILD udev-9999.ebuild 12557 RMD160 193f5e9ba3158953a8021c7546ca5674d33e69e1 SHA1 31009ec00f8200d0b3b3397702ca8fad970df3f0 SHA256 b9bfc01f09d5f9afad739ad62ce260b7375b2548a68565ca471c8781505c0ffa -MISC ChangeLog 126912 RMD160 53c2f6e2cdad72aa8e4842150dc6dc65f5c1fac0 SHA1 a8fe66b4c61d8352c4a39dd9d6f505a27c81b117 SHA256 75ceb8ffd08060dc1c8007b103d00e9883b087c55dcfbbc7149d71b809b7cd19 +EBUILD udev-9999.ebuild 12400 RMD160 df95b9f3d476beca995d4b5892ab9255a0e1a7bd SHA1 4e391fb476894ccf3993d238f51705f40346838b SHA256 189ceda62dee2134d6d2896c3cdff46979c693a66cf9fb1663875568199102e3 +MISC ChangeLog 127051 RMD160 6c292180bc8e9a7baf46c03b53df2dc2c8c71fc0 SHA1 03421f016f768b48dd96ecb8a583117f0c160f36 SHA256 e53d462e353ed92a76100b383fc121dce5d491b27c7c6cfc5930dfda3f8a28b9 MISC metadata.xml 1235 RMD160 36ff4665ed99aa392ff8003e9351bd620cc79424 SHA1 3fd0e915598c248b5c7d609b6a98a4cde8431b05 SHA256 dbbbd093a910a5cb541d7be160f749dc87fc699d72165c184965fa056d60f24b -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk7pDLkACgkQaC/OocHi7JY3ZAD+OVU90/brer0EErdBOTJOk9lY -yMSfc0/LAX38H6VBFs0BAJ4d41NuEg2Cb75kpG0l6Qx1ccdhuq+44tP1/Yda9KeG -=Um+M +iEYEARECAAYFAk7pHiAACgkQblQW9DDEZTgoYgCcD/c3OeXkXln/ze0ZpA8zJZPa +cG8AoL07M0KZFocb+LVYyTriSMjPTR6+ +=eBaB -----END PGP SIGNATURE----- diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild index fb79b2419ab3..80aba28e9c01 100644 --- a/sys-fs/udev/udev-9999.ebuild +++ b/sys-fs/udev/udev-9999.ebuild @@ -1,6 +1,6 @@ # 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-9999.ebuild,v 1.63 2011/12/09 22:12:00 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.64 2011/12/14 22:06:39 williamh Exp $ EAPI=4 @@ -17,7 +17,7 @@ inherit ${vcs} eutils flag-o-matic multilib toolchain-funcs linux-info systemd l scriptname=${PN}-gentoo-scripts if [[ ${PV} != "9999" ]] then - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2" if [[ -n "${patchversion}" ]] then @@ -164,20 +164,20 @@ src_configure() { filter-flags -fprefetch-loop-arrays econf \ - --prefix="${EPREFIX}/usr" \ - --sysconfdir="${EPREFIX}/etc" \ - --sbindir="${EPREFIX}/sbin" \ - --libdir="${EPREFIX}/usr/$(get_libdir)" \ - --with-rootlibdir="${EPREFIX}/$(get_libdir)" \ - --libexecdir="${EPREFIX}/lib/udev" \ + --prefix=/usr \ + --sysconfdir=/etc \ + --bindir=/bin \ + --libdir=/usr/$(get_libdir) \ + --with-rootlibdir=/$(get_libdir) \ + --libexecdir=/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" \ + --with-pci-ids-path=/usr/share/misc/pci.ids \ + --with-usb-ids-path=/usr/share/misc/usb.ids \ $(use_enable acl udev_acl) \ $(use_enable gudev) \ $(use_enable introspection) \ @@ -209,7 +209,7 @@ src_install() # Add gentoo stuff to udev.conf echo "# If you need to change mount-options, do it in /etc/fstab" \ - >> "${ED}"/etc/udev/udev.conf + >> "${D}"/etc/udev/udev.conf # Now install rules insinto /lib/udev/rules.d/ @@ -237,7 +237,7 @@ src_install() # 19 Nov 2008 fix_old_persistent_net_rules() { - local rules=${EROOT}/etc/udev/rules.d/70-persistent-net.rules + local rules="${ROOT}"/etc/udev/rules.d/70-persistent-net.rules [[ -f ${rules} ]] || return elog @@ -262,7 +262,7 @@ restart_udevd() fi # need to merge to our system - [[ ${EROOT} = / ]] || return + [[ ${ROOT} = / ]] || 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 @@ -304,16 +304,16 @@ postinst_init_scripts() # 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 ]] + if [[ -x "${ROOT}"/etc/init.d/udev \ + && -d "${ROOT}"/etc/runlevels/sysinit ]] then - ln -s "${EPREFIX}"/etc/init.d/udev "${EROOT}"/etc/runlevels/sysinit/udev + ln -s /etc/init.d/udev "${ROOT}"/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 ]] + if [[ -e "${ROOT}"/etc/runlevels/sysinit && ! -e "${ROOT}"/etc/runlevels/sysinit/udev ]] then ewarn ewarn "You need to add the udev init script to the runlevel sysinit," @@ -328,19 +328,19 @@ postinst_init_scripts() # like a hotplug event, 2009/10/15 # already enabled? - [[ -e "${EROOT}"/etc/runlevels/default/udev-postmount ]] && return + [[ -e "${ROOT}"/etc/runlevels/default/udev-postmount ]] && return - [[ -e "${EROOT}"/etc/runlevels/sysinit/udev ]] && enable_postmount=true - [[ "${EROOT}" = "/" && -d /dev/.udev/ ]] && enable_postmount=true + [[ -e "${ROOT}"/etc/runlevels/sysinit/udev ]] && enable_postmount=true + [[ "${ROOT}" = "/" && -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} ]] + if [[ -e ${ROOT}/etc/init.d/${initd} ]] && \ + [[ ! -e ${ROOT}/etc/runlevels/default/${initd} ]] then - ln -snf "${EPREFIX}"/etc/init.d/${initd} "${EROOT}"/etc/runlevels/default/${initd} + ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/default/${initd} elog "Auto-adding '${initd}' service to your default runlevel" fi else @@ -356,7 +356,7 @@ ismounted() { while read a m a; do [ "$m" = "$1" ] && return 0 - done < "${EROOT}"/proc/mounts + done < "${ROOT}"/proc/mounts return 1 } @@ -366,8 +366,8 @@ pkg_postinst() # "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 ]] + rmdir "${ROOT}"/dev/loop 2>/dev/null + if [[ -d "${ROOT}"/dev/loop ]] then ewarn "Please make sure your remove /dev/loop," ewarn "else losetup may be confused when looking for unused devices." @@ -381,16 +381,16 @@ pkg_postinst() # just ignore them anyway... # Removing some device-nodes we thought we need some time ago, 25 Jan 2007 - if [[ -d ${EROOT}/lib/udev/devices ]] + if [[ -d ${ROOT}/lib/udev/devices ]] then - rm -f "${EROOT}"/lib/udev/devices/{null,zero,console,urandom} + rm -f "${ROOT}"/lib/udev/devices/{null,zero,console,urandom} fi # Try to remove /etc/dev.d as that is obsolete, 23 Apr 2007 - if [[ -d ${EROOT}/etc/dev.d ]] + if [[ -d ${ROOT}/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 ]] + 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." @@ -399,10 +399,10 @@ pkg_postinst() # 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 [[ -f ${EROOT}/etc/udev/rules.d/64-device-mapper.rules ]] && + if [[ -f ${ROOT}/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 + rm -f "${ROOT}"/etc/udev/rules.d/64-device-mapper.rules einfo "Removed unneeded file 64-device-mapper.rules" fi @@ -411,7 +411,7 @@ pkg_postinst() elog "persistent-net assigns 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 "\trm ${ROOT}etc/udev/rules.d/70-persistent-net.rules" elog "then reboot." elog elog "This may however number your devices in a different way than they are now."