1 |
williamh 15/07/04 20:48:11 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: kmod-21.ebuild |
5 |
Log: |
6 |
version bump |
7 |
|
8 |
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x30C46538) |
9 |
|
10 |
Revision Changes Path |
11 |
1.202 sys-apps/kmod/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?rev=1.202&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?rev=1.202&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?r1=1.201&r2=1.202 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v |
20 |
retrieving revision 1.201 |
21 |
retrieving revision 1.202 |
22 |
diff -u -r1.201 -r1.202 |
23 |
--- ChangeLog 1 Jul 2015 13:35:03 -0000 1.201 |
24 |
+++ ChangeLog 4 Jul 2015 20:48:11 -0000 1.202 |
25 |
@@ -1,6 +1,11 @@ |
26 |
# ChangeLog for sys-apps/kmod |
27 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL |
28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.201 2015/07/01 13:35:03 williamh Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.202 2015/07/04 20:48:11 williamh Exp $ |
30 |
+ |
31 |
+*kmod-21 (04 Jul 2015) |
32 |
+ |
33 |
+ 04 Jul 2015; William Hubbs <williamh@g.o> +kmod-21.ebuild: |
34 |
+ version bump |
35 |
|
36 |
01 Jul 2015; William Hubbs <williamh@g.o> files/kmod-static-nodes-r1: |
37 |
Add -systemd-nspawn keyword to service script for #548092 |
38 |
|
39 |
|
40 |
|
41 |
1.1 sys-apps/kmod/kmod-21.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-21.ebuild?rev=1.1&view=markup |
44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-21.ebuild?rev=1.1&content-type=text/plain |
45 |
|
46 |
Index: kmod-21.ebuild |
47 |
=================================================================== |
48 |
# Copyright 1999-2015 Gentoo Foundation |
49 |
# Distributed under the terms of the GNU General Public License v2 |
50 |
# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-21.ebuild,v 1.1 2015/07/04 20:48:11 williamh Exp $ |
51 |
|
52 |
EAPI=5 |
53 |
|
54 |
PYTHON_COMPAT=( python{2_7,3_3,3_4} ) |
55 |
|
56 |
inherit bash-completion-r1 eutils multilib python-r1 |
57 |
|
58 |
if [[ ${PV} == 9999* ]]; then |
59 |
EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" |
60 |
inherit autotools git-2 |
61 |
else |
62 |
SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz" |
63 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
64 |
inherit libtool |
65 |
fi |
66 |
|
67 |
DESCRIPTION="library and tools for managing linux kernel modules" |
68 |
HOMEPAGE="http://git.kernel.org/?p=utils/kernel/kmod/kmod.git" |
69 |
|
70 |
LICENSE="LGPL-2" |
71 |
SLOT="0" |
72 |
IUSE="debug doc lzma python static-libs +tools zlib" |
73 |
|
74 |
# Upstream does not support running the test suite with custom configure flags. |
75 |
# I was also told that the test suite is intended for kmod developers. |
76 |
# So we have to restrict it. |
77 |
# See bug #408915. |
78 |
RESTRICT="test" |
79 |
|
80 |
# Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch |
81 |
RDEPEND="!sys-apps/module-init-tools |
82 |
!sys-apps/modutils |
83 |
!<sys-apps/openrc-0.13.8 |
84 |
!<sys-apps/systemd-216-r3 |
85 |
lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) |
86 |
python? ( ${PYTHON_DEPS} ) |
87 |
zlib? ( >=sys-libs/zlib-1.2.6 )" #427130 |
88 |
DEPEND="${RDEPEND} |
89 |
doc? ( dev-util/gtk-doc ) |
90 |
lzma? ( virtual/pkgconfig ) |
91 |
python? ( |
92 |
dev-python/cython[${PYTHON_USEDEP}] |
93 |
virtual/pkgconfig |
94 |
) |
95 |
zlib? ( virtual/pkgconfig )" |
96 |
if [[ ${PV} == 9999* ]]; then |
97 |
DEPEND="${DEPEND} |
98 |
dev-libs/libxslt" |
99 |
fi |
100 |
|
101 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
102 |
|
103 |
DOCS="NEWS README TODO" |
104 |
|
105 |
src_prepare() { |
106 |
if [ ! -e configure ]; then |
107 |
if use doc; then |
108 |
gtkdocize --copy --docdir libkmod/docs || die |
109 |
else |
110 |
touch libkmod/docs/gtk-doc.make |
111 |
fi |
112 |
eautoreconf |
113 |
else |
114 |
elibtoolize |
115 |
fi |
116 |
|
117 |
# Restore possibility of running --enable-static wrt #472608 |
118 |
sed -i \ |
119 |
-e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \ |
120 |
configure || die |
121 |
} |
122 |
|
123 |
src_configure() { |
124 |
local myeconfargs=( |
125 |
--bindir="${EPREFIX}/bin" |
126 |
--with-rootlibdir="${EPREFIX}/$(get_libdir)" |
127 |
--enable-shared |
128 |
$(use_enable static-libs static) |
129 |
$(use_enable tools) |
130 |
$(use_enable debug) |
131 |
$(use_enable doc gtk-doc) |
132 |
$(use_with lzma xz) |
133 |
$(use_with zlib) |
134 |
--with-bashcompletiondir="$(get_bashcompdir)" |
135 |
) |
136 |
|
137 |
local ECONF_SOURCE="${S}" |
138 |
|
139 |
kmod_configure() { |
140 |
mkdir -p "${BUILD_DIR}" || die |
141 |
run_in_build_dir econf "${myeconfargs[@]}" "$@" |
142 |
} |
143 |
|
144 |
BUILD_DIR="${WORKDIR}/build" |
145 |
kmod_configure --disable-python |
146 |
|
147 |
if use python; then |
148 |
python_parallel_foreach_impl kmod_configure --enable-python |
149 |
fi |
150 |
} |
151 |
|
152 |
src_compile() { |
153 |
emake -C "${BUILD_DIR}" |
154 |
|
155 |
if use python; then |
156 |
local native_builddir=${BUILD_DIR} |
157 |
|
158 |
python_compile() { |
159 |
emake -C "${BUILD_DIR}" -f Makefile -f - python \ |
160 |
VPATH="${native_builddir}:${S}" \ |
161 |
native_builddir="${native_builddir}" \ |
162 |
libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la' \ |
163 |
<<< 'python: $(pkgpyexec_LTLIBRARIES)' |
164 |
} |
165 |
|
166 |
python_foreach_impl python_compile |
167 |
fi |
168 |
} |
169 |
|
170 |
src_install() { |
171 |
emake -C "${BUILD_DIR}" DESTDIR="${D}" install |
172 |
einstalldocs |
173 |
|
174 |
if use python; then |
175 |
local native_builddir=${BUILD_DIR} |
176 |
|
177 |
python_install() { |
178 |
emake -C "${BUILD_DIR}" DESTDIR="${D}" \ |
179 |
VPATH="${native_builddir}:${S}" \ |
180 |
install-pkgpyexecLTLIBRARIES \ |
181 |
install-dist_pkgpyexecPYTHON |
182 |
} |
183 |
|
184 |
python_foreach_impl python_install |
185 |
fi |
186 |
|
187 |
prune_libtool_files --modules |
188 |
|
189 |
if use tools; then |
190 |
local bincmd sbincmd |
191 |
for sbincmd in depmod insmod lsmod modinfo modprobe rmmod; do |
192 |
dosym /bin/kmod /sbin/${sbincmd} |
193 |
done |
194 |
|
195 |
# These are also usable as normal user |
196 |
for bincmd in lsmod modinfo; do |
197 |
dosym kmod /bin/${bincmd} |
198 |
done |
199 |
fi |
200 |
|
201 |
cat <<-EOF > "${T}"/usb-load-ehci-first.conf |
202 |
softdep uhci_hcd pre: ehci_hcd |
203 |
softdep ohci_hcd pre: ehci_hcd |
204 |
EOF |
205 |
|
206 |
insinto /lib/modprobe.d |
207 |
doins "${T}"/usb-load-ehci-first.conf #260139 |
208 |
|
209 |
newinitd "${FILESDIR}"/kmod-static-nodes-r1 kmod-static-nodes |
210 |
} |
211 |
|
212 |
pkg_postinst() { |
213 |
if [[ -L ${EROOT%/}/etc/runlevels/boot/static-nodes ]]; then |
214 |
ewarn "Removing old conflicting static-nodes init script from the boot runlevel" |
215 |
rm -f "${EROOT%/}"/etc/runlevels/boot/static-nodes |
216 |
fi |
217 |
|
218 |
# Add kmod to the runlevel automatically if this is the first install of this package. |
219 |
if [[ -z ${REPLACING_VERSIONS} ]]; then |
220 |
if [[ ! -d ${EROOT%/}/etc/runlevels/sysinit ]]; then |
221 |
mkdir -p "${EROOT%/}"/etc/runlevels/sysinit |
222 |
fi |
223 |
if [[ -x ${EROOT%/}/etc/init.d/kmod-static-nodes ]]; then |
224 |
ln -s /etc/init.d/kmod-static-nodes "${EROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes |
225 |
fi |
226 |
fi |
227 |
|
228 |
if [[ -e ${EROOT%/}/etc/runlevels/sysinit ]]; then |
229 |
if [[ ! -e ${EROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then |
230 |
ewarn |
231 |
ewarn "You need to add kmod-static-nodes to the sysinit runlevel for" |
232 |
ewarn "kernel modules to have required static nodes!" |
233 |
ewarn "Run this command:" |
234 |
ewarn "\trc-update add kmod-static-nodes sysinit" |
235 |
fi |
236 |
fi |
237 |
} |