* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-9999.ebuild
@ 2008-12-30 22:51 Matthias Schwarzott (zzam)
0 siblings, 0 replies; 38+ messages in thread
From: Matthias Schwarzott (zzam) @ 2008-12-30 22:51 UTC (permalink / raw
To: gentoo-commits
zzam 08/12/30 22:51:00
Modified: ChangeLog
Added: udev-9999.ebuild
Log:
Add live udev ebuild.
(Portage version: 2.1.6.4/cvs/Linux 2.6.27-gentoo-r1 i686)
Revision Changes Path
1.432 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.432&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.432&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.431&r2=1.432
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.431
retrieving revision 1.432
diff -u -r1.431 -r1.432
--- ChangeLog 27 Dec 2008 23:03:52 -0000 1.431
+++ ChangeLog 30 Dec 2008 22:51:00 -0000 1.432
@@ -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.431 2008/12/27 23:03:52 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.432 2008/12/30 22:51:00 zzam Exp $
+
+*udev-9999 (30 Dec 2008)
+
+ 30 Dec 2008; Matthias Schwarzott <zzam@gentoo.org> +udev-9999.ebuild:
+ Add live udev ebuild.
*udev-135-r3 (27 Dec 2008)
1.1 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.1&content-type=text/plain
Index: udev-9999.ebuild
===================================================================
# 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-9999.ebuild,v 1.1 2008/12/30 22:51:00 zzam Exp $
inherit eutils flag-o-matic multilib toolchain-funcs versionator
DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
if [[ ${PV} == "9999" ]]; then
EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git"
EGIT_BRANCH="master"
inherit git autotools
else
SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2"
fi
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
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 min_micro=15 min_micro_reliable=20
local ok=0
if [[ ${KV_MAJOR} == 2 && ${KV_MINOR} == 6 ]]
then
if [[ ${KV_MICRO} -ge ${min_micro_reliable} ]]; then
ok=2
elif [[ ${KV_MICRO} -ge ${min_micro} ]]; then
ok=1
fi
fi
if [[ ${ok} -lt 1 ]]
then
ewarn
ewarn "${P} does not support Linux kernel before version 2.6.${min_micro}!"
fi
if [[ ${ok} -lt 2 ]]; then
ewarn "If you want to use udev reliable you should update"
ewarn "to at least kernel version 2.6.${min_micro_reliable}!"
ewarn
ebeep
fi
}
sed_helper_dir() {
sed -e "s#/lib/udev#${udev_helper_dir}#" -i "$@"
}
src_unpack() {
if [[ ${PV} == "9999" ]] ; then
git_src_unpack
else
unpack ${A}
fi
cd "${S}"
# patches go here...
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} != c233e7da2eaebbda659d7121957aea72 ]]
then
echo
eerror "50-udev-default.rules has been updated, please validate!"
die "50-udev-default.rules has been updated, please validate!"
fi
fi
sed_helper_dir \
rules/rules.d/50-udev-default.rules \
extras/rule_generator/write_*_rules \
udev/udev-util.c \
udev/udev-rules.c \
udev/udevd.c || die "sed failed"
if [[ ${PV} == 9999 ]]; then
eautoreconf
fi
}
src_compile() {
filter-flags -fprefetch-loop-arrays
econf \
--prefix=/usr \
--sysconfdir=/etc \
--exec-prefix= \
--with-libdir-name=$(get_libdir) \
--enable-logging \
$(use_with selinux)
emake || die "compiling udev failed"
}
src_install() {
into /
emake DESTDIR="${D}" install || die "make install failed"
if [[ "$(get_libdir)" != "lib" ]]; then
# we can not just rename /lib to /lib64, because
# make install creates /lib64 and /lib
mkdir -p "${D}/$(get_libdir)"
mv "${D}"/lib/* "${D}/$(get_libdir)/"
rmdir "${D}"/lib
fi
exeinto "${udev_helper_dir}"
newexe "${FILESDIR}"/net-130-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
doins packages/40-isdn.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-135-r3.sh udev-start.sh
newins "${FILESDIR}"/udev-stop-135-r2.sh udev-stop.sh
# The udev-post init-script
newinitd "${FILESDIR}"/udev-postmount-135-r2.initd udev-postmount
# init-scripts for >=openrc-0.3.1, Bug #240984
newinitd "${FILESDIR}/udev-135-r2.initd" udev
newinitd "${FILESDIR}/udev-mount-135-r3.initd" udev-mount
newinitd "${FILESDIR}/udev-dev-tarball-135-r2.initd" udev-dev-tarball
# config file for init-script and start-addon
newconfd "${FILESDIR}/udev-135-r3.confd" udev
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=$?
}
fix_old_persistent_net_rules() {
local rules=${ROOT}/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() {
# need to merge to our system
[[ ${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
# 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
}
pkg_postinst() {
fix_old_persistent_net_rules
restart_udevd
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,"
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
# 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 the persistent-net rules,"
elog "just delete the rules file"
elog "\trm ${ROOT}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."
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"
}
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-9999.ebuild
@ 2009-01-06 18:42 Michael Sterrett (mr_bones_)
0 siblings, 0 replies; 38+ messages in thread
From: Michael Sterrett (mr_bones_) @ 2009-01-06 18:42 UTC (permalink / raw
To: gentoo-commits
mr_bones_ 09/01/06 18:42:15
Modified: ChangeLog udev-9999.ebuild
Log:
set DESCRIPTION after inherit to avoid overwriting it
(Portage version: 2.1.6.4/cvs/Linux 2.6.27.8 i686)
Revision Changes Path
1.434 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.434&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.434&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.433&r2=1.434
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.433
retrieving revision 1.434
diff -u -r1.433 -r1.434
--- ChangeLog 1 Jan 2009 12:40:13 -0000 1.433
+++ ChangeLog 6 Jan 2009 18:42:15 -0000 1.434
@@ -1,6 +1,9 @@
# ChangeLog for sys-fs/udev
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.433 2009/01/01 12:40:13 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.434 2009/01/06 18:42:15 mr_bones_ Exp $
+
+ 06 Jan 2009; Michael Sterrett <mr_bones_@gentoo.org> udev-9999.ebuild:
+ set DESCRIPTION after inherit to avoid overwriting it
01 Jan 2009; Benedikt Böhm <hollow@gentoo.org> files/udev.initd:
fix udev init script inside vservers, bug #253105
1.2 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.1&r2=1.2
Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- udev-9999.ebuild 30 Dec 2008 22:51:00 -0000 1.1
+++ udev-9999.ebuild 6 Jan 2009 18:42:15 -0000 1.2
@@ -1,10 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.1 2008/12/30 22:51:00 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.2 2009/01/06 18:42:15 mr_bones_ Exp $
inherit eutils flag-o-matic multilib toolchain-funcs versionator
-DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
if [[ ${PV} == "9999" ]]; then
EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git"
@@ -13,6 +12,7 @@
else
SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2"
fi
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
LICENSE="GPL-2"
SLOT="0"
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-9999.ebuild
@ 2009-01-22 11:18 Matthias Schwarzott (zzam)
0 siblings, 0 replies; 38+ messages in thread
From: Matthias Schwarzott (zzam) @ 2009-01-22 11:18 UTC (permalink / raw
To: gentoo-commits
zzam 09/01/22 11:18:07
Modified: ChangeLog udev-9999.ebuild
Log:
Also set HOMEPAGE after inherit, Bug #255953.
(Portage version: 2.1.6.6/cvs/Linux 2.6.27-gentoo-r1 i686)
Revision Changes Path
1.439 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.439&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.439&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.438&r2=1.439
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.438
retrieving revision 1.439
diff -u -r1.438 -r1.439
--- ChangeLog 20 Jan 2009 13:00:01 -0000 1.438
+++ ChangeLog 22 Jan 2009 11:18:06 -0000 1.439
@@ -1,6 +1,9 @@
# ChangeLog for sys-fs/udev
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.438 2009/01/20 13:00:01 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.439 2009/01/22 11:18:06 zzam Exp $
+
+ 22 Jan 2009; Matthias Schwarzott <zzam@gentoo.org> udev-9999.ebuild:
+ Also set HOMEPAGE after inherit, Bug #255953.
*udev-136 (20 Jan 2009)
1.5 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.4&r2=1.5
Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- udev-9999.ebuild 20 Jan 2009 22:45:08 -0000 1.4
+++ udev-9999.ebuild 22 Jan 2009 11:18:06 -0000 1.5
@@ -1,10 +1,9 @@
# Copyright 1999-2009 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.4 2009/01/20 22:45:08 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.5 2009/01/22 11:18:06 zzam Exp $
inherit eutils flag-o-matic multilib toolchain-funcs versionator
-HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
if [[ ${PV} == "9999" ]]; then
EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git"
EGIT_BRANCH="master"
@@ -13,6 +12,7 @@
SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2"
fi
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"
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-9999.ebuild
@ 2009-02-25 12:50 Matthias Schwarzott (zzam)
0 siblings, 0 replies; 38+ messages in thread
From: Matthias Schwarzott (zzam) @ 2009-02-25 12:50 UTC (permalink / raw
To: gentoo-commits
zzam 09/02/25 12:50:07
Modified: ChangeLog udev-9999.ebuild
Log:
Fix dialout permissions also for udev-9999 ebuild.
(Portage version: 2.1.6.7/cvs/Linux i686)
Revision Changes Path
1.453 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.453&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.453&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.452&r2=1.453
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.452
retrieving revision 1.453
diff -u -r1.452 -r1.453
--- ChangeLog 23 Feb 2009 16:30:52 -0000 1.452
+++ ChangeLog 25 Feb 2009 12:50:07 -0000 1.453
@@ -1,6 +1,9 @@
# ChangeLog for sys-fs/udev
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.452 2009/02/23 16:30:52 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.453 2009/02/25 12:50:07 zzam Exp $
+
+ 25 Feb 2009; Matthias Schwarzott <zzam@gentoo.org> udev-9999.ebuild:
+ Fix dialout permissions also for udev-9999 ebuild.
23 Feb 2009; Matthias Schwarzott <zzam@gentoo.org>
files/136/udev-postmount.initd:
1.7 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.6&r2=1.7
Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- udev-9999.ebuild 27 Jan 2009 10:42:15 -0000 1.6
+++ udev-9999.ebuild 25 Feb 2009 12:50:07 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2009 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.6 2009/01/27 10:42:15 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.7 2009/02/25 12:50:07 zzam Exp $
inherit eutils flag-o-matic multilib toolchain-funcs versionator
@@ -93,14 +93,15 @@
# change rules back to group uucp instead of dialout for now
sed -e 's/GROUP="dialout"/GROUP="uucp"/' \
- -i rules/{rules.d,packages}/*.rules
+ -i rules/{rules.d,packages,gentoo}/*.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} != 7c7de0a29a2cf218dc43dd099cd3bfec ]]
+ if [[ ${MD5} != 980aeafcd2f2d057945cf3ddf2ae884e ]]
then
echo
eerror "50-udev-default.rules has been updated, please validate!"
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-9999.ebuild
@ 2009-06-17 13:52 Matthias Schwarzott (zzam)
0 siblings, 0 replies; 38+ messages in thread
From: Matthias Schwarzott (zzam) @ 2009-06-17 13:52 UTC (permalink / raw
To: gentoo-commits
zzam 09/06/17 13:52:39
Modified: ChangeLog udev-9999.ebuild
Log:
Update to level of udev-141-r1. Update for changed configure-script. Patch out gtk-doc stuff, else autotools fail without gtk. Note about needed util-linux for it libblkid. udev no longer installs libvolume_id and vol_id binary. Lift minimal required kernel version to 2.6.25. Disable new udev-extras for now, they need a lot of dependencies.
(Portage version: 2.1.6.13/cvs/Linux i686)
Revision Changes Path
1.471 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.471&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.471&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.470&r2=1.471
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.470
retrieving revision 1.471
diff -u -r1.470 -r1.471
--- ChangeLog 17 Jun 2009 13:29:39 -0000 1.470
+++ ChangeLog 17 Jun 2009 13:52:39 -0000 1.471
@@ -1,6 +1,13 @@
# ChangeLog for sys-fs/udev
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.470 2009/06/17 13:29:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.471 2009/06/17 13:52:39 zzam Exp $
+
+ 17 Jun 2009; Matthias Schwarzott <zzam@gentoo.org> udev-9999.ebuild:
+ Update to level of udev-141-r1. Update for changed configure-script. Patch
+ out gtk-doc stuff, else autotools fail without gtk. Note about needed
+ util-linux for it libblkid. udev no longer installs libvolume_id and
+ vol_id binary. Lift minimal required kernel version to 2.6.25. Disable new
+ udev-extras for now, they need a lot of dependencies.
17 Jun 2009; Jeroen Roovers <jer@gentoo.org> udev-141-r1.ebuild:
Stable for HPPA (bug #254616).
1.9 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.8&r2=1.9
Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- udev-9999.ebuild 6 May 2009 23:52:24 -0000 1.8
+++ udev-9999.ebuild 17 Jun 2009 13:52:39 -0000 1.9
@@ -1,6 +1,8 @@
# Copyright 1999-2009 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.8 2009/05/06 23:52:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.9 2009/06/17 13:52:39 zzam Exp $
+
+EAPI="1"
inherit eutils flag-o-matic multilib toolchain-funcs versionator
@@ -17,17 +19,20 @@
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE="selinux"
+IUSE="selinux +devfs-compat -doc"
COMMON_DEPEND="selinux? ( sys-libs/libselinux )"
+# >=sys-apps/util-linux-2.16 should provide libblkid
+
+# for compiling the extras udev needs a lot more depends (see README)
+
+DEPEND="${COMMON_DEPEND}"
if [[ ${PV} == "9999" ]]; then
# for documentation processing with xsltproc
- DEPEND="${COMMON_DEPEND}
+ DEPEND="${DEPEND}
app-text/docbook-xsl-stylesheets
app-text/docbook-xml-dtd"
-else
- DEPEND="${COMMON_DEPEND}"
fi
RDEPEND="${COMMON_DEPEND}
@@ -39,7 +44,7 @@
PROVIDE="virtual/dev-manager"
pkg_setup() {
- udev_helper_dir="/$(get_libdir)/udev"
+ udev_libexec_dir="/$(get_libdir)/udev"
# comparing kernel version without linux-info.eclass to not pull
# virtual/linux-sources
@@ -49,7 +54,7 @@
local KV_MINOR=$(get_version_component_range 2 ${KV})
local KV_MICRO=$(get_version_component_range 3 ${KV})
- local KV_min_micro=15 KV_min_micro_reliable=22
+ local KV_min_micro=25 KV_min_micro_reliable=25
KV_min=2.6.${KV_min_micro}
KV_min_reliable=2.6.${KV_min_micro_reliable}
@@ -76,8 +81,8 @@
fi
}
-sed_helper_dir() {
- sed -e "s#/lib/udev#${udev_helper_dir}#" -i "$@"
+sed_libexec_dir() {
+ sed -e "s#/lib/udev#${udev_libexec_dir}#" -i "$@"
}
src_unpack() {
@@ -90,6 +95,10 @@
cd "${S}"
# patches go here...
+ if ! use devfs-compat; then
+ # see Bug #269359
+ epatch "${FILESDIR}"/udev-141-remove-devfs-names.diff
+ fi
# change rules back to group uucp instead of dialout for now
sed -e 's/GROUP="dialout"/GROUP="uucp"/' \
@@ -101,7 +110,7 @@
# (more for my own needs than anything else ...)
MD5=$(md5sum < "${S}/rules/rules.d/50-udev-default.rules")
MD5=${MD5/ -/}
- if [[ ${MD5} != 980aeafcd2f2d057945cf3ddf2ae884e ]]
+ if [[ ${MD5} != b5c2f014a48a53921de37c4e469aab96 ]]
then
echo
eerror "50-udev-default.rules has been updated, please validate!"
@@ -110,14 +119,21 @@
fi
fi
- sed_helper_dir \
+ sed_libexec_dir \
rules/rules.d/50-udev-default.rules \
+ rules/rules.d/78-sound-card.rules \
extras/rule_generator/write_*_rules \
- udev/udev-util.c \
- udev/udev-rules.c \
- udev/udevd.c || die "sed failed"
+ || die "sed failed"
if [[ ${PV} == 9999 ]]; then
+ if ! use doc; then
+ sed -e '/docs\/Makefile/d' \
+ -e '/GTK_DOC_CHECK/d' \
+ -i.orig configure.ac
+ sed -e 's/SUBDIRS =.*/SUBDIRS =/' \
+ -e 's/docs//' \
+ -i.orig libudev/Makefile.am
+ fi
eautoreconf
fi
}
@@ -128,10 +144,13 @@
econf \
--prefix=/usr \
--sysconfdir=/etc \
- --exec-prefix= \
- --with-libdir-name=$(get_libdir) \
+ --sbindir=/sbin \
+ --libdir=/usr/$(get_libdir) \
+ --with-rootlibdir=/$(get_libdir) \
+ --libexecdir="${udev_libexec_dir}" \
--enable-logging \
- $(use_with selinux)
+ $(use_with selinux) \
+ --disable-extras
emake || die "compiling udev failed"
}
@@ -149,7 +168,7 @@
rmdir "${D}"/lib
fi
- exeinto "${udev_helper_dir}"
+ exeinto "${udev_libexec_dir}"
newexe "${FILESDIR}"/net-130-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"
@@ -161,13 +180,12 @@
doexe "${scriptdir}"/shell-compat-addon.sh \
|| die "shell-compat.sh not installed properly"
- keepdir "${udev_helper_dir}"/state
- keepdir "${udev_helper_dir}"/devices
+ keepdir "${udev_libexec_dir}"/state
+ keepdir "${udev_libexec_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
+ dosym "..${udev_libexec_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" \
@@ -178,7 +196,7 @@
# Now installing rules
cd "${S}"/rules
- insinto "${udev_helper_dir}"/rules.d/
+ insinto "${udev_libexec_dir}"/rules.d/
# Our rules files
doins gentoo/??-*.rules
@@ -220,8 +238,10 @@
newins "${FILESDIR}"/pnp-aliases pnp-aliases.conf
# convert /lib/udev to real used dir
- sed_helper_dir \
+ sed_libexec_dir \
"${D}/$(get_libdir)"/rcscripts/addons/*.sh \
+ "${D}/${udev_libexec_dir}"/write_root_link_rule \
+ "${D}"/etc/conf.d/udev \
"${D}"/etc/init.d/udev* \
"${D}"/etc/modprobe.d/*
@@ -231,16 +251,22 @@
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() {
+ local f dir=${ROOT}/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 ${ROOT}/lib/udev-state ]]
then
mv -f "${ROOT}"/lib/udev-state/* "${D}"/lib/udev/state/
@@ -430,6 +456,17 @@
ewarn "set in /etc/udev/udev.conf, but in /etc/fstab"
ewarn "as for other directories."
+ if use devfs-compat; then
+ ewarn
+ ewarn "You have devfs-compat use flag enabled."
+ ewarn "This enables devfs compatible device names."
+ 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 will be removed in the future."
+ ewarn "For reference see Bug #269359."
+ fi
+
elog
elog "For more information on udev on Gentoo, writing udev rules, and"
elog " fixing known issues visit:"
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-9999.ebuild
@ 2009-09-19 21:36 Matthias Schwarzott (zzam)
0 siblings, 0 replies; 38+ messages in thread
From: Matthias Schwarzott (zzam) @ 2009-09-19 21:36 UTC (permalink / raw
To: gentoo-commits
zzam 09/09/19 21:36:49
Modified: ChangeLog udev-9999.ebuild
Log:
Do not apply upstream patch that is already applied.
(Portage version: 2.2_rc40/cvs/Linux i686)
Revision Changes Path
1.492 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.492&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.492&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.491&r2=1.492
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.491
retrieving revision 1.492
diff -u -r1.491 -r1.492
--- ChangeLog 19 Sep 2009 17:41:52 -0000 1.491
+++ ChangeLog 19 Sep 2009 21:36:48 -0000 1.492
@@ -1,6 +1,9 @@
# ChangeLog for sys-fs/udev
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.491 2009/09/19 17:41:52 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.492 2009/09/19 21:36:48 zzam Exp $
+
+ 19 Sep 2009; Matthias Schwarzott <zzam@gentoo.org> udev-9999.ebuild:
+ Do not apply upstream patch that is already applied.
*udev-146 (19 Sep 2009)
1.14 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.13&r2=1.14
Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- udev-9999.ebuild 19 Sep 2009 17:41:52 -0000 1.13
+++ udev-9999.ebuild 19 Sep 2009 21:36:48 -0000 1.14
@@ -1,6 +1,6 @@
# Copyright 1999-2009 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.13 2009/09/19 17:41:52 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.14 2009/09/19 21:36:48 zzam Exp $
EAPI="1"
@@ -130,10 +130,6 @@
cd "${S}"
# patches go here...
-
- # allow cups to access usb_device nodes of printers, Bug #285166
- epatch "${FILESDIR}"/udev-146-printer-usb_device-permission.diff
-
if ! use devfs-compat; then
# see Bug #269359
epatch "${FILESDIR}"/udev-141-remove-devfs-names.diff
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-9999.ebuild
@ 2009-10-15 21:40 Matthias Schwarzott (zzam)
0 siblings, 0 replies; 38+ messages in thread
From: Matthias Schwarzott (zzam) @ 2009-10-15 21:40 UTC (permalink / raw
To: gentoo-commits
zzam 09/10/15 21:40:47
Modified: ChangeLog udev-9999.ebuild
Log:
Do not call net.* scripts when new-style network is used. Retry failed events in udev-postmount, Bug #283414. Add udev-postmount to runlevel default at update and no longer inject it. Use mountinfo for mounting the fstab entry, bug #288021.
(Portage version: 2.2_rc46/cvs/Linux i686)
Revision Changes Path
1.499 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.499&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.499&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.498&r2=1.499
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.498
retrieving revision 1.499
diff -u -r1.498 -r1.499
--- ChangeLog 3 Oct 2009 17:40:33 -0000 1.498
+++ ChangeLog 15 Oct 2009 21:40:47 -0000 1.499
@@ -1,6 +1,17 @@
# ChangeLog for sys-fs/udev
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.498 2009/10/03 17:40:33 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.499 2009/10/15 21:40:47 zzam Exp $
+
+ 15 Oct 2009; Matthias Schwarzott <zzam@gentoo.org>
+ +files/147/shell-compat-KV.sh, +files/147/shell-compat-addon.sh,
+ +files/147/udev.confd, +files/147/udev.initd,
+ +files/147/udev-dev-tarball.initd, +files/147/udev-mount.initd,
+ +files/147/udev-postmount.initd, +files/147/udev-start.sh,
+ +files/147/udev-stop.sh, udev-9999.ebuild:
+ Do not call net.* scripts when new-style network is used. Retry failed
+ events in udev-postmount, Bug #283414. Add udev-postmount to runlevel
+ default at update and no longer inject it. Use mountinfo for mounting the
+ fstab entry, bug #288021.
03 Oct 2009; Tobias Klausmann <klausman@gentoo.org> udev-146-r1.ebuild:
Stable on alpha, bug #286074
1.16 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.15&r2=1.16
Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- udev-9999.ebuild 2 Oct 2009 11:30:20 -0000 1.15
+++ udev-9999.ebuild 15 Oct 2009 21:40:47 -0000 1.16
@@ -1,6 +1,6 @@
# Copyright 1999-2009 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.15 2009/10/02 11:30:20 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.16 2009/10/15 21:40:47 zzam Exp $
EAPI="1"
@@ -184,7 +184,7 @@
}
src_install() {
- local scriptdir="${FILESDIR}/136"
+ local scriptdir="${FILESDIR}/147"
into /
emake DESTDIR="${D}" install || die "make install failed"
@@ -355,6 +355,9 @@
has_version "<${CATEGORY}/${PN}-113"
previous_less_than_113=$?
+
+ has_version "<${CATEGORY}/${PN}-146-r2"
+ previous_less_than_146_r2=$?
}
fix_old_persistent_net_rules() {
@@ -489,6 +492,20 @@
einfo "Removed unneeded file 64-device-mapper.rules"
fi
+ # add udev-postmount to default runlevel instead of that ugly injecting
+ # like a hotplug event, added 2009/10/15
+ if [[ $previous_less_than_146_r2 = 0 ]]
+ then
+ local initd=udev-postmount
+
+ if [[ -e ${ROOT}/etc/init.d/${initd} ]] && \
+ [[ ! -e ${ROOT}/etc/runlevels/default/${initd} ]]
+ then
+ ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/default/${initd}
+ elog "Auto-adding '${initd}' service to your default runlevel"
+ fi
+ fi
+
# requested in bug #275974, added 2009/09/05
ewarn
ewarn "If after the udev update removable devices or CD/DVD drives"
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-9999.ebuild
@ 2009-10-20 12:38 Matthias Schwarzott (zzam)
0 siblings, 0 replies; 38+ messages in thread
From: Matthias Schwarzott (zzam) @ 2009-10-20 12:38 UTC (permalink / raw
To: gentoo-commits
zzam 09/10/20 12:38:15
Modified: ChangeLog udev-9999.ebuild
Log:
Update init-scripts. udev-postmount should be in default runlevel. No longer handle it like a synthetic hotplug event. Let it rerun failed events. Handle devtmpfs if supported, and also the case /dev is already mounted. Do not run net.* init-scripts if the new network init-script is used. Cleanup of pre/postinst code.
(Portage version: 2.2_rc46/cvs/Linux i686)
Revision Changes Path
1.500 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.500&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.500&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.499&r2=1.500
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.499
retrieving revision 1.500
diff -u -r1.499 -r1.500
--- ChangeLog 15 Oct 2009 21:40:47 -0000 1.499
+++ ChangeLog 20 Oct 2009 12:38:15 -0000 1.500
@@ -1,6 +1,15 @@
# ChangeLog for sys-fs/udev
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.499 2009/10/15 21:40:47 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.500 2009/10/20 12:38:15 zzam Exp $
+
+ 20 Oct 2009; Matthias Schwarzott <zzam@gentoo.org>
+ files/147/shell-compat-addon.sh, udev-9999.ebuild, files/147/udev.initd,
+ files/147/udev-mount.initd, files/147/udev-postmount.initd:
+ Update init-scripts. udev-postmount should be in default runlevel. No
+ longer handle it like a synthetic hotplug event. Let it rerun failed
+ events. Handle devtmpfs if supported, and also the case /dev is already
+ mounted. Do not run net.* init-scripts if the new network init-script is
+ used. Cleanup of pre/postinst code.
15 Oct 2009; Matthias Schwarzott <zzam@gentoo.org>
+files/147/shell-compat-KV.sh, +files/147/shell-compat-addon.sh,
1.17 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.16&r2=1.17
Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- udev-9999.ebuild 15 Oct 2009 21:40:47 -0000 1.16
+++ udev-9999.ebuild 20 Oct 2009 12:38:15 -0000 1.17
@@ -1,6 +1,6 @@
# Copyright 1999-2009 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.16 2009/10/15 21:40:47 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.17 2009/10/20 12:38:15 zzam Exp $
EAPI="1"
@@ -298,6 +298,7 @@
}
pkg_preinst() {
+ # moving old files to support newer modprobe, 12 May 2009
local f dir=${ROOT}/etc/modprobe.d/
for f in pnp-aliases blacklist; do
if [[ -f $dir/$f && ! -f $dir/$f.conf ]]
@@ -337,13 +338,6 @@
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=$?
@@ -360,6 +354,7 @@
previous_less_than_146_r2=$?
}
+# 19 Nov 2008
fix_old_persistent_net_rules() {
local rules=${ROOT}/etc/udev/rules.d/70-persistent-net.rules
[[ -f ${rules} ]] || return
@@ -414,11 +409,18 @@
fi
}
-pkg_postinst() {
- fix_old_persistent_net_rules
-
- restart_udevd
+postinst_init_scripts() {
+ # FIXME: we need some code like
+ # if use bootstrap; then
+ # add init-scripts
+ # fi
+ #
+ # FIXME: inconsistent handling of init-scripts here
+ # * udev is added to sysinit in openrc-ebuild
+ # * we add udev-postmount to default in here
+ #
+ # migration to >=openrc-0.4
if [[ -e "${ROOT}"/etc/runlevels/sysinit && ! -e "${ROOT}"/etc/runlevels/sysinit/udev ]]
then
ewarn
@@ -430,20 +432,32 @@
ewarn
fi
- # people want reminders, I'll give them reminders. Odds are they will
- # just ignore them anyway...
-
- if [[ ${coldplug_stale} == 1 ]]
+ # add udev-postmount to default runlevel instead of that ugly injecting
+ # like a hotplug event, 2009/10/15
+ if [[ $previous_less_than_146_r2 = 0 ]]
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."
+ local initd=udev-postmount
+
+ if [[ -e ${ROOT}/etc/init.d/${initd} ]] && \
+ [[ ! -e ${ROOT}/etc/runlevels/default/${initd} ]]
+ then
+ ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/default/${initd}
+ elog "Auto-adding '${initd}' service to your default runlevel"
+ fi
fi
+}
- # delete 40-scsi-hotplug.rules - all integrated in 50-udev.rules
+pkg_postinst() {
+ fix_old_persistent_net_rules
+
+ 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 ${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules ]]
then
@@ -452,26 +466,27 @@
rm -f "${ROOT}"/etc/udev/rules.d/40-scsi-hotplug.rules
fi
- # Removing some device-nodes we thought we need some time ago
+ # Removing some device-nodes we thought we need some time ago, 25 Jan 2007
if [[ -d ${ROOT}/lib/udev/devices ]]
then
rm -f "${ROOT}"/lib/udev/devices/{null,zero,console,urandom}
fi
- # Removing some old file
+ # Removing some old file, 29 Jan 2007
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
+ # 19 Mar 2007
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
+ # Try to remove /etc/dev.d as that is obsolete, 23 Apr 2007
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
@@ -483,7 +498,7 @@
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
+ # remove it if user don't has sys-fs/device-mapper installed, 27 Jun 2007
if [[ $previous_less_than_113 = 0 ]] &&
[[ -f ${ROOT}/etc/udev/rules.d/64-device-mapper.rules ]] &&
! has_version sys-fs/device-mapper
@@ -492,20 +507,6 @@
einfo "Removed unneeded file 64-device-mapper.rules"
fi
- # add udev-postmount to default runlevel instead of that ugly injecting
- # like a hotplug event, added 2009/10/15
- if [[ $previous_less_than_146_r2 = 0 ]]
- then
- local initd=udev-postmount
-
- if [[ -e ${ROOT}/etc/init.d/${initd} ]] && \
- [[ ! -e ${ROOT}/etc/runlevels/default/${initd} ]]
- then
- ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/default/${initd}
- elog "Auto-adding '${initd}' service to your default runlevel"
- fi
- fi
-
# requested in bug #275974, added 2009/09/05
ewarn
ewarn "If after the udev update removable devices or CD/DVD drives"
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-9999.ebuild
@ 2009-10-20 19:04 Matthias Schwarzott (zzam)
0 siblings, 0 replies; 38+ messages in thread
From: Matthias Schwarzott (zzam) @ 2009-10-20 19:04 UTC (permalink / raw
To: gentoo-commits
zzam 09/10/20 19:04:32
Modified: ChangeLog udev-9999.ebuild
Log:
Auto enable udev-postmount only if udev is enabled.
(Portage version: 2.2_rc46/cvs/Linux i686)
Revision Changes Path
1.501 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.501&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.501&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.500&r2=1.501
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.500
retrieving revision 1.501
diff -u -r1.500 -r1.501
--- ChangeLog 20 Oct 2009 12:38:15 -0000 1.500
+++ ChangeLog 20 Oct 2009 19:04:32 -0000 1.501
@@ -1,6 +1,9 @@
# ChangeLog for sys-fs/udev
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.500 2009/10/20 12:38:15 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.501 2009/10/20 19:04:32 zzam Exp $
+
+ 20 Oct 2009; Matthias Schwarzott <zzam@gentoo.org> udev-9999.ebuild:
+ Auto enable udev-postmount only if udev is enabled.
20 Oct 2009; Matthias Schwarzott <zzam@gentoo.org>
files/147/shell-compat-addon.sh, udev-9999.ebuild, files/147/udev.initd,
1.18 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.17&r2=1.18
Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- udev-9999.ebuild 20 Oct 2009 12:38:15 -0000 1.17
+++ udev-9999.ebuild 20 Oct 2009 19:04:32 -0000 1.18
@@ -1,6 +1,6 @@
# Copyright 1999-2009 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.17 2009/10/20 12:38:15 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.18 2009/10/20 19:04:32 zzam Exp $
EAPI="1"
@@ -349,9 +349,6 @@
has_version "<${CATEGORY}/${PN}-113"
previous_less_than_113=$?
-
- has_version "<${CATEGORY}/${PN}-146-r2"
- previous_less_than_146_r2=$?
}
# 19 Nov 2008
@@ -410,10 +407,8 @@
}
postinst_init_scripts() {
- # FIXME: we need some code like
- # if use bootstrap; then
- # add init-scripts
- # fi
+ # FIXME: we may need some code that detects if this is a system bootstrap
+ # and auto-enables udev then
#
# FIXME: inconsistent handling of init-scripts here
# * udev is added to sysinit in openrc-ebuild
@@ -434,7 +429,15 @@
# add udev-postmount to default runlevel instead of that ugly injecting
# like a hotplug event, 2009/10/15
- if [[ $previous_less_than_146_r2 = 0 ]]
+
+ # already enabled?
+ [[ -e "${ROOT}"/etc/runlevels/default/udev-postmount ]] && return
+
+ local enable_postmount=0
+ [[ -e "${ROOT}"/etc/runlevels/sysinit/udev ]] && enable_postmount=1
+ [[ "${ROOT}" = "/" && -d /dev/.udev/ ]] && enable_postmount=1
+
+ if [[ ${enable_postmount} = 1 ]]
then
local initd=udev-postmount
@@ -444,6 +447,10 @@
ln -snf /etc/init.d/${initd} "${ROOT}"/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
}
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-9999.ebuild
@ 2010-04-19 20:28 Matthias Schwarzott (zzam)
0 siblings, 0 replies; 38+ messages in thread
From: Matthias Schwarzott (zzam) @ 2010-04-19 20:28 UTC (permalink / raw
To: gentoo-commits
zzam 10/04/19 20:28:22
Modified: ChangeLog udev-9999.ebuild
Log:
Add keywords nolxc and noopenvz to udev init-script, Bug #310427.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Revision Changes Path
1.534 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.534&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.534&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.533&r2=1.534
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.533
retrieving revision 1.534
diff -u -r1.533 -r1.534
--- ChangeLog 16 Apr 2010 20:14:18 -0000 1.533
+++ ChangeLog 19 Apr 2010 20:28:22 -0000 1.534
@@ -1,6 +1,10 @@
# ChangeLog for sys-fs/udev
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.533 2010/04/16 20:14:18 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.534 2010/04/19 20:28:22 zzam Exp $
+
+ 19 Apr 2010; Matthias Schwarzott <zzam@gentoo.org> files/151/udev.initd,
+ udev-9999.ebuild:
+ Add keywords nolxc and noopenvz to udev init-script, Bug #310427.
16 Apr 2010; Brent Baude <ranger@gentoo.org> udev-149.ebuild:
Marking udev-149 ppc for bug 303031
1.27 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.26&r2=1.27
Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- udev-9999.ebuild 15 Mar 2010 21:43:05 -0000 1.26
+++ udev-9999.ebuild 19 Apr 2010 20:28:22 -0000 1.27
@@ -1,6 +1,6 @@
# Copyright 1999-2010 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.26 2010/03/15 21:43:05 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.27 2010/04/19 20:28:22 zzam Exp $
EAPI="1"
@@ -173,10 +173,6 @@
fi
fi
- if use old-hd-rules; then
- epatch "${FILESDIR}"/udev-151-readd-hd-rules.diff
- fi
-
sed_libexec_dir \
rules/rules.d/50-udev-default.rules \
rules/rules.d/78-sound-card.rules \
@@ -554,13 +550,9 @@
ewarn "For reference see Bug #269359."
fi
- if use old-hd-rules; then
- ewarn
- ewarn "old-hd-rules use flag is enabled (by default)."
- ewarn "This adds the removed rules for /dev/hd* devices"
- ewarn "Please migrate to the new libata."
- ewarn "These rules will be removed in the future"
- fi
+ ewarn
+ ewarn "Rules for /dev/hd* devices have been removed"
+ ewarn "Please migrate to the new libata."
elog
elog "For more information on udev on Gentoo, writing udev rules, and"
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-9999.ebuild
@ 2010-07-17 19:14 Matthias Schwarzott (zzam)
0 siblings, 0 replies; 38+ messages in thread
From: Matthias Schwarzott (zzam) @ 2010-07-17 19:14 UTC (permalink / raw
To: gentoo-commits
zzam 10/07/17 19:14:18
Modified: ChangeLog udev-9999.ebuild
Log:
Updated live ebuild, Bug #327823.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.545 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.545&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.545&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.544&r2=1.545
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.544
retrieving revision 1.545
diff -u -r1.544 -r1.545
--- ChangeLog 12 Jul 2010 19:58:52 -0000 1.544
+++ ChangeLog 17 Jul 2010 19:14:17 -0000 1.545
@@ -1,6 +1,9 @@
# ChangeLog for sys-fs/udev
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.544 2010/07/12 19:58:52 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.545 2010/07/17 19:14:17 zzam Exp $
+
+ 17 Jul 2010; Matthias Schwarzott <zzam@gentoo.org> udev-9999.ebuild:
+ Updated live ebuild, Bug #327823.
*udev-160 (12 Jul 2010)
1.30 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.30&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.30&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.29&r2=1.30
Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- udev-9999.ebuild 20 Jun 2010 19:27:54 -0000 1.29
+++ udev-9999.ebuild 17 Jul 2010 19:14:18 -0000 1.30
@@ -1,6 +1,6 @@
# Copyright 1999-2010 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.29 2010/06/20 19:27:54 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.30 2010/07/17 19:14:18 zzam Exp $
EAPI="1"
@@ -151,7 +151,7 @@
# change rules back to group uucp instead of dialout for now
sed -e 's/GROUP="dialout"/GROUP="uucp"/' \
- -i rules/{rules.d,arch,gentoo}/*.rules \
+ -i rules/{rules.d,arch}/*.rules \
|| die "failed to change group dialout to uucp"
if [[ ${PV} != 9999 ]]; then
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-9999.ebuild
@ 2011-06-07 5:54 William Hubbs (williamh)
0 siblings, 0 replies; 38+ messages in thread
From: William Hubbs (williamh) @ 2011-06-07 5:54 UTC (permalink / raw
To: gentoo-commits
williamh 11/06/07 05:54:01
Modified: ChangeLog udev-9999.ebuild
Log:
migrate live ebuild to eapi 4.
(Portage version: 2.2.0_alpha37/cvs/Linux i686)
Revision Changes Path
1.581 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.581&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.581&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.580&r2=1.581
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.580
retrieving revision 1.581
diff -u -r1.580 -r1.581
--- ChangeLog 5 Jun 2011 21:09:22 -0000 1.580
+++ ChangeLog 7 Jun 2011 05:54:01 -0000 1.581
@@ -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.580 2011/06/05 21:09:22 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.581 2011/06/07 05:54:01 williamh Exp $
+
+ 07 Jun 2011; William Hubbs <williamh@gentoo.org> udev-9999.ebuild:
+ migrate live ebuild to eapi 4.
05 Jun 2011; Robin H. Johnson <robbat2@gentoo.org> udev-146-r1.ebuild,
udev-149.ebuild, udev-151-r4.ebuild, udev-162.ebuild, udev-163.ebuild,
1.41 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.41&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.41&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.40&r2=1.41
Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- udev-9999.ebuild 5 Jun 2011 21:09:22 -0000 1.40
+++ udev-9999.ebuild 7 Jun 2011 05:54:01 -0000 1.41
@@ -1,33 +1,42 @@
# 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.40 2011/06/05 21:09:22 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.41 2011/06/07 05:54:01 williamh Exp $
-EAPI="1"
+EAPI=4
-inherit eutils flag-o-matic multilib toolchain-funcs linux-info systemd
-
-PATCHSET=${P}-gentoo-patchset-v1
+KV_min=2.6.32
+KV_reliable=2.6.32
+#PATCHSET=${P}-gentoo-patchset-v1
scriptversion=v3
scriptname=udev-gentoo-scripts-${scriptversion}
-if [[ ${PV} == "9999" ]]; then
- SRC_URI="mirror://gentoo/${scriptname}.tar.bz2"
+if [[ ${PV} == "9999" ]]
+then
EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git"
EGIT_BRANCH="master"
- inherit git autotools
-else
+ vcs="git-2 autotools"
+fi
+
+inherit ${VCS} eutils flag-o-matic multilib toolchain-funcs linux-info systemd
+
+if [[ ${PV} != "9999" ]]
+then
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
# 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}-151-testsys.tar.bz2 )
- mirror://gentoo/${scriptname}.tar.bz2"
- [[ -n "${PATCHSET}" ]] && SRC_URI="${SRC_URI} mirror://gentoo/${PATCHSET}.tar.bz2"
+ test? ( mirror://gentoo/${PN}-151-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"
-KEYWORDS=""
IUSE="selinux test debug +rule_generator +hwdb +udev_acl +gudev introspection +keymap floppy edd action_modeswitch"
COMMON_DEPEND="selinux? ( sys-libs/libselinux )
@@ -46,17 +55,14 @@
test? ( app-text/tree )"
RDEPEND="${COMMON_DEPEND}
- hwdb?
- (
- >=sys-apps/usbutils-0.82
- sys-apps/pciutils
- )
+ hwdb? ( >=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
+if [[ ${PV} == "9999" ]]
+then
# for documentation processing with xsltproc
DEPEND="${DEPEND}
app-text/docbook-xsl-stylesheets
@@ -74,13 +80,12 @@
# 0 - too old
udev_check_KV() {
local ok=0
- if [[ ${KV_MAJOR} == 2 && ${KV_MINOR} == 6 ]] || [[ ${KV_MAJOR} == 3 ]]
+ if kernel_is -ge ${KV_reliable//./ }
then
- if kernel_is -ge 2 6 ${KV_PATCH_reliable} ; then
- ok=2
- elif kernel_is -ge 2 6 ${KV_PATCH_min} ; then
- ok=1
- fi
+ ok=2
+ elif kernel_is -ge ${KV_min//./ }
+ then
+ ok=1
fi
return $ok
}
@@ -88,67 +93,56 @@
pkg_setup() {
linux-info_pkg_setup
- # udev requires signalfd introduced in kernel 2.6.25,
- # but a glibc compiled against >=linux-headers-2.6.27 uses the
- # new signalfd syscall introduced in kernel 2.6.27 without falling back
- # to the old one. So we just depend on 2.6.27 here, see Bug #281312.
- KV_PATCH_min=32
- KV_PATCH_reliable=32
- KV_min=2.6.${KV_PATCH_min}
- KV_reliable=2.6.${KV_PATCH_reliable}
-
# always print kernel version requirements
ewarn
ewarn "${P} does not support Linux kernel before version ${KV_min}!"
- if [[ ${KV_PATCH_min} != ${KV_PATCH_reliable} ]]; then
+ if [[ ${KV_min} != ${KV_reliable} ]]
+ then
ewarn "For a reliable udev, use at least kernel ${KV_reliable}"
fi
- echo
- # We don't care about the secondary revision of the kernel.
- # 2.6.30.4 -> 2.6.30 is all we check
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."
- ebeep ;;
+ ;;
0) eerror "Your kernel version (${KV_FULL}) is too old to run ${P}"
- ebeep ;;
+ ;;
esac
- echo
KV_FULL_SRC=${KV_FULL}
get_running_version
udev_check_KV
- if [[ "$?" = "0" ]]; then
+ 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
- ebeep
fi
}
src_unpack() {
unpack ${A}
- if [[ ${PV} == "9999" ]] ; then
+ if [[ ${PV} == "9999" ]]
+ then
git_src_unpack
- else
- if use test; then
- mv "${WORKDIR}"/test/sys "${S}"/test/
- fi
fi
+}
- #cd "${WORKDIR}/${scriptname}"
-
- cd "${S}"
+src_prepare() {
+ if use test
+ then
+ mv "${WORKDIR}"/test/sys "${S}"/test/
+ fi
# patches go here...
# backport some patches
- if [[ -n "${PATCHSET}" ]]; then
+ if [[ -n "${PATCHSET}" ]]
+ then
EPATCH_SOURCE="${WORKDIR}/${PATCHSET}" EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" epatch
fi
@@ -158,29 +152,28 @@
-i rules/{rules.d,arch}/*.rules \
|| die "failed to change group dialout to uucp"
- if [[ ${PV} != 9999 ]]; then
+ 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
- echo
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
+ if [[ ${PV} == 9999 ]]
+ then
gtkdocize --copy || die "gtkdocize failed"
eautoreconf
fi
}
-src_compile() {
- filter-flags -fprefetch-loop-arrays
-
+src_configure() {
econf \
--prefix=/usr \
--sysconfdir=/etc \
@@ -204,18 +197,22 @@
$(use_enable edd) \
$(use_enable action_modeswitch) \
$(systemd_with_unitdir)
+}
+
+src_compile() {
+ filter-flags -fprefetch-loop-arrays
- emake || die "compiling udev failed"
+ emake
}
src_install() {
emake -C "${WORKDIR}/${scriptname}" \
DESTDIR="${D}" LIBDIR="$(get_libdir)" \
KV_min="${KV_min}" KV_reliable="${KV_reliable}" \
- install || die "make install failed"
+ install
into /
- emake DESTDIR="${D}" install || die "make install failed"
+ emake DESTDIR="${D}" install
exeinto /lib/udev
keepdir /lib/udev/state
@@ -251,12 +248,13 @@
newins "${FILESDIR}"/pnp-aliases pnp-aliases.conf
# documentation
- dodoc ChangeLog README TODO || die "failed installing docs"
+ dodoc ChangeLog README TODO
# keep doc in just one directory, Bug #281137
rm -rf "${D}/usr/share/doc/${PN}"
- if use keymap; then
- dodoc extras/keymap/README.keymap.txt || die "failed installing docs"
+ if use keymap
+ then
+ dodoc extras/keymap/README.keymap.txt
fi
}
@@ -333,7 +331,8 @@
# See Bug #129204 for a discussion about restarting udevd
restart_udevd() {
- if [[ ${NO_RESTART} = "1" ]]; then
+ if [[ ${NO_RESTART} = "1" ]]
+ then
ewarn "Not restarting udevd, as your kernel is too old!"
return
fi
@@ -359,13 +358,13 @@
/sbin/udevd --daemon
sleep 3
- if [[ ! -n $(pidof udevd) ]]; then
+ 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"
- ebeep
fi
}
@@ -432,7 +431,8 @@
# "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 "${ROOT}"/dev/loop 2>/dev/null
- if [[ -d "${ROOT}"/dev/loop ]]; then
+ 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."
fi
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-9999.ebuild
@ 2011-06-08 15:30 William Hubbs (williamh)
0 siblings, 0 replies; 38+ messages in thread
From: William Hubbs (williamh) @ 2011-06-08 15:30 UTC (permalink / raw
To: gentoo-commits
williamh 11/06/08 15:30:14
Modified: ChangeLog udev-9999.ebuild
Log:
fix typo: VCS should be vcs, bug #370647.
(Portage version: 2.2.0_alpha38/cvs/Linux i686)
Revision Changes Path
1.585 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.585&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.585&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.584&r2=1.585
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.584
retrieving revision 1.585
diff -u -r1.584 -r1.585
--- ChangeLog 8 Jun 2011 06:10:41 -0000 1.584
+++ ChangeLog 8 Jun 2011 15:30:14 -0000 1.585
@@ -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.584 2011/06/08 06:10:41 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.585 2011/06/08 15:30:14 williamh Exp $
+
+ 08 Jun 2011; William Hubbs <williamh@gentoo.org> udev-9999.ebuild:
+ fix typo: VCS should be vcs. bug #370647.
08 Jun 2011; William Hubbs <williamh@gentoo.org> udev-171-r1.ebuild,
udev-9999.ebuild:
1.44 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.44&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.44&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.43&r2=1.44
Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- udev-9999.ebuild 8 Jun 2011 06:10:41 -0000 1.43
+++ udev-9999.ebuild 8 Jun 2011 15:30:14 -0000 1.44
@@ -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.43 2011/06/08 06:10:41 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.44 2011/06/08 15:30:14 williamh Exp $
EAPI=4
@@ -17,7 +17,7 @@
vcs="git-2 autotools"
fi
-inherit ${VCS} eutils flag-o-matic multilib toolchain-funcs linux-info systemd
+inherit ${vcs} eutils flag-o-matic multilib toolchain-funcs linux-info systemd
if [[ ${PV} != "9999" ]]
then
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-9999.ebuild
@ 2011-06-09 13:18 Matthias Schwarzott (zzam)
0 siblings, 0 replies; 38+ messages in thread
From: Matthias Schwarzott (zzam) @ 2011-06-09 13:18 UTC (permalink / raw
To: gentoo-commits
zzam 11/06/09 13:18:21
Modified: ChangeLog udev-9999.ebuild
Log:
Fix unpacking with git-2 eclass, bug #370647.
(Portage version: 2.1.10/cvs/Linux x86_64)
Revision Changes Path
1.589 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.589&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.589&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.588&r2=1.589
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.588
retrieving revision 1.589
diff -u -r1.588 -r1.589
--- ChangeLog 9 Jun 2011 13:10:45 -0000 1.588
+++ ChangeLog 9 Jun 2011 13:18:21 -0000 1.589
@@ -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.588 2011/06/09 13:10:45 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.589 2011/06/09 13:18:21 zzam Exp $
+
+ 09 Jun 2011; Matthias Schwarzott <zzam@gentoo.org> udev-9999.ebuild:
+ Fix unpacking with git-2 eclass, bug #370647.
09 Jun 2011; Matthias Schwarzott <zzam@gentoo.org> udev-171-r1.ebuild,
udev-9999.ebuild:
1.46 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.46&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.46&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.45&r2=1.46
Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- udev-9999.ebuild 9 Jun 2011 13:10:45 -0000 1.45
+++ udev-9999.ebuild 9 Jun 2011 13:18:21 -0000 1.46
@@ -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.45 2011/06/09 13:10:45 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.46 2011/06/09 13:18:21 zzam Exp $
EAPI=4
@@ -128,7 +128,7 @@
unpack ${A}
if [[ ${PV} == "9999" ]]
then
- git_src_unpack
+ git-2_src_unpack
fi
}
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-9999.ebuild
@ 2011-11-03 1:58 William Hubbs (williamh)
0 siblings, 0 replies; 38+ messages in thread
From: William Hubbs (williamh) @ 2011-11-03 1:58 UTC (permalink / raw
To: gentoo-commits
williamh 11/11/03 01:58:08
Modified: ChangeLog udev-9999.ebuild
Log:
Major updates for the live ebuild:
- The src_test function was set back to the default per upstream's
recommendations. Also, test has been restricted to run if userpriv is
not active.
- The src_unpack and pkg_preinst functions were removed.
- a new version of the udev startup scripts was included which is more
integrated to openrc and has had some outdated files removed.
- Now the ebuild manually installs the files from udev-gentoo-scripts.
- Several other small code cleanups.
(Portage version: 2.2.0_alpha72/cvs/Linux i686)
Revision Changes Path
1.604 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.604&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.604&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.603&r2=1.604
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.603
retrieving revision 1.604
diff -u -r1.603 -r1.604
--- ChangeLog 18 Sep 2011 06:42:42 -0000 1.603
+++ ChangeLog 3 Nov 2011 01:58:08 -0000 1.604
@@ -1,6 +1,17 @@
# 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.603 2011/09/18 06:42:42 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.604 2011/11/03 01:58:08 williamh Exp $
+
+ 03 Nov 2011; William Hubbs <williamh@gentoo.org> udev-9999.ebuild:
+ Major updates to the live ebuild:
+ - The src_test function was set back to the default per upstream's
+ recommendations. Also, test has been restricted to run if userpriv is
+ not active.
+ - The src_unpack and pkg_preinst functions were removed.
+ - a new version of the udev startup scripts was included which is more
+ integrated to openrc and has had some outdated files removed.
+ - Now the ebuild manually installs the files from udev-gentoo-scripts.
+ - Several other small code cleanups.
18 Sep 2011; Zac Medico <zmedico@gentoo.org> udev-171-r2.ebuild,
udev-9999.ebuild:
1.54 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.54&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.54&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.53&r2=1.54
Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- udev-9999.ebuild 18 Sep 2011 06:42:42 -0000 1.53
+++ udev-9999.ebuild 3 Nov 2011 01:58:08 -0000 1.54
@@ -1,35 +1,30 @@
# 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.53 2011/09/18 06:42:42 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.54 2011/11/03 01:58:08 williamh Exp $
EAPI=4
-KV_min=2.6.32
-KV_reliable=2.6.32
+KV_min=2.6.34
#PATCHSET=${P}-gentoo-patchset-v1
-scriptversion=v4
-scriptname=udev-gentoo-scripts-${scriptversion}
+scriptversion=5
+scriptname=${PN}-gentoo-scripts
+udev_rules_md5=9fadfc5642284b82e75005c4e85142f1
-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
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git"
+[[ ${PV} == "9999" ]] && vcs="git-2 autotools"
inherit ${vcs} eutils flag-o-matic multilib toolchain-funcs linux-info systemd
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 )"
+ SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2"
if [[ -n "${PATCHSET}" ]]
then
SRC_URI="${SRC_URI} mirror://gentoo/${PATCHSET}.tar.bz2"
fi
fi
+scriptname="${scriptname}-${scriptversion}"
SRC_URI="${SRC_URI} mirror://gentoo/${scriptname}.tar.bz2"
DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
@@ -37,14 +32,16 @@
LICENSE="GPL-2"
SLOT="0"
-IUSE="build selinux test debug +rule_generator hwdb acl gudev introspection
- keymap floppy edd action_modeswitch"
+IUSE="build selinux debug +rule_generator hwdb acl gudev introspection
+ keymap floppy edd doc"
+[[ ${PV} == "9999" ]] && IUSE="${IUSE} test"
+
+RESTRICT="test? ( userpriv )"
COMMON_DEPEND="selinux? ( sys-libs/libselinux )
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"
@@ -55,17 +52,6 @@
!<sys-kernel/linux-headers-2.6.34
test? ( app-text/tree )"
-RDEPEND="${COMMON_DEPEND}
- hwdb?
- (
- >=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
@@ -75,51 +61,43 @@
dev-util/gtk-doc"
fi
+RDEPEND="${COMMON_DEPEND}
+ hwdb? ( >=sys-apps/usbutils-0.82 sys-apps/pciutils )
+ acl? ( sys-apps/coreutils[acl] )
+ !sys-apps/coldplug
+ !<sys-fs/lvm2-2.02.45
+ !sys-fs/device-mapper
+ >=sys-apps/baselayout-1.12.5"
+
# required kernel options
CONFIG_CHECK="~INOTIFY_USER ~SIGNALFD ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2
- ~!IDE ~BLK_DEV_BSG"
+ ~!IDE ~BLK_DEV_BSG ~TMPFS_POSIX_ACL"
-# 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//./ }
+udev_check_KV()
+{
+ if kernel_is lt ${KV_min//./ }
then
- ok=1
+ return 1
fi
- return $ok
+ return 0
}
-pkg_setup() {
+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} ]]
+
+ if ! udev_check_KV
then
- ewarn "For a reliable udev, use at least kernel ${KV_reliable}"
+ eerror "Your kernel version (${KV_FULL}) is too old to run ${P}"
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" ]]
+ if ! udev_check_KV
then
eerror
eerror "udev cannot be restarted after emerging,"
@@ -129,27 +107,13 @@
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...
-
+src_prepare()
+{
# backport some patches
if [[ -n "${PATCHSET}" ]]
then
EPATCH_SOURCE="${WORKDIR}/${PATCHSET}" EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" epatch
+ EPATCH_FORCE="yes" epatch
fi
# change rules back to group uucp instead of dialout for now
@@ -163,7 +127,7 @@
# (more for my own needs than anything else ...)
MD5=$(md5sum < "${S}/rules/rules.d/50-udev-default.rules")
MD5=${MD5/ -/}
- if [[ ${MD5} != a9954d57e97aa0ad2e0ed53899d9559a ]]
+ if [[ ${MD5} != ${udev_rules_md5} ]]
then
eerror "50-udev-default.rules has been updated, please validate!"
eerror "md5sum: ${MD5}"
@@ -178,7 +142,9 @@
fi
}
-src_configure() {
+src_configure()
+{
+ filter-flags -fprefetch-loop-arrays
econf \
--prefix="${EPREFIX}/usr" \
--sysconfdir="${EPREFIX}/etc" \
@@ -200,32 +166,24 @@
$(use_enable keymap) \
$(use_enable floppy) \
$(use_enable edd) \
- $(use_enable action_modeswitch) \
+ $(use_enable doc gtk-doc) \
$(systemd_with_unitdir)
}
-src_compile() {
- filter-flags -fprefetch-loop-arrays
+src_install()
+{
+ emake DESTDIR="${D}" docdir="/usr/share/doc/${P}" install
- emake
-}
-
-src_install() {
- emake -C "${WORKDIR}/${scriptname}" \
- DESTDIR="${D}" LIBDIR="${EPREFIX}$(get_libdir)" \
- LIBUDEV="${EPREFIX}/lib/udev" \
- MODPROBE_DIR="${EPREFIX}/etc/modprobe.d" \
- INITD="${EPREFIX}/etc/init.d" \
- CONFD="${EPREFIX}/etc/conf.d" \
- KV_min="${KV_min}" KV_reliable="${KV_reliable}" \
- install
+ # documentation
+ dodoc ChangeLog README TODO
- into /
- emake DESTDIR="${D}" install
+ if use keymap
+ then
+ dodoc extras/keymap/README.keymap.txt
+ fi
- exeinto /lib/udev
- keepdir /lib/udev/state
- keepdir /lib/udev/devices
+ # Upstream moved udevd to /lib/udev,, so symlnking it is the easiest option
+ dosym "../lib/udev/udevd" /sbin/udevd
# create symlinks for these utilities to /sbin
# where multipath-tools expect them to be (Bug #168588)
@@ -235,114 +193,32 @@
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
+ # Now install 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
+ doins rules/misc/30-kernel-compat.rules
- # keep doc in just one directory, Bug #281137
- rm -rf "${ED}/usr/share/doc/${PN}"
- if use keymap
+ # add arch specific rules
+ if [[ -f rules/arch/40-${ARCH}.rules ]]
then
- dodoc extras/keymap/README.keymap.txt
+ doins "rules/arch/40-${ARCH}.rules"
fi
-}
-src_test() {
- local emake_cmd="${MAKE:-make} ${MAKEOPTS} ${EXTRA_EMAKE}"
cd "${WORKDIR}/${scriptname}"
- vecho ">>> Test phase [scripts:test]: ${CATEGORY}/${PF}"
- if ! $emake_cmd -j1 test
- then
- has test $FEATURES && die "scripts: Make test failed. See above for details."
- has test $FEATURES || eerror "scripts: Make test failed. See above for details."
- fi
-
- 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=$?
+ doconfd conf.d/*
+ exeinto /lib/udev
+ doexe helpers/*
+ doinitd init.d/*
+ insinto /etc/modprobe.d
+ doins modprobe.d/*
+ insinto /lib/udev/rules.d
+ doins rules.d/*
}
# 19 Nov 2008
-fix_old_persistent_net_rules() {
+fix_old_persistent_net_rules()
+{
local rules=${EROOT}/etc/udev/rules.d/70-persistent-net.rules
[[ -f ${rules} ]] || return
@@ -359,7 +235,8 @@
}
# See Bug #129204 for a discussion about restarting udevd
-restart_udevd() {
+restart_udevd()
+{
if [[ ${NO_RESTART} = "1" ]]
then
ewarn "Not restarting udevd, as your kernel is too old!"
@@ -397,7 +274,8 @@
fi
}
-postinst_init_scripts() {
+postinst_init_scripts()
+{
local enable_postmount=false
# FIXME: inconsistent handling of init-scripts here
@@ -454,7 +332,8 @@
fi
}
-pkg_postinst() {
+pkg_postinst()
+{
fix_old_persistent_net_rules
# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
@@ -473,35 +352,12 @@
# 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
@@ -515,8 +371,7 @@
# 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 ]] &&
+ if [[ -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
@@ -525,11 +380,11 @@
# requested in Bug #225033:
elog
- elog "persistent-net does assigning fixed names to network devices."
+ 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 "and then reboot."
+ elog "then reboot."
elog
elog "This may however number your devices in a different way than they are now."
@@ -555,6 +410,10 @@
ewarn "Rules for /dev/hd* devices have been removed"
ewarn "Please migrate to libata."
+ ewarn
+ ewarn "action_modeswitch has been removed by upstream."
+ ewarn "Please use sys-apps/usb_modeswitch."
+
elog
elog "For more information on udev on Gentoo, writing udev rules, and"
elog " fixing known issues visit:"
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-9999.ebuild
@ 2011-11-04 18:32 William Hubbs (williamh)
0 siblings, 0 replies; 38+ messages in thread
From: William Hubbs (williamh) @ 2011-11-04 18:32 UTC (permalink / raw
To: gentoo-commits
williamh 11/11/04 18:32:12
Modified: ChangeLog udev-9999.ebuild
Log:
Live ebuild now pulls udev gentoo scripts from git.
(Portage version: 2.2.0_alpha72/cvs/Linux i686)
Revision Changes Path
1.605 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.605&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.605&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.604&r2=1.605
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.604
retrieving revision 1.605
diff -u -r1.604 -r1.605
--- ChangeLog 3 Nov 2011 01:58:08 -0000 1.604
+++ ChangeLog 4 Nov 2011 18:32:12 -0000 1.605
@@ -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.604 2011/11/03 01:58:08 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.605 2011/11/04 18:32:12 williamh Exp $
+
+ 04 Nov 2011; William Hubbs <williamh@gentoo.org> udev-9999.ebuild:
+ Live ebuild now pulls udev gentoo scripts from git.
03 Nov 2011; William Hubbs <williamh@gentoo.org> udev-9999.ebuild:
Major updates to the live ebuild:
1.55 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.55&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.55&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.54&r2=1.55
Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- udev-9999.ebuild 3 Nov 2011 01:58:08 -0000 1.54
+++ udev-9999.ebuild 4 Nov 2011 18:32:12 -0000 1.55
@@ -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.54 2011/11/03 01:58:08 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.55 2011/11/04 18:32:12 williamh Exp $
EAPI=4
@@ -23,9 +23,9 @@
then
SRC_URI="${SRC_URI} mirror://gentoo/${PATCHSET}.tar.bz2"
fi
+ scriptname="${scriptname}-${scriptversion}"
+ SRC_URI="${SRC_URI} mirror://gentoo/${scriptname}.tar.bz2"
fi
-scriptname="${scriptname}-${scriptversion}"
-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"
@@ -107,6 +107,22 @@
fi
}
+if [[ $PV == 9999 ]]
+then
+ src_unpack()
+ {
+ git-2_src_unpack
+ unset EGIT_BRANCH
+ unset EGIT_COMMIT
+ unset EGIT_DIR
+ unset EGIT_MASTER
+ EGIT_PROJECT="${scriptname}"
+ EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${scriptname}.git"
+ EGIT_SOURCEDIR="${WORKDIR}/${scriptname}"
+ git-2_src_unpack
+ }
+fi
+
src_prepare()
{
# backport some patches
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-9999.ebuild
@ 2011-11-06 2:36 William Hubbs (williamh)
0 siblings, 0 replies; 38+ messages in thread
From: William Hubbs (williamh) @ 2011-11-06 2:36 UTC (permalink / raw
To: gentoo-commits
williamh 11/11/06 02:36:07
Modified: ChangeLog udev-9999.ebuild
Log:
fix dependencies for doc use flag in live ebuild.
(Portage version: 2.2.0_alpha72/cvs/Linux i686)
Revision Changes Path
1.606 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.606&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.606&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.605&r2=1.606
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.605
retrieving revision 1.606
diff -u -r1.605 -r1.606
--- ChangeLog 4 Nov 2011 18:32:12 -0000 1.605
+++ ChangeLog 6 Nov 2011 02:36:06 -0000 1.606
@@ -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.605 2011/11/04 18:32:12 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.606 2011/11/06 02:36:06 williamh Exp $
+
+ 06 Nov 2011; William Hubbs <williamh@gentoo.org> udev-9999.ebuild:
+ fix dependencies for doc use flag in live ebuild.
04 Nov 2011; William Hubbs <williamh@gentoo.org> udev-9999.ebuild:
Live ebuild now pulls udev gentoo scripts from git.
1.56 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.56&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.56&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.55&r2=1.56
Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- udev-9999.ebuild 4 Nov 2011 18:32:12 -0000 1.55
+++ udev-9999.ebuild 6 Nov 2011 02:36:06 -0000 1.56
@@ -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.55 2011/11/04 18:32:12 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.56 2011/11/06 02:36:06 williamh Exp $
EAPI=4
@@ -8,7 +8,7 @@
#PATCHSET=${P}-gentoo-patchset-v1
scriptversion=5
scriptname=${PN}-gentoo-scripts
-udev_rules_md5=9fadfc5642284b82e75005c4e85142f1
+udev_rules_md5=a585b848976900cd15cf729e8ef11c61
EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git"
@@ -52,12 +52,10 @@
!<sys-kernel/linux-headers-2.6.34
test? ( app-text/tree )"
-if [[ ${PV} == "9999" ]]
+if [[ ${PV} == "9999" ]] || use doc
then
# for documentation processing with xsltproc
DEPEND="${DEPEND}
- app-text/docbook-xsl-stylesheets
- app-text/docbook-xml-dtd
dev-util/gtk-doc"
fi
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-9999.ebuild
@ 2011-11-07 4:55 William Hubbs (williamh)
0 siblings, 0 replies; 38+ messages in thread
From: William Hubbs (williamh) @ 2011-11-07 4:55 UTC (permalink / raw
To: gentoo-commits
williamh 11/11/07 04:55:18
Modified: ChangeLog udev-9999.ebuild
Log:
sync live ebuild
(Portage version: 2.2.0_alpha72/cvs/Linux i686)
Revision Changes Path
1.609 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.609&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.609&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.608&r2=1.609
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.608
retrieving revision 1.609
diff -u -r1.608 -r1.609
--- ChangeLog 7 Nov 2011 04:19:01 -0000 1.608
+++ ChangeLog 7 Nov 2011 04:55:18 -0000 1.609
@@ -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.608 2011/11/07 04:19:01 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.609 2011/11/07 04:55:18 williamh Exp $
+
+ 07 Nov 2011; William Hubbs <williamh@gentoo.org> udev-9999.ebuild:
+ sync live ebuild.
*udev-174-r1 (07 Nov 2011)
1.57 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.57&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.57&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.56&r2=1.57
Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- udev-9999.ebuild 6 Nov 2011 02:36:06 -0000 1.56
+++ udev-9999.ebuild 7 Nov 2011 04:55:18 -0000 1.57
@@ -1,27 +1,28 @@
# 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.56 2011/11/06 02:36:06 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.57 2011/11/07 04:55:18 williamh Exp $
EAPI=4
KV_min=2.6.34
-#PATCHSET=${P}-gentoo-patchset-v1
+patchversion=1
scriptversion=5
-scriptname=${PN}-gentoo-scripts
-udev_rules_md5=a585b848976900cd15cf729e8ef11c61
+udev_rules_md5=f7ceae528475742f75516c532ec95a88
EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git"
[[ ${PV} == "9999" ]] && vcs="git-2 autotools"
inherit ${vcs} eutils flag-o-matic multilib toolchain-funcs linux-info systemd
+scriptname=${PN}-gentoo-scripts
if [[ ${PV} != "9999" ]]
then
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2"
- if [[ -n "${PATCHSET}" ]]
+ if [[ -n "${patchversion}" ]]
then
- SRC_URI="${SRC_URI} mirror://gentoo/${PATCHSET}.tar.bz2"
+ patchset=${P}-patchset-${patchversion}
+ SRC_URI="${SRC_URI} mirror://gentoo/${patchset}.tar.bz2"
fi
scriptname="${scriptname}-${scriptversion}"
SRC_URI="${SRC_URI} mirror://gentoo/${scriptname}.tar.bz2"
@@ -49,8 +50,13 @@
keymap? ( dev-util/gperf )
dev-util/pkgconfig
virtual/os-headers
- !<sys-kernel/linux-headers-2.6.34
- test? ( app-text/tree )"
+ !<sys-kernel/linux-headers-2.6.34"
+
+if [[ $PV == "9999" ]]
+then
+ DEPEND="${DEPEND}
+ test? ( app-text/tree )"
+fi
if [[ ${PV} == "9999" ]] || use doc
then
@@ -124,9 +130,9 @@
src_prepare()
{
# backport some patches
- if [[ -n "${PATCHSET}" ]]
+ if [[ -n "${patchset}" ]]
then
- EPATCH_SOURCE="${WORKDIR}/${PATCHSET}" EPATCH_SUFFIX="patch" \
+ EPATCH_SOURCE="${WORKDIR}/${patchset}" EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" epatch
fi
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-9999.ebuild
@ 2011-12-09 22:12 William Hubbs (williamh)
0 siblings, 0 replies; 38+ messages in thread
From: William Hubbs (williamh) @ 2011-12-09 22:12 UTC (permalink / raw
To: gentoo-commits
williamh 11/12/09 22:12:00
Modified: ChangeLog udev-9999.ebuild
Log:
sync live ebuild
(Portage version: 2.2.0_alpha79/cvs/Linux i686)
Revision Changes Path
1.619 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.619&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.619&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.618&r2=1.619
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.618
retrieving revision 1.619
diff -u -r1.618 -r1.619
--- ChangeLog 9 Dec 2011 20:43:22 -0000 1.618
+++ ChangeLog 9 Dec 2011 22:12:00 -0000 1.619
@@ -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.618 2011/12/09 20:43:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.619 2011/12/09 22:12:00 williamh Exp $
+
+ 09 Dec 2011; William Hubbs <williamh@gentoo.org> udev-9999.ebuild:
+ sync live ebuild
09 Dec 2011; Mike Frysinger <vapier@gentoo.org> udev-171-r3.ebuild,
udev-175.ebuild, udev-175-r1.ebuild:
1.63 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.63&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.63&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.62&r2=1.63
Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- udev-9999.ebuild 11 Nov 2011 19:34:18 -0000 1.62
+++ udev-9999.ebuild 9 Dec 2011 22:12:00 -0000 1.63
@@ -1,12 +1,12 @@
# 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.62 2011/11/11 19:34:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.63 2011/12/09 22:12:00 williamh Exp $
EAPI=4
KV_min=2.6.34
# patchversion=1
-scriptversion=5
+scriptversion=6
udev_rules_md5=7a7180a394e5bdea9011f68582b94fe8
EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git"
@@ -62,7 +62,7 @@
fi
RDEPEND="${COMMON_DEPEND}
- hwdb? ( >=sys-apps/usbutils-0.82 sys-apps/pciutils )
+ hwdb? ( >=sys-apps/usbutils-0.82 sys-apps/pciutils[-zlib] )
acl? ( sys-apps/coreutils[acl] )
!sys-apps/coldplug
!<sys-fs/lvm2-2.02.45
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-9999.ebuild
@ 2012-04-08 6:37 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 38+ messages in thread
From: Samuli Suominen (ssuominen) @ 2012-04-08 6:37 UTC (permalink / raw
To: gentoo-commits
ssuominen 12/04/08 06:37:43
Modified: ChangeLog udev-9999.ebuild
Log:
Use sys-apps/hwids for -9999 too. See commit 01 Apr 2012 to udev-182-r3.
(Portage version: 2.2.0_alpha99/cvs/Linux x86_64)
Revision Changes Path
1.678 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.678&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.678&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.677&r2=1.678
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.677
retrieving revision 1.678
diff -u -r1.677 -r1.678
--- ChangeLog 2 Apr 2012 04:00:05 -0000 1.677
+++ ChangeLog 8 Apr 2012 06:37:43 -0000 1.678
@@ -1,6 +1,9 @@
# ChangeLog for sys-fs/udev
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.677 2012/04/02 04:00:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.678 2012/04/08 06:37:43 ssuominen Exp $
+
+ 08 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> udev-9999.ebuild:
+ Use sys-apps/hwids for -9999 too. See commit 01 Apr 2012 to udev-182-r3.
02 Apr 2012; Jeroen Roovers <jer@gentoo.org> udev-182-r3.ebuild:
Marked ~hppa (bug #410401).
1.96 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.96&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.96&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.95&r2=1.96
Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- udev-9999.ebuild 28 Mar 2012 21:54:03 -0000 1.95
+++ udev-9999.ebuild 8 Apr 2012 06:37:43 -0000 1.96
@@ -1,6 +1,6 @@
# Copyright 1999-2012 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.95 2012/03/28 21:54:03 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.96 2012/04/08 06:37:43 ssuominen Exp $
EAPI=4
@@ -58,10 +58,7 @@
fi
RDEPEND="${COMMON_DEPEND}
- hwdb? (
- >=sys-apps/usbutils-0.82
- || ( >=sys-apps/pciutils-3.1.9-r1[-compress-db] <sys-apps/pciutils-3.1.9-r1[-zlib] )
- )
+ hwdb? ( sys-apps/hwids )
openrc? ( >=sys-fs/udev-init-scripts-10
!<sys-apps/openrc-0.9.9 )
!sys-apps/coldplug
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-9999.ebuild
@ 2013-01-16 13:56 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 38+ messages in thread
From: Samuli Suominen (ssuominen) @ 2013-01-16 13:56 UTC (permalink / raw
To: gentoo-commits
ssuominen 13/01/16 13:56:48
Modified: ChangeLog udev-9999.ebuild
Log:
safe kludge also to 9999 to reflect -r3
(Portage version: 2.2.0_alpha151/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.766 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.766&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.766&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.765&r2=1.766
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.765
retrieving revision 1.766
diff -u -r1.765 -r1.766
--- ChangeLog 16 Jan 2013 13:55:29 -0000 1.765
+++ ChangeLog 16 Jan 2013 13:56:48 -0000 1.766
@@ -1,11 +1,11 @@
# ChangeLog for sys-fs/udev
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.765 2013/01/16 13:55:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.766 2013/01/16 13:56:48 ssuominen Exp $
*udev-197-r3 (16 Jan 2013)
16 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> udev-197-r2.ebuild,
- +udev-197-r3.ebuild:
+ +udev-197-r3.ebuild, udev-9999.ebuild:
Edit -r2 to install 80-net-name-slot.rules if the file isn't there yet; this
is for stable. This will make current -r2 as -r3 with a safe kludge to avoid
overwriting the file; this is for ~arch.
1.132 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.132&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.132&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.131&r2=1.132
Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- udev-9999.ebuild 15 Jan 2013 16:01:56 -0000 1.131
+++ udev-9999.ebuild 16 Jan 2013 13:56:48 -0000 1.132
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.131 2013/01/15 16:01:56 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.132 2013/01/16 13:56:48 ssuominen Exp $
EAPI=4
@@ -325,7 +325,7 @@
preserve_old_lib /$(get_libdir)/libudev.so.0
if has_version '<sys-fs/udev-197'; then
net_rules="${ROOT}"etc/udev/rules.d/80-net-name-slot.rules
- cp "${FILESDIR}"/80-net-name-slot.rules "${net_rules}"
+ [[ -f ${net_rules} ]] || cp "${FILESDIR}"/80-net-name-slot.rules "${net_rules}"
fi
}
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-9999.ebuild
@ 2013-02-08 11:55 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 38+ messages in thread
From: Samuli Suominen (ssuominen) @ 2013-02-08 11:55 UTC (permalink / raw
To: gentoo-commits
ssuominen 13/02/08 11:55:49
Modified: ChangeLog udev-9999.ebuild
Log:
Update live ebuild to use new --root switch from git for hwdb --update. Remove target systemd-install-hook (and udev-confdirs) to match current git. This will mean content of /usr/lib/systemd/system/sysinit.target.wants/ is not installed with udev anymore.
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.822 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.822&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.822&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.821&r2=1.822
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.821
retrieving revision 1.822
diff -u -r1.821 -r1.822
--- ChangeLog 7 Feb 2013 18:50:36 -0000 1.821
+++ ChangeLog 8 Feb 2013 11:55:49 -0000 1.822
@@ -1,6 +1,12 @@
# ChangeLog for sys-fs/udev
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.821 2013/02/07 18:50:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.822 2013/02/08 11:55:49 ssuominen Exp $
+
+ 08 Feb 2013; Samuli Suominen <ssuominen@gentoo.org> udev-9999.ebuild:
+ Update live ebuild to use new --root switch from git for hwdb --update.
+ Remove target systemd-install-hook (and udev-confdirs) to match current git.
+ This will mean content of /usr/lib/systemd/system/sysinit.target.wants/ is
+ not installed with udev anymore.
*udev-197-r8 (07 Feb 2013)
1.173 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.173&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.173&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.172&r2=1.173
Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- udev-9999.ebuild 7 Feb 2013 18:05:03 -0000 1.172
+++ udev-9999.ebuild 8 Feb 2013 11:55:49 -0000 1.173
@@ -1,10 +1,10 @@
# Copyright 1999-2013 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.172 2013/02/07 18:05:03 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.173 2013/02/08 11:55:49 ssuominen Exp $
EAPI=4
-KV_min=2.6.39
+KV_min=2.6.32
inherit autotools eutils linux-info multilib systemd toolchain-funcs versionator
@@ -18,7 +18,8 @@
if [[ -n "${patchset}" ]]
then
SRC_URI="${SRC_URI}
- http://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.bz2"
+ http://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.bz2
+ http://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.bz2"
fi
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
fi
@@ -77,8 +78,6 @@
udev_check_KV()
{
- # accept4 came late for ia64
- use ia64 && KV_min=3.3
if kernel_is lt ${KV_min//./ }
then
return 1
@@ -176,13 +175,13 @@
if [[ ${PV} = 9999* ]]; then
# secure_getenv() disable for non-glibc systems wrt bug #443030
- if ! [[ $(grep -r secure_getenv * | wc -l) -eq 13 ]]; then
+ if ! [[ $(grep -r secure_getenv * | wc -l) -eq 23 ]]; then
eerror "The line count for secure_getenv() failed, see bug #443030"
die
fi
# gperf disable if keymaps are not requested wrt bug #452760
- if ! [[ $(grep -i gperf Makefile.am | wc -l) -eq 24 ]]; then
+ if ! [[ $(grep -i gperf Makefile.am | wc -l) -eq 27 ]]; then
eerror "The line count for gperf references failed, see bug 452760"
die
fi
@@ -307,8 +306,6 @@
install-sharepkgconfigDATA
install-typelibsDATA
install-dist_docDATA
- udev-confdirs
- systemd-install-hook
libudev-install-hook
libsystemd-daemon-install-hook
install-pkgincludeHEADERS
@@ -524,5 +521,5 @@
elog " fixing known issues visit:"
elog " http://www.gentoo.org/doc/en/udev-guide.xml"
- use hwdb && udevadm hwdb --update
+ use hwdb && udevadm hwdb --update --root="${ROOT%/}"
}
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-9999.ebuild
@ 2013-02-08 12:28 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 38+ messages in thread
From: Samuli Suominen (ssuominen) @ 2013-02-08 12:28 UTC (permalink / raw
To: gentoo-commits
ssuominen 13/02/08 12:28:41
Modified: ChangeLog udev-9999.ebuild
Log:
Remove systemd-daemon targets. Allow parallel building again.
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.823 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.823&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.823&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.822&r2=1.823
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.822
retrieving revision 1.823
diff -u -r1.822 -r1.823
--- ChangeLog 8 Feb 2013 11:55:49 -0000 1.822
+++ ChangeLog 8 Feb 2013 12:28:41 -0000 1.823
@@ -1,12 +1,14 @@
# ChangeLog for sys-fs/udev
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.822 2013/02/08 11:55:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.823 2013/02/08 12:28:41 ssuominen Exp $
08 Feb 2013; Samuli Suominen <ssuominen@gentoo.org> udev-9999.ebuild:
- Update live ebuild to use new --root switch from git for hwdb --update.
- Remove target systemd-install-hook (and udev-confdirs) to match current git.
- This will mean content of /usr/lib/systemd/system/sysinit.target.wants/ is
- not installed with udev anymore.
+ Remove multiple targets that installed systemd files since libudev and
+ libgudev doesn't link against libsystemd-daemon anymore. Unfortunately
+ this will mean content of /usr/lib/systemd/system/sysinit.target.wants/
+ went away because the new target install-target-wants-hook would install
+ too much of unrelated systemd files.
+ Use --root switch for udevadm hwdb --update.
*udev-197-r8 (07 Feb 2013)
1.174 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.174&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.174&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.173&r2=1.174
Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- udev-9999.ebuild 8 Feb 2013 11:55:49 -0000 1.173
+++ udev-9999.ebuild 8 Feb 2013 12:28:41 -0000 1.174
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.173 2013/02/08 11:55:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.174 2013/02/08 12:28:41 ssuominen Exp $
EAPI=4
@@ -251,7 +251,6 @@
systemd-udevd
udevadm
libudev.la
- libsystemd-daemon.la
ata_id
cdrom_id
collect
@@ -259,10 +258,6 @@
v4l_id
accelerometer
mtd_probe
- man/sd_is_fifo.3
- man/sd_notify.3
- man/sd_listen_fds.3
- man/sd-daemon.3
man/udev.7
man/udevadm.8
man/systemd-udevd.8
@@ -281,8 +276,8 @@
src_install()
{
- local lib_LTLIBRARIES="libsystemd-daemon.la libudev.la" \
- pkgconfiglib_DATA="src/libsystemd-daemon/libsystemd-daemon.pc src/libudev/libudev.pc"
+ local lib_LTLIBRARIES="libudev.la" \
+ pkgconfiglib_DATA="src/libudev/libudev.pc"
local targets=(
install-libLTLIBRARIES
@@ -307,8 +302,6 @@
install-typelibsDATA
install-dist_docDATA
libudev-install-hook
- libsystemd-daemon-install-hook
- install-pkgincludeHEADERS
)
if use gudev
@@ -322,14 +315,9 @@
rootlibexec_PROGRAMS=systemd-udevd
bin_PROGRAMS=udevadm
lib_LTLIBRARIES="${lib_LTLIBRARIES}"
- MANPAGES="man/sd-daemon.3 man/sd_notify.3 man/sd_listen_fds.3 \
- man/sd_is_fifo.3 man/sd_booted.3 man/udev.7 man/udevadm.8 \
+ MANPAGES="man/udev.7 man/udevadm.8 \
man/systemd-udevd.service.8"
- MANPAGES_ALIAS="man/sd_is_socket.3 man/sd_is_socket_unix.3 \
- man/sd_is_socket_inet.3 man/sd_is_mq.3 man/sd_notifyf.3 \
- man/SD_LISTEN_FDS_START.3 man/SD_EMERG.3 man/SD_ALERT.3 \
- man/SD_CRIT.3 man/SD_ERR.3 man/SD_WARNING.3 man/SD_NOTICE.3 \
- man/SD_INFO.3 man/SD_DEBUG.3 man/systemd-udevd.8"
+ MANPAGES_ALIAS="man/systemd-udevd.8"
dist_systemunit_DATA="units/systemd-udevd-control.socket \
units/systemd-udevd-kernel.socket"
nodist_systemunit_DATA="units/systemd-udevd.service \
@@ -337,9 +325,8 @@
units/systemd-udev-settle.service"
pkgconfiglib_DATA="${pkgconfiglib_DATA}"
systemunitdir="$(systemd_get_unitdir)"
- pkginclude_HEADERS="src/systemd/sd-daemon.h"
)
- emake -j1 DESTDIR="${D}" "${targets[@]}"
+ emake DESTDIR="${D}" "${targets[@]}"
if use doc
then
emake -C docs/libudev DESTDIR="${D}" install
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-9999.ebuild
@ 2013-02-13 22:37 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 38+ messages in thread
From: Samuli Suominen (ssuominen) @ 2013-02-13 22:37 UTC (permalink / raw
To: gentoo-commits
ssuominen 13/02/13 22:37:15
Modified: ChangeLog udev-9999.ebuild
Log:
pass --disable-polkit too, since it was added to git
(Portage version: 2.2.0_alpha162/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.829 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.829&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.829&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.828&r2=1.829
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.828
retrieving revision 1.829
diff -u -r1.828 -r1.829
--- ChangeLog 9 Feb 2013 23:00:03 -0000 1.828
+++ ChangeLog 13 Feb 2013 22:37:15 -0000 1.829
@@ -1,6 +1,11 @@
# ChangeLog for sys-fs/udev
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.828 2013/02/09 23:00:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.829 2013/02/13 22:37:15 ssuominen Exp $
+
+ 13 Feb 2013; Samuli Suominen <ssuominen@gentoo.org> udev-9999.ebuild:
+ Update to use --disable-polkit flag, see:
+ http://cgit.freedesktop.org/systemd/systemd/commit/?id=46ba8aae2b82bc5c87ba34
+ 7e6bf914ecd5e9d51e
09 Feb 2013; Samuli Suominen <ssuominen@gentoo.org> udev-197-r4.ebuild:
arm/ppc64 stable wrt #452556
1.176 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.176&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.176&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.175&r2=1.176
Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- udev-9999.ebuild 9 Feb 2013 20:47:16 -0000 1.175
+++ udev-9999.ebuild 13 Feb 2013 22:37:15 -0000 1.176
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.175 2013/02/09 20:47:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.176 2013/02/13 22:37:15 ssuominen Exp $
EAPI=4
@@ -227,6 +227,7 @@
--disable-timedated
--disable-xz
--disable-silent-rules
+ --disable-polkit
$(use_enable acl)
$(use_enable doc gtk-doc)
$(use_enable gudev)
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-9999.ebuild
@ 2013-03-08 22:45 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 38+ messages in thread
From: Samuli Suominen (ssuominen) @ 2013-03-08 22:45 UTC (permalink / raw
To: gentoo-commits
ssuominen 13/03/08 22:45:03
Modified: ChangeLog udev-9999.ebuild
Log:
Stop installing 80-net-name-slot.rules. Pass --without-python to avoid sphinx.
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.845 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.845&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.845&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.844&r2=1.845
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.844
retrieving revision 1.845
diff -u -r1.844 -r1.845
--- ChangeLog 6 Mar 2013 20:13:38 -0000 1.844
+++ ChangeLog 8 Mar 2013 22:45:03 -0000 1.845
@@ -1,6 +1,10 @@
# ChangeLog for sys-fs/udev
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.844 2013/03/06 20:13:38 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.845 2013/03/08 22:45:03 ssuominen Exp $
+
+ 08 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> udev-9999.ebuild:
+ Stop installing 80-net-name-slot.rules. Pass --without-python to avoid
+ dev-python/sphinx.
06 Mar 2013; Raúl Porcel <armin76@gentoo.org> udev-197-r8.ebuild:
m68k/s390/sh/sparc stable wrt #457568
1.181 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.181&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.181&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.180&r2=1.181
Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- udev-9999.ebuild 2 Mar 2013 01:20:33 -0000 1.180
+++ udev-9999.ebuild 8 Mar 2013 22:45:03 -0000 1.181
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.180 2013/03/02 01:20:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.181 2013/03/08 22:45:03 ssuominen Exp $
EAPI=4
@@ -18,8 +18,7 @@
if [[ -n "${patchset}" ]]
then
SRC_URI="${SRC_URI}
- http://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.bz2
- http://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.bz2"
+ http://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.bz2"
fi
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
fi
@@ -69,8 +68,8 @@
!<sec-policy/selinux-base-2.20120725-r10"
PDEPEND=">=virtual/udev-197-r1
- hwdb? ( >=sys-apps/hwids-20130114[udev] )
- openrc? ( >=sys-fs/udev-init-scripts-19-r1 )"
+ hwdb? ( >=sys-apps/hwids-20130302[udev] )
+ openrc? ( >=sys-fs/udev-init-scripts-23 )"
S=${WORKDIR}/systemd-${PV}
@@ -125,6 +124,20 @@
src_prepare()
{
+ if ! [[ ${PV} = 9999* ]]; then
+ # secure_getenv() disable for non-glibc systems wrt bug #443030
+ if ! [[ $(grep -r secure_getenv * | wc -l) -eq 16 ]]; then
+ eerror "The line count for secure_getenv() failed, see bug #443030"
+ die
+ fi
+
+ # gperf disable if keymaps are not requested wrt bug #452760
+ if ! [[ $(grep -i gperf Makefile.am | wc -l) -eq 27 ]]; then
+ eerror "The line count for gperf references failed, see bug 452760"
+ die
+ fi
+ fi
+
# backport some patches
if [[ -n "${patchset}" ]]
then
@@ -133,11 +146,9 @@
# These are missing from upstream 50-udev-default.rules
cat <<-EOF > "${T}"/40-gentoo.rules
- # Propably unrequired, check how it is with OSS/OSS4, then remove
- SUBSYSTEM=="snd", GROUP="audio"
# Gentoo specific usb group
SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
- # Keep this for Linux 2.6.32 support wrt #457868
+ # Keep this for Linux 2.6.32 kernels with accept4() support like .60 wrt #457868
SUBSYSTEM=="mem", KERNEL=="null|zero|full|random|urandom", MODE="0666"
EOF
@@ -158,7 +169,7 @@
version_is_at_least 4.6 $(gcc-version) || \
sed -i 's:static_assert:alsdjflkasjdfa:' src/shared/macro.h
- # change rules back to group uucp instead of dialout for now
+ # change rules back to group uucp instead of dialout for now wrt #454556
sed -e 's/GROUP="dialout"/GROUP="uucp"/' \
-i rules/*.rules \
|| die "failed to change group dialout to uucp"
@@ -177,20 +188,6 @@
elibtoolize
fi
- if [[ ${PV} = 9999* ]]; then
- # secure_getenv() disable for non-glibc systems wrt bug #443030
- if ! [[ $(grep -r secure_getenv * | wc -l) -eq 23 ]]; then
- eerror "The line count for secure_getenv() failed, see bug #443030"
- die
- fi
-
- # gperf disable if keymaps are not requested wrt bug #452760
- if ! [[ $(grep -i gperf Makefile.am | wc -l) -eq 27 ]]; then
- eerror "The line count for gperf references failed, see bug 452760"
- die
- fi
- fi
-
if ! use elibc_glibc; then #443030
echo '#define secure_getenv(x) NULL' >> config.h.in
sed -i -e '/error.*secure_getenv/s:.*:#define secure_getenv(x) NULL:' src/shared/missing.h || die
@@ -214,6 +211,7 @@
--with-html-dir=/usr/share/doc/${PF}/html
--with-rootprefix=
--with-rootlibdir=/$(get_libdir)
+ --without-python
--disable-audit
--disable-coredump
--disable-hostnamed
@@ -358,10 +356,6 @@
dosym /sbin/udevd "$(systemd_get_utildir)"/systemd-udevd
find "${ED}/$(systemd_get_unitdir)" -name '*.service' -exec \
sed -i -e "/ExecStart/s:/lib/systemd:$(systemd_get_utildir):" {} +
-
- docinto gentoo
- dodoc "${FILESDIR}"/80-net-name-slot.rules
- docompress -x /usr/share/doc/${PF}/gentoo/80-net-name-slot.rules
}
pkg_preinst()
@@ -395,23 +389,6 @@
{
mkdir -p "${ROOT}"run
- net_rules="${ROOT}"etc/udev/rules.d/80-net-name-slot.rules
- copy_net_rules() {
- [[ -f ${net_rules} ]] || cp "${ROOT}"usr/share/doc/${PF}/gentoo/80-net-name-slot.rules "${net_rules}"
- }
-
- if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 197 ]]; then
- ewarn "Because this is a upgrade we disable the new predictable network interface"
- ewarn "name scheme by default."
- copy_net_rules
- fi
-
- if has_version sys-apps/biosdevname; then
- ewarn "Because sys-apps/biosdevname is installed we disable the new predictable"
- ewarn "network interface name scheme by default."
- copy_net_rules
- fi
-
# "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 "${ROOT}"dev/loop 2>/dev/null
@@ -424,20 +401,13 @@
# people want reminders, I'll give them reminders. Odds are they will
# just ignore them anyway...
- # 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 ${ROOT}etc/udev/rules.d/64-device-mapper.rules ]] &&
- ! has_version sys-fs/device-mapper
+ # 64-device-mapper.rules is related to sys-fs/device-mapper which we block
+ # in favour of sys-fs/lvm2
+ old_dm_rules=${ROOT}etc/udev/rules.d/64-device-mapper.rules
+ if [[ -f ${old_dm_rules} ]]
then
- rm -f "${ROOT}"etc/udev/rules.d/64-device-mapper.rules
- einfo "Removed unneeded file 64-device-mapper.rules"
- fi
-
- if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 189 ]]; then
- ewarn
- ewarn "Upstream has removed the persistent-cd rules"
- ewarn "generator. If you need persistent names for these devices,"
- ewarn "place udev rules for them in ${ROOT}etc/udev/rules.d."
+ rm -f "${old_dm_rules}"
+ einfo "Removed unneeded file ${old_dm_rules}"
fi
if ismounted /usr
@@ -459,15 +429,6 @@
ewarn "http://www.gentoo.org/doc/en/initramfs-guide.xml"
fi
- if [ -n "${net_rules}" ]; then
- ewarn
- ewarn "udev-197 and newer introduces a new method of naming network"
- ewarn "interfaces. The new names are a very significant change, so"
- ewarn "they are disabled by default on live systems."
- ewarn "Please see the contents of ${net_rules} for more"
- ewarn "information on this feature."
- fi
-
local fstab="${ROOT}"etc/fstab dev path fstype rest
while read -r dev path fstype rest; do
if [[ ${path} == /dev && ${fstype} != devtmpfs ]]; then
@@ -489,22 +450,27 @@
ewarn "Note that qfile can be found in app-portage/portage-utils"
fi
+ old_cd_rules=${ROOT}etc/udev/rules.d/70-persistent-cd.rules
old_net_rules=${ROOT}etc/udev/rules.d/70-persistent-net.rules
- if [[ -f ${old_net_rules} ]]; then
- ewarn "You still have ${old_net_rules} in place from previous udev release."
- ewarn "Upstream has removed the possibility of renaming to existing"
- ewarn "network interfaces. For example, it's not possible to assign based"
- ewarn "on MAC address to existing interface eth0."
- ewarn "See http://bugs.gentoo.org/453494 for more information."
- ewarn "Rename your file to something else starting with 70- to silence"
- ewarn "this warning."
- fi
+ for old_rules in "${old_cd_rules}" "${old_net_rules}"; do
+ if [[ -f ${old_rules} ]]
+ then
+ ewarn
+ ewarn "File ${old_rules} is from old udev installation but if you still use it,"
+ ewarn "rename it to something else starting with 70- to silence this"
+ ewarn "deprecation warning."
+ fi
+ done
+
+ ewarn
+ ewarn "We don't install ${ROOT}etc/udev/rules.d/80-net-name-slot.rules anymore"
+ ewarn "and the new predictable network interface names are used by default:"
+ ewarn "http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
ewarn
ewarn "You need to restart udev as soon as possible to make the upgrade go"
ewarn "into effect."
ewarn "The method you use to do this depends on your init system."
- ewarn
preserve_old_lib_notify /{,usr/}$(get_libdir)/libudev$(get_libname 0)
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-9999.ebuild
@ 2013-03-08 22:51 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 38+ messages in thread
From: Samuli Suominen (ssuominen) @ 2013-03-08 22:51 UTC (permalink / raw
To: gentoo-commits
ssuominen 13/03/08 22:51:25
Modified: ChangeLog udev-9999.ebuild
Log:
keepdir rules.d dir in /etc
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.846 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.846&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.846&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.845&r2=1.846
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.845
retrieving revision 1.846
diff -u -r1.845 -r1.846
--- ChangeLog 8 Mar 2013 22:45:03 -0000 1.845
+++ ChangeLog 8 Mar 2013 22:51:25 -0000 1.846
@@ -1,10 +1,11 @@
# ChangeLog for sys-fs/udev
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.845 2013/03/08 22:45:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.846 2013/03/08 22:51:25 ssuominen Exp $
08 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> udev-9999.ebuild:
- Stop installing 80-net-name-slot.rules. Pass --without-python to avoid
- dev-python/sphinx.
+ Stop installing /etc/udev/rules.d/80-net-name-slot.rules and keepdir
+ /etc/udev/rules.d to keep the directory in place.
+ Pass --without-python to avoid dev-python/sphinx.
06 Mar 2013; Raúl Porcel <armin76@gentoo.org> udev-197-r8.ebuild:
m68k/s390/sh/sparc stable wrt #457568
1.183 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.183&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.183&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.182&r2=1.183
Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- udev-9999.ebuild 8 Mar 2013 22:45:59 -0000 1.182
+++ udev-9999.ebuild 8 Mar 2013 22:51:25 -0000 1.183
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.182 2013/03/08 22:45:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.183 2013/03/08 22:51:25 ssuominen Exp $
EAPI=4
@@ -356,6 +356,8 @@
dosym /sbin/udevd "$(systemd_get_utildir)"/systemd-udevd
find "${ED}/$(systemd_get_unitdir)" -name '*.service' -exec \
sed -i -e "/ExecStart/s:/lib/systemd:$(systemd_get_utildir):" {} +
+
+ keepdir /etc/udev/rules.d
}
pkg_preinst()
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-9999.ebuild
@ 2013-03-08 23:08 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 38+ messages in thread
From: Samuli Suominen (ssuominen) @ 2013-03-08 23:08 UTC (permalink / raw
To: gentoo-commits
ssuominen 13/03/08 23:08:54
Modified: ChangeLog udev-9999.ebuild
Log:
better fix for last commit
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.847 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.847&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.847&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.846&r2=1.847
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.846
retrieving revision 1.847
diff -u -r1.846 -r1.847
--- ChangeLog 8 Mar 2013 22:51:25 -0000 1.846
+++ ChangeLog 8 Mar 2013 23:08:54 -0000 1.847
@@ -1,10 +1,11 @@
# ChangeLog for sys-fs/udev
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.846 2013/03/08 22:51:25 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.847 2013/03/08 23:08:54 ssuominen Exp $
08 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> udev-9999.ebuild:
- Stop installing /etc/udev/rules.d/80-net-name-slot.rules and keepdir
- /etc/udev/rules.d to keep the directory in place.
+ Stop installing /etc/udev/rules.d/80-net-name-slot.rules and set values
+ for INSTALL_DIRS to keep /etc/udev/{hwdb,rules}.d directories with the
+ install-directories-hook target.
Pass --without-python to avoid dev-python/sphinx.
06 Mar 2013; Raúl Porcel <armin76@gentoo.org> udev-197-r8.ebuild:
1.184 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.184&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.184&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.183&r2=1.184
Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- udev-9999.ebuild 8 Mar 2013 22:51:25 -0000 1.183
+++ udev-9999.ebuild 8 Mar 2013 23:08:54 -0000 1.184
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.183 2013/03/08 22:51:25 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.184 2013/03/08 23:08:54 ssuominen Exp $
EAPI=4
@@ -305,6 +305,7 @@
install-typelibsDATA
install-dist_docDATA
libudev-install-hook
+ install-directories-hook
)
if use gudev
@@ -328,6 +329,8 @@
units/systemd-udev-settle.service"
pkgconfiglib_DATA="${pkgconfiglib_DATA}"
systemunitdir="$(systemd_get_unitdir)"
+ INSTALL_DIRS='$(sysconfdir)/udev/rules.d \
+ $(sysconfdir)/udev/hwdb.d'
)
emake DESTDIR="${D}" "${targets[@]}"
if use doc
@@ -356,8 +359,6 @@
dosym /sbin/udevd "$(systemd_get_utildir)"/systemd-udevd
find "${ED}/$(systemd_get_unitdir)" -name '*.service' -exec \
sed -i -e "/ExecStart/s:/lib/systemd:$(systemd_get_utildir):" {} +
-
- keepdir /etc/udev/rules.d
}
pkg_preinst()
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-9999.ebuild
@ 2013-03-26 17:43 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 38+ messages in thread
From: Samuli Suominen (ssuominen) @ 2013-03-26 17:43 UTC (permalink / raw
To: gentoo-commits
ssuominen 13/03/26 17:43:31
Modified: ChangeLog udev-9999.ebuild
Log:
Remove separate /usr warning since it doesn't belong to sys-fs/udev anymore since we install it to / instead of /usr and it's not sys-fs/udev's problem if something from /usr gets used in early boot, like keymaps from sys-apps/kbd or net-wireless/bluez for bluetooth keyboard, wrt bug #463386.
(Portage version: 2.2.0_alpha169/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.877 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.877&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.877&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.876&r2=1.877
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.876
retrieving revision 1.877
diff -u -r1.876 -r1.877
--- ChangeLog 24 Mar 2013 17:04:06 -0000 1.876
+++ ChangeLog 26 Mar 2013 17:43:31 -0000 1.877
@@ -1,6 +1,12 @@
# ChangeLog for sys-fs/udev
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.876 2013/03/24 17:04:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.877 2013/03/26 17:43:31 ssuominen Exp $
+
+ 26 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> udev-9999.ebuild:
+ Remove separate /usr warning since it doesn't belong to sys-fs/udev anymore
+ since we install it to / instead of /usr and it's not sys-fs/udev's problem
+ if something from /usr gets used in early boot, like keymaps from
+ sys-apps/kbd or net-wireless/bluez for bluetooth keyboard, wrt bug #463386.
24 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> -udev-198-r5.ebuild:
old
1.208 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.208&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.208&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.207&r2=1.208
Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- udev-9999.ebuild 24 Mar 2013 09:26:55 -0000 1.207
+++ udev-9999.ebuild 26 Mar 2013 17:43:31 -0000 1.208
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.207 2013/03/24 09:26:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.208 2013/03/26 17:43:31 ssuominen Exp $
EAPI=5
@@ -361,15 +361,6 @@
preserve_old_lib /{,usr/}$(get_libdir)/libudev$(get_libname 0)
}
-# This function determines if a directory is a mount point.
-# It was lifted from dracut.
-ismounted() {
- while read a m a; do
- [[ $m = $1 ]] && return 0
- done < "${ROOT}"/proc/mounts
- return 1
-}
-
pkg_postinst() {
mkdir -p "${ROOT}"run
@@ -392,24 +383,6 @@
einfo "Removed unneeded file ${old_dm_rules}"
fi
- if ismounted /usr; then
- ewarn
- ewarn "Your system has /usr on a separate partition. This means"
- ewarn "you will need to use an initramfs to pre-mount /usr before"
- ewarn "udev runs."
- ewarn
- ewarn "If this is not set up before your next reboot, udev may work;"
- ewarn "However, you also may experience failures which are very"
- ewarn "difficult to troubleshoot."
- ewarn
- ewarn "For a more detailed explanation, see the following URL:"
- ewarn "http://www.freedesktop.org/wiki/Software/systemd/separate-usr-is-broken"
- ewarn
- ewarn "For more information on setting up an initramfs, see the"
- ewarn "following URL:"
- ewarn "http://www.gentoo.org/doc/en/initramfs-guide.xml"
- fi
-
local fstab="${ROOT}"etc/fstab dev path fstype rest
while read -r dev path fstype rest; do
if [[ ${path} == /dev && ${fstype} != devtmpfs ]]; then
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-9999.ebuild
@ 2013-03-26 19:23 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 38+ messages in thread
From: Samuli Suominen (ssuominen) @ 2013-03-26 19:23 UTC (permalink / raw
To: gentoo-commits
ssuominen 13/03/26 19:23:33
Modified: ChangeLog udev-9999.ebuild
Log:
Synchronize the sys-apps/systemd blocker with ones in 198-r6 and 199 as approved by floppym.
(Portage version: 2.2.0_alpha169/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.879 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.879&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.879&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.878&r2=1.879
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.878
retrieving revision 1.879
diff -u -r1.878 -r1.879
--- ChangeLog 26 Mar 2013 19:20:02 -0000 1.878
+++ ChangeLog 26 Mar 2013 19:23:33 -0000 1.879
@@ -1,6 +1,10 @@
# ChangeLog for sys-fs/udev
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.878 2013/03/26 19:20:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.879 2013/03/26 19:23:33 ssuominen Exp $
+
+ 26 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> udev-9999.ebuild:
+ Synchronize the sys-apps/systemd blocker with ones in 198-r6 and 199 as
+ approved by floppym.
*udev-199 (26 Mar 2013)
1.210 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.210&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.210&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.209&r2=1.210
Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- udev-9999.ebuild 26 Mar 2013 19:20:02 -0000 1.209
+++ udev-9999.ebuild 26 Mar 2013 19:23:33 -0000 1.210
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.209 2013/03/26 19:20:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.210 2013/03/26 19:23:33 ssuominen Exp $
EAPI=5
@@ -43,7 +43,7 @@
kmod? ( >=sys-apps/kmod-12 )
selinux? ( >=sys-libs/libselinux-2.1.9 )
!<sys-libs/glibc-2.11
- !<sys-apps/systemd-${PV}"
+ !sys-apps/systemd"
DEPEND="${COMMON_DEPEND}
virtual/os-headers
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-9999.ebuild
@ 2013-04-18 17:57 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 38+ messages in thread
From: Samuli Suominen (ssuominen) @ 2013-04-18 17:57 UTC (permalink / raw
To: gentoo-commits
ssuominen 13/04/18 17:57:31
Modified: ChangeLog udev-9999.ebuild
Log:
Fix building with USE="-keymap" since upstream went from AC_PATH_TOOL to AC_CHECK_TOOL
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.906 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.906&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.906&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.905&r2=1.906
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.905
retrieving revision 1.906
diff -u -r1.905 -r1.906
--- ChangeLog 18 Apr 2013 02:14:20 -0000 1.905
+++ ChangeLog 18 Apr 2013 17:57:31 -0000 1.906
@@ -1,6 +1,12 @@
# ChangeLog for sys-fs/udev
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.905 2013/04/18 02:14:20 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.906 2013/04/18 17:57:31 ssuominen Exp $
+
+ 18 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> udev-9999.ebuild:
+ Use ac_cv_prog_ac_ct_GPERF instead of ac_cv_path_GPERF to disable
+ dev-util/gperf for USE="-keymap". See following commit,
+ http://cgit.freedesktop.org/systemd/systemd/commit/?id=ac714a78fdca481488d88f
+ 84b6332d28083a4511
18 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> -udev-198-r6.ebuild,
-udev-199-r1.ebuild:
1.223 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.223&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.223&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.222&r2=1.223
Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- udev-9999.ebuild 10 Apr 2013 07:15:33 -0000 1.222
+++ udev-9999.ebuild 18 Apr 2013 17:57:31 -0000 1.223
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.222 2013/04/10 07:15:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.223 2013/04/18 17:57:31 ssuominen Exp $
EAPI=5
@@ -192,7 +192,7 @@
src_configure() {
tc-export CC #463846
- use keymap || export ac_cv_path_GPERF=true #452760
+ use keymap || export ac_cv_prog_ac_ct_GPERF=true #452760
local econf_args
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-9999.ebuild
@ 2013-05-17 13:50 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 38+ messages in thread
From: Samuli Suominen (ssuominen) @ 2013-05-17 13:50 UTC (permalink / raw
To: gentoo-commits
ssuominen 13/05/17 13:50:18
Modified: ChangeLog udev-9999.ebuild
Log:
revert
(Portage version: 2.2.0_alpha174/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.917 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.917&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.917&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.916&r2=1.917
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.916
retrieving revision 1.917
diff -u -r1.916 -r1.917
--- ChangeLog 17 May 2013 13:44:44 -0000 1.916
+++ ChangeLog 17 May 2013 13:50:18 -0000 1.917
@@ -1,11 +1,6 @@
# ChangeLog for sys-fs/udev
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.916 2013/05/17 13:44:44 ssuominen Exp $
-
- 17 May 2013; Samuli Suominen <ssuominen@gentoo.org> udev-9999.ebuild,
- +files/logind, metadata.xml:
- Initial commit of USE="logind" wrt #461940. For example, manpages are known
- to be missing.
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.917 2013/05/17 13:50:18 ssuominen Exp $
15 May 2013; Samuli Suominen <ssuominen@gentoo.org> -udev-202.ebuild,
-udev-203.ebuild:
1.228 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.228&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.228&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.227&r2=1.228
Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -r1.227 -r1.228
--- udev-9999.ebuild 17 May 2013 13:44:44 -0000 1.227
+++ udev-9999.ebuild 17 May 2013 13:50:18 -0000 1.228
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.227 2013/05/17 13:44:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.228 2013/05/17 13:50:18 ssuominen Exp $
EAPI=5
@@ -11,7 +11,7 @@
KV_min=2.6.32
fi
-inherit autotools eutils linux-info multilib pam toolchain-funcs versionator
+inherit autotools eutils linux-info multilib toolchain-funcs versionator
if [[ ${PV} = 9999* ]]; then
EGIT_REPO_URI="git://anongit.freedesktop.org/systemd/systemd"
@@ -32,21 +32,14 @@
LICENSE="LGPL-2.1 MIT GPL-2"
SLOT="0"
-IUSE="acl audit doc +firmware-loader gudev hwdb introspection logind keymap +kmod +openrc pam selinux static-libs"
+IUSE="acl doc +firmware-loader gudev hwdb introspection keymap +kmod +openrc selinux static-libs"
RESTRICT="test"
COMMON_DEPEND=">=sys-apps/util-linux-2.20
+ acl? ( sys-apps/acl )
gudev? ( >=dev-libs/glib-2 )
introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
- logind? (
- sys-apps/dbus
- sys-auth/polkit
- sys-libs/libcap
- acl? ( sys-apps/acl )
- audit? ( >=sys-process/audit-2 )
- pam? ( virtual/pam )
- )
kmod? ( >=sys-apps/kmod-13 )
selinux? ( >=sys-libs/libselinux-2.1.9 )
!<sys-libs/glibc-2.11
@@ -60,8 +53,7 @@
virtual/pkgconfig
!<sys-kernel/linux-headers-${KV_min}
doc? ( >=dev-util/gtk-doc-1.18 )
- keymap? ( dev-util/gperf )
- logind? ( dev-util/gperf )"
+ keymap? ( dev-util/gperf )"
if [[ ${PV} = 9999* ]]; then
DEPEND="${DEPEND}
@@ -85,7 +77,7 @@
S=${WORKDIR}/systemd-${PV}
-QA_MULTILIB_PATHS="lib/systemd/.*"
+#QA_MULTILIB_PATHS="lib/systemd/systemd-udevd"
udev_check_KV() {
if kernel_is lt ${KV_min//./ }; then
@@ -109,8 +101,6 @@
pkg_setup() {
CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL"
- # check me from console login using pam module -> required just like for pam_ck_connector.so.?
- # use logind && CONFIG_CHECK++=" ~AUDITSYSCALL"
linux-info_pkg_setup
@@ -203,69 +193,58 @@
src_configure() {
tc-export CC #463846
- use keymap || { use logind || export ac_cv_prog_ac_ct_GPERF=true; } #452760
+ use keymap || export ac_cv_prog_ac_ct_GPERF=true #452760
local econf_args
econf_args=(
- --libdir="/usr/$(get_libdir)"
+ ac_cv_search_cap_init=
+ ac_cv_header_sys_capability_h=yes
+ DBUS_CFLAGS=' '
+ DBUS_LIBS=' '
+ --bindir=/bin
--docdir=/usr/share/doc/${PF}
- $(use_enable static-libs static)
- --disable-nls
- $(use_enable doc gtk-doc)
- $(use_enable kmod)
- --disable-ima
- $(use_enable selinux)
- --disable-xz
- --disable-tcpwrap
- --disable-pam
- --disable-acl
+ --libdir=/usr/$(get_libdir)
+ --with-html-dir=/usr/share/doc/${PF}/html
+ --with-rootprefix=
+ --with-rootlibdir=/$(get_libdir)
+ --with-bashcompletiondir=/usr/share/bash-completion
+ --without-python
--disable-audit
+ --disable-coredump
+ --disable-hostnamed
+ --disable-ima
--disable-libcryptsetup
- --disable-readahead
- --disable-quotacheck
+ --disable-localed
--disable-logind
- --disable-hostnamed
+ --disable-myhostname
+ --disable-nls
+ --disable-pam
+ --disable-quotacheck
+ --disable-readahead
+ --enable-split-usr
+ --disable-tcpwrap
--disable-timedated
- --disable-localed
- --disable-coredump
+ --disable-xz
--disable-polkit
- --disable-myhostname
+ $(use_enable acl)
+ $(use_enable doc gtk-doc)
$(use_enable gudev)
$(use_enable keymap)
- --enable-split-usr
- --with-html-dir=/usr/share/doc/${PF}/html
- --without-python
- --with-bashcompletiondir=/usr/share/bash-completion
- --with-rootprefix=
- --with-rootlibdir=/$(get_libdir)
+ $(use_enable kmod)
+ $(use_enable selinux)
+ $(use_enable static-libs static)
)
-
- if use logind; then
+ if use introspection; then
econf_args+=(
- --enable-logind
- --enable-polkit
- $(use_enable acl)
- $(use_enable audit)
+ --enable-introspection=$(usex introspection)
)
- if use pam; then
- econf_args+=(
- --enable-pam
- --with-pamlibdir="$(getpam_mod_dir)"
- )
- fi
- else
+ fi
+ if use firmware-loader; then
econf_args+=(
- ac_cv_search_cap_init=
- ac_cv_header_sys_capability_h=yes
- DBUS_CFLAGS=' '
- DBUS_LIBS=' '
+ --with-firmware-path="/lib/firmware/updates:/lib/firmware"
)
fi
-
- use firmware-loader && econf_args+=( -with-firmware-path="/lib/firmware/updates:/lib/firmware" )
- use introspection && econf_args+=( --enable-introspection=$(usex introspection) )
-
econf "${econf_args[@]}"
}
@@ -273,6 +252,7 @@
echo 'BUILT_SOURCES: $(BUILT_SOURCES)' > "${T}"/Makefile.extra
emake -f Makefile -f "${T}"/Makefile.extra BUILT_SOURCES
local targets=(
+ libudev.la
systemd-udevd
udevadm
ata_id
@@ -287,22 +267,9 @@
man/systemd-udevd.service.8
)
use keymap && targets+=( keymap )
- if use logind; then
- logind_targets=(
- libsystemd-daemon.la
- libsystemd-login.la
- systemd-logind
- systemd-user-sessions
- loginctl
- )
- use pam && logind_targets+=( pam_systemd.la )
- fi
use gudev && targets+=( libgudev-1.0.la )
- # Build libudev.la and dependencies before the helpers (parallel error)
- emake libudev.la
emake "${targets[@]}"
- emake -j1 "${logind_targets}"
if use doc; then
emake -C docs/libudev
use gudev && emake -C docs/gudev
@@ -310,17 +277,14 @@
}
src_install() {
- local lib_LTLIBRARIES=libudev.la \
- pkgconfiglib_DATA=src/libudev/libudev.pc \
- dist_bashcompletion_DATA=shell-completion/bash/udevadm \
- rootbin_PROGRAMS=udevadm \
- rootlibexec_PROGRAMS=systemd-udevd
+ local lib_LTLIBRARIES="libudev.la" \
+ pkgconfiglib_DATA="src/libudev/libudev.pc"
local targets=(
install-libLTLIBRARIES
install-includeHEADERS
install-libgudev_includeHEADERS
- install-rootbinPROGRAMS
+ install-binPROGRAMS
install-rootlibexecPROGRAMS
install-udevlibexecPROGRAMS
install-dist_udevconfDATA
@@ -338,35 +302,17 @@
libudev-install-hook
install-directories-hook
install-dist_bashcompletionDATA
- install-dist_pkgsysconfDATA
- install-pamlibLTLIBRARIES
- install-pkgincludeHEADERS
)
- # add final values of variables:
if use gudev; then
lib_LTLIBRARIES+=" libgudev-1.0.la"
pkgconfiglib_DATA+=" src/gudev/gudev-1.0.pc"
fi
- if use logind; then
- dist_bashcompletion_DATA+=" shell-completion/bash/loginctl"
- lib_LTLIBRARIES+=" libsystemd-login.la libsystemd-daemon.la"
- rootlibexec_PROGRAMS+=" systemd-logind systemd-user-sessions"
- rootbin_PROGRAMS+=" loginctl"
- pkgconfiglib_DATA+=" src/login/libsystemd-login.pc"
- dist_pkgsysconf_DATA+=" src/login/logind.conf"
- pkgconfiglib_DATA+=" src/libsystemd-daemon/libsystemd-daemon.pc"
- use pam && pamlib_LTLIBRARIES+=" pam_systemd.la"
- pkginclude_HEADERS+=" src/systemd/sd-daemon.h"
- targets+=( libsystemd-daemon-install-hook )
- fi
-
+ # add final values of variables:
targets+=(
- pkginclude_HEADERS="${pkginclude_HEADERS}"
- dist_pkgsysconf_DATA="${dist_pkgsysconf_DATA}"
- rootlibexec_PROGRAMS="${rootlibexec_PROGRAMS}"
- rootbin_PROGRAMS="${rootbin_PROGRAMS}"
+ rootlibexec_PROGRAMS=systemd-udevd
+ bin_PROGRAMS=udevadm
lib_LTLIBRARIES="${lib_LTLIBRARIES}"
MANPAGES="man/udev.7 man/udevadm.8 \
man/systemd-udevd.service.8"
@@ -374,9 +320,8 @@
pkgconfiglib_DATA="${pkgconfiglib_DATA}"
INSTALL_DIRS='$(sysconfdir)/udev/rules.d \
$(sysconfdir)/udev/hwdb.d'
- dist_bashcompletion_DATA="${dist_bashcompletion_DATA}"
+ dist_bashcompletion_DATA="shell-completion/bash/udevadm"
)
-
emake -j1 DESTDIR="${D}" "${targets[@]}"
if use doc; then
emake -C docs/libudev DESTDIR="${D}" install
@@ -389,10 +334,11 @@
"${D}"/lib/udev/rules.d/99-systemd.rules \
"${D}"/usr/share/doc/${PF}/LICENSE.*
+ # see src_prepare() for content of these files
insinto /lib/udev/rules.d
doins "${T}"/40-gentoo.rules
-
- doman "${T}"/*.8
+ doman "${T}"/udevd.8
+ doman "${T}"/systemd-udevd.8
# install udevadm compatibility symlink
dosym {../bin,sbin}/udevadm
@@ -400,12 +346,7 @@
# install udevd to /sbin and remove empty and redudant directory
# /lib/systemd because systemd is installed to /usr wrt #462750
mv "${D}"/{lib/systemd/systemd-,sbin/}udevd || die
-
- if use logind; then
- doinitd "${FILESDIR}"/logind
- else
- rm -r "${D}"/lib/systemd
- fi
+ rm -r "${D}"/lib/systemd
}
pkg_preinst() {
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-9999.ebuild
@ 2013-06-07 18:00 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 38+ messages in thread
From: Samuli Suominen (ssuominen) @ 2013-06-07 18:00 UTC (permalink / raw
To: gentoo-commits
ssuominen 13/06/07 18:00:05
Modified: ChangeLog udev-9999.ebuild
Log:
Revert upstream commit that discontinued support for --enable-static in order to get libudev.a back for USE="static" in sys-fs/cryptsetup and sys-fs/lvm2 wrt #472608
(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.919 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.919&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.919&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.918&r2=1.919
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.918
retrieving revision 1.919
diff -u -r1.918 -r1.919
--- ChangeLog 2 Jun 2013 13:29:15 -0000 1.918
+++ ChangeLog 7 Jun 2013 18:00:05 -0000 1.919
@@ -1,6 +1,11 @@
# ChangeLog for sys-fs/udev
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.918 2013/06/02 13:29:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.919 2013/06/07 18:00:05 ssuominen Exp $
+
+ 07 Jun 2013; Samuli Suominen <ssuominen@gentoo.org> udev-9999.ebuild:
+ Revert upstream commit that discontinued support for --enable-static in order
+ to get libudev.a back for USE="static" in sys-fs/cryptsetup and sys-fs/lvm2
+ wrt #472608
02 Jun 2013; Jeroen Roovers <jer@gentoo.org> udev-204.ebuild:
Stable for HPPA (bug #470580).
1.229 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.229&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.229&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.228&r2=1.229
Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -r1.228 -r1.229
--- udev-9999.ebuild 17 May 2013 13:50:18 -0000 1.228
+++ udev-9999.ebuild 7 Jun 2013 18:00:05 -0000 1.229
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.228 2013/05/17 13:50:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.229 2013/06/07 18:00:05 ssuominen Exp $
EAPI=5
@@ -181,6 +181,11 @@
elibtoolize
fi
+ # Restore possibility of running --enable-static wrt #472608
+ sed -i \
+ -e '/--enable-static is not supported by systemd/s:as_fn_error:echo:' \
+ configure || die
+
if ! use elibc_glibc; then #443030
echo '#define secure_getenv(x) NULL' >> config.h.in
sed -i -e '/error.*secure_getenv/s:.*:#define secure_getenv(x) NULL:' src/shared/missing.h || die
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-9999.ebuild
@ 2013-07-01 17:32 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 38+ messages in thread
From: Samuli Suominen (ssuominen) @ 2013-07-01 17:32 UTC (permalink / raw
To: gentoo-commits
ssuominen 13/07/01 17:32:10
Modified: ChangeLog udev-9999.ebuild
Log:
Improve the postinst message about networking wrt #474864 by "Coacher". Pass --disable-tmpfiles to follow upstream git. Separate building of the udev helpers to avoid more parallel make problems that aren't fixed by upgrading sys-devel/make to 3.82-r4.
(Portage version: 2.2.0_alpha184/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.931 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.931&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.931&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.930&r2=1.931
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.930
retrieving revision 1.931
diff -u -r1.930 -r1.931
--- ChangeLog 30 Jun 2013 18:05:43 -0000 1.930
+++ ChangeLog 1 Jul 2013 17:32:10 -0000 1.931
@@ -1,6 +1,12 @@
# ChangeLog for sys-fs/udev
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.930 2013/06/30 18:05:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.931 2013/07/01 17:32:10 ssuominen Exp $
+
+ 01 Jul 2013; Samuli Suominen <ssuominen@gentoo.org> udev-9999.ebuild:
+ Improve the postinst message about networking wrt #474864 by "Coacher". Pass
+ --disable-tmpfiles to follow upstream git. Separate building of the udev
+ helpers to avoid more parallel make problems that aren't fixed by upgrading
+ sys-devel/make to 3.82-r4.
30 Jun 2013; Agostino Sarubbo <ago@gentoo.org> udev-204.ebuild:
Stable for s390, wrt bug #470580
1.230 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.230&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.230&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.229&r2=1.230
Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -r1.229 -r1.230
--- udev-9999.ebuild 7 Jun 2013 18:00:05 -0000 1.229
+++ udev-9999.ebuild 1 Jul 2013 17:32:10 -0000 1.230
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.229 2013/06/07 18:00:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.230 2013/07/01 17:32:10 ssuominen Exp $
EAPI=5
@@ -147,6 +147,14 @@
SUBSYSTEM=="mem", KERNEL=="null|zero|full|random|urandom", MODE="0666"
EOF
+ # Create link to systemd-udevd.8 here to avoid parallel build problem and
+ # while at it, create convinience link to `man 8 udevd` even if upstream
+ # doesn't do that anymore
+ local man
+ for man in udevd systemd-udevd; do
+ echo '.so systemd-udevd.service.8' > "${T}"/${man}.8
+ done
+
# Remove requirements for gettext and intltool wrt bug #443028
if ! has_version dev-util/intltool && ! [[ ${PV} = 9999* ]]; then
sed -i \
@@ -190,10 +198,6 @@
echo '#define secure_getenv(x) NULL' >> config.h.in
sed -i -e '/error.*secure_getenv/s:.*:#define secure_getenv(x) NULL:' src/shared/missing.h || die
fi
-
- # link udevd(8) and systemd-udevd(8) manpages to systemd-udevd.service(8) manpage
- echo '.so systemd-udevd.service.8' > "${T}"/udevd.8
- echo '.so systemd-udevd.service.8' > "${T}"/systemd-udevd.8
}
src_configure() {
@@ -201,13 +205,11 @@
use keymap || export ac_cv_prog_ac_ct_GPERF=true #452760
local econf_args
-
econf_args=(
ac_cv_search_cap_init=
ac_cv_header_sys_capability_h=yes
DBUS_CFLAGS=' '
DBUS_LIBS=' '
- --bindir=/bin
--docdir=/usr/share/doc/${PF}
--libdir=/usr/$(get_libdir)
--with-html-dir=/usr/share/doc/${PF}/html
@@ -232,6 +234,9 @@
--disable-timedated
--disable-xz
--disable-polkit
+ --disable-smack
+ --disable-tmpfiles
+ --enable-introspection=$(usex introspection)
$(use_enable acl)
$(use_enable doc gtk-doc)
$(use_enable gudev)
@@ -240,26 +245,30 @@
$(use_enable selinux)
$(use_enable static-libs static)
)
- if use introspection; then
- econf_args+=(
- --enable-introspection=$(usex introspection)
- )
- fi
- if use firmware-loader; then
- econf_args+=(
- --with-firmware-path="/lib/firmware/updates:/lib/firmware"
- )
- fi
+ use firmware-loader && econf_args+=( --with-firmware-path="/lib/firmware/updates:/lib/firmware" )
+
econf "${econf_args[@]}"
}
src_compile() {
echo 'BUILT_SOURCES: $(BUILT_SOURCES)' > "${T}"/Makefile.extra
emake -f Makefile -f "${T}"/Makefile.extra BUILT_SOURCES
- local targets=(
- libudev.la
+
+ # Most of the parallel build problems were solved by >=sys-devel/make-3.82-r4,
+ # but not everything -- separate building of the binaries as a workaround,
+ # which will force internal libraries required for the helpers to be built
+ # early enough, like eg. libsystemd-shared.la
+ local lib_targets=( libudev.la )
+ use gudev && lib_targets+=( libgudev-1.0.la )
+ emake "${lib_targets[@]}"
+
+ local exec_targets=(
systemd-udevd
udevadm
+ )
+ emake "${exec_targets[@]}"
+
+ local helper_targets=(
ata_id
cdrom_id
collect
@@ -267,14 +276,17 @@
v4l_id
accelerometer
mtd_probe
+ )
+ use keymap && helper_targets+=( keymap )
+ emake "${helper_targets[@]}"
+
+ local man_targets=(
man/udev.7
man/udevadm.8
man/systemd-udevd.service.8
)
- use keymap && targets+=( keymap )
- use gudev && targets+=( libgudev-1.0.la )
+ emake "${man_targets[@]}"
- emake "${targets[@]}"
if use doc; then
emake -C docs/libudev
use gudev && emake -C docs/gudev
@@ -289,7 +301,7 @@
install-libLTLIBRARIES
install-includeHEADERS
install-libgudev_includeHEADERS
- install-binPROGRAMS
+ install-rootbinPROGRAMS
install-rootlibexecPROGRAMS
install-udevlibexecPROGRAMS
install-dist_udevconfDATA
@@ -317,7 +329,7 @@
# add final values of variables:
targets+=(
rootlibexec_PROGRAMS=systemd-udevd
- bin_PROGRAMS=udevadm
+ rootbin_PROGRAMS=udevadm
lib_LTLIBRARIES="${lib_LTLIBRARIES}"
MANPAGES="man/udev.7 man/udevadm.8 \
man/systemd-udevd.service.8"
@@ -339,11 +351,10 @@
"${D}"/lib/udev/rules.d/99-systemd.rules \
"${D}"/usr/share/doc/${PF}/LICENSE.*
- # see src_prepare() for content of these files
+ # see src_prepare() for content of these
insinto /lib/udev/rules.d
doins "${T}"/40-gentoo.rules
- doman "${T}"/udevd.8
- doman "${T}"/systemd-udevd.8
+ doman "${T}"/{systemd-,}udevd.8
# install udevadm compatibility symlink
dosym {../bin,sbin}/udevadm
@@ -433,23 +444,27 @@
fi
done
+ elog
+ elog "Starting from version >= 200 the new predictable network interface names are"
+ elog "used by default, see:"
+ elog "http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
+ elog "http://cgit.freedesktop.org/systemd/systemd/tree/src/udev/udev-builtin-net_id.c"
+ elog
+ elog "Example command to get the information for the new interface name before booting"
+ elog "(replace <ifname> with, for example, eth0):"
+ elog "# udevadm test-builtin net_id /sys/class/net/<ifname> 2> /dev/null"
+ elog
+ elog "You can use either kernel parameter \"net.ifnames=0\", create empty"
+ elog "file /etc/udev/rules.d/80-net-name-slot.rules, or symlink it to /dev/null"
+ elog "to disable the feature."
+
if has_version sys-apps/biosdevname; then
ewarn
- ewarn "You have sys-apps/biosdevname installed which has been deprecated"
- ewarn "in favor of the predictable network interface names."
+ ewarn "You can replace the functionality of sys-apps/biosdevname which you have"
+ ewarn "installed with the new predictable network interface names."
fi
ewarn
- ewarn "The new predictable network interface names are used by default, see:"
- ewarn "http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
- ewarn
- ewarn "Example command to get the information for the new interface name before booting"
- ewarn "(replace <ifname> with, for example, eth0):"
- ewarn "# udevadm test-builtin net_id /sys/class/net/<ifname> 2> /dev/null"
- ewarn
- ewarn "You can use kernel commandline net.ifnames=0 to disable this feature."
-
- ewarn
ewarn "You need to restart udev as soon as possible to make the upgrade go"
ewarn "into effect."
ewarn "The method you use to do this depends on your init system."
@@ -458,9 +473,9 @@
elog
elog "For more information on udev on Gentoo, upgrading, writing udev rules, and"
- elog " fixing known issues visit:"
- elog " http://wiki.gentoo.org/wiki/Udev/upgrade"
- elog " http://www.gentoo.org/doc/en/udev-guide.xml"
+ elog "fixing known issues visit:"
+ elog "http://wiki.gentoo.org/wiki/Udev/upgrade"
+ elog "http://www.gentoo.org/doc/en/udev-guide.xml"
# Update hwdb database in case the format is changed by udev version.
if use hwdb && has_version 'sys-apps/hwids[udev]'; then
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-9999.ebuild
@ 2013-07-01 17:39 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 38+ messages in thread
From: Samuli Suominen (ssuominen) @ 2013-07-01 17:39 UTC (permalink / raw
To: gentoo-commits
ssuominen 13/07/01 17:39:45
Modified: ChangeLog udev-9999.ebuild
Log:
whitespace, ChangeLog even more
(Portage version: 2.2.0_alpha184/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.932 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.932&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.932&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.931&r2=1.932
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.931
retrieving revision 1.932
diff -u -r1.931 -r1.932
--- ChangeLog 1 Jul 2013 17:32:10 -0000 1.931
+++ ChangeLog 1 Jul 2013 17:39:45 -0000 1.932
@@ -1,12 +1,14 @@
# ChangeLog for sys-fs/udev
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.931 2013/07/01 17:32:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.932 2013/07/01 17:39:45 ssuominen Exp $
01 Jul 2013; Samuli Suominen <ssuominen@gentoo.org> udev-9999.ebuild:
Improve the postinst message about networking wrt #474864 by "Coacher". Pass
--disable-tmpfiles to follow upstream git. Separate building of the udev
helpers to avoid more parallel make problems that aren't fixed by upgrading
- sys-devel/make to 3.82-r4.
+ sys-devel/make to 3.82-r4. Remove --bindir=/bin and follow upstream Makefile.am
+ by using "rootbin" instead of "bin" targets. Move away --enable-introspection
+ from it's own 'if' and 'else'.
30 Jun 2013; Agostino Sarubbo <ago@gentoo.org> udev-204.ebuild:
Stable for s390, wrt bug #470580
1.232 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.232&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.232&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.231&r2=1.232
Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -r1.231 -r1.232
--- udev-9999.ebuild 1 Jul 2013 17:35:27 -0000 1.231
+++ udev-9999.ebuild 1 Jul 2013 17:39:45 -0000 1.232
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.231 2013/07/01 17:35:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.232 2013/07/01 17:39:45 ssuominen Exp $
EAPI=5
@@ -350,7 +350,7 @@
"${D}"/lib/udev/rules.d/99-systemd.rules \
"${D}"/usr/share/doc/${PF}/LICENSE.*
- # see src_prepare() for content of these
+ # see src_prepare() for content of these files
insinto /lib/udev/rules.d
doins "${T}"/40-gentoo.rules
doman "${T}"/{systemd-,}udevd.8
@@ -459,8 +459,8 @@
if has_version sys-apps/biosdevname; then
ewarn
- ewarn "You can replace the functionality of sys-apps/biosdevname which you have"
- ewarn "installed with the new predictable network interface names."
+ ewarn "You can replace the functionality of sys-apps/biosdevname which has been"
+ ewaen "detected to be installed with the new predictable network interface names."
fi
ewarn
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-9999.ebuild
@ 2013-07-09 10:44 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 38+ messages in thread
From: Samuli Suominen (ssuominen) @ 2013-07-09 10:44 UTC (permalink / raw
To: gentoo-commits
ssuominen 13/07/09 10:44:35
Modified: ChangeLog udev-9999.ebuild
Log:
Force at least sys-apps/kmod >= 14 wrt http://cgit.freedesktop.org/systemd/systemd/commit/?id=edeb68c53f1cdc452016b4c8512586a70b1262e3
(Portage version: 2.2.0_alpha186/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.934 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.934&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.934&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.933&r2=1.934
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.933
retrieving revision 1.934
diff -u -r1.933 -r1.934
--- ChangeLog 4 Jul 2013 12:11:15 -0000 1.933
+++ ChangeLog 9 Jul 2013 10:44:35 -0000 1.934
@@ -1,6 +1,11 @@
# ChangeLog for sys-fs/udev
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.933 2013/07/04 12:11:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.934 2013/07/09 10:44:35 ssuominen Exp $
+
+ 09 Jul 2013; Samuli Suominen <ssuominen@gentoo.org> udev-9999.ebuild:
+ Force at least sys-apps/kmod >= 14 wrt
+ http://cgit.freedesktop.org/systemd/systemd/commit/?id=edeb68c53f1cdc452016b4
+ c8512586a70b1262e3
*udev-205 (04 Jul 2013)
1.234 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.234&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.234&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.233&r2=1.234
Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -r1.233 -r1.234
--- udev-9999.ebuild 4 Jul 2013 12:11:15 -0000 1.233
+++ udev-9999.ebuild 9 Jul 2013 10:44:35 -0000 1.234
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.233 2013/07/04 12:11:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.234 2013/07/09 10:44:35 ssuominen Exp $
EAPI=5
@@ -40,7 +40,7 @@
acl? ( sys-apps/acl )
gudev? ( >=dev-libs/glib-2 )
introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
- kmod? ( >=sys-apps/kmod-13 )
+ kmod? ( >=sys-apps/kmod-14 )
selinux? ( >=sys-libs/libselinux-2.1.9 )
!<sys-libs/glibc-2.11
!sys-apps/systemd"
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-9999.ebuild
@ 2013-07-15 11:03 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 38+ messages in thread
From: Samuli Suominen (ssuominen) @ 2013-07-15 11:03 UTC (permalink / raw
To: gentoo-commits
ssuominen 13/07/15 11:03:14
Modified: ChangeLog udev-9999.ebuild
Log:
gperf is a harrdep again, due to changes made by upstream in git
(Portage version: 2.2.0_alpha186/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.935 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.935&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.935&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.934&r2=1.935
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.934
retrieving revision 1.935
diff -u -r1.934 -r1.935
--- ChangeLog 9 Jul 2013 10:44:35 -0000 1.934
+++ ChangeLog 15 Jul 2013 11:03:14 -0000 1.935
@@ -1,6 +1,13 @@
# ChangeLog for sys-fs/udev
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.934 2013/07/09 10:44:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.935 2013/07/15 11:03:14 ssuominen Exp $
+
+ 15 Jul 2013; Samuli Suominen <ssuominen@gentoo.org> udev-9999.ebuild:
+ Force dev-util/gperf DEPEND for upstream commit of:
+ http://cgit.freedesktop.org/systemd/systemd/commit/?id=9d7d42bc406a2ac0463967
+ 4281ce3ff6beeda790
+ This will revert commit for bug #452760 that made it optional dependency you
+ could avoid by setting USE="-keymap"
09 Jul 2013; Samuli Suominen <ssuominen@gentoo.org> udev-9999.ebuild:
Force at least sys-apps/kmod >= 14 wrt
1.235 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.235&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.235&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.234&r2=1.235
Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -r1.234 -r1.235
--- udev-9999.ebuild 9 Jul 2013 10:44:35 -0000 1.234
+++ udev-9999.ebuild 15 Jul 2013 11:03:14 -0000 1.235
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.234 2013/07/09 10:44:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.235 2013/07/15 11:03:14 ssuominen Exp $
EAPI=5
@@ -44,23 +44,19 @@
selinux? ( >=sys-libs/libselinux-2.1.9 )
!<sys-libs/glibc-2.11
!sys-apps/systemd"
-
DEPEND="${COMMON_DEPEND}
app-text/docbook-xsl-stylesheets
dev-libs/libxslt
+ dev-util/gperf
>=sys-devel/make-3.82-r4
virtual/os-headers
virtual/pkgconfig
!<sys-kernel/linux-headers-${KV_min}
- doc? ( >=dev-util/gtk-doc-1.18 )
- keymap? ( dev-util/gperf )"
-
+ doc? ( >=dev-util/gtk-doc-1.18 )"
if [[ ${PV} = 9999* ]]; then
DEPEND="${DEPEND}
- dev-util/gperf
>=dev-util/intltool-0.50"
fi
-
RDEPEND="${COMMON_DEPEND}
openrc? ( !<sys-apps/openrc-0.9.9 )
!sys-apps/coldplug
@@ -70,7 +66,6 @@
!<sys-kernel/dracut-017-r1
!<sys-kernel/genkernel-3.4.25
!<sec-policy/selinux-base-2.20120725-r10"
-
PDEPEND=">=virtual/udev-197-r1
hwdb? ( >=sys-apps/hwids-20130326.1[udev] )
openrc? ( >=sys-fs/udev-init-scripts-25 )"
@@ -126,12 +121,6 @@
eerror "The line count for secure_getenv() failed, see bug #443030"
die
fi
-
- # gperf disable if keymaps are not requested wrt bug #452760
- if ! [[ $(grep -i gperf Makefile.am | wc -l) -eq 27 ]]; then
- eerror "The line count for gperf references failed, see bug 452760"
- die
- fi
fi
# backport some patches
@@ -202,7 +191,6 @@
src_configure() {
tc-export CC #463846
- use keymap || export ac_cv_prog_ac_ct_GPERF=true #452760
local econf_args
econf_args=(
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-9999.ebuild
@ 2013-07-16 15:34 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 38+ messages in thread
From: Samuli Suominen (ssuominen) @ 2013-07-16 15:34 UTC (permalink / raw
To: gentoo-commits
ssuominen 13/07/16 15:34:08
Modified: ChangeLog udev-9999.ebuild
Log:
This commit will require 60-keyboard.hwdb file from sys-apps/hwids. Upstream removed keymaps in favour of hwdb based ones, see http://cgit.freedesktop.org/systemd/systemd/commit/?id=ddc77f62244bb41d5c8261517e2e1ff1b763fc94
(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.936 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.936&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.936&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.935&r2=1.936
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.935
retrieving revision 1.936
diff -u -r1.935 -r1.936
--- ChangeLog 15 Jul 2013 11:03:14 -0000 1.935
+++ ChangeLog 16 Jul 2013 15:34:08 -0000 1.936
@@ -1,6 +1,12 @@
# ChangeLog for sys-fs/udev
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.935 2013/07/15 11:03:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.936 2013/07/16 15:34:08 ssuominen Exp $
+
+ 16 Jul 2013; Samuli Suominen <ssuominen@gentoo.org> udev-9999.ebuild:
+ This commit will require 60-keyboard.hwdb file from sys-apps/hwids. Upstream
+ removed keymaps in favour of hwdb based ones, see
+ http://cgit.freedesktop.org/systemd/systemd/commit/?id=ddc77f62244bb41d5c8261
+ 517e2e1ff1b763fc94
15 Jul 2013; Samuli Suominen <ssuominen@gentoo.org> udev-9999.ebuild:
Force dev-util/gperf DEPEND for upstream commit of:
1.236 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.236&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.236&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.235&r2=1.236
Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -r1.235 -r1.236
--- udev-9999.ebuild 15 Jul 2013 11:03:14 -0000 1.235
+++ udev-9999.ebuild 16 Jul 2013 15:34:08 -0000 1.236
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.235 2013/07/15 11:03:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.236 2013/07/16 15:34:08 ssuominen Exp $
EAPI=5
@@ -32,7 +32,7 @@
LICENSE="LGPL-2.1 MIT GPL-2"
SLOT="0"
-IUSE="acl doc +firmware-loader gudev hwdb introspection keymap +kmod +openrc selinux static-libs"
+IUSE="acl doc +firmware-loader gudev hwdb introspection +kmod +openrc selinux static-libs"
RESTRICT="test"
@@ -228,7 +228,6 @@
$(use_enable acl)
$(use_enable doc gtk-doc)
$(use_enable gudev)
- $(use_enable keymap)
$(use_enable kmod)
$(use_enable selinux)
$(use_enable static-libs static)
@@ -265,7 +264,6 @@
accelerometer
mtd_probe
)
- use keymap && helper_targets+=( keymap )
emake "${helper_targets[@]}"
local man_targets=(
@@ -293,9 +291,6 @@
install-rootlibexecPROGRAMS
install-udevlibexecPROGRAMS
install-dist_udevconfDATA
- install-dist_udevhomeSCRIPTS
- install-dist_udevkeymapDATA
- install-dist_udevkeymapforcerelDATA
install-dist_udevrulesDATA
install-girDATA
install-man7
^ permalink raw reply [flat|nested] 38+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-9999.ebuild
@ 2014-02-21 12:18 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 38+ messages in thread
From: Samuli Suominen (ssuominen) @ 2014-02-21 12:18 UTC (permalink / raw
To: gentoo-commits
ssuominen 14/02/21 12:18:06
Modified: ChangeLog udev-9999.ebuild
Log:
Try to make ChangeLog more readable, drop one extra doc that slipped through.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.987 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.987&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.987&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.986&r2=1.987
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.986
retrieving revision 1.987
diff -u -r1.986 -r1.987
--- ChangeLog 21 Feb 2014 12:00:36 -0000 1.986
+++ ChangeLog 21 Feb 2014 12:18:06 -0000 1.987
@@ -1,13 +1,14 @@
# ChangeLog for sys-fs/udev
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.986 2014/02/21 12:00:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.987 2014/02/21 12:18:06 ssuominen Exp $
21 Feb 2014; Samuli Suominen <ssuominen@gentoo.org> udev-9999.ebuild:
- Fix bash completion directory using bash-completion-r1.eclass. Install
- 99-default.link to /lib/systemd and move udevd binary there as well to follow
- suit. Remove reference to now non-existing 80-net-name-slot.rules from
- postinst message. Sort ./configure flags based on --help and only pass
- required --disable flags.
+ Use bash-completion-r1.eclass to determine directory for udevadm.
+ Since /lib/udev/rules.d/80-net-name-slot.rules was replaced with
+ /lib/systemd/network/99-default.link, start installing udevd as
+ systemd-udevd to it's original location at /lib/systemd too.
+ Sort configure flags based on ./configure --help and pass only
+ required --disable flags for ebuild readability.
16 Feb 2014; Samuli Suominen <ssuominen@gentoo.org> udev-9999.ebuild:
Check for CONFIG_FHANDLE wrt http://cgit.freedesktop.org/systemd/systemd/commi
1.264 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.264&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.264&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.263&r2=1.264
Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -r1.263 -r1.264
--- udev-9999.ebuild 21 Feb 2014 12:03:40 -0000 1.263
+++ udev-9999.ebuild 21 Feb 2014 12:18:06 -0000 1.264
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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.263 2014/02/21 12:03:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.264 2014/02/21 12:18:06 ssuominen Exp $
EAPI=5
@@ -199,6 +199,7 @@
--disable-libcryptsetup
--disable-qrencode
--disable-microhttpd
+ --disable-readahead
--disable-quotacheck
--disable-polkit
--disable-myhostname
@@ -375,7 +376,7 @@
prune_libtool_files --all
rm -f \
"${D}"/lib/udev/rules.d/99-systemd.rules \
- "${D}"/usr/share/doc/${PF}/LICENSE.*
+ "${D}"/usr/share/doc/${PF}/{LICENSE.*,sd-shutdown.h}
# see src_prepare() for content of these files
insinto /lib/udev/rules.d
^ permalink raw reply [flat|nested] 38+ messages in thread
end of thread, other threads:[~2014-02-21 12:18 UTC | newest]
Thread overview: 38+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-18 17:57 [gentoo-commits] gentoo-x86 commit in sys-fs/udev: ChangeLog udev-9999.ebuild Samuli Suominen (ssuominen)
-- strict thread matches above, loose matches on Subject: below --
2014-02-21 12:18 Samuli Suominen (ssuominen)
2013-07-16 15:34 Samuli Suominen (ssuominen)
2013-07-15 11:03 Samuli Suominen (ssuominen)
2013-07-09 10:44 Samuli Suominen (ssuominen)
2013-07-01 17:39 Samuli Suominen (ssuominen)
2013-07-01 17:32 Samuli Suominen (ssuominen)
2013-06-07 18:00 Samuli Suominen (ssuominen)
2013-05-17 13:50 Samuli Suominen (ssuominen)
2013-03-26 19:23 Samuli Suominen (ssuominen)
2013-03-26 17:43 Samuli Suominen (ssuominen)
2013-03-08 23:08 Samuli Suominen (ssuominen)
2013-03-08 22:51 Samuli Suominen (ssuominen)
2013-03-08 22:45 Samuli Suominen (ssuominen)
2013-02-13 22:37 Samuli Suominen (ssuominen)
2013-02-08 12:28 Samuli Suominen (ssuominen)
2013-02-08 11:55 Samuli Suominen (ssuominen)
2013-01-16 13:56 Samuli Suominen (ssuominen)
2012-04-08 6:37 Samuli Suominen (ssuominen)
2011-12-09 22:12 William Hubbs (williamh)
2011-11-07 4:55 William Hubbs (williamh)
2011-11-06 2:36 William Hubbs (williamh)
2011-11-04 18:32 William Hubbs (williamh)
2011-11-03 1:58 William Hubbs (williamh)
2011-06-09 13:18 Matthias Schwarzott (zzam)
2011-06-08 15:30 William Hubbs (williamh)
2011-06-07 5:54 William Hubbs (williamh)
2010-07-17 19:14 Matthias Schwarzott (zzam)
2010-04-19 20:28 Matthias Schwarzott (zzam)
2009-10-20 19:04 Matthias Schwarzott (zzam)
2009-10-20 12:38 Matthias Schwarzott (zzam)
2009-10-15 21:40 Matthias Schwarzott (zzam)
2009-09-19 21:36 Matthias Schwarzott (zzam)
2009-06-17 13:52 Matthias Schwarzott (zzam)
2009-02-25 12:50 Matthias Schwarzott (zzam)
2009-01-22 11:18 Matthias Schwarzott (zzam)
2009-01-06 18:42 Michael Sterrett (mr_bones_)
2008-12-30 22:51 Matthias Schwarzott (zzam)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox