| 1 |
ssuominen 12/11/24 20:47:20 |
| 2 |
|
| 3 |
Modified: kmod-9999.ebuild ChangeLog |
| 4 |
Added: kmod-11-r2.ebuild |
| 5 |
Log: |
| 6 |
Move kmod from /usr to / wrt #443710 by Francisco Blas Izquierdo Riera and Lars Wendler |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 4868F14D) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.39 sys-apps/kmod/kmod-9999.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild?rev=1.39&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild?rev=1.39&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild?r1=1.38&r2=1.39 |
| 16 |
|
| 17 |
Index: kmod-9999.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v |
| 20 |
retrieving revision 1.38 |
| 21 |
retrieving revision 1.39 |
| 22 |
diff -u -r1.38 -r1.39 |
| 23 |
--- kmod-9999.ebuild 10 Nov 2012 22:40:03 -0000 1.38 |
| 24 |
+++ kmod-9999.ebuild 24 Nov 2012 20:47:20 -0000 1.39 |
| 25 |
@@ -1,10 +1,10 @@ |
| 26 |
# Copyright 1999-2012 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.38 2012/11/10 22:40:03 williamh Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.39 2012/11/24 20:47:20 ssuominen Exp $ |
| 30 |
|
| 31 |
EAPI=4 |
| 32 |
|
| 33 |
-inherit autotools eutils toolchain-funcs libtool |
| 34 |
+inherit autotools eutils libtool toolchain-funcs |
| 35 |
|
| 36 |
if [[ ${PV} == 9999 ]]; then |
| 37 |
EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" |
| 38 |
@@ -29,7 +29,7 @@ |
| 39 |
|
| 40 |
RDEPEND="!sys-apps/module-init-tools |
| 41 |
!sys-apps/modutils |
| 42 |
- lzma? ( app-arch/xz-utils ) |
| 43 |
+ lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) |
| 44 |
zlib? ( >=sys-libs/zlib-1.2.6 )" #427130 |
| 45 |
DEPEND="${RDEPEND} |
| 46 |
dev-libs/libxslt |
| 47 |
@@ -54,6 +54,7 @@ |
| 48 |
src_configure() |
| 49 |
{ |
| 50 |
econf \ |
| 51 |
+ --bindir=/sbin \ |
| 52 |
$(use_enable static-libs static) \ |
| 53 |
$(use_enable tools) \ |
| 54 |
$(use_enable debug) \ |
| 55 |
@@ -66,16 +67,14 @@ |
| 56 |
{ |
| 57 |
default |
| 58 |
prune_libtool_files |
| 59 |
+ gen_usr_ldscript -a kmod |
| 60 |
|
| 61 |
if use tools; then |
| 62 |
local cmd |
| 63 |
- for cmd in depmod insmod lsmod modinfo modprobe rmmod; do |
| 64 |
- dosym kmod /usr/bin/${cmd} |
| 65 |
+ for cmd in depmod insmod modinfo modprobe rmmod; do |
| 66 |
+ dosym kmod /sbin/${cmd} |
| 67 |
done |
| 68 |
- # Compability symlink(s): |
| 69 |
- # These are both hardcoded in the Linux kernel source tree wrt #426698 |
| 70 |
- dosym /usr/bin/kmod /sbin/depmod |
| 71 |
- dosym /usr/bin/kmod /sbin/modprobe |
| 72 |
+ dosym /sbin/kmod /bin/lsmod |
| 73 |
fi |
| 74 |
|
| 75 |
cat <<-EOF > "${T}"/usb-load-ehci-first.conf |
| 76 |
|
| 77 |
|
| 78 |
|
| 79 |
1.57 sys-apps/kmod/ChangeLog |
| 80 |
|
| 81 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?rev=1.57&view=markup |
| 82 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?rev=1.57&content-type=text/plain |
| 83 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?r1=1.56&r2=1.57 |
| 84 |
|
| 85 |
Index: ChangeLog |
| 86 |
=================================================================== |
| 87 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v |
| 88 |
retrieving revision 1.56 |
| 89 |
retrieving revision 1.57 |
| 90 |
diff -u -r1.56 -r1.57 |
| 91 |
--- ChangeLog 10 Nov 2012 22:45:45 -0000 1.56 |
| 92 |
+++ ChangeLog 24 Nov 2012 20:47:20 -0000 1.57 |
| 93 |
@@ -1,5 +1,12 @@ |
| 94 |
# ChangeLog for sys-apps/kmod |
| 95 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.56 2012/11/10 22:45:45 williamh Exp $ |
| 96 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.57 2012/11/24 20:47:20 ssuominen Exp $ |
| 97 |
+ |
| 98 |
+*kmod-11-r2 (24 Nov 2012) |
| 99 |
+ |
| 100 |
+ 24 Nov 2012; Samuli Suominen <ssuominen@g.o> +kmod-11-r2.ebuild, |
| 101 |
+ kmod-9999.ebuild: |
| 102 |
+ Move kmod from /usr to / wrt #443710 by Francisco Blas Izquierdo Riera and |
| 103 |
+ Lars Wendler |
| 104 |
|
| 105 |
10 Nov 2012; William Hubbs <williamh@g.o> ChangeLog: |
| 106 |
add libxslt dependency for bug #442402 to kmod-11-r1 and kmod-9999. |
| 107 |
|
| 108 |
|
| 109 |
|
| 110 |
1.1 sys-apps/kmod/kmod-11-r2.ebuild |
| 111 |
|
| 112 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-11-r2.ebuild?rev=1.1&view=markup |
| 113 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-11-r2.ebuild?rev=1.1&content-type=text/plain |
| 114 |
|
| 115 |
Index: kmod-11-r2.ebuild |
| 116 |
=================================================================== |
| 117 |
# Copyright 1999-2012 Gentoo Foundation |
| 118 |
# Distributed under the terms of the GNU General Public License v2 |
| 119 |
# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-11-r2.ebuild,v 1.1 2012/11/24 20:47:20 ssuominen Exp $ |
| 120 |
|
| 121 |
EAPI=4 |
| 122 |
|
| 123 |
inherit autotools eutils libtool toolchain-funcs |
| 124 |
|
| 125 |
if [[ ${PV} == 9999 ]]; then |
| 126 |
EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" |
| 127 |
inherit git-2 |
| 128 |
else |
| 129 |
SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz" |
| 130 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
| 131 |
fi |
| 132 |
|
| 133 |
DESCRIPTION="library and tools for managing linux kernel modules" |
| 134 |
HOMEPAGE="http://git.kernel.org/?p=utils/kernel/kmod/kmod.git" |
| 135 |
|
| 136 |
LICENSE="LGPL-2" |
| 137 |
SLOT="0" |
| 138 |
IUSE="debug doc lzma static-libs +tools zlib" |
| 139 |
|
| 140 |
# Upstream does not support running the test suite with custom configure flags. |
| 141 |
# I was also told that the test suite is intended for kmod developers. |
| 142 |
# So we have to restrict it. |
| 143 |
# See bug #408915. |
| 144 |
RESTRICT="test" |
| 145 |
|
| 146 |
RDEPEND="!sys-apps/module-init-tools |
| 147 |
!sys-apps/modutils |
| 148 |
lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) |
| 149 |
zlib? ( >=sys-libs/zlib-1.2.6 )" #427130 |
| 150 |
DEPEND="${RDEPEND} |
| 151 |
dev-libs/libxslt |
| 152 |
doc? ( dev-util/gtk-doc ) |
| 153 |
lzma? ( virtual/pkgconfig ) |
| 154 |
zlib? ( virtual/pkgconfig )" |
| 155 |
|
| 156 |
src_prepare() |
| 157 |
{ |
| 158 |
if [ ! -e configure ]; then |
| 159 |
if use doc; then |
| 160 |
gtkdocize --copy --docdir libkmod/docs || die |
| 161 |
else |
| 162 |
touch libkmod/docs/gtk-doc.make |
| 163 |
fi |
| 164 |
eautoreconf |
| 165 |
else |
| 166 |
elibtoolize |
| 167 |
fi |
| 168 |
} |
| 169 |
|
| 170 |
src_configure() |
| 171 |
{ |
| 172 |
econf \ |
| 173 |
--bindir=/sbin \ |
| 174 |
$(use_enable static-libs static) \ |
| 175 |
$(use_enable tools) \ |
| 176 |
$(use_enable debug) \ |
| 177 |
$(use_enable doc gtk-doc) \ |
| 178 |
$(use_with lzma xz) \ |
| 179 |
$(use_with zlib) |
| 180 |
} |
| 181 |
|
| 182 |
src_install() |
| 183 |
{ |
| 184 |
default |
| 185 |
prune_libtool_files |
| 186 |
gen_usr_ldscript -a kmod |
| 187 |
|
| 188 |
if use tools; then |
| 189 |
local cmd |
| 190 |
for cmd in depmod insmod modinfo modprobe rmmod; do |
| 191 |
dosym kmod /sbin/${cmd} |
| 192 |
done |
| 193 |
dosym /sbin/kmod /bin/lsmod |
| 194 |
fi |
| 195 |
|
| 196 |
cat <<-EOF > "${T}"/usb-load-ehci-first.conf |
| 197 |
softdep uhci_hcd pre: ehci_hcd |
| 198 |
softdep ohci_hcd pre: ehci_hcd |
| 199 |
EOF |
| 200 |
|
| 201 |
insinto /lib/modprobe.d |
| 202 |
doins "${T}"/usb-load-ehci-first.conf #260139 |
| 203 |
} |
Archives