* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: udev-197-r4.ebuild ChangeLog udev-9999.ebuild
@ 2013-01-20 9:57 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 4+ messages in thread
From: Samuli Suominen (ssuominen) @ 2013-01-20 9:57 UTC (permalink / raw
To: gentoo-commits
ssuominen 13/01/20 09:57:30
Modified: udev-197-r4.ebuild ChangeLog udev-9999.ebuild
Log:
Optionalize dev-util/gperf dependency behind USE="keymap" wrt #452760 by Mike Frysinger
(Portage version: 2.2.0_alpha155/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.6 sys-fs/udev/udev-197-r4.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-197-r4.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-197-r4.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-197-r4.ebuild?r1=1.5&r2=1.6
Index: udev-197-r4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-197-r4.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- udev-197-r4.ebuild 19 Jan 2013 18:30:59 -0000 1.5
+++ udev-197-r4.ebuild 20 Jan 2013 09:57:30 -0000 1.6
@@ -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-197-r4.ebuild,v 1.5 2013/01/19 18:30:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-197-r4.ebuild,v 1.6 2013/01/20 09:57:30 ssuominen Exp $
EAPI=4
@@ -42,18 +42,19 @@
!<sys-apps/systemd-${PV}"
DEPEND="${COMMON_DEPEND}
- dev-util/gperf
virtual/os-headers
virtual/pkgconfig
!<sys-kernel/linux-headers-${KV_min}
doc? ( >=dev-util/gtk-doc-1.18 )
- hwdb? ( >=sys-apps/hwids-20121202.2[udev] )"
+ hwdb? ( >=sys-apps/hwids-20130114[udev] )
+ keymap? ( dev-util/gperf )"
if [[ ${PV} = 9999* ]]
then
DEPEND="${DEPEND}
app-text/docbook-xsl-stylesheets
dev-libs/libxslt
+ dev-util/gperf
>=dev-util/intltool-0.50"
fi
@@ -140,17 +141,6 @@
eval export {MSG{FMT,MERGE},XGETTEXT}=/bin/true
fi
- # This check is for maintainers only
- if [[ ${PV} = 9999* ]]; then
- # Support uClibc wrt bug #443030 with a safe kludge so we know when
- # to check for other uses than logs. See the echo for secure_getenv
- # at the end of src_prepare().
- if ! [[ $(grep -r secure_getenv * | wc -l) -eq 16 ]]; then
- eerror "The line count of secure_getenv failed, see bug #443030"
- die
- fi
- fi
-
# apply user patches
epatch_user
@@ -177,8 +167,21 @@
elibtoolize
fi
- # This is the actual fix for bug #443030 if the check earlier doesn't fail.
- if ! use elibc_glibc; then
+ 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 24 ]]; 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
fi
@@ -186,6 +189,8 @@
src_configure()
{
+ use keymap || export ac_cv_path_GPERF=true #452760
+
local econf_args
econf_args=(
1.788 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.788&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.788&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.787&r2=1.788
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.787
retrieving revision 1.788
diff -u -r1.787 -r1.788
--- ChangeLog 19 Jan 2013 18:24:17 -0000 1.787
+++ ChangeLog 20 Jan 2013 09:57:30 -0000 1.788
@@ -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.787 2013/01/19 18:24:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.788 2013/01/20 09:57:30 ssuominen Exp $
+
+ 20 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> udev-197-r4.ebuild,
+ udev-9999.ebuild:
+ Optionalize dev-util/gperf dependency behind USE="keymap" wrt #452760 by Mike
+ Frysinger
19 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> udev-197-r3.ebuild,
udev-197-r4.ebuild, udev-9999.ebuild:
1.147 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.147&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.147&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.146&r2=1.147
Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- udev-9999.ebuild 19 Jan 2013 18:30:59 -0000 1.146
+++ udev-9999.ebuild 20 Jan 2013 09:57:30 -0000 1.147
@@ -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.146 2013/01/19 18:30:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.147 2013/01/20 09:57:30 ssuominen Exp $
EAPI=4
@@ -20,7 +20,7 @@
SRC_URI="${SRC_URI}
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"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
fi
DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
@@ -42,18 +42,19 @@
!<sys-apps/systemd-${PV}"
DEPEND="${COMMON_DEPEND}
- dev-util/gperf
virtual/os-headers
virtual/pkgconfig
!<sys-kernel/linux-headers-${KV_min}
doc? ( >=dev-util/gtk-doc-1.18 )
- hwdb? ( >=sys-apps/hwids-20121202.2[udev] )"
+ hwdb? ( >=sys-apps/hwids-20130114[udev] )
+ keymap? ( dev-util/gperf )"
if [[ ${PV} = 9999* ]]
then
DEPEND="${DEPEND}
app-text/docbook-xsl-stylesheets
dev-libs/libxslt
+ dev-util/gperf
>=dev-util/intltool-0.50"
fi
@@ -140,17 +141,6 @@
eval export {MSG{FMT,MERGE},XGETTEXT}=/bin/true
fi
- # This check is for maintainers only
- if [[ ${PV} = 9999* ]]; then
- # Support uClibc wrt bug #443030 with a safe kludge so we know when
- # to check for other uses than logs. See the echo for secure_getenv
- # at the end of src_prepare().
- if ! [[ $(grep -r secure_getenv * | wc -l) -eq 13 ]]; then
- eerror "The line count of secure_getenv failed, see bug #443030"
- die
- fi
- fi
-
# apply user patches
epatch_user
@@ -177,8 +167,21 @@
elibtoolize
fi
- # This is the actual fix for bug #443030 if the check earlier doesn't fail.
- if ! use elibc_glibc; then
+ 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 24 ]]; 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
fi
@@ -186,6 +189,8 @@
src_configure()
{
+ use keymap || export ac_cv_path_GPERF=true #452760
+
local econf_args
econf_args=(
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: udev-197-r4.ebuild ChangeLog udev-9999.ebuild
@ 2013-01-21 19:44 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 4+ messages in thread
From: Samuli Suominen (ssuominen) @ 2013-01-21 19:44 UTC (permalink / raw
To: gentoo-commits
ssuominen 13/01/21 19:44:52
Modified: udev-197-r4.ebuild ChangeLog udev-9999.ebuild
Log:
Use plain bash instead of calling external executable grep in fstab check by Arfrever
(Portage version: 2.2.0_alpha155/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.9 sys-fs/udev/udev-197-r4.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-197-r4.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-197-r4.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-197-r4.ebuild?r1=1.8&r2=1.9
Index: udev-197-r4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-197-r4.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- udev-197-r4.ebuild 21 Jan 2013 19:05:42 -0000 1.8
+++ udev-197-r4.ebuild 21 Jan 2013 19:44:52 -0000 1.9
@@ -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-197-r4.ebuild,v 1.8 2013/01/21 19:05:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-197-r4.ebuild,v 1.9 2013/01/21 19:44:52 ssuominen Exp $
EAPI=4
@@ -457,7 +457,7 @@
fi
local fstab="${ROOT}"etc/fstab
- if $(grep -qs ^udev "${fstab}"); then
+ if [[ $(<"${fstab}") =~ (^|$'\n')udev ]]; then
ewarn "You should review and/or remove your udev starting line from ${fstab}"
ewarn "Not doing so might result in unbootable system."
ewarn "You have been warned. For details, see:"
1.793 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.793&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.793&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.792&r2=1.793
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.792
retrieving revision 1.793
diff -u -r1.792 -r1.793
--- ChangeLog 21 Jan 2013 18:56:20 -0000 1.792
+++ ChangeLog 21 Jan 2013 19:44:52 -0000 1.793
@@ -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.792 2013/01/21 18:56:20 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.793 2013/01/21 19:44:52 ssuominen Exp $
+
+ 21 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> udev-197-r4.ebuild,
+ udev-9999.ebuild:
+ Use plain bash instead of calling external executable grep in fstab check by
+ Arfrever
21 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> udev-197-r3.ebuild,
udev-197-r4.ebuild, udev-9999.ebuild:
1.151 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.151&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.151&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.150&r2=1.151
Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- udev-9999.ebuild 21 Jan 2013 19:05:42 -0000 1.150
+++ udev-9999.ebuild 21 Jan 2013 19:44:52 -0000 1.151
@@ -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.150 2013/01/21 19:05:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.151 2013/01/21 19:44:52 ssuominen Exp $
EAPI=4
@@ -457,7 +457,7 @@
fi
local fstab="${ROOT}"etc/fstab
- if $(grep -qs ^udev "${fstab}"); then
+ if [[ $(<"${fstab}") =~ (^|$'\n')udev ]]; then
ewarn "You should review and/or remove your udev starting line from ${fstab}"
ewarn "Not doing so might result in unbootable system."
ewarn "You have been warned. For details, see:"
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: udev-197-r4.ebuild ChangeLog udev-9999.ebuild
@ 2013-01-24 3:13 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 4+ messages in thread
From: Samuli Suominen (ssuominen) @ 2013-01-24 3:13 UTC (permalink / raw
To: gentoo-commits
ssuominen 13/01/24 03:13:09
Modified: udev-197-r4.ebuild ChangeLog udev-9999.ebuild
Log:
Disable the new predictable network interface name scheme if sys-apps/biosdevname is installed.
(Portage version: 2.2.0_alpha155/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.19 sys-fs/udev/udev-197-r4.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-197-r4.ebuild?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-197-r4.ebuild?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-197-r4.ebuild?r1=1.18&r2=1.19
Index: udev-197-r4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-197-r4.ebuild,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- udev-197-r4.ebuild 23 Jan 2013 20:47:04 -0000 1.18
+++ udev-197-r4.ebuild 24 Jan 2013 03:13:09 -0000 1.19
@@ -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-197-r4.ebuild,v 1.18 2013/01/23 20:47:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-197-r4.ebuild,v 1.19 2013/01/24 03:13:09 ssuominen Exp $
EAPI=4
@@ -397,17 +397,29 @@
pkg_postinst()
{
- mkdir -p "${ROOT}"/run
+ mkdir -p "${ROOT}"run
- if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 197 ]]; then
+ copy_net_rules() {
net_rules="${ROOT}"etc/udev/rules.d/80-net-name-slot.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 are 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
- if [[ -d ${ROOT}/dev/loop ]]
+ rmdir "${ROOT}"dev/loop 2>/dev/null
+ if [[ -d ${ROOT}dev/loop ]]
then
ewarn "Please make sure your remove /dev/loop,"
ewarn "else losetup may be confused when looking for unused devices."
@@ -418,10 +430,10 @@
# 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 ]] &&
+ if [[ -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
+ rm -f "${ROOT}"etc/udev/rules.d/64-device-mapper.rules
einfo "Removed unneeded file 64-device-mapper.rules"
fi
1.800 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.800&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.800&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.799&r2=1.800
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.799
retrieving revision 1.800
diff -u -r1.799 -r1.800
--- ChangeLog 23 Jan 2013 20:41:29 -0000 1.799
+++ ChangeLog 24 Jan 2013 03:13:09 -0000 1.800
@@ -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.799 2013/01/23 20:41:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.800 2013/01/24 03:13:09 ssuominen Exp $
+
+ 24 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> udev-197-r4.ebuild,
+ udev-9999.ebuild:
+ Disable the new predictable network interface name scheme if
+ sys-apps/biosdevname is installed.
23 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> udev-197-r3.ebuild,
udev-197-r4.ebuild, udev-9999.ebuild:
1.161 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.161&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.161&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.160&r2=1.161
Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- udev-9999.ebuild 23 Jan 2013 20:47:04 -0000 1.160
+++ udev-9999.ebuild 24 Jan 2013 03:13:09 -0000 1.161
@@ -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.160 2013/01/23 20:47:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.161 2013/01/24 03:13:09 ssuominen Exp $
EAPI=4
@@ -397,17 +397,29 @@
pkg_postinst()
{
- mkdir -p "${ROOT}"/run
+ mkdir -p "${ROOT}"run
- if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 197 ]]; then
+ copy_net_rules() {
net_rules="${ROOT}"etc/udev/rules.d/80-net-name-slot.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 are 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
- if [[ -d ${ROOT}/dev/loop ]]
+ rmdir "${ROOT}"dev/loop 2>/dev/null
+ if [[ -d ${ROOT}dev/loop ]]
then
ewarn "Please make sure your remove /dev/loop,"
ewarn "else losetup may be confused when looking for unused devices."
@@ -418,10 +430,10 @@
# 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 ]] &&
+ if [[ -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
+ rm -f "${ROOT}"etc/udev/rules.d/64-device-mapper.rules
einfo "Removed unneeded file 64-device-mapper.rules"
fi
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/udev: udev-197-r4.ebuild ChangeLog udev-9999.ebuild
@ 2013-01-24 10:36 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 4+ messages in thread
From: Samuli Suominen (ssuominen) @ 2013-01-24 10:36 UTC (permalink / raw
To: gentoo-commits
ssuominen 13/01/24 10:36:26
Modified: udev-197-r4.ebuild ChangeLog udev-9999.ebuild
Log:
Set the net_rules variable outside of the copy_net_rules() function for later use in the postinst phase.
(Portage version: 2.2.0_alpha155/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.21 sys-fs/udev/udev-197-r4.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-197-r4.ebuild?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-197-r4.ebuild?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-197-r4.ebuild?r1=1.20&r2=1.21
Index: udev-197-r4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-197-r4.ebuild,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- udev-197-r4.ebuild 24 Jan 2013 05:31:44 -0000 1.20
+++ udev-197-r4.ebuild 24 Jan 2013 10:36:26 -0000 1.21
@@ -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-197-r4.ebuild,v 1.20 2013/01/24 05:31:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-197-r4.ebuild,v 1.21 2013/01/24 10:36:26 ssuominen Exp $
EAPI=4
@@ -399,8 +399,8 @@
{
mkdir -p "${ROOT}"run
+ net_rules="${ROOT}"etc/udev/rules.d/80-net-name-slot.rules
copy_net_rules() {
- net_rules="${ROOT}"etc/udev/rules.d/80-net-name-slot.rules
[[ -f ${net_rules} ]] || cp "${ROOT}"usr/share/doc/${PF}/gentoo/80-net-name-slot.rules "${net_rules}"
}
1.802 sys-fs/udev/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.802&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.802&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.801&r2=1.802
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.801
retrieving revision 1.802
diff -u -r1.801 -r1.802
--- ChangeLog 24 Jan 2013 03:26:31 -0000 1.801
+++ ChangeLog 24 Jan 2013 10:36:26 -0000 1.802
@@ -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.801 2013/01/24 03:26:31 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.802 2013/01/24 10:36:26 ssuominen Exp $
+
+ 24 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> udev-197-r4.ebuild,
+ udev-9999.ebuild:
+ Set the net_rules variable outside of the copy_net_rules() function for later
+ use in the postinst phase.
24 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> udev-197-r4.ebuild,
udev-9999.ebuild:
1.163 sys-fs/udev/udev-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.163&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.163&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.162&r2=1.163
Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- udev-9999.ebuild 24 Jan 2013 05:31:44 -0000 1.162
+++ udev-9999.ebuild 24 Jan 2013 10:36:26 -0000 1.163
@@ -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.162 2013/01/24 05:31:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.163 2013/01/24 10:36:26 ssuominen Exp $
EAPI=4
@@ -399,8 +399,8 @@
{
mkdir -p "${ROOT}"run
+ net_rules="${ROOT}"etc/udev/rules.d/80-net-name-slot.rules
copy_net_rules() {
- net_rules="${ROOT}"etc/udev/rules.d/80-net-name-slot.rules
[[ -f ${net_rules} ]] || cp "${ROOT}"usr/share/doc/${PF}/gentoo/80-net-name-slot.rules "${net_rules}"
}
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-01-24 10:36 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-21 19:44 [gentoo-commits] gentoo-x86 commit in sys-fs/udev: udev-197-r4.ebuild ChangeLog udev-9999.ebuild Samuli Suominen (ssuominen)
-- strict thread matches above, loose matches on Subject: below --
2013-01-24 10:36 Samuli Suominen (ssuominen)
2013-01-24 3:13 Samuli Suominen (ssuominen)
2013-01-20 9:57 Samuli Suominen (ssuominen)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox