From 47faedaa29e867b0d1077427be79b6c9dba70e1b Mon Sep 17 00:00:00 2001 From: Matthias Schwarzott Date: Wed, 25 Apr 2007 14:42:08 +0000 Subject: [PATCH] No longer ignore MAKEOPTS, CFLAGS and LDFLAGS, requested in Bug #175893. Package-Manager: portage-2.1.2.4 --- sys-fs/udev/ChangeLog | 8 +- sys-fs/udev/Manifest | 25 +- sys-fs/udev/files/digest-udev-109-r1 | 3 + .../udev/files/udev-109-respect-CFLAGS.diff | 20 ++ sys-fs/udev/udev-109-r1.ebuild | 298 ++++++++++++++++++ 5 files changed, 346 insertions(+), 8 deletions(-) create mode 100644 sys-fs/udev/files/digest-udev-109-r1 create mode 100644 sys-fs/udev/files/udev-109-respect-CFLAGS.diff create mode 100644 sys-fs/udev/udev-109-r1.ebuild diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index 5b8cd5f6c0ce..0ecf55351c6d 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,12 @@ # 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.296 2007/04/24 06:41:46 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.297 2007/04/25 14:42:08 zzam Exp $ + +*udev-109-r1 (25 Apr 2007) + + 25 Apr 2007; Matthias Schwarzott + +files/udev-109-respect-CFLAGS.diff, +udev-109-r1.ebuild: + No longer ignore MAKEOPTS, CFLAGS and LDFLAGS, requested in Bug #175893. *udev-109 (24 Apr 2007) diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index 4f7c5a0cfa52..83449c81c4c0 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -121,6 +121,10 @@ AUX udev-108-persistent-joystick.diff 1167 RMD160 8722bddcd3541faf345d76af1e843d MD5 02fc5dc221ea63b655277c7f2a77ce40 files/udev-108-persistent-joystick.diff 1167 RMD160 8722bddcd3541faf345d76af1e843d506ae18c21 files/udev-108-persistent-joystick.diff 1167 SHA256 8533c943449a3b7c7b5f1431975fbfb884ca5a9a48868016134cdb41218a3a23 files/udev-108-persistent-joystick.diff 1167 +AUX udev-109-respect-CFLAGS.diff 644 RMD160 b881a4cf7bc54f2ff8df8e1ec28d210f6b0f0446 SHA1 e938b0c0fef5d197e3ed410a577e26343568be31 SHA256 fddadf459f05e8cbcd78d38b47cf6b3ed1fbfbc25bc868644c62dc8181919676 +MD5 e710c187a4fa44330046b9f9d5264347 files/udev-109-respect-CFLAGS.diff 644 +RMD160 b881a4cf7bc54f2ff8df8e1ec28d210f6b0f0446 files/udev-109-respect-CFLAGS.diff 644 +SHA256 fddadf459f05e8cbcd78d38b47cf6b3ed1fbfbc25bc868644c62dc8181919676 files/udev-109-respect-CFLAGS.diff 644 AUX udev-parisc-path_id-again.patch 524 RMD160 d305615a2f5ae0ab6b468400e95ad3332a2bcb38 SHA1 574d12600292d5cd1acb3b1be2bc24d337581a88 SHA256 a1b40d1bf3f8a7e0d6787d310218b44916c79a4f94a39287bc00f8ae058b67ff MD5 2f18f7560f7667fa98179c6084396453 files/udev-parisc-path_id-again.patch 524 RMD160 d305615a2f5ae0ab6b468400e95ad3332a2bcb38 files/udev-parisc-path_id-again.patch 524 @@ -407,14 +411,18 @@ EBUILD udev-108.ebuild 9608 RMD160 d7e60ea554e963d2a66aa1cba8796f4458782b3f SHA1 MD5 821fd4c4b7db717688987e169c936ddf udev-108.ebuild 9608 RMD160 d7e60ea554e963d2a66aa1cba8796f4458782b3f udev-108.ebuild 9608 SHA256 3b39e71f420ada07465a7891ffd8a019bfb6db322479265e1a7b5e0924118a1e udev-108.ebuild 9608 +EBUILD udev-109-r1.ebuild 9878 RMD160 4183ad2b21b266816a9060ef48be1ec490ebc547 SHA1 4c2b11eeaadaeedfd47b856295bf9860dc600a12 SHA256 40c9294ecc5392b2221c8aa3a352dcb5ce9acc19b22cdfa8681a1bed8ad96706 +MD5 530c455d9296e3c6c0620c8f2a8b8a3e udev-109-r1.ebuild 9878 +RMD160 4183ad2b21b266816a9060ef48be1ec490ebc547 udev-109-r1.ebuild 9878 +SHA256 40c9294ecc5392b2221c8aa3a352dcb5ce9acc19b22cdfa8681a1bed8ad96706 udev-109-r1.ebuild 9878 EBUILD udev-109.ebuild 9854 RMD160 a75a5676d1f25dc7d9c85f7f83d31861c335884c SHA1 28b2658232e1d5b4d9c28a7260a679b0191bf00a SHA256 c71970cc99f0033209198bfbc6707f96f86fc216d27ffe64991b2248767cc390 MD5 4edd51d72db2d07d5aeceee955996ad0 udev-109.ebuild 9854 RMD160 a75a5676d1f25dc7d9c85f7f83d31861c335884c udev-109.ebuild 9854 SHA256 c71970cc99f0033209198bfbc6707f96f86fc216d27ffe64991b2248767cc390 udev-109.ebuild 9854 -MISC ChangeLog 56858 RMD160 fade067f62ce54d04d8491a8aaef1ff29093feff SHA1 bba53cf690a970f0093962d06914800651a6d88d SHA256 ac7443ced02efe29178625e4f86d50f0547b1d4979a3ef028d1136a9d3bbb6e7 -MD5 f87ee8e21725b3c80877f16261fdea8d ChangeLog 56858 -RMD160 fade067f62ce54d04d8491a8aaef1ff29093feff ChangeLog 56858 -SHA256 ac7443ced02efe29178625e4f86d50f0547b1d4979a3ef028d1136a9d3bbb6e7 ChangeLog 56858 +MISC ChangeLog 57075 RMD160 6c26bdd0298df5d0d441db30f9ec5d87bdc14624 SHA1 38b123212f31fa507e4a39e39212829d6721d9d6 SHA256 f41ee1831fb9b8d47fa4fb5a6be6dd5d32c327bd5455b0fb2cf0721ea5024142 +MD5 adf44302abe1d611deb13fb471a3d1b0 ChangeLog 57075 +RMD160 6c26bdd0298df5d0d441db30f9ec5d87bdc14624 ChangeLog 57075 +SHA256 f41ee1831fb9b8d47fa4fb5a6be6dd5d32c327bd5455b0fb2cf0721ea5024142 ChangeLog 57075 MISC metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be SHA1 70c43d2863c09958849bfce8c5bb97d406a0662b SHA256 a9881de1424ac71191111bd30c7c1253589673b0cdce13c352204f1499e9d884 MD5 f74bee0505505c00e76da6313db29e49 metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be metadata.xml 447 @@ -482,10 +490,13 @@ SHA256 ff79035ff80988aa331bbc8d5146584c9462b49ceea58433682c944c28a341c6 files/di MD5 06dd85951af811c5b41062e59a3e0d29 files/digest-udev-109 229 RMD160 b69604bc7ad0380706666cdfd0c540092cecca03 files/digest-udev-109 229 SHA256 8dea85fc9892209ba9075aea974823c58c2bacc7f34c52861e4a00f9f89e5f98 files/digest-udev-109 229 +MD5 06dd85951af811c5b41062e59a3e0d29 files/digest-udev-109-r1 229 +RMD160 b69604bc7ad0380706666cdfd0c540092cecca03 files/digest-udev-109-r1 229 +SHA256 8dea85fc9892209ba9075aea974823c58c2bacc7f34c52861e4a00f9f89e5f98 files/digest-udev-109-r1 229 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFGLaaxt2vP6XvVdOcRApEAAKCJ0GnHls5uHrF0sZi0Ae1aF8zIUQCdH98b -OwGegTYnmSdmHNxFlhwBPfI= -=ycvJ +iD8DBQFGL2jHt2vP6XvVdOcRAtYwAJsEu8dpLwJzKMmAXqP0wo1qTDWv9ACgqZWL ++yWOTTm7Ai+ukxuOVAAIDn8= +=wT9T -----END PGP SIGNATURE----- diff --git a/sys-fs/udev/files/digest-udev-109-r1 b/sys-fs/udev/files/digest-udev-109-r1 new file mode 100644 index 000000000000..6a196fcc2437 --- /dev/null +++ b/sys-fs/udev/files/digest-udev-109-r1 @@ -0,0 +1,3 @@ +MD5 6fd1ed31f48d7e99c549a132974a34c0 udev-109.tar.bz2 188252 +RMD160 8700365b2ea744e19f0133615a652ca85726d890 udev-109.tar.bz2 188252 +SHA256 d16886d1d1791331f6cf949338b3c5aaf9f57c5a5b141531efa61c8b881b3330 udev-109.tar.bz2 188252 diff --git a/sys-fs/udev/files/udev-109-respect-CFLAGS.diff b/sys-fs/udev/files/udev-109-respect-CFLAGS.diff new file mode 100644 index 000000000000..292362244625 --- /dev/null +++ b/sys-fs/udev/files/udev-109-respect-CFLAGS.diff @@ -0,0 +1,20 @@ +diff --git a/Makefile b/Makefile +index a7a2cbf..072ae7f 100644 +--- a/Makefile ++++ b/Makefile +@@ -113,13 +113,13 @@ LD = $(CROSS_COMPILE)gcc + AR = $(CROSS_COMPILE)ar + RANLIB = $(CROSS_COMPILE)ranlib + +-CFLAGS = -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 ++CFLAGS += -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 + WARNINGS = -Wstrict-prototypes -Wsign-compare -Wshadow \ + -Wchar-subscripts -Wmissing-declarations -Wnested-externs \ + -Wpointer-arith -Wcast-align -Wsign-compare -Wmissing-prototypes + CFLAGS += $(WARNINGS) + +-LDFLAGS = -Wl,-warn-common ++LDFLAGS += -Wl,-warn-common + + OPTFLAGS = -Os + CFLAGS += $(OPTFLAGS) diff --git a/sys-fs/udev/udev-109-r1.ebuild b/sys-fs/udev/udev-109-r1.ebuild new file mode 100644 index 000000000000..2698c8b76b17 --- /dev/null +++ b/sys-fs/udev/udev-109-r1.ebuild @@ -0,0 +1,298 @@ +# 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-109-r1.ebuild,v 1.1 2007/04/25 14:42:08 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}-udev_volume_id.patch + epatch ${FILESDIR}/${PN}-104-peristent-net-disable-xen.patch + + epatch ${FILESDIR}/${P}-respect-CFLAGS.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/50-udev.rules"` + MD5=${MD5/ -/} + if [ "${MD5}" != "db0c266c3f407b6e4d1959b31f753e9a" ] + 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/edd_id \ + extras/firmware \ + extras/floppy \ + extras/path_id \ + extras/scsi_id \ + extras/usb_id \ + extras/volume_id \ + extras/rule_generator" + + 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)" + emake \ + 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/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/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" + 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/vol_id /sbin/vol_id + dosym ../lib/udev/scsi_id /sbin/scsi_id + + # 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-105.sh modprobe.sh || die "Required binary not installed properly" + doexe extras/eventrecorder.sh || die "Required binary not installed properly" + + # Our udev config file + insinto /etc/udev + newins ${FILESDIR}/udev.conf.post_108 udev.conf + + # Our rules files + insinto /etc/udev/rules.d/ + doins etc/udev/gentoo/??-*.rules + #newins ${FILESDIR}/udev.rules-107-r1 50-udev.rules + #newins ${FILESDIR}/05-udev-early.rules-106-r5 05-udev-early.rules + #doins ${FILESDIR}/95-udev-late.rules + # Special rules for device-mapper + #newins ${FILESDIR}/64-device-mapper.rules-107-r1 64-device-mapper.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 + + # 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/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-108-r1.sh udev-start.sh + newins "${FILESDIR}"/udev-stop-108-r1.sh 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 + + insinto /etc/modprobe.d + doins ${FILESDIR}/blacklist ${FILESDIR}/pnp-aliases + + if use s390; then + # s390 does not has persistent mac addresses + # and we only have persistence rules for mac. + # For now just remove the rules file. + rm ${D}/etc/udev/rules.d/75-persistent-net-generator.rules + fi + +} + +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 "