/[gentoo-x86]/eclass/kernel-2.eclass
Gentoo

Diff of /eclass/kernel-2.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.232 Revision 1.289
1# Copyright 1999-2009 Gentoo Foundation 1# Copyright 1999-2013 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.232 2010/05/02 08:48:16 robbat2 Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.289 2013/11/02 12:58:50 tomwij Exp $
4 4
5# Description: kernel.eclass rewrite for a clean base regarding the 2.6 5# Description: kernel.eclass rewrite for a clean base regarding the 2.6
6# series of kernel with back-compatibility for 2.4 6# series of kernel with back-compatibility for 2.4
7# 7#
8# Original author: John Mylchreest <johnm@gentoo.org> 8# Original author: John Mylchreest <johnm@gentoo.org>
38# K_SYMLINK - if this is set, then forcably create symlink anyway 38# K_SYMLINK - if this is set, then forcably create symlink anyway
39# 39#
40# K_DEFCONFIG - Allow specifying a different defconfig target. 40# K_DEFCONFIG - Allow specifying a different defconfig target.
41# If length zero, defaults to "defconfig". 41# If length zero, defaults to "defconfig".
42# K_WANT_GENPATCHES - Apply genpatches to kernel source. Provide any 42# K_WANT_GENPATCHES - Apply genpatches to kernel source. Provide any
43# combination of "base" and "extras" 43# combination of "base", "extras" or "experimental".
44# K_EXP_GENPATCHES_PULL - If set, we pull "experimental" regardless of the USE FLAG
45# but expect the ebuild maintainer to use K_EXP_GENPATCHES_LIST.
46# K_EXP_GENPATCHES_NOUSE - If set, no USE flag will be provided for "experimental";
47# as a result the user cannot choose to apply those patches.
48# K_EXP_GENPATCHES_LIST - A list of patches to pick from "experimental" to apply when
49# the USE flag is unset and K_EXP_GENPATCHES_PULL is set.
44# K_GENPATCHES_VER - The version of the genpatches tarball(s) to apply. 50# K_GENPATCHES_VER - The version of the genpatches tarball(s) to apply.
45# A value of "5" would apply genpatches-2.6.12-5 to 51# A value of "5" would apply genpatches-2.6.12-5 to
46# my-sources-2.6.12.ebuild 52# my-sources-2.6.12.ebuild
47# K_SECURITY_UNSUPPORTED- If set, this kernel is unsupported by Gentoo Security 53# K_SECURITY_UNSUPPORTED- If set, this kernel is unsupported by Gentoo Security
48# K_DEBLOB_AVAILABLE - A value of "0" will disable all of the optional deblob 54# K_DEBLOB_AVAILABLE - A value of "0" will disable all of the optional deblob
50# possible. Test ONLY for "1". 56# possible. Test ONLY for "1".
51# K_PREDEBLOBBED - This kernel was already deblobbed elsewhere. 57# K_PREDEBLOBBED - This kernel was already deblobbed elsewhere.
52# If false, either optional deblobbing will be available 58# If false, either optional deblobbing will be available
53# or the license will note the inclusion of freedist 59# or the license will note the inclusion of freedist
54# code. 60# code.
55 61# K_LONGTERM - If set, the eclass will search for the kernel source
62# in the long term directories on the upstream servers
63# as the location has been changed by upstream
56# H_SUPPORTEDARCH - this should be a space separated list of ARCH's which 64# H_SUPPORTEDARCH - this should be a space separated list of ARCH's which
57# can be supported by the headers ebuild 65# can be supported by the headers ebuild
58 66
59# UNIPATCH_LIST - space delimetered list of patches to be applied to the 67# UNIPATCH_LIST - space delimetered list of patches to be applied to the
60# kernel 68# kernel
65# UNIPATCH_DOCS - space delimemeted list of docs to be installed to 73# UNIPATCH_DOCS - space delimemeted list of docs to be installed to
66# the doc dir 74# the doc dir
67# UNIPATCH_STRICTORDER - if this is set places patches into directories of 75# UNIPATCH_STRICTORDER - if this is set places patches into directories of
68# order, so they are applied in the order passed 76# order, so they are applied in the order passed
69 77
78# Changing any other variable in this eclass is not supported; you can request
79# for additional variables to be added by contacting the current maintainer.
80# If you do change them, there is a chance that we will not fix resulting bugs;
81# that of course does not mean we're not willing to help.
82
70inherit eutils toolchain-funcs versionator multilib 83inherit eutils toolchain-funcs versionator multilib
71EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_preinst pkg_postinst 84EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm
72 85
73# Added by Daniel Ostrow <dostrow@gentoo.org> 86# Added by Daniel Ostrow <dostrow@gentoo.org>
74# This is an ugly hack to get around an issue with a 32-bit userland on ppc64. 87# This is an ugly hack to get around an issue with a 32-bit userland on ppc64.
75# I will remove it when I come up with something more reasonable. 88# I will remove it when I come up with something more reasonable.
76[[ ${PROFILE_ARCH} == "ppc64" ]] && CHOST="powerpc64-${CHOST#*-}" 89[[ ${PROFILE_ARCH} == "ppc64" ]] && CHOST="powerpc64-${CHOST#*-}"
79if [[ ${CTARGET} == ${CHOST} && ${CATEGORY/cross-} != ${CATEGORY} ]]; then 92if [[ ${CTARGET} == ${CHOST} && ${CATEGORY/cross-} != ${CATEGORY} ]]; then
80 export CTARGET=${CATEGORY/cross-} 93 export CTARGET=${CATEGORY/cross-}
81fi 94fi
82 95
83HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ ${HOMEPAGE}" 96HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ ${HOMEPAGE}"
84[[ -z ${LICENSE} ]] && \
85 LICENSE="GPL-2" 97: ${LICENSE:="GPL-2"}
86 98
87# This is the latest KV_PATCH of the deblob tool available from the 99# This is the latest KV_PATCH of the deblob tool available from the
88# libre-sources upstream. 100# libre-sources upstream. If you bump this, you MUST regenerate the Manifests
89[[ -z ${DEBLOB_MAX_VERSION} ]] && DEBLOB_MAX_VERSION=33 101# for ALL kernel-2 consumer packages where deblob is available.
102: ${DEBLOB_MAX_VERSION:=38}
90 103
91# No need to run scanelf/strip on kernel sources/headers (bug #134453). 104# No need to run scanelf/strip on kernel sources/headers (bug #134453).
92RESTRICT="binchecks strip" 105RESTRICT="binchecks strip"
93 106
94# set LINUX_HOSTCFLAGS if not already set 107# set LINUX_HOSTCFLAGS if not already set
95[[ -z ${LINUX_HOSTCFLAGS} ]] && \
96 LINUX_HOSTCFLAGS="-Wall -Wstrict-prototypes -Os -fomit-frame-pointer -I${S}/include" 108: ${LINUX_HOSTCFLAGS:="-Wall -Wstrict-prototypes -Os -fomit-frame-pointer -I${S}/include"}
97 109
98# debugging functions 110# debugging functions
99#============================================================== 111#==============================================================
100# this function exists only to help debug kernel-2.eclass 112# this function exists only to help debug kernel-2.eclass
101# if you are adding new functionality in, put a call to it 113# if you are adding new functionality in, put a call to it
102# at the start of src_unpack, or during SRC_URI/dep generation. 114# at the start of src_unpack, or during SRC_URI/dep generation.
103debug-print-kernel2-variables() { 115debug-print-kernel2-variables() {
104 for v in PVR CKV OKV KV KV_FULL KV_MAJOR KV_MINOR KV_PATCH RELEASETYPE \ 116 for v in PVR CKV OKV KV KV_FULL KV_MAJOR KV_MINOR KV_PATCH RELEASETYPE \
105 RELEASE UNIPATCH_LIST_DEFAULT UNIPATCH_LIST_GENPATCHES \ 117 RELEASE UNIPATCH_LIST_DEFAULT UNIPATCH_LIST_GENPATCHES \
106 UNIPATCH_LIST S KERNEL_URI ; do 118 UNIPATCH_LIST S KERNEL_URI K_WANT_GENPATCHES ; do
107 debug-print "${v}: ${!v}" 119 debug-print "${v}: ${!v}"
108 done 120 done
109} 121}
110 122
111#Eclass functions only from here onwards ... 123#Eclass functions only from here onwards ...
112#============================================================== 124#==============================================================
113handle_genpatches() { 125handle_genpatches() {
114 local tarball 126 local tarball
115 [[ -z ${K_WANT_GENPATCHES} || -z ${K_GENPATCHES_VER} ]] && return 1 127 [[ -z ${K_WANT_GENPATCHES} || -z ${K_GENPATCHES_VER} ]] && return 1
116 128
129 debug-print "Inside handle_genpatches"
130 local OKV_ARRAY
131 IFS="." read -r -a OKV_ARRAY <<<"${OKV}"
132
133 # for > 3.0 kernels, handle genpatches tarball name
134 # genpatches for 3.0 and 3.0.1 might be named
135 # genpatches-3.0-1.base.tar.xz and genpatches-3.0-2.base.tar.xz
136 # respectively. Handle this.
137
117 for i in ${K_WANT_GENPATCHES} ; do 138 for i in ${K_WANT_GENPATCHES} ; do
139 if [[ ${KV_MAJOR} -ge 3 ]]; then
140 if [[ ${#OKV_ARRAY[@]} -ge 3 ]]; then
141 tarball="genpatches-${KV_MAJOR}.${KV_MINOR}-${K_GENPATCHES_VER}.${i}.tar.xz"
142 else
143 tarball="genpatches-${KV_MAJOR}.${KV_PATCH}-${K_GENPATCHES_VER}.${i}.tar.xz"
144 fi
145 else
118 tarball="genpatches-${OKV}-${K_GENPATCHES_VER}.${i}.tar.bz2" 146 tarball="genpatches-${OKV}-${K_GENPATCHES_VER}.${i}.tar.xz"
119 GENPATCHES_URI="${GENPATCHES_URI} mirror://gentoo/${tarball}" 147 fi
148
149 local use_cond_start="" use_cond_end=""
150
151 if [[ "${i}" == "experimental" && -z ${K_EXP_GENPATCHES_PULL} && -z ${K_EXP_GENPATCHES_NOUSE} ]] ; then
152 use_cond_start="experimental? ( "
153 use_cond_end=" )"
154
155 if use experimental ; then
156 UNIPATCH_LIST_GENPATCHES+=" ${DISTDIR}/${tarball}"
157 debug-print "genpatches tarball: $tarball"
158 fi
159 else
120 UNIPATCH_LIST_GENPATCHES="${UNIPATCH_LIST_GENPATCHES} ${DISTDIR}/${tarball}" 160 UNIPATCH_LIST_GENPATCHES+=" ${DISTDIR}/${tarball}"
161 debug-print "genpatches tarball: $tarball"
162 fi
163
164 GENPATCHES_URI+=" ${use_cond_start}mirror://gentoo/${tarball}${use_cond_end}"
121 done 165 done
122} 166}
123 167
124detect_version() { 168detect_version() {
125 # this function will detect and set 169 # this function will detect and set
126 # - OKV: Original Kernel Version (2.6.0/2.6.0-test11) 170 # - OKV: Original Kernel Version (2.6.0/2.6.0-test11)
127 # - KV: Kernel Version (2.6.0-gentoo/2.6.0-test11-gentoo-r1) 171 # - KV: Kernel Version (2.6.0-gentoo/2.6.0-test11-gentoo-r1)
128 # - EXTRAVERSION: The additional version appended to OKV (-gentoo/-gentoo-r1) 172 # - EXTRAVERSION: The additional version appended to OKV (-gentoo/-gentoo-r1)
129 173
130 if [[ -n ${KV_FULL} ]]; then 174 # We've already run, so nothing to do here.
131 # we will set this for backwards compatibility. 175 [[ -n ${KV_FULL} ]] && return 0
132 KV=${KV_FULL}
133
134 # we know KV_FULL so lets stop here. but not without resetting S
135 S=${WORKDIR}/linux-${KV_FULL}
136 return
137 fi
138 176
139 # CKV is used as a comparison kernel version, which is used when 177 # CKV is used as a comparison kernel version, which is used when
140 # PV doesnt reflect the genuine kernel version. 178 # PV doesnt reflect the genuine kernel version.
141 # this gets set to the portage style versioning. ie: 179 # this gets set to the portage style versioning. ie:
142 # CKV=2.6.11_rc4 180 # CKV=2.6.11_rc4
146 OKV=${OKV/_rc/-rc} 184 OKV=${OKV/_rc/-rc}
147 OKV=${OKV/-r*} 185 OKV=${OKV/-r*}
148 OKV=${OKV/_p*} 186 OKV=${OKV/_p*}
149 187
150 KV_MAJOR=$(get_version_component_range 1 ${OKV}) 188 KV_MAJOR=$(get_version_component_range 1 ${OKV})
189 # handle if OKV is X.Y or X.Y.Z (e.g. 3.0 or 3.0.1)
190 local OKV_ARRAY
191 IFS="." read -r -a OKV_ARRAY <<<"${OKV}"
192
193 # if KV_MAJOR >= 3, then we have no more KV_MINOR
194 #if [[ ${KV_MAJOR} -lt 3 ]]; then
195 if [[ ${#OKV_ARRAY[@]} -ge 3 ]]; then
151 KV_MINOR=$(get_version_component_range 2 ${OKV}) 196 KV_MINOR=$(get_version_component_range 2 ${OKV})
152 KV_PATCH=$(get_version_component_range 3 ${OKV}) 197 KV_PATCH=$(get_version_component_range 3 ${OKV})
153
154 if [[ ${KV_MAJOR}${KV_MINOR}${KV_PATCH} -ge 269 ]]; then 198 if [[ ${KV_MAJOR}${KV_MINOR}${KV_PATCH} -ge 269 ]]; then
199 KV_EXTRA=$(get_version_component_range 4- ${OKV})
200 KV_EXTRA=${KV_EXTRA/[-_]*}
201 else
202 KV_PATCH=$(get_version_component_range 3- ${OKV})
203 fi
204 else
205 KV_PATCH=$(get_version_component_range 2 ${OKV})
155 KV_EXTRA=$(get_version_component_range 4- ${OKV}) 206 KV_EXTRA=$(get_version_component_range 3- ${OKV})
156 KV_EXTRA=${KV_EXTRA/[-_]*} 207 KV_EXTRA=${KV_EXTRA/[-_]*}
208 fi
209
210 debug-print "KV_EXTRA is ${KV_EXTRA}"
211
212 KV_PATCH=${KV_PATCH/[-_]*}
213
214 local v n=0 missing
215 #if [[ ${KV_MAJOR} -lt 3 ]]; then
216 if [[ ${#OKV_ARRAY[@]} -ge 3 ]]; then
217 for v in CKV OKV KV_{MAJOR,MINOR,PATCH} ; do
218 [[ -z ${!v} ]] && n=1 && missing="${missing}${v} ";
219 done
157 else 220 else
158 KV_PATCH=$(get_version_component_range 3- ${OKV}) 221 for v in CKV OKV KV_{MAJOR,PATCH} ; do
222 [[ -z ${!v} ]] && n=1 && missing="${missing}${v} ";
223 done
224 fi
225
226 [[ $n -eq 1 ]] && \
227 eerror "Missing variables: ${missing}" && \
228 die "Failed to extract kernel version (try explicit CKV in ebuild)!"
229 unset v n missing
230
231# if [[ ${KV_MAJOR} -ge 3 ]]; then
232 if [[ ${#OKV_ARRAY[@]} -lt 3 ]]; then
233 KV_PATCH_ARR=(${KV_PATCH//\./ })
234
235 # at this point 031412, Linus is putting all 3.x kernels in a
236 # 3.x directory, may need to revisit when 4.x is released
237 KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.x"
238
239 [[ -n "${K_LONGTERM}" ]] &&
240 KERNEL_BASE_URI="${KERNEL_BASE_URI}/longterm/v${KV_MAJOR}.${KV_PATCH_ARR}"
241 else
242 #KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.0"
243 #KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}"
244 if [[ ${KV_MAJOR} -ge 3 ]]; then
245 KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.x"
246 else
247 KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}"
159 fi 248 fi
160 KV_PATCH=${KV_PATCH/[-_]*}
161 249
162 KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2" 250 [[ -n "${K_LONGTERM}" ]] &&
251 #KERNEL_BASE_URI="${KERNEL_BASE_URI}/longterm"
252 KERNEL_BASE_URI="${KERNEL_BASE_URI}/longterm/v${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
253 fi
254
255 debug-print "KERNEL_BASE_URI is ${KERNEL_BASE_URI}"
256
257 if [[ ${#OKV_ARRAY[@]} -ge 3 ]] && [[ ${KV_MAJOR} -ge 3 ]]; then
258 # handle non genpatch using sources correctly
259 if [[ -z ${K_WANT_GENPATCHES} && -z ${K_GENPATCHES_VER} && ${KV_PATCH} -gt 0 ]]; then
260 KERNEL_URI="${KERNEL_BASE_URI}/patch-${OKV}.xz"
261 UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV}.xz"
262 fi
263 KERNEL_URI="${KERNEL_URI} ${KERNEL_BASE_URI}/linux-${KV_MAJOR}.${KV_MINOR}.tar.xz"
264 else
265 KERNEL_URI="${KERNEL_BASE_URI}/linux-${OKV}.tar.xz"
266 fi
163 267
164 RELEASE=${CKV/${OKV}} 268 RELEASE=${CKV/${OKV}}
165 RELEASE=${RELEASE/_beta} 269 RELEASE=${RELEASE/_beta}
166 RELEASE=${RELEASE/_rc/-rc} 270 RELEASE=${RELEASE/_rc/-rc}
167 RELEASE=${RELEASE/_pre/-pre} 271 RELEASE=${RELEASE/_pre/-pre}
272 # We cannot trivally call kernel_is here, because it calls us to detect the
273 # version
168 kernel_is ge 2 6 && RELEASE=${RELEASE/-pre/-git} 274 #kernel_is ge 2 6 && RELEASE=${RELEASE/-pre/-git}
275 [ $(($KV_MAJOR * 1000 + ${KV_MINOR:-0})) -ge 2006 ] && RELEASE=${RELEASE/-pre/-git}
169 RELEASETYPE=${RELEASE//[0-9]} 276 RELEASETYPE=${RELEASE//[0-9]}
170 277
171 # Now we know that RELEASE is the -rc/-git 278 # Now we know that RELEASE is the -rc/-git
172 # and RELEASETYPE is the same but with its numerics stripped 279 # and RELEASETYPE is the same but with its numerics stripped
173 # we can work on better sorting EXTRAVERSION. 280 # we can work on better sorting EXTRAVERSION.
174 # first of all, we add the release 281 # first of all, we add the release
175 EXTRAVERSION="${RELEASE}" 282 EXTRAVERSION="${RELEASE}"
176 debug-print "0 EXTRAVERSION:${EXTRAVERSION}" 283 debug-print "0 EXTRAVERSION:${EXTRAVERSION}"
177 [[ -n ${KV_EXTRA} ]] && EXTRAVERSION=".${KV_EXTRA}${EXTRAVERSION}" 284 [[ -n ${KV_EXTRA} ]] && [[ ${KV_MAJOR} -lt 3 ]] && EXTRAVERSION=".${KV_EXTRA}${EXTRAVERSION}"
178 285
179 debug-print "1 EXTRAVERSION:${EXTRAVERSION}" 286 debug-print "1 EXTRAVERSION:${EXTRAVERSION}"
180 if [[ -n "${K_NOUSEPR}" ]]; then 287 if [[ -n "${K_NOUSEPR}" ]]; then
181 # Don't add anything based on PR to EXTRAVERSION 288 # Don't add anything based on PR to EXTRAVERSION
182 debug-print "1.0 EXTRAVERSION:${EXTRAVERSION}" 289 debug-print "1.0 EXTRAVERSION:${EXTRAVERSION}"
200 debug-print "2 EXTRAVERSION:${EXTRAVERSION}" 307 debug-print "2 EXTRAVERSION:${EXTRAVERSION}"
201 308
202 # The only messing around which should actually effect this is for KV_EXTRA 309 # The only messing around which should actually effect this is for KV_EXTRA
203 # since this has to limit OKV to MAJ.MIN.PAT and strip EXTRA off else 310 # since this has to limit OKV to MAJ.MIN.PAT and strip EXTRA off else
204 # KV_FULL evaluates to MAJ.MIN.PAT.EXT.EXT after EXTRAVERSION 311 # KV_FULL evaluates to MAJ.MIN.PAT.EXT.EXT after EXTRAVERSION
312
205 if [[ -n ${KV_EXTRA} ]]; then 313 if [[ -n ${KV_EXTRA} ]]; then
314 if [[ -n ${KV_MINOR} ]]; then
206 OKV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}" 315 OKV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
207 KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/patch-${CKV}.bz2 316 else
208 mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}.tar.bz2" 317 OKV="${KV_MAJOR}.${KV_PATCH}"
318 fi
319 KERNEL_URI="${KERNEL_BASE_URI}/patch-${CKV}.xz
320 ${KERNEL_BASE_URI}/linux-${OKV}.tar.xz"
209 UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV}.bz2" 321 UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV}.xz"
210 fi 322 fi
211 323
212 # We need to set this using OKV, but we need to set it before we do any 324 # We need to set this using OKV, but we need to set it before we do any
213 # messing around with OKV based on RELEASETYPE 325 # messing around with OKV based on RELEASETYPE
214 KV_FULL=${OKV}${EXTRAVERSION} 326 KV_FULL=${OKV}${EXTRAVERSION}
219 331
220 # -rc-git pulls can be achieved by specifying CKV 332 # -rc-git pulls can be achieved by specifying CKV
221 # for example: 333 # for example:
222 # CKV="2.6.11_rc3_pre2" 334 # CKV="2.6.11_rc3_pre2"
223 # will pull: 335 # will pull:
224 # linux-2.6.10.tar.bz2 & patch-2.6.11-rc3.bz2 & patch-2.6.11-rc3-git2.bz2 336 # linux-2.6.10.tar.xz & patch-2.6.11-rc3.xz & patch-2.6.11-rc3-git2.xz
225 337
338 if [[ ${KV_MAJOR}${KV_MINOR} -eq 26 ]]; then
339
226 if [[ ${RELEASETYPE} == -rc ]] || [[ ${RELEASETYPE} == -pre ]]; then 340 if [[ ${RELEASETYPE} == -rc ]] || [[ ${RELEASETYPE} == -pre ]]; then
227 OKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_PATCH} - 1))" 341 OKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_PATCH} - 1))"
228 KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/testing/patch-${CKV//_/-}.bz2 342 KERNEL_URI="${KERNEL_BASE_URI}/testing/patch-${CKV//_/-}.xz
229 mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2" 343 ${KERNEL_BASE_URI}/linux-${OKV}.tar.xz"
230 UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV//_/-}.bz2" 344 UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV//_/-}.xz"
231 fi 345 fi
232 346
233 if [[ ${RELEASETYPE} == -git ]]; then 347 if [[ ${RELEASETYPE} == -git ]]; then
234 KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/snapshots/patch-${OKV}${RELEASE}.bz2 348 KERNEL_URI="${KERNEL_BASE_URI}/snapshots/patch-${OKV}${RELEASE}.xz
235 mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2" 349 ${KERNEL_BASE_URI}/linux-${OKV}.tar.xz"
236 UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${OKV}${RELEASE}.bz2" 350 UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${OKV}${RELEASE}.xz"
237 fi 351 fi
238 352
239 if [[ ${RELEASETYPE} == -rc-git ]]; then 353 if [[ ${RELEASETYPE} == -rc-git ]]; then
240 OKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_PATCH} - 1))" 354 OKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_PATCH} - 1))"
241 KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/snapshots/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE}.bz2 355 KERNEL_URI="${KERNEL_BASE_URI}/snapshots/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE}.xz
242 mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/testing/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE/-git*}.bz2 356 ${KERNEL_BASE_URI}/testing/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE/-git*}.xz
243 mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2" 357 ${KERNEL_BASE_URI}/linux-${OKV}.tar.xz"
358
244 UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE/-git*}.bz2 ${DISTDIR}/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE}.bz2" 359 UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE/-git*}.xz ${DISTDIR}/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE}.xz"
245 fi 360 fi
361 else
362 if [[ ${RELEASETYPE} == -rc ]] || [[ ${RELEASETYPE} == -pre ]]; then
363 if [[ ${KV_MAJOR}${KV_PATCH} -eq 30 ]]; then
364 OKV="2.6.39"
365 else
366 KV_PATCH_ARR=(${KV_PATCH//\./ })
367 OKV="${KV_MAJOR}.$((${KV_PATCH_ARR} - 1))"
368 fi
369 KERNEL_URI="${KERNEL_BASE_URI}/testing/patch-${CKV//_/-}.xz
370 ${KERNEL_BASE_URI}/linux-${OKV}.tar.xz"
371 UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV//_/-}.xz"
372 fi
373
374 if [[ ${RELEASETYPE} == -git ]]; then
375 KERNEL_URI="${KERNEL_BASE_URI}/snapshots/patch-${OKV}${RELEASE}.xz
376 ${KERNEL_BASE_URI}/linux-${OKV}.tar.xz"
377 UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${OKV}${RELEASE}.xz"
378 fi
379
380 if [[ ${RELEASETYPE} == -rc-git ]]; then
381 if [[ ${KV_MAJOR}${KV_PATCH} -eq 30 ]]; then
382 OKV="2.6.39"
383 else
384 KV_PATCH_ARR=(${KV_PATCH//\./ })
385 OKV="${KV_MAJOR}.$((${KV_PATCH_ARR} - 1))"
386 fi
387 KERNEL_URI="${KERNEL_BASE_URI}/snapshots/patch-${KV_MAJOR}.${KV_PATCH}${RELEASE}.xz
388 ${KERNEL_BASE_URI}/testing/patch-${KV_MAJOR}.${KV_PATCH}${RELEASE/-git*}.xz
389 ${KERNEL_BASE_URI}/linux-${OKV}.tar.xz"
390
391 UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${KV_MAJOR}.${KV_PATCH}${RELEASE/-git*}.xz ${DISTDIR}/patch-${KV_MAJOR}.${KV_PATCH}${RELEASE}.xz"
392 fi
393
394
395 fi
396
246 397
247 debug-print-kernel2-variables 398 debug-print-kernel2-variables
248 399
249 handle_genpatches 400 handle_genpatches
250} 401}
251 402
403# Note: duplicated in linux-info.eclass
252kernel_is() { 404kernel_is() {
253 # ALL of these should be set before we can safely continue this function. 405 # ALL of these should be set before we can safely continue this function.
254 # some of the sources have in the past had only one set. 406 # some of the sources have in the past had only one set.
255 local v n=0 407 local v n=0
256 for v in OKV KV_{MAJOR,MINOR,PATCH} ; do [[ -z ${!v} ]] && n=1 ; done 408 for v in OKV KV_{MAJOR,MINOR,PATCH} ; do [[ -z ${!v} ]] && n=1 ; done
257 [[ $n -eq 1 ]] && detect_version 409 [[ $n -eq 1 ]] && detect_version
258 unset v n 410 unset v n
259 411
260 # Now we can continue 412 # Now we can continue
261 local operator test value x=0 y=0 z=0 413 local operator test value
262 414
263 case ${1} in 415 case ${1#-} in
264 lt) operator="-lt"; shift;; 416 lt) operator="-lt"; shift;;
265 gt) operator="-gt"; shift;; 417 gt) operator="-gt"; shift;;
266 le) operator="-le"; shift;; 418 le) operator="-le"; shift;;
267 ge) operator="-ge"; shift;; 419 ge) operator="-ge"; shift;;
268 eq) operator="-eq"; shift;; 420 eq) operator="-eq"; shift;;
269 *) operator="-eq";; 421 *) operator="-eq";;
270 esac 422 esac
271
272 for x in ${@}; do
273 for((y=0; y<$((3 - ${#x})); y++)); do value="${value}0"; done
274 value="${value}${x}"
275 z=$((${z} + 1))
276
277 case ${z} in
278 1) for((y=0; y<$((3 - ${#KV_MAJOR})); y++)); do test="${test}0"; done;
279 test="${test}${KV_MAJOR}";;
280 2) for((y=0; y<$((3 - ${#KV_MINOR})); y++)); do test="${test}0"; done;
281 test="${test}${KV_MINOR}";;
282 3) for((y=0; y<$((3 - ${#KV_PATCH})); y++)); do test="${test}0"; done;
283 test="${test}${KV_PATCH}";;
284 *) die "Error in kernel-2_kernel_is(): Too many parameters.";; 423 [[ $# -gt 3 ]] && die "Error in kernel-2_kernel_is(): too many parameters"
285 esac
286 done
287 424
288 [ ${test} ${operator} ${value} ] && return 0 || return 1 425 : $(( test = (KV_MAJOR << 16) + (KV_MINOR << 8) + KV_PATCH ))
426 : $(( value = (${1:-${KV_MAJOR}} << 16) + (${2:-${KV_MINOR}} << 8) + ${3:-${KV_PATCH}} ))
427 [ ${test} ${operator} ${value} ]
289} 428}
290 429
291kernel_is_2_4() { 430kernel_is_2_4() {
292 kernel_is 2 4 431 kernel_is 2 4
293} 432}
299# Capture the sources type and set DEPENDs 438# Capture the sources type and set DEPENDs
300if [[ ${ETYPE} == sources ]]; then 439if [[ ${ETYPE} == sources ]]; then
301 DEPEND="!build? ( sys-apps/sed 440 DEPEND="!build? ( sys-apps/sed
302 >=sys-devel/binutils-2.11.90.0.31 )" 441 >=sys-devel/binutils-2.11.90.0.31 )"
303 RDEPEND="!build? ( >=sys-libs/ncurses-5.2 442 RDEPEND="!build? ( >=sys-libs/ncurses-5.2
304 sys-devel/make )" 443 sys-devel/make
444 dev-lang/perl
445 sys-devel/bc )"
305 PDEPEND="!build? ( virtual/dev-manager )" 446 PDEPEND="!build? ( virtual/dev-manager )"
306 447
307 PROVIDE="virtual/linux-sources"
308 kernel_is gt 2 4 && PROVIDE="${PROVIDE} virtual/alsa"
309
310 SLOT="${PVR}" 448 SLOT="${PVR}"
311 DESCRIPTION="Sources for the ${KV_MAJOR}.${KV_MINOR} linux kernel" 449 DESCRIPTION="Sources based on the Linux Kernel."
312 IUSE="symlink build" 450 IUSE="symlink build"
313 451
314 # Bug #266157, deblob for libre support 452 # Bug #266157, deblob for libre support
315 if [[ -z ${K_PREDEBLOBBED} ]] ; then 453 if [[ -z ${K_PREDEBLOBBED} ]] ; then
316 if [[ -z ${K_DEBLOB_AVAILABLE} ]] ; then 454 # Bug #359865, force a call to detect_version if needed
317 kernel_is ge 2 6 27 && \ 455 kernel_is ge 2 6 27 && \
456 [[ -z "${K_DEBLOB_AVAILABLE}" ]] && \
318 kernel_is le 2 6 ${DEBLOB_MAX_VERSION} && \ 457 kernel_is le 2 6 ${DEBLOB_MAX_VERSION} && \
319 K_DEBLOB_AVAILABLE=1 458 K_DEBLOB_AVAILABLE=1
320 fi
321 if [[ ${K_DEBLOB_AVAILABLE} == "1" ]] ; then 459 if [[ ${K_DEBLOB_AVAILABLE} == "1" ]] ; then
322 IUSE="${IUSE} deblob" 460 IUSE="${IUSE} deblob"
323 # Reflect that kernels contain firmware blobs unless otherwise 461 # Reflect that kernels contain firmware blobs unless otherwise
324 # stripped 462 # stripped
325 LICENSE="${LICENSE} !deblob? ( freedist )" 463 LICENSE="${LICENSE} !deblob? ( freedist )"
326 464
465 if [[ -n KV_MINOR ]]; then
327 DEBLOB_PV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}" 466 DEBLOB_PV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
467 else
468 DEBLOB_PV="${KV_MAJOR}.${KV_PATCH}"
469 fi
470
471 if [[ ${KV_MAJOR} -ge 3 ]]; then
472 DEBLOB_PV="${KV_MAJOR}.${KV_MINOR}"
473 fi
474
328 DEBLOB_A="deblob-${DEBLOB_PV}" 475 DEBLOB_A="deblob-${DEBLOB_PV}"
476 DEBLOB_CHECK_A="deblob-check-${DEBLOB_PV}"
329 DEBLOB_HOMEPAGE="http://www.fsfla.org/svnwiki/selibre/linux-libre/" 477 DEBLOB_HOMEPAGE="http://www.fsfla.org/svnwiki/selibre/linux-libre/"
478 DEBLOB_URI_PATH="download/releases/LATEST-${DEBLOB_PV}.N"
479 if ! has "${EAPI:-0}" 0 1 ; then
480 DEBLOB_CHECK_URI="${DEBLOB_HOMEPAGE}/${DEBLOB_URI_PATH}/deblob-check -> ${DEBLOB_CHECK_A}"
481 else
482 DEBLOB_CHECK_URI="mirror://gentoo/${DEBLOB_CHECK_A}"
483 fi
484 DEBLOB_URI="${DEBLOB_HOMEPAGE}/${DEBLOB_URI_PATH}/${DEBLOB_A}"
330 HOMEPAGE="${HOMEPAGE} ${DEBLOB_HOMEPAGE}" 485 HOMEPAGE="${HOMEPAGE} ${DEBLOB_HOMEPAGE}"
331 486
487 DEPEND+=" deblob? ( =dev-lang/python-2* )"
332 KERNEL_URI="${KERNEL_URI} 488 KERNEL_URI="${KERNEL_URI}
333 deblob? ( 489 deblob? (
334 ${DEBLOB_HOMEPAGE}/download/releases/LATEST-${DEBLOB_PV}.N/${DEBLOB_A} 490 ${DEBLOB_URI}
491 ${DEBLOB_CHECK_URI}
335 )" 492 )"
336 else 493 else
337 # We have no way to deblob older kernels, so just mark them as 494 # We have no way to deblob older kernels, so just mark them as
338 # tainted with non-libre materials. 495 # tainted with non-libre materials.
339 LICENSE="${LICENSE} freedist" 496 LICENSE="${LICENSE} freedist"
345 502
346 # Since we should NOT honour KBUILD_OUTPUT in headers 503 # Since we should NOT honour KBUILD_OUTPUT in headers
347 # lets unset it here. 504 # lets unset it here.
348 unset KBUILD_OUTPUT 505 unset KBUILD_OUTPUT
349 506
350 if [[ ${CTARGET} = ${CHOST} ]]; then
351 DEPEND="!virtual/os-headers"
352 PROVIDE="virtual/os-headers"
353 SLOT="0" 507 SLOT="0"
354 else
355 SLOT="${CTARGET}"
356 fi
357else 508else
358 eerror "Unknown ETYPE=\"${ETYPE}\", must be \"sources\" or \"headers\"" 509 eerror "Unknown ETYPE=\"${ETYPE}\", must be \"sources\" or \"headers\""
359 die "Unknown ETYPE=\"${ETYPE}\", must be \"sources\" or \"headers\"" 510 die "Unknown ETYPE=\"${ETYPE}\", must be \"sources\" or \"headers\""
360fi 511fi
361 512
417 || die "make include/linux/version.h failed" 568 || die "make include/linux/version.h failed"
418 rm -f .config >/dev/null 569 rm -f .config >/dev/null
419} 570}
420 571
421universal_unpack() { 572universal_unpack() {
573 debug-print "Inside universal_unpack"
574
575 local OKV_ARRAY
576 IFS="." read -r -a OKV_ARRAY <<<"${OKV}"
577
422 cd "${WORKDIR}" 578 cd "${WORKDIR}"
579 if [[ ${#OKV_ARRAY[@]} -ge 3 ]] && [[ ${KV_MAJOR} -ge 3 ]]; then
580 unpack linux-${KV_MAJOR}.${KV_MINOR}.tar.xz
581 else
423 unpack linux-${OKV}.tar.bz2 582 unpack linux-${OKV}.tar.xz
583 fi
584
424 if [[ -d "linux" ]]; then 585 if [[ -d "linux" ]]; then
586 debug-print "Moving linux to linux-${KV_FULL}"
425 mv linux linux-${KV_FULL} \ 587 mv linux linux-${KV_FULL} \
426 || die "Unable to move source tree to ${KV_FULL}." 588 || die "Unable to move source tree to ${KV_FULL}."
427 elif [[ "${OKV}" != "${KV_FULL}" ]]; then 589 elif [[ "${OKV}" != "${KV_FULL}" ]]; then
590 if [[ ${#OKV_ARRAY[@]} -ge 3 ]] && [[ ${KV_MAJOR} -ge 3 ]] &&
591 [[ "${ETYPE}" = "sources" ]]; then
592 debug-print "moving linux-${KV_MAJOR}.${KV_MINOR} to linux-${KV_FULL} "
593 mv linux-${KV_MAJOR}.${KV_MINOR} linux-${KV_FULL} \
594 || die "Unable to move source tree to ${KV_FULL}."
595 else
596 debug-print "moving linux-${OKV} to linux-${KV_FULL} "
428 mv linux-${OKV} linux-${KV_FULL} \ 597 mv linux-${OKV} linux-${KV_FULL} \
598 || die "Unable to move source tree to ${KV_FULL}."
599 fi
600 elif [[ ${#OKV_ARRAY[@]} -ge 3 ]] && [[ ${KV_MAJOR} -ge 3 ]]; then
601 mv linux-${KV_MAJOR}.${KV_MINOR} linux-${KV_FULL} \
429 || die "Unable to move source tree to ${KV_FULL}." 602 || die "Unable to move source tree to ${KV_FULL}."
430 fi 603 fi
431 cd "${S}" 604 cd "${S}"
432 605
433 # remove all backup files 606 # remove all backup files
434 find . -iname "*~" -exec rm {} \; 2> /dev/null 607 find . -iname "*~" -exec rm {} \; 2> /dev/null
435 608
436 # fix a problem on ppc where TOUT writes to /usr/src/linux breaking sandbox
437 # only do this for kernel < 2.6.27 since this file does not exist in later
438 # kernels
439 if [[ ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} < 2.6.27 ]]
440 then
441 sed -i \
442 -e 's|TOUT := .tmp_gas_check|TOUT := $(T).tmp_gas_check|' \
443 "${S}"/arch/ppc/Makefile
444 else
445 sed -i \
446 -e 's|TOUT := .tmp_gas_check|TOUT := $(T).tmp_gas_check|' \
447 "${S}"/arch/powerpc/Makefile
448 fi
449} 609}
450 610
451unpack_set_extraversion() { 611unpack_set_extraversion() {
452 cd "${S}" 612 cd "${S}"
453 sed -i -e "s:^\(EXTRAVERSION =\).*:\1 ${EXTRAVERSION}:" Makefile 613 sed -i -e "s:^\(EXTRAVERSION =\).*:\1 ${EXTRAVERSION}:" Makefile
530} 690}
531 691
532# install functions 692# install functions
533#============================================================== 693#==============================================================
534install_universal() { 694install_universal() {
535 #fix silly permissions in tarball 695 # Fix silly permissions in tarball
536 cd "${WORKDIR}" 696 cd "${WORKDIR}"
537 chown -R root:0 * >& /dev/null 697 chown -R 0:0 * >& /dev/null
538 chmod -R a+r-w+X,u+w * 698 chmod -R a+r-w+X,u+w *
539 cd ${OLDPWD} 699 cd ${OLDPWD}
540} 700}
541 701
542install_headers() { 702install_headers() {
547 if kernel_is ge 2 6 18 ; then 707 if kernel_is ge 2 6 18 ; then
548 env_setup_xmakeopts 708 env_setup_xmakeopts
549 emake headers_install INSTALL_HDR_PATH="${D}"/${ddir}/.. ${xmakeopts} || die 709 emake headers_install INSTALL_HDR_PATH="${D}"/${ddir}/.. ${xmakeopts} || die
550 710
551 # let other packages install some of these headers 711 # let other packages install some of these headers
552 rm -rf "${D}"/${ddir}/sound #alsa-headers
553 rm -rf "${D}"/${ddir}/scsi #glibc/uclibc/etc... 712 rm -rf "${D}"/${ddir}/scsi #glibc/uclibc/etc...
554 return 0 713 return 0
555 fi 714 fi
556 715
557 # Do not use "linux/*" as that can cause problems with very long 716 # Do not use "linux/*" as that can cause problems with very long
558 # $S values where the cmdline to cp is too long 717 # $S values where the cmdline to cp is too long
559 cd "${S}" 718 pushd "${S}" >/dev/null
560 dodir ${ddir}/linux 719 dodir ${ddir}/linux
561 cp -pPR "${S}"/include/linux "${D}"/${ddir}/ || die 720 cp -pPR "${S}"/include/linux "${D}"/${ddir}/ || die
562 rm -rf "${D}"/${ddir}/linux/modules 721 rm -rf "${D}"/${ddir}/linux/modules
563 722
564 # Handle multilib headers and crap
565 local multi_dirs="" multi_defs=""
566 case $(tc-arch-kernel) in
567 sparc64)
568 multi_dirs="sparc sparc64"
569 multi_defs="!__arch64__ __arch64__"
570 ;;
571 x86_64)
572 multi_dirs="i386 x86_64"
573 multi_defs="__i386__ __x86_64__"
574 ;;
575 ppc64)
576 multi_dirs="ppc ppc64"
577 multi_defs="!__powerpc64__ __powerpc64__"
578 ;;
579 s390x)
580 multi_dirs="s390 s390x"
581 multi_defs="!__s390x__ __s390x__"
582 ;;
583 arm)
584 dodir ${ddir}/asm 723 dodir ${ddir}/asm
585 cp -pPR "${S}"/include/asm/* "${D}"/${ddir}/asm 724 cp -pPR "${S}"/include/asm/* "${D}"/${ddir}/asm
586 [[ ! -e ${D}/${ddir}/asm/arch ]] && ln -sf arch-ebsa285 "${D}"/${ddir}/asm/arch
587 [[ ! -e ${D}/${ddir}/asm/proc ]] && ln -sf proc-armv "${D}"/${ddir}/asm/proc
588 ;;
589 powerpc)
590 dodir ${ddir}/asm
591 cp -pPR "${S}"/include/asm/* "${D}"/${ddir}/asm
592 if [[ -e "${S}"/include/asm-ppc ]] ; then
593 dodir ${ddir}/asm-ppc
594 cp -pPR "${S}"/include/asm-ppc/* "${D}"/${ddir}/asm-ppc
595 fi
596 ;;
597 *)
598 dodir ${ddir}/asm
599 cp -pPR "${S}"/include/asm/* "${D}"/${ddir}/asm
600 ;;
601 esac
602 if [[ -n ${multi_dirs} ]] ; then
603 local d ml_inc=""
604 for d in ${multi_dirs} ; do
605 dodir ${ddir}/asm-${d}
606 cp -pPR "${S}"/include/asm-${d}/* "${D}"/${ddir}/asm-${d}/ || die "cp asm-${d} failed"
607 725
608 ml_inc="${ml_inc} ${multi_defs%% *}:${ddir}/asm-${d}"
609 multi_defs=${multi_defs#* }
610 done
611 create_ml_includes ${ddir}/asm ${ml_inc}
612 fi
613
614 if kernel_is 2 6; then 726 if kernel_is 2 6 ; then
615 dodir ${ddir}/asm-generic 727 dodir ${ddir}/asm-generic
616 cp -pPR "${S}"/include/asm-generic/* "${D}"/${ddir}/asm-generic 728 cp -pPR "${S}"/include/asm-generic/* "${D}"/${ddir}/asm-generic
617 fi 729 fi
618 730
619 # clean up 731 # clean up
620 find "${D}" -name '*.orig' -exec rm -f {} \; 732 find "${D}" -name '*.orig' -exec rm -f {} \;
621 733
622 cd ${OLDPWD} 734 popd >/dev/null
623} 735}
624 736
625install_sources() { 737install_sources() {
626 local file 738 local file
627 739
646 echo "Please check the ebuild ChangeLog for more details." \ 758 echo "Please check the ebuild ChangeLog for more details." \
647 > "${S}"/patches.txt 759 > "${S}"/patches.txt
648 fi 760 fi
649 761
650 mv ${WORKDIR}/linux* "${D}"/usr/src 762 mv ${WORKDIR}/linux* "${D}"/usr/src
763
764 if [[ -n "${UNIPATCH_DOCS}" ]] ; then
765 for i in ${UNIPATCH_DOCS}; do
766 dodoc "${T}"/${i}
767 done
768 fi
651} 769}
652 770
653# pkg_preinst functions 771# pkg_preinst functions
654#============================================================== 772#==============================================================
655preinst_headers() { 773preinst_headers() {
714 fi 832 fi
715 833
716 # optionally display security unsupported message 834 # optionally display security unsupported message
717 # Start with why 835 # Start with why
718 if [[ ${K_SECURITY_UNSUPPORTED} = deblob ]]; then 836 if [[ ${K_SECURITY_UNSUPPORTED} = deblob ]]; then
719 ewarn "Deblobbed kernels are UNSUPPORTED by Gentoo Security" 837 ewarn "Deblobbed kernels may not be up-to-date security-wise"
838 ewarn "as they depend on external scripts."
720 elif [[ -n ${K_SECURITY_UNSUPPORTED} ]]; then 839 elif [[ -n ${K_SECURITY_UNSUPPORTED} ]]; then
721 ewarn "${PN} is UNSUPPORTED by Gentoo Security." 840 ewarn "${PN} is UNSUPPORTED by Gentoo Security."
722 fi 841 fi
723 # And now the general message. 842 # And now the general message.
724 if [[ -n ${K_SECURITY_UNSUPPORTED} ]]; then 843 if [[ -n ${K_SECURITY_UNSUPPORTED} ]]; then
729 848
730 # warn sparc users that they need to do cross-compiling with >= 2.6.25(bug #214765) 849 # warn sparc users that they need to do cross-compiling with >= 2.6.25(bug #214765)
731 KV_MAJOR=$(get_version_component_range 1 ${OKV}) 850 KV_MAJOR=$(get_version_component_range 1 ${OKV})
732 KV_MINOR=$(get_version_component_range 2 ${OKV}) 851 KV_MINOR=$(get_version_component_range 2 ${OKV})
733 KV_PATCH=$(get_version_component_range 3 ${OKV}) 852 KV_PATCH=$(get_version_component_range 3 ${OKV})
734 if [[ "$(tc-arch)" = "sparc" ]] \ 853 if [[ "$(tc-arch)" = "sparc" ]]; then
735 && [[ ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} > 2.6.24 ]] 854 if [[ ${KV_MAJOR} -ge 3 || ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} > 2.6.24 ]]
736 then 855 then
737 echo 856 echo
738 elog "NOTE: Since 2.6.25 the kernel Makefile has changed in a way that" 857 elog "NOTE: Since 2.6.25 the kernel Makefile has changed in a way that"
739 elog "you now need to do" 858 elog "you now need to do"
740 elog " make CROSS_COMPILE=sparc64-unknown-linux-gnu-" 859 elog " make CROSS_COMPILE=sparc64-unknown-linux-gnu-"
741 elog "instead of just" 860 elog "instead of just"
742 elog " make" 861 elog " make"
743 elog "to compile the kernel. For more information please browse to" 862 elog "to compile the kernel. For more information please browse to"
744 elog "https://bugs.gentoo.org/show_bug.cgi?id=214765" 863 elog "https://bugs.gentoo.org/show_bug.cgi?id=214765"
745 echo 864 echo
746 fi 865 fi
747} 866 fi
748
749postinst_headers() {
750 elog "Kernel headers are usually only used when recompiling your system libc, as"
751 elog "such, following the installation of newer headers, it is advised that you"
752 elog "re-merge your system libc."
753 elog "Failure to do so will cause your system libc to not make use of newer"
754 elog "features present in the updated kernel headers."
755} 867}
756 868
757# pkg_setup functions 869# pkg_setup functions
758#============================================================== 870#==============================================================
759setup_headers() { 871setup_headers() {
773 885
774# unipatch 886# unipatch
775#============================================================== 887#==============================================================
776unipatch() { 888unipatch() {
777 local i x y z extention PIPE_CMD UNIPATCH_DROP KPATCH_DIR PATCH_DEPTH ELINE 889 local i x y z extention PIPE_CMD UNIPATCH_DROP KPATCH_DIR PATCH_DEPTH ELINE
778 local STRICT_COUNT PATCH_LEVEL myLC_ALL myLANG extglob_bak 890 local STRICT_COUNT PATCH_LEVEL myLC_ALL myLANG
779 891
780 # set to a standard locale to ensure sorts are ordered properly. 892 # set to a standard locale to ensure sorts are ordered properly.
781 myLC_ALL="${LC_ALL}" 893 myLC_ALL="${LC_ALL}"
782 myLANG="${LANG}" 894 myLANG="${LANG}"
783 LC_ALL="C" 895 LC_ALL="C"
785 897
786 [ -z "${KPATCH_DIR}" ] && KPATCH_DIR="${WORKDIR}/patches/" 898 [ -z "${KPATCH_DIR}" ] && KPATCH_DIR="${WORKDIR}/patches/"
787 [ ! -d ${KPATCH_DIR} ] && mkdir -p ${KPATCH_DIR} 899 [ ! -d ${KPATCH_DIR} ] && mkdir -p ${KPATCH_DIR}
788 900
789 # We're gonna need it when doing patches with a predefined patchlevel 901 # We're gonna need it when doing patches with a predefined patchlevel
790 extglob_bak=$(shopt -p extglob)
791 shopt -s extglob 902 eshopts_push -s extglob
792 903
793 # This function will unpack all passed tarballs, add any passed patches, and remove any passed patchnumbers 904 # This function will unpack all passed tarballs, add any passed patches, and remove any passed patchnumbers
794 # usage can be either via an env var or by params 905 # usage can be either via an env var or by params
795 # although due to the nature we pass this within this eclass 906 # although due to the nature we pass this within this eclass
796 # it shall be by param only. 907 # it shall be by param only.
822 else 933 else
823 extention=${i/*./} 934 extention=${i/*./}
824 extention=${extention/:*/} 935 extention=${extention/:*/}
825 PIPE_CMD="" 936 PIPE_CMD=""
826 case ${extention} in 937 case ${extention} in
938 xz) PIPE_CMD="xz -dc";;
939 lzma) PIPE_CMD="lzma -dc";;
827 bz2) PIPE_CMD="bzip2 -dc";; 940 bz2) PIPE_CMD="bzip2 -dc";;
828 patch) PIPE_CMD="cat";; 941 patch*) PIPE_CMD="cat";;
829 diff) PIPE_CMD="cat";; 942 diff) PIPE_CMD="cat";;
830 gz|Z|z) PIPE_CMD="gzip -dc";; 943 gz|Z|z) PIPE_CMD="gzip -dc";;
831 ZIP|zip) PIPE_CMD="unzip -p";; 944 ZIP|zip) PIPE_CMD="unzip -p";;
832 *) UNIPATCH_DROP="${UNIPATCH_DROP} ${i/:*/}";; 945 *) UNIPATCH_DROP="${UNIPATCH_DROP} ${i/:*/}";;
833 esac 946 esac
854 do z="${z}0"; 967 do z="${z}0";
855 done 968 done
856 PATCH_ORDER="${z}${STRICT_COUNT}" 969 PATCH_ORDER="${z}${STRICT_COUNT}"
857 970
858 mkdir -p ${KPATCH_DIR}/${PATCH_ORDER}/ 971 mkdir -p ${KPATCH_DIR}/${PATCH_ORDER}/
859 $(${PIPE_CMD} ${i} > ${KPATCH_DIR}/${PATCH_ORDER}/${x}.patch${PATCH_LEVEL}) 972 $(${PIPE_CMD} ${i} > ${KPATCH_DIR}/${PATCH_ORDER}/${x}.patch${PATCH_LEVEL}) || die "uncompressing patch failed"
860 else 973 else
861 $(${PIPE_CMD} ${i} > ${KPATCH_DIR}/${x}.patch${PATCH_LEVEL}) 974 $(${PIPE_CMD} ${i} > ${KPATCH_DIR}/${x}.patch${PATCH_LEVEL}) || die "uncompressing patch failed"
862 fi 975 fi
863 fi 976 fi
977 fi
978
979 # If experimental was not chosen by the user, drop experimental patches not in K_EXP_GENPATCHES_LIST.
980 if [[ "${i}" == *"genpatches-"*".experimental."* && -n ${K_EXP_GENPATCHES_PULL} ]] ; then
981 if [[ -z ${K_EXP_GENPATCHES_NOUSE} ]] && use experimental; then
982 continue
983 fi
984
985 local j
986 for j in ${KPATCH_DIR}/*/50*_*.patch*; do
987 if [[ ! "${K_EXP_GENPATCHES_LIST}" == *"$(basename ${j})"* ]] ; then
988 UNIPATCH_DROP+=" $(basename ${j})"
989 fi
990 done
864 fi 991 fi
865 done 992 done
866 993
867 #populate KPATCH_DIRS so we know where to look to remove the excludes 994 #populate KPATCH_DIRS so we know where to look to remove the excludes
868 x=${KPATCH_DIR} 995 x=${KPATCH_DIR}
872 done 999 done
873 1000
874 # do not apply fbcondecor patch to sparc/sparc64 as it breaks boot 1001 # do not apply fbcondecor patch to sparc/sparc64 as it breaks boot
875 # bug #272676 1002 # bug #272676
876 if [[ "$(tc-arch)" = "sparc" || "$(tc-arch)" = "sparc64" ]]; then 1003 if [[ "$(tc-arch)" = "sparc" || "$(tc-arch)" = "sparc64" ]]; then
877 if [[ ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} > 2.6.28 ]]; then 1004 if [[ ${KV_MAJOR} -ge 3 || ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} > 2.6.28 ]]; then
878 UNIPATCH_DROP="${UNIPATCH_DROP} *_fbcondecor-0.9.6.patch" 1005 UNIPATCH_DROP="${UNIPATCH_DROP} *_fbcondecor-0.9.6.patch"
879 echo 1006 echo
880 ewarn "fbcondecor currently prevents sparc/sparc64 from booting" 1007 ewarn "fbcondecor currently prevents sparc/sparc64 from booting"
881 ewarn "for kernel versions >= 2.6.29. Removing fbcondecor patch." 1008 ewarn "for kernel versions >= 2.6.29. Removing fbcondecor patch."
882 ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=272676 for details" 1009 ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=272676 for details"
901 [ -z ${i/*.patch*/} ] && PATCH_DEPTH=${i/*.patch/} 1028 [ -z ${i/*.patch*/} ] && PATCH_DEPTH=${i/*.patch/}
902 #[ -z ${i/*.diff*/} ] && PATCH_DEPTH=${i/*.diff/} 1029 #[ -z ${i/*.diff*/} ] && PATCH_DEPTH=${i/*.diff/}
903 1030
904 if [ -z "${PATCH_DEPTH}" ]; then PATCH_DEPTH=0; fi 1031 if [ -z "${PATCH_DEPTH}" ]; then PATCH_DEPTH=0; fi
905 1032
906 ebegin "Applying ${i/*\//} (-p${PATCH_DEPTH}+)"
907 while [ ${PATCH_DEPTH} -lt 5 ]; do 1033 while [ ${PATCH_DEPTH} -lt 5 ]; do
908 echo "Attempting Dry-run:" >> ${STDERR_T} 1034 echo "Attempting Dry-run:" >> ${STDERR_T}
909 echo "cmd: patch -p${PATCH_DEPTH} --no-backup-if-mismatch --dry-run -f < ${i}" >> ${STDERR_T} 1035 echo "cmd: patch -p${PATCH_DEPTH} --no-backup-if-mismatch --dry-run -f < ${i}" >> ${STDERR_T}
910 echo "=======================================================" >> ${STDERR_T} 1036 echo "=======================================================" >> ${STDERR_T}
911 if [ $(patch -p${PATCH_DEPTH} --no-backup-if-mismatch --dry-run -f < ${i} >> ${STDERR_T}) $? -eq 0 ]; then 1037 if [ $(patch -p${PATCH_DEPTH} --no-backup-if-mismatch --dry-run -f < ${i} >> ${STDERR_T}) $? -eq 0 ]; then
1038 ebegin "Applying ${i/*\//} (-p${PATCH_DEPTH})"
912 echo "Attempting patch:" > ${STDERR_T} 1039 echo "Attempting patch:" > ${STDERR_T}
913 echo "cmd: patch -p${PATCH_DEPTH} --no-backup-if-mismatch -f < ${i}" >> ${STDERR_T} 1040 echo "cmd: patch -p${PATCH_DEPTH} --no-backup-if-mismatch -f < ${i}" >> ${STDERR_T}
914 echo "=======================================================" >> ${STDERR_T} 1041 echo "=======================================================" >> ${STDERR_T}
915 if [ $(patch -p${PATCH_DEPTH} --no-backup-if-mismatch -f < ${i} >> ${STDERR_T}) "$?" -eq 0 ]; then 1042 if [ $(patch -p${PATCH_DEPTH} --no-backup-if-mismatch -f < ${i} >> ${STDERR_T}) "$?" -eq 0 ]; then
916 eend 0 1043 eend 0
918 break 1045 break
919 else 1046 else
920 eend 1 1047 eend 1
921 eerror "Failed to apply patch ${i/*\//}" 1048 eerror "Failed to apply patch ${i/*\//}"
922 eerror "Please attach ${STDERR_T} to any bug you may post." 1049 eerror "Please attach ${STDERR_T} to any bug you may post."
923 die "Failed to apply ${i/*\//}" 1050 eshopts_pop
1051 die "Failed to apply ${i/*\//} on patch depth ${PATCH_DEPTH}."
924 fi 1052 fi
925 else 1053 else
926 PATCH_DEPTH=$((${PATCH_DEPTH} + 1)) 1054 PATCH_DEPTH=$((${PATCH_DEPTH} + 1))
927 fi 1055 fi
928 done 1056 done
929 if [ ${PATCH_DEPTH} -eq 5 ]; then 1057 if [ ${PATCH_DEPTH} -eq 5 ]; then
930 eend 1 1058 eerror "Failed to dry-run patch ${i/*\//}"
931 eerror "Please attach ${STDERR_T} to any bug you may post." 1059 eerror "Please attach ${STDERR_T} to any bug you may post."
932 die "Unable to dry-run patch." 1060 eshopts_pop
1061 die "Unable to dry-run patch on any patch depth lower than 5."
933 fi 1062 fi
934 done 1063 done
935 done 1064 done
936 1065
937 # This is a quick, and kind of nasty hack to deal with UNIPATCH_DOCS which 1066 # When genpatches is used, we want to install 0000_README which documents
938 # sit in KPATCH_DIR's. This is handled properly in the unipatch rewrite, 1067 # the patches that were used; such that the user can see them, bug #301478.
939 # which is why I'm not taking too much time over this. 1068 if [[ ! -z ${K_WANT_GENPATCHES} ]] ; then
1069 UNIPATCH_DOCS="${UNIPATCH_DOCS} 0000_README"
1070 fi
1071
1072 # When files listed in UNIPATCH_DOCS are found in KPATCH_DIR's, we copy it
1073 # to the temporary directory and remember them in UNIPATCH_DOCS to install
1074 # them during the install phase.
940 local tmp 1075 local tmp
1076 for x in ${KPATCH_DIR}; do
941 for i in ${UNIPATCH_DOCS}; do 1077 for i in ${UNIPATCH_DOCS}; do
1078 if [[ -f "${x}/${i}" ]] ; then
942 tmp="${tmp} ${i//*\/}" 1079 tmp="${tmp} ${i}"
943 cp -f ${i} "${T}"/ 1080 cp -f "${x}/${i}" "${T}"/
1081 fi
1082 done
944 done 1083 done
945 UNIPATCH_DOCS="${tmp}" 1084 UNIPATCH_DOCS="${tmp}"
946 1085
947 # clean up KPATCH_DIR's - fixes bug #53610 1086 # clean up KPATCH_DIR's - fixes bug #53610
948 for x in ${KPATCH_DIR}; do rm -Rf ${x}; done 1087 for x in ${KPATCH_DIR}; do rm -Rf ${x}; done
949 1088
950 LC_ALL="${myLC_ALL}" 1089 LC_ALL="${myLC_ALL}"
951 LANG="${myLANG}" 1090 LANG="${myLANG}"
952 eval ${extglob_bak} 1091 eshopts_pop
953} 1092}
954 1093
955# getfilevar accepts 2 vars as follows: 1094# getfilevar accepts 2 vars as follows:
956# getfilevar <VARIABLE> <CONFIGFILE> 1095# getfilevar <VARIABLE> <CONFIGFILE>
957# pulled from linux-info 1096# pulled from linux-info
1004 for i in ${COMPAT_URI}; do 1143 for i in ${COMPAT_URI}; do
1005 ARCH_PATCH="${ARCH_PATCH} ${DISTDIR}/${i/*\//}" 1144 ARCH_PATCH="${ARCH_PATCH} ${DISTDIR}/${i/*\//}"
1006 done 1145 done
1007 fi 1146 fi
1008 done 1147 done
1009}
1010
1011# sparc nastiness
1012#==============================================================
1013# This script generates the files in /usr/include/asm for sparc systems
1014# during installation of sys-kernel/linux-headers.
1015# Will no longer be needed when full 64 bit support is used on sparc64
1016# systems.
1017#
1018# Shamefully ripped from Debian
1019# ----------------------------------------------------------------------
1020
1021# Idea borrowed from RedHat's kernel package
1022
1023# This is gonna get replaced by something in multilib.eclass soon...
1024# --eradicator
1025generate_sparc_asm() {
1026 local name
1027
1028 cd $1 || die
1029 mkdir asm
1030
1031 for h in `( ls asm-sparc; ls asm-sparc64 ) | grep '\.h$' | sort -u`; do
1032 name="$(echo $h | tr a-z. A-Z_)"
1033 # common header
1034 echo "/* All asm/ files are generated and point to the corresponding
1035 * file in asm-sparc or asm-sparc64.
1036 */
1037
1038#ifndef __SPARCSTUB__${name}__
1039#define __SPARCSTUB__${name}__
1040" > asm/${h}
1041
1042 # common for sparc and sparc64
1043 if [ -f asm-sparc/$h -a -f asm-sparc64/$h ]; then
1044 echo "#ifdef __arch64__
1045#include <asm-sparc64/$h>
1046#else
1047#include <asm-sparc/$h>
1048#endif
1049" >> asm/${h}
1050
1051 # sparc only
1052 elif [ -f asm-sparc/$h ]; then
1053echo "#ifndef __arch64__
1054#include <asm-sparc/$h>
1055#endif
1056" >> asm/${h}
1057
1058 # sparc64 only
1059 else
1060echo "#ifdef __arch64__
1061#include <asm-sparc64/$h>
1062#endif
1063" >> asm/${h}
1064 fi
1065
1066 # common footer
1067 echo "#endif /* !__SPARCSTUB__${name}__ */" >> asm/${h}
1068 done
1069 return 0
1070} 1148}
1071 1149
1072headers___fix() { 1150headers___fix() {
1073 # Voodoo to partially fix broken upstream headers. 1151 # Voodoo to partially fix broken upstream headers.
1074 # note: do not put inline/asm/volatile together (breaks "inline asm volatile") 1152 # note: do not put inline/asm/volatile together (breaks "inline asm volatile")
1116 kernel_is 2 4 && unpack_2_4 1194 kernel_is 2 4 && unpack_2_4
1117 kernel_is 2 6 && unpack_2_6 1195 kernel_is 2 6 && unpack_2_6
1118 fi 1196 fi
1119 1197
1120 if [[ $K_DEBLOB_AVAILABLE == 1 ]] && use deblob ; then 1198 if [[ $K_DEBLOB_AVAILABLE == 1 ]] && use deblob ; then
1121 cp "${DISTDIR}/${DEBLOB_A}" "${T}" 1199 cp "${DISTDIR}/${DEBLOB_A}" "${T}" || die "cp ${DEBLOB_A} failed"
1122 chmod +x "${T}/${DEBLOB_A}" 1200 cp "${DISTDIR}/${DEBLOB_CHECK_A}" "${T}/deblob-check" || die "cp ${DEBLOB_CHECK_A} failed"
1201 chmod +x "${T}/${DEBLOB_A}" "${T}/deblob-check" || die "chmod deblob scripts failed"
1202 fi
1203
1204 # fix a problem on ppc where TOUT writes to /usr/src/linux breaking sandbox
1205 # only do this for kernel < 2.6.27 since this file does not exist in later
1206 # kernels
1207 if [[ -n ${KV_MINOR} && ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} < 2.6.27 ]]
1208 then
1209 sed -i \
1210 -e 's|TOUT := .tmp_gas_check|TOUT := $(T).tmp_gas_check|' \
1211 "${S}"/arch/ppc/Makefile
1212 else
1213 sed -i \
1214 -e 's|TOUT := .tmp_gas_check|TOUT := $(T).tmp_gas_check|' \
1215 "${S}"/arch/powerpc/Makefile
1123 fi 1216 fi
1124} 1217}
1125 1218
1126kernel-2_src_compile() { 1219kernel-2_src_compile() {
1127 cd "${S}" 1220 cd "${S}"
1128 [[ ${ETYPE} == headers ]] && compile_headers 1221 [[ ${ETYPE} == headers ]] && compile_headers
1129 1222
1130 if [[ $K_DEBLOB_AVAILABLE == 1 ]] && use deblob ; then 1223 if [[ $K_DEBLOB_AVAILABLE == 1 ]] && use deblob ; then
1131 echo ">>> Running deblob script ..." 1224 echo ">>> Running deblob script ..."
1132 sh "${T}/${DEBLOB_A}" --force || \ 1225 EPYTHON="python2" sh "${T}/${DEBLOB_A}" --force || die "Deblob script failed to run!!!"
1133 die "Deblob script failed to run!!!"
1134 fi 1226 fi
1135} 1227}
1228
1229# if you leave it to the default src_test, it will run make to
1230# find whether test/check targets are present; since "make test"
1231# actually produces a few support files, they are installed even
1232# though the package is binchecks-restricted.
1233#
1234# Avoid this altogether by making the function moot.
1235kernel-2_src_test() { :; }
1136 1236
1137kernel-2_pkg_preinst() { 1237kernel-2_pkg_preinst() {
1138 [[ ${ETYPE} == headers ]] && preinst_headers 1238 [[ ${ETYPE} == headers ]] && preinst_headers
1139} 1239}
1140 1240
1143 [[ ${ETYPE} == headers ]] && install_headers 1243 [[ ${ETYPE} == headers ]] && install_headers
1144 [[ ${ETYPE} == sources ]] && install_sources 1244 [[ ${ETYPE} == sources ]] && install_sources
1145} 1245}
1146 1246
1147kernel-2_pkg_postinst() { 1247kernel-2_pkg_postinst() {
1148 [[ ${ETYPE} == headers ]] && postinst_headers
1149 [[ ${ETYPE} == sources ]] && postinst_sources 1248 [[ ${ETYPE} == sources ]] && postinst_sources
1150} 1249}
1151 1250
1152kernel-2_pkg_setup() { 1251kernel-2_pkg_setup() {
1153 if kernel_is 2 4; then 1252 if kernel_is 2 4; then
1154 if [ "$( gcc-major-version )" -eq "4" ] ; then 1253 if [[ $(gcc-major-version) -ge 4 ]] ; then
1155 echo 1254 echo
1156 ewarn "Be warned !! >=sys-devel/gcc-4.0.0 isn't supported with linux-2.4!" 1255 ewarn "Be warned !! >=sys-devel/gcc-4.0.0 isn't supported with linux-2.4!"
1157 ewarn "Either switch to another gcc-version (via gcc-config) or use a" 1256 ewarn "Either switch to another gcc-version (via gcc-config) or use a"
1158 ewarn "newer kernel that supports gcc-4." 1257 ewarn "newer kernel that supports gcc-4."
1159 echo 1258 echo
1166 1265
1167 ABI="${KERNEL_ABI}" 1266 ABI="${KERNEL_ABI}"
1168 [[ ${ETYPE} == headers ]] && setup_headers 1267 [[ ${ETYPE} == headers ]] && setup_headers
1169 [[ ${ETYPE} == sources ]] && echo ">>> Preparing to unpack ..." 1268 [[ ${ETYPE} == sources ]] && echo ">>> Preparing to unpack ..."
1170} 1269}
1270
1271kernel-2_pkg_postrm() {
1272 # This warning only makes sense for kernel sources.
1273 [[ ${ETYPE} == headers ]] && return 0
1274
1275 # If there isn't anything left behind, then don't complain.
1276 [[ -e ${ROOT}usr/src/linux-${KV_FULL} ]] || return 0
1277 echo
1278 ewarn "Note: Even though you have successfully unmerged "
1279 ewarn "your kernel package, directories in kernel source location: "
1280 ewarn "${ROOT}usr/src/linux-${KV_FULL}"
1281 ewarn "with modified files will remain behind. By design, package managers"
1282 ewarn "will not remove these modified files and the directories they reside in."
1283 echo
1284}

Legend:
Removed from v.1.232  
changed lines
  Added in v.1.289

  ViewVC Help
Powered by ViewVC 1.1.20