* [gentoo-commits] gentoo-x86 commit in sys-apps/module-init-tools: ChangeLog module-init-tools-3.11.1.ebuild
@ 2009-11-23 2:10 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 3+ messages in thread
From: Robin H. Johnson (robbat2) @ 2009-11-23 2:10 UTC (permalink / raw
To: gentoo-commits
robbat2 09/11/23 02:10:52
Modified: ChangeLog
Added: module-init-tools-3.11.1.ebuild
Log:
Version bump. Upstream has included pre-generated manpages again.
(Portage version: 2.2_rc51/cvs/Linux x86_64)
Revision Changes Path
1.155 sys-apps/module-init-tools/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/module-init-tools/ChangeLog?rev=1.155&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/module-init-tools/ChangeLog?rev=1.155&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/module-init-tools/ChangeLog?r1=1.154&r2=1.155
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v
retrieving revision 1.154
retrieving revision 1.155
diff -p -w -b -B -u -u -r1.154 -r1.155
--- ChangeLog 24 Oct 2009 08:27:43 -0000 1.154
+++ ChangeLog 23 Nov 2009 02:10:52 -0000 1.155
@@ -1,6 +1,12 @@
# ChangeLog for sys-apps/module-init-tools
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.154 2009/10/24 08:27:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.155 2009/11/23 02:10:52 robbat2 Exp $
+
+*module-init-tools-3.11.1 (23 Nov 2009)
+
+ 23 Nov 2009; Robin H. Johnson <robbat2@gentoo.org>
+ +module-init-tools-3.11.1.ebuild:
+ Version bump. Upstream has included pre-generated manpages again.
24 Oct 2009; Mike Frysinger <vapier@gentoo.org>
module-init-tools-3.11.ebuild:
1.1 sys-apps/module-init-tools/module-init-tools-3.11.1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.11.1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.11.1.ebuild?rev=1.1&content-type=text/plain
Index: module-init-tools-3.11.1.ebuild
===================================================================
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.11.1.ebuild,v 1.1 2009/11/23 02:10:52 robbat2 Exp $
inherit eutils
DESCRIPTION="tools for managing linux kernel modules"
HOMEPAGE="http://kerneltools.org/"
SRC_URI="mirror://kernel/linux/utils/kernel/module-init-tools/${P}.tar.bz2"
# upstream has included generated manpages again.
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE=""
DEPEND="sys-libs/zlib
>=sys-apps/baselayout-2.0.1
!virtual/modutils"
PROVIDE="virtual/modutils"
src_unpack() {
unpack ${A}
cd "${S}"
epatch "${FILESDIR}"/${PN}-3.2.2-handle-dupliate-aliases.patch #149426
touch *.5 *.8 # dont regen manpages
}
src_compile() {
mkdir build && cd build #290207
ECONF_SOURCE=.. \
econf \
--prefix=/ \
--enable-zlib \
--enable-zlib-dynamic \
--disable-static-utils
emake || die "emake module-init-tools failed"
}
src_test() {
./tests/runtests || die
}
src_install() {
emake -C build install DESTDIR="${D}" || die
dodoc AUTHORS ChangeLog NEWS README TODO
into /
newsbin "${FILESDIR}"/update-modules-3.5.sh update-modules || die
doman "${FILESDIR}"/update-modules.8
}
pkg_postinst() {
# cheat to keep users happy
if grep -qs modules-update "${ROOT}"/etc/init.d/modules ; then
sed -i 's:modules-update:update-modules:' "${ROOT}"/etc/init.d/modules
fi
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/module-init-tools: ChangeLog module-init-tools-3.11.1.ebuild
@ 2010-01-08 2:36 Mike Frysinger (vapier)
0 siblings, 0 replies; 3+ messages in thread
From: Mike Frysinger (vapier) @ 2010-01-08 2:36 UTC (permalink / raw
To: gentoo-commits
vapier 10/01/08 02:36:41
Modified: ChangeLog module-init-tools-3.11.1.ebuild
Log:
Add support for USE=static #299932 by Brad Laue.
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Revision Changes Path
1.156 sys-apps/module-init-tools/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/module-init-tools/ChangeLog?rev=1.156&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/module-init-tools/ChangeLog?rev=1.156&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/module-init-tools/ChangeLog?r1=1.155&r2=1.156
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- ChangeLog 23 Nov 2009 02:10:52 -0000 1.155
+++ ChangeLog 8 Jan 2010 02:36:41 -0000 1.156
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/module-init-tools
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.155 2009/11/23 02:10:52 robbat2 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.156 2010/01/08 02:36:41 vapier Exp $
+
+ 08 Jan 2010; Mike Frysinger <vapier@gentoo.org>
+ module-init-tools-3.11.1.ebuild:
+ Add support for USE=static #299932 by Brad Laue.
*module-init-tools-3.11.1 (23 Nov 2009)
1.2 sys-apps/module-init-tools/module-init-tools-3.11.1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.11.1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.11.1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.11.1.ebuild?r1=1.1&r2=1.2
Index: module-init-tools-3.11.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.11.1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- module-init-tools-3.11.1.ebuild 23 Nov 2009 02:10:52 -0000 1.1
+++ module-init-tools-3.11.1.ebuild 8 Jan 2010 02:36:41 -0000 1.2
@@ -1,18 +1,17 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.11.1.ebuild,v 1.1 2009/11/23 02:10:52 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.11.1.ebuild,v 1.2 2010/01/08 02:36:41 vapier Exp $
-inherit eutils
+inherit eutils flag-o-matic
DESCRIPTION="tools for managing linux kernel modules"
HOMEPAGE="http://kerneltools.org/"
SRC_URI="mirror://kernel/linux/utils/kernel/module-init-tools/${P}.tar.bz2"
-# upstream has included generated manpages again.
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
+IUSE="static"
DEPEND="sys-libs/zlib
>=sys-apps/baselayout-2.0.1
@@ -28,6 +27,7 @@
src_compile() {
mkdir build && cd build #290207
+ use static && append-ldflags -static
ECONF_SOURCE=.. \
econf \
--prefix=/ \
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/module-init-tools: ChangeLog module-init-tools-3.11.1.ebuild
@ 2010-02-15 2:12 Mike Frysinger (vapier)
0 siblings, 0 replies; 3+ messages in thread
From: Mike Frysinger (vapier) @ 2010-02-15 2:12 UTC (permalink / raw
To: gentoo-commits
vapier 10/02/15 02:12:41
Modified: ChangeLog module-init-tools-3.11.1.ebuild
Log:
Handle upgrades of .conf files for people #274942 by Peter Volkov.
(Portage version: 2.2_rc62/cvs/Linux x86_64)
Revision Changes Path
1.157 sys-apps/module-init-tools/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/module-init-tools/ChangeLog?rev=1.157&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/module-init-tools/ChangeLog?rev=1.157&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/module-init-tools/ChangeLog?r1=1.156&r2=1.157
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- ChangeLog 8 Jan 2010 02:36:41 -0000 1.156
+++ ChangeLog 15 Feb 2010 02:12:40 -0000 1.157
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/module-init-tools
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.156 2010/01/08 02:36:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.157 2010/02/15 02:12:40 vapier Exp $
+
+ 15 Feb 2010; Mike Frysinger <vapier@gentoo.org>
+ module-init-tools-3.11.1.ebuild:
+ Handle upgrades of .conf files for people #274942 by Peter Volkov.
08 Jan 2010; Mike Frysinger <vapier@gentoo.org>
module-init-tools-3.11.1.ebuild:
1.3 sys-apps/module-init-tools/module-init-tools-3.11.1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.11.1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.11.1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.11.1.ebuild?r1=1.2&r2=1.3
Index: module-init-tools-3.11.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.11.1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- module-init-tools-3.11.1.ebuild 8 Jan 2010 02:36:41 -0000 1.2
+++ module-init-tools-3.11.1.ebuild 15 Feb 2010 02:12:40 -0000 1.3
@@ -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-apps/module-init-tools/module-init-tools-3.11.1.ebuild,v 1.2 2010/01/08 02:36:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.11.1.ebuild,v 1.3 2010/02/15 02:12:40 vapier Exp $
inherit eutils flag-o-matic
@@ -55,4 +55,36 @@
if grep -qs modules-update "${ROOT}"/etc/init.d/modules ; then
sed -i 's:modules-update:update-modules:' "${ROOT}"/etc/init.d/modules
fi
+
+ # For files that were upgraded but not renamed via their ebuild to
+ # have a proper .conf extension, rename them so etc-update tools can
+ # take care of things. #274942
+ local i f cfg
+ eshopts_push -s nullglob
+ for f in "${ROOT}"etc/modprobe.d/* ; do
+ # The .conf files need no upgrading unless a non-.conf exists,
+ # so skip this until later ...
+ [[ ${f} == *.conf ]] && continue
+ # If a .conf doesn't exist, then a package needs updating, or
+ # the user created it, or it's orphaned. Either way, we don't
+ # really know, so leave it alone.
+ [[ ! -f ${f}.conf ]] && continue
+
+ i=0
+ while :; do
+ cfg=$(printf "%s/._cfg%04d_%s.conf" "${f%/*}" ${i} "${f##*/}")
+ [[ ! -e ${cfg} ]] && break
+ ((i++))
+ done
+ einfo "Updating ${f}; please run 'etc-update'"
+ mv "${f}.conf" "${cfg}"
+ mv "${f}" "${f}.conf"
+ done
+ # Whine about any non-.conf files that are left
+ for f in "${ROOT}"etc/modprobe.d/* ; do
+ [[ ${f} == *.conf ]] && continue
+ ewarn "The '${f}' file needs to be upgraded to end with a '.conf'."
+ ewarn "Either upgrade the package that owns it, or manually rename it."
+ done
+ eshopts_pop
}
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-02-15 2:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-11-23 2:10 [gentoo-commits] gentoo-x86 commit in sys-apps/module-init-tools: ChangeLog module-init-tools-3.11.1.ebuild Robin H. Johnson (robbat2)
-- strict thread matches above, loose matches on Subject: below --
2010-01-08 2:36 Mike Frysinger (vapier)
2010-02-15 2:12 Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox