1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
|
#!/bin/bash
#
# Copyright (C) 2004-2009 by the ptxdist project
# 2010 by Marc Kleine-Budde <mkl@pengutronix.de>
#
# See CREDITS for details about who has contributed to this project.
#
# For further information about the PTXdist project and license conditions
# see the README file.
#
#
# ptxd_make_world_patchin_apply_init -
# initialize variables used to apply the patches
#
# out:
#
# pkg_patch_series path to series file
# pkg_patch_tool tool used to apply the patch series
#
ptxd_make_world_patchin_apply_init()
{
# look for series
if [ -n "${pkg_patch_series}" ]; then
# check if specified series file can be found
pkg_patch_series="${pkg_patch_dir}/${pkg_patch_series}"
if [ \! -e "${pkg_patch_series}" ]; then
echo "error: specified series '${pkg_patch_series}' not found"
return 1
fi
else
# is there a "series" file
pkg_patch_series="${pkg_patch_dir}/series"
fi
# decide which tool to use
if [ "${PTXCONF_SETUP_PATCHIN_GIT}" ] && which git > /dev/null 2>&1; then
pkg_patch_tool=git
elif which quilt > /dev/null 2>&1; then
pkg_patch_tool=quilt
else
pkg_patch_tool=patch
fi
}
export -f ptxd_make_world_patchin_apply_init
#
# initialize git database in $pkg_patchin_dir and do initial commit
#
ptxd_make_world_patchin_apply_git_init()
{
local git_dir
git_dir="$(git rev-parse --git-dir 2> /dev/null)" || true
# is already git repo?
if [ "${git_dir}" != ".git" ]; then
echo "patchin: git: initializing repository"
git init -q &&
git add -f . &&
git commit -q -m "initial commit" --author="ptxdist-${PTXDIST_VERSION_FULL} <ptxdist@pengutronix.de>" &&
git tag "${pkg_pkg//\~/-}" &&
git tag base &&
git config alias.ptx-patches "!${PTXDIST_TOPDIR}/scripts/git-ptx-patches \"\${@}\"" &&
git config diff.renames false &&
git config core.abbrev 12 &&
echo "patchin: git: done"
fi
}
export -f ptxd_make_world_patchin_apply_git_init
#
# create a directory containing the patches and the selected series
# file. name that file "series".
#
# decompress "bz2", "gz" and "xz" patches on the fly
#
ptxd_make_world_patchin_apply_git_compat()
{
mkdir "${pkg_patchin_dir}/.ptxdist/git-patches" || return
local patch para
while read patch para; do
local cat
local patch_file="${patch##*/}"
case "${para}" in
""|"#"*) para="-p1" ;; # no para or comment
-p*) ;;
esac
case "${patch}" in
"#tag:"*)
local tag="${patch##\#tag:}"
if [ -f ${pkg_patchin_dir}/.ptxdist/git-patches/series ]; then
mv ${pkg_patchin_dir}/.ptxdist/git-patches/series{,.${tag}} &&
touch ${pkg_patchin_dir}/.ptxdist/git-patches/series
else
touch ${pkg_patchin_dir}/.ptxdist/git-patches/series.${tag}
fi
continue
;;
""|"#"*) continue ;; # skip empty lines and comments
*.gz) cat="zcat" ;;
*.bz2) cat="bzcat" ;;
*.xz) cat="xzcat" ;;
*)
ln -s "../patches/${patch}" "${pkg_patchin_dir}/.ptxdist/git-patches/${patch_file}" &&
echo "${patch_file}" "${para}" >> "${pkg_patchin_dir}/.ptxdist/git-patches/series" || return
continue
;;
esac &&
"${cat}" "${pkg_patchin_dir}/.ptxdist/patches/${patch}" > \
"${pkg_patchin_dir}/.ptxdist/git-patches/${patch_file%.*}"
echo "${patch_file%.*}" "${para}" >> "${pkg_patchin_dir}/.ptxdist/git-patches/series" || return
done < "${pkg_patchin_dir}/.ptxdist/series" &&
touch "${pkg_patchin_dir}/.ptxdist/git-patches/series"
}
export -f ptxd_make_world_patchin_apply_git_compat
#
# apply patch series with git
#
ptxd_make_world_patchin_apply_git()
{
#
# git quiltimport has certain limitations, work around them
#
ptxd_make_world_patchin_apply_git_compat || return
grep "\#tag:" "${pkg_patchin_dir}/.ptxdist/series" | while read tagline; do
local tag="${tagline##\#tag:}"
tag=$(echo ${tag}|cut -d' ' -f1)
if [ -f "${pkg_patchin_dir}/.ptxdist/git-patches/series.${tag}" ]; then
mv ${pkg_patchin_dir}/.ptxdist/git-patches/series{,.1} || return
mv ${pkg_patchin_dir}/.ptxdist/git-patches/series{.${tag},} || return
git quiltimport \
--patches "${pkg_patchin_dir}/.ptxdist/git-patches" \
--author "unknown author <unknown.author@example.com>" &&
echo "tagging -> ${tag}" &&
git tag -f ${tag} &&
mv ${pkg_patchin_dir}/.ptxdist/git-patches/series{,.${tag}} || return
mv ${pkg_patchin_dir}/.ptxdist/git-patches/series{.1,} || return
fi
done
git quiltimport \
--patches "${pkg_patchin_dir}/.ptxdist/git-patches" \
--author "unknown author <unknown.author@example.com>" &&
# skip patches generated by other tools with '# <tool>-end' as end marker
if tail -n1 "${pkg_patchin_dir}/.ptxdist/series" | grep -q '# [^ ]*-end$'; then
local last="$(sed -n 's/^0*\([1-9][0-9]*\)-.*/\1/p' "${pkg_patchin_dir}/.ptxdist/series" | tail -n1)"
git tag -f base || return
local next=1000
if [ -n "${last}" ]; then
next="$[(1+${last}/1000)*1000]"
fi
echo "#tag:base --start-number ${next}" >> ${pkg_patchin_dir}/.ptxdist/series.append
fi
}
export -f ptxd_make_world_patchin_apply_git
#
# apply patch series with quilt
#
ptxd_make_world_patchin_apply_quilt()
{
QUILT_PATCHES="${pkg_patchin_dir}/.ptxdist/patches" quilt push -a
}
export -f ptxd_make_world_patchin_apply_quilt
#
# apply patch series with patch
#
ptxd_make_world_patchin_apply_patch()
{
local patch para junk
while read patch para junk; do
local cat
case "${patch}" in
""|"#"*) continue ;; # skip empty lines and comments
*.gz) cat=zcat ;;
*.bz2) cat=bzcat ;;
*.xz) cat=xzcat ;;
*) cat=cat ;;
esac
case "${para}" in
""|"#"*) para="-p1" ;; # no para or comment
-p*) ;;
esac
echo "applying '${patch}'"
patch="${pkg_patchin_dir}/.ptxdist/patches/${patch}"
"${cat}" "${patch}" | patch "${para}" -N -d "${pkg_patchin_dir}" &&
check_pipe_status || return
done < "${pkg_patchin_dir}/.ptxdist/series" &&
unset patch para junk
}
export -f ptxd_make_world_patchin_apply_patch
#
# generic apply patch series function
#
ptxd_make_world_patchin_apply()
{
local \
tmp_patch_series \
pkg_patch_series \
pkg_patch_tool
ptxd_make_world_patchin_apply_init || return
if [ -z "${pkg_patch_dir}" ]; then
return
fi &&
if [ "${pkg_patch_tool}" = "git" ]; then
ptxd_make_world_patchin_apply_git_init || return
fi &&
#
# the primary reference is the ".ptxdist" folder in the pkg_patchin_dir:
# these files might be existent:
#
# patches link, pointing to the dir containing the pkg's patches
# series usually link, pointing to the used series file
# if no series file is supplied and the folder
# containing the patches is not writable, this will be a
# file
#
if [ -e "${pkg_patchin_dir}/.ptxdist" ]; then
ptxd_bailout "pkg_patchin_dir '${pkg_patchin_dir}' already contains a '.ptxdist' folder"
fi &&
mkdir "${pkg_patchin_dir}/.ptxdist" &&
#
# create a ".ptxdist/patches" link pointing to the directory
# containing the patches
#
ln -s "${pkg_patch_dir}" "${pkg_patchin_dir}/.ptxdist/patches" &&
tmp_patch_series="${pkg_patchin_dir}/.ptxdist/series" &&
# link series file - if not available create it
if [ ! -e "${pkg_patch_series}" ]; then
#
# look for patches (and archives) and put into series file
# (the "sed" removes "./" from find's output)
#
pushd "${pkg_patch_dir}/" >/dev/null &&
find \
-name "*.diff" -o \
-name "*.patch" -o \
-name "*.xz" -o \
-name "*.bz2" -o \
-name "*.gz" | \
sed -e "s:^[.]/::" | sort > \
"${tmp_patch_series}" &&
popd > /dev/null
# no patches found
if [ \! -s "${tmp_patch_series}" ]; then
rm -f "${tmp_patch_series}" &&
unset pkg_patch_series
else
ptxd_pedantic "series file for '$(ptxd_print_path "${pkg_patch_dir}")' is missing" &&
# if writable, create series file next to the patches
if [ -w "${pkg_patch_dir}/" ]; then
mv "${tmp_patch_series}" "${pkg_patch_series}" &&
ln -s "${pkg_patch_series}" "${tmp_patch_series}"
fi
fi
else
ln -s "${pkg_patch_series}" "${tmp_patch_series}"
#
# check for non existing patches
#
# Some tools like "git" skip non existing patches without an
# error. In ptxdist we consider this a fatal error.
#
local patch para junk
while read patch tmp; do
case "${patch}" in
""|"#"*) continue ;; # skip empty lines and comments
*) ;;
esac
case "${para}" in
""|"#"*) ;; # no para or comment
-p*) ;;
*) ptxd_bailout "invalid parameter to patch '${patch}' in series file '${pkg_patch_series}'"
esac
if [ \! -f "${pkg_patchin_dir}/.ptxdist/patches/${patch}" ]; then
ptxd_bailout "cannot find patch: '${patch}' specified in series file '${pkg_patch_series}'"
fi
done < "${pkg_patchin_dir}/.ptxdist/series" &&
unset patch para junk
fi || return
#
# setup convenience links
#
# series
if [ -e "${pkg_patchin_dir}/.ptxdist/series" ]; then
if [ -e "${pkg_patchin_dir}/series" ]; then
ptxd_bailout "there's a 'series' file in the pkg_patchin_dir"
fi
ln -sf ".ptxdist/series" "${pkg_patchin_dir}/series"
fi &&
# patches
if [ \! -e "${pkg_patchin_dir}/patches" ]; then
ln -sf ".ptxdist/patches" "${pkg_patchin_dir}/patches"
fi || return
echo
echo "pkg_patch_dir: '$(ptxd_print_path "${pkg_patch_dir:-<none>}")'"
echo "pkg_patch_series: '$(ptxd_print_path "${pkg_patch_series:-<none>}")'"
echo
# apply patches if series file is available
if [ -n "${pkg_patch_series}" ]; then
echo "patchin: ${pkg_patch_tool}: apply '$(ptxd_print_path ${pkg_patch_series})'"
"ptxd_make_world_patchin_apply_${pkg_patch_tool}" || return
echo -e "patchin: ${pkg_patch_tool}: done\n"
fi
}
export -f ptxd_make_world_patchin_apply
#
#
#
ptxd_make_world_patchin_fixup()
{
local file
echo "patchin: fixup:"
find "${pkg_dir}/" -name "configure" -a -type f -a \! -path "*/.pc/*" | while read file; do
ptxd_print_path "${file}"
#
# the first fixes a problem with libtool on blackfin:
# - on blackfin they've got symbols with more "_" prefixes than on other platforms
# - teach libtool to cope with it
#
# the second one supresses the adding of "rpath"
#
sed -i \
-e "s=sed -e \"s/\\\\(\.\*\\\\)/\\\\1;/\"=sed -e \"s/\\\\(.*\\\\)/'\"\$ac_symprfx\"'\\\\1;/\"=" \
\
-e "s:^\(hardcode_into_libs\)=.*:\1=\"no\":" \
-e "s:^\(hardcode_libdir_flag_spec\)=.*:\1=\"\":" \
-e "s:^\(hardcode_libdir_flag_spec_ld\)=.*:\1=\"\":" \
"${file}" || return
done &&
find "${pkg_dir}/" -name "ltmain.sh" -a \( -type f -o -type l \) -a \! -path "*/.pc/*" | while read file; do
ptxd_print_path "${file}"
#
# this sed turns of the relinking during "make install" (it
# might pick up libs from the host or break otherwise, we
# don't need it on linux anyway)
#
sed -i \
-e "s:\(need_relink\)=yes:\1=\"no\":" \
"${file}" || return
done &&
ptxd_get_alternative scripts/autoconf config.sub
local config_sub="${ptxd_reply}"
find "${pkg_dir}/" \( -type f -o -type l \) -name "config.sub" ! -path "*/.pc/*" | while read file; do
ptxd_print_path "${file}"
cp -f "${config_sub}" "${file}" || return
done &&
echo -e "patchin: fixup: done\n"
}
export -f ptxd_make_world_patchin_fixup
#
#
#
ptxd_make_world_autogen() {
# look for autogen.sh
local pkg_patch_autogen="${pkg_patch_dir}/autogen.sh"
if [ ! -x "${pkg_patch_autogen}" ]; then
if [ -e "${pkg_patch_autogen}" -o -L "${pkg_patch_autogen}" ]; then
ptxd_bailout "'$(ptxd_print_path "${pkg_patch_autogen}")' is not executable or a broken link"
fi
unset pkg_patch_autogen
fi
echo "pkg_patch_autogen: '$(ptxd_print_path "${pkg_patch_autogen:-<none>}")'"
echo
# run autogen.sh if available
if [ -n "${pkg_patch_autogen}" ]; then
"${pkg_patch_autogen}" 2>&1 || return
echo -e "patchin: autogen: done\n"
fi
}
export -f ptxd_make_world_autogen
#
# ptxd_make_world_patchin_init -
# initialize variables used to apply the patches
#
# out:
#
# pkg_patchin_dir where to apply the patches
# pkg_patch_dir path to dir that contains the patches
# empty if no patches should be applied
#
ptxd_make_world_patchin_init()
{
ptxd_make_world_init || return
if [ -z "${pkg_url}" -a -z "${pkg_src}" ]; then
# no <PKG>_URL and no <PKG>_SOURCE -> assume the package has nothing to patchin.
return
fi
if [ -n "${pkg_deprecated_patchin_series}" ]; then
ptxd_bailout "a 3rd parameter to patchin ('${pkg_deprecated_patchin_series}') is obsolete, please define <PKG>_SERIES instead"
fi
pkg_patchin_dir=${pkg_deprecated_patchin_dir:-${pkg_dir}}
#
# FIXME: do we still need this check?
#
case "${pkg_url}" in
file://)
local dir="${pkg_url#file://}"
if [ -d "${dir}" -a "${pkg_label}" != "kernel" ]; then
echo "local directory instead of tar file, skipping patch"
fi
;;
esac
#
# find patch_dir
# for compatibility, look first in 'generic', then in standard
# location
#
if ! ptxd_in_path PTXDIST_PATH_PATCHES ${pkg_pkg}/generic &&
! ptxd_in_path PTXDIST_PATH_PATCHES ${pkg_pkg} ; then
return
fi
pkg_patch_dir="${ptxd_reply}"
}
export -f ptxd_make_world_patchin_init
ptxd_make_world_patchin()
{
ptxd_make_world_patchin_init || return
if [ -n "${pkg_patch_dir}" ]; then (
cd "${pkg_patchin_dir}" &&
ptxd_make_world_patchin_apply
) else
echo -e "patchin: no patches found"
fi
}
export -f ptxd_make_world_patchin
ptxd_make_world_patchin_post() {
ptxd_make_world_patchin_init || return
if [ -n "${pkg_patchin_dir}" ]; then (
cd "${pkg_patchin_dir}" &&
if [ -n "${pkg_patch_dir}" ]; then
ptxd_make_world_autogen
fi
) fi &&
if [ -e "${pkg_dir}" ]; then (
cd "${pkg_dir}" &&
if [ "${pkg_type}" = "target" ]; then
ptxd_make_world_patchin_fixup
fi
) fi
}
export -f ptxd_make_world_patchin_post
|