/[gentoo-x86]/eclass/eutils.eclass
Gentoo

Diff of /eclass/eutils.eclass

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

Revision 1.5 Revision 1.9
1# Copyright 1999-2002 Gentoo Technologies, Inc. 1# Copyright 1999-2002 Gentoo Technologies, Inc.
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# Author: Martin Schlemmer <azarah@gentoo.org> 3# Author: Martin Schlemmer <azarah@gentoo.org>
4# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.5 2002/11/11 22:36:22 azarah Exp $ 4# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.9 2002/12/01 15:48:27 azarah Exp $
5# This eclass is for general purpose functions that most ebuilds 5# This eclass is for general purpose functions that most ebuilds
6# have to implement themselfs. 6# have to implement themselves.
7# 7#
8# NB: If you add anything, please comment it! 8# NB: If you add anything, please comment it!
9 9
10ECLASS=eutils 10ECLASS=eutils
11INHERITED="$INHERITED $ECLASS" 11INHERITED="$INHERITED $ECLASS"
87EPATCH_SOURCE="${WORKDIR}/patch" 87EPATCH_SOURCE="${WORKDIR}/patch"
88# Default extension for patches 88# Default extension for patches
89EPATCH_SUFFIX="patch.bz2" 89EPATCH_SUFFIX="patch.bz2"
90# Default options for patch 90# Default options for patch
91EPATCH_OPTS="" 91EPATCH_OPTS=""
92# List of patches not to apply. Not this is only file names,
93# and not the full path ..
94EPATCH_EXCLUDE=""
95# Change the printed message for a single patch.
96EPATCH_SINGLE_MSG=""
92 97
93# This function is for bulk patching, or in theory for just one 98# This function is for bulk patching, or in theory for just one
94# or two patches. 99# or two patches.
95# 100#
96# It should work with .bz2, .gz, .zip and plain text patches. 101# It should work with .bz2, .gz, .zip and plain text patches.
124# <azarah@gentoo.org> (10 Nov 2002) 129# <azarah@gentoo.org> (10 Nov 2002)
125# 130#
126epatch() { 131epatch() {
127 local PIPE_CMD="" 132 local PIPE_CMD=""
128 local STDERR_TARGET="${T}/$$.out" 133 local STDERR_TARGET="${T}/$$.out"
134 local PATCH_TARGET="${T}/$$.patch"
135 local PATCH_SUFFIX=""
129 local SINGLE_PATCH="no" 136 local SINGLE_PATCH="no"
130 local x="" 137 local x=""
131 138
132 if [ "$#" -gt 1 ] 139 if [ "$#" -gt 1 ]
133 then 140 then
144 151
145 elif [ -n "$1" -a -d "$1" ] 152 elif [ -n "$1" -a -d "$1" ]
146 then 153 then
147 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 154 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}"
148 else 155 else
156 if [ ! -d ${EPATCH_SOURCE} ]
157 then
158 echo
159 eerror "Cannot find \$EPATCH_SOURCE!"
160 echo
161 die "Cannot find \$EPATCH_SOURCE!"
162 fi
163
149 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 164 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
150 fi 165 fi
151 166
152 case ${EPATCH_SUFFIX##*\.} in 167 case ${EPATCH_SUFFIX##*\.} in
153 bz2) 168 bz2)
154 PIPE_CMD="bzip2 -dc" 169 PIPE_CMD="bzip2 -dc"
170 PATCH_SUFFIX="bz2"
155 ;; 171 ;;
156 gz) 172 gz|Z|z)
157 PIPE_CMD="gzip -dc" 173 PIPE_CMD="gzip -dc"
174 PATCH_SUFFIX="gz"
158 ;; 175 ;;
159 zip) 176 ZIP|zip)
160 PIPE_CMD="unzip -p" 177 PIPE_CMD="unzip -p"
178 PATCH_SUFFIX="zip"
161 ;; 179 ;;
162 *) 180 *)
163 PIPE_CMD="cat" 181 PIPE_CMD="cat"
182 PATCH_SUFFIX="patch"
164 ;; 183 ;;
165 esac 184 esac
166 185
167 if [ "${SINGLE_PATCH}" = "no" ] 186 if [ "${SINGLE_PATCH}" = "no" ]
168 then 187 then
173 # New ARCH dependant patch naming scheme... 192 # New ARCH dependant patch naming scheme...
174 # 193 #
175 # ???_arch_foo.patch 194 # ???_arch_foo.patch
176 # 195 #
177 if [ -f ${x} ] && \ 196 if [ -f ${x} ] && \
178 [ -n "$1" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] 197 [ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ]
179 then 198 then
180 local count=0 199 local count=0
181 local popts="${EPATCH_OPTS}" 200 local popts="${EPATCH_OPTS}"
201
202 if [ -n "${EPATCH_EXCLUDE}" ]
203 then
204 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ]
205 then
206 continue
207 fi
208 fi
182 209
183 if [ "${SINGLE_PATCH}" = "yes" ] 210 if [ "${SINGLE_PATCH}" = "yes" ]
184 then 211 then
212 if [ -n "${EPATCH_SINGLE_MSG}" ]
213 then
214 einfo "${EPATCH_SINGLE_MSG}"
215 else
185 einfo "Applying ${x##*/}..." 216 einfo "Applying ${x##*/}..."
217 fi
186 else 218 else
187 einfo " ${x##*/}..." 219 einfo " ${x##*/}..."
188 fi 220 fi
189 221
190 echo "***** ${x##*/} *****" > ${STDERR_TARGET} 222 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
191 echo >> ${STDERR_TARGET} 223 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
192 224
193 # Allow for prefix to differ ... im lazy, so shoot me :/ 225 # Allow for prefix to differ ... im lazy, so shoot me :/
194 while [ "${count}" -lt 5 ] 226 while [ "${count}" -lt 5 ]
195 do 227 do
196 # Generate some useful debug info ... 228 # Generate some useful debug info ...
197 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET} 229 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
198 echo >> ${STDERR_TARGET} 230 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
231
232 if [ "${PATCH_SUFFIX}" != "patch" ]
233 then
234 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
235 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
236 else
237 PATCH_TARGET="${x}"
238 fi
199 239
200 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET} 240 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
201 echo "${PIPE_CMD} ${x} | patch ${popts} -p${count}" >> ${STDERR_TARGET} 241 echo "patch ${popts} -p${count} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
202 242
203 echo >> ${STDERR_TARGET} 243 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
204 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET} 244 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
245
246 if [ "${PATCH_SUFFIX}" != "patch" ]
247 then
248 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1
249 then
250 echo
251 eerror "Could not extract patch!"
252 #die "Could not extract patch!"
253 count=5
254 break
255 fi
256 fi
205 257
206 if eval ${PIPE_CMD} ${x} | patch ${popts} --dry-run -f -p${count} 2>&1 >> ${STDERR_TARGET} 258 if patch ${popts} --dry-run -f -p${count} < ${PATCH_TARGET} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1
259 then
260 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
261 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
262 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
263 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
264 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
265
266 patch ${popts} -p${count} < ${PATCH_TARGET} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1
267
268 if [ "$?" -ne 0 ]
207 then 269 then
208 eval ${PIPE_CMD} ${x} | patch ${popts} -p${count} 2>&1 >> ${STDERR_TARGET} 270 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
271 echo
272 eerror "A dry-run of patch command succeeded, but actually"
273 eerror "applying the patch failed!"
274 #die "Real world sux compared to the dreamworld!"
275 count=5
276 fi
277
278 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
279
209 break 280 break
210 fi 281 fi
211 282
212 count=$((count + 1)) 283 count=$((count + 1))
213 done 284 done
214 285
286 if [ "${PATCH_SUFFIX}" != "patch" ]
287 then
288 rm -f ${PATCH_TARGET}
289 fi
290
215 if [ "${count}" -eq 5 ] 291 if [ "${count}" -eq 5 ]
216 then 292 then
293 echo
217 eerror "Failed Patch: ${x##*/}!" 294 eerror "Failed Patch: ${x##*/}!"
218 eerror 295 eerror
219 eerror "Include in your bugreport the contents of:" 296 eerror "Include in your bugreport the contents of:"
220 eerror 297 eerror
221 eerror " ${STDERR_TARGET}" 298 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}"
222 eerror 299 echo
223 die "Failed Patch: ${x##*/}!" 300 die "Failed Patch: ${x##*/}!"
224 fi 301 fi
302
303 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
225 304
226 eend 0 305 eend 0
227 fi 306 fi
228 done 307 done
229 if [ "${SINGLE_PATCH}" = "no" ] 308 if [ "${SINGLE_PATCH}" = "no" ]

Legend:
Removed from v.1.5  
changed lines
  Added in v.1.9

  ViewVC Help
Powered by ViewVC 1.1.20