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

Diff of /eclass/eutils.eclass

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

Revision 1.2 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.2 2002/11/10 19:45:51 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"
47 more info. */ 47 more info. */
48GROUP ( /lib/libxxx ) 48GROUP ( /lib/libxxx )
49END_LDSCRIPT 49END_LDSCRIPT
50 50
51 dosed "s:libxxx:$1:" /usr/lib/$1 51 dosed "s:libxxx:$1:" /usr/lib/$1
52
53 return 0
52} 54}
53 55
56# Simple function to draw a line consisting of '=' the same length as $*
57#
58# <azarah@gentoo.org> (11 Nov 2002)
59#
60draw_line() {
61 local i=0
62 local str_length=""
63
64 # Handle calls that do not have args, or wc not being installed ...
65 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
66 then
67 echo "==============================================================="
68 return 0
69 fi
70
71 # Get the length of $*
72 str_length="$(echo -n "$*" | wc -m)"
73
74 while [ "$i" -lt "${str_length}" ]
75 do
76 echo -n "="
77
78 i=$((i + 1))
79 done
80
81 echo
82
83 return 0
84}
54 85
55# Default directory where patches are located 86# Default directory where patches are located
56EPATCH_SOURCE="${WORKDIR}/patch" 87EPATCH_SOURCE="${WORKDIR}/patch"
57# Default directory in which patches should be applied
58EPATCH_WORKDIR="${S}"
59# Default extension for patches 88# Default extension for patches
60EPATCH_SUFFIX="patch.bz2" 89EPATCH_SUFFIX="patch.bz2"
61# Default options for patch 90# Default options for patch
62EPATCH_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=""
63 97
64# 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
65# or two patches. 99# or two patches.
66# 100#
67# It should work with .bz2, .gz, .zip and plain text patches. 101# It should work with .bz2, .gz, .zip and plain text patches.
72# 106#
73# Above EPATCH_* variables can be used to control various defaults, 107# Above EPATCH_* variables can be used to control various defaults,
74# bug they should be left as is to ensure an ebuild can rely on 108# bug they should be left as is to ensure an ebuild can rely on
75# them for. 109# them for.
76# 110#
111# Patches are applied in current directory.
112#
77# Patch/Patches should preferibly have the form of: 113# Bulk Patches should preferibly have the form of:
78# 114#
79# ??_${ARCH}_foo.${EPATCH_SUFFIX} 115# ??_${ARCH}_foo.${EPATCH_SUFFIX}
80# 116#
81# For example: 117# For example:
82# 118#
83# 01_all_misc-fix.patch.bz2 119# 01_all_misc-fix.patch.bz2
84# 02_sparc_another-fix.patch.bz2 120# 02_sparc_another-fix.patch.bz2
85# 121#
86# This ensures that there are a set order, and you can have ARCH 122# This ensures that there are a set order, and you can have ARCH
87# specific patches. 123# specific patches.
124#
125# If you however give an argument to epatch(), it will treat it as a
126# single patch that need to be applied if its a file. If on the other
127# hand its a directory, it will set EPATCH_SOURCE to this.
88# 128#
89# <azarah@gentoo.org> (10 Nov 2002) 129# <azarah@gentoo.org> (10 Nov 2002)
90# 130#
91epatch() { 131epatch() {
92 local PIPE_CMD="" 132 local PIPE_CMD=""
93 local STDERR_TARGET="${T}/$$.out" 133 local STDERR_TARGET="${T}/$$.out"
134 local PATCH_TARGET="${T}/$$.patch"
135 local PATCH_SUFFIX=""
136 local SINGLE_PATCH="no"
137 local x=""
138
139 if [ "$#" -gt 1 ]
140 then
141 eerror "Invalid arguments to epatch()"
142 die "Invalid arguments to epatch()"
143 fi
144
145 if [ -n "$1" -a -f "$1" ]
146 then
147 SINGLE_PATCH="yes"
148
149 local EPATCH_SOURCE="$1"
150 local EPATCH_SUFFIX="${1##*\.}"
151
152 elif [ -n "$1" -a -d "$1" ]
153 then
154 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}"
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
164 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
165 fi
94 166
95 case ${EPATCH_SUFFIX##*\.} in 167 case ${EPATCH_SUFFIX##*\.} in
96 bz2) 168 bz2)
97 PIPE_CMD="bzip2 -dc" 169 PIPE_CMD="bzip2 -dc"
170 PATCH_SUFFIX="bz2"
98 ;; 171 ;;
99 gz) 172 gz|Z|z)
100 PIPE_CMD="gzip -dc" 173 PIPE_CMD="gzip -dc"
174 PATCH_SUFFIX="gz"
101 ;; 175 ;;
102 zip) 176 ZIP|zip)
103 PIPE_CMD="unzip -p" 177 PIPE_CMD="unzip -p"
178 PATCH_SUFFIX="zip"
104 ;; 179 ;;
105 *) 180 *)
106 PIPE_CMD="cat" 181 PIPE_CMD="cat"
182 PATCH_SUFFIX="patch"
107 ;; 183 ;;
108 esac 184 esac
109 185
110 cd ${EPATCH_WORKDIR} 186 if [ "${SINGLE_PATCH}" = "no" ]
187 then
111 einfo "Applying various patches (bugfixes/updates)..." 188 einfo "Applying various patches (bugfixes/updates)..."
112 for x in ${EPATCH_SOURCE}/*.${EPATCH_SUFFIX} 189 fi
190 for x in ${EPATCH_SOURCE}
113 do 191 do
114 # New ARCH dependant patch naming scheme... 192 # New ARCH dependant patch naming scheme...
115 # 193 #
116 # ???_arch_foo.patch 194 # ???_arch_foo.patch
117 # 195 #
118 if [ -f ${x} ] && \ 196 if [ -f ${x} ] && \
119 [ "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] 197 [ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ]
120 then 198 then
121 local count=0 199 local count=0
122 local popts="${EPATCH_OPTS}" 200 local popts="${EPATCH_OPTS}"
123 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
209
210 if [ "${SINGLE_PATCH}" = "yes" ]
211 then
212 if [ -n "${EPATCH_SINGLE_MSG}" ]
213 then
214 einfo "${EPATCH_SINGLE_MSG}"
215 else
216 einfo "Applying ${x##*/}..."
217 fi
218 else
124 einfo " ${x##*/}..." 219 einfo " ${x##*/}..."
220 fi
125 221
126 > ${STDERR_TARGET} 222 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
223 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
127 224
128 # Allow for prefix to differ ... im lazy, so shoot me :/ 225 # Allow for prefix to differ ... im lazy, so shoot me :/
129 while [ "${count}" -lt 5 ] 226 while [ "${count}" -lt 5 ]
130 do 227 do
131 if eval ${PIPE_CMD} ${x} | patch ${popts} --dry-run -f -p${count} 2>&1 >> ${STDERR_TARGET} 228 # Generate some useful debug info ...
229 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${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
239
240 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
241 echo "patch ${popts} -p${count} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
242
243 echo >> ${STDERR_TARGET%/*}/${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
132 then 249 then
133 eval ${PIPE_CMD} ${x} | patch ${popts} -p${count} 2>&1 >> ${STDERR_TARGET} 250 echo
251 eerror "Could not extract patch!"
252 #die "Could not extract patch!"
253 count=5
254 break
255 fi
256 fi
257
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 ]
269 then
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
134 break 280 break
135 fi 281 fi
136 282
137 count=$((count + 1)) 283 count=$((count + 1))
138 done 284 done
139 285
286 if [ "${PATCH_SUFFIX}" != "patch" ]
287 then
288 rm -f ${PATCH_TARGET}
289 fi
290
140 if [ "${count}" -eq 5 ] 291 if [ "${count}" -eq 5 ]
141 then 292 then
293 echo
142 eerror "Failed Patch: ${x##*/}!" 294 eerror "Failed Patch: ${x##*/}!"
143 eerror 295 eerror
144 eerror "Include in your bugreport the contents of:" 296 eerror "Include in your bugreport the contents of:"
145 eerror 297 eerror
146 eerror " ${STDERR_TARGET}" 298 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}"
147 eerror 299 echo
148 die "Failed Patch: ${x##*/}!" 300 die "Failed Patch: ${x##*/}!"
149 fi 301 fi
302
303 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
304
305 eend 0
150 fi 306 fi
151 done 307 done
308 if [ "${SINGLE_PATCH}" = "no" ]
309 then
152 eend 0 "Done with patching" 310 einfo "Done with patching"
311 fi
153} 312}
154 313

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

  ViewVC Help
Powered by ViewVC 1.1.20