forked from lbt/git-pkg
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathgp_setup
More file actions
executable file
·480 lines (393 loc) · 13.9 KB
/
Copy pathgp_setup
File metadata and controls
executable file
·480 lines (393 loc) · 13.9 KB
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
#!/bin/bash
# gp_setup
# This is part of the Mer git-packaging suite
# It sets up a git repo to use git-pkg and can use
# existing packaging
. ${GP_LIB:=/usr/share/gitpkg}/gp_common
trap cleanup EXIT
usage() {
cat <<EOF
gp_setup --manual [--distro=<DISTRO>] \
[--pkgdir=<packaging dir>]
gp_setup --existing --base-on=<tag>|--unpack=<tag> \
--pkgdir=<packaging dir> \
[--patch-branch=<branch/tag>] [--pristine] \
[--distro=<DISTRO>]
Used to setup an existing git repo for git-pkg
$DISTRO is set either in ~/.gitpkg, the GITPKG_DISTRO
environment variable or using --distro=<DISTRO>. If not
specified 'mer' is used.
EOF
# keep the usage msg near the code:
usage_pkg
usage_existing
}
confirm_continue() {
echo "Press <enter> to continue or ^C"
read dummy
}
unpack_tarball() {
rm -rf *
case $1 in
*xz )
xzcat $1 | tar --transform 's_[^/]*/__' -xf -
;;
* )
tar --transform 's_[^/]*/__' -xf $1
;;
esac
}
usage_existing() {
cat <<EOF
--auto [--pristine] --base-on=<tag>|--unpack-to=<tag>
--pkgdir=<packaging dir> [--patch-branch=<branch/tag>]
[--ver=<ver>[-<rel>]]
Takes an existing set of packaging and applies it to some git repo.
This can be used in 3 ways:
1) with an upstream git and some packaging/patches
2) with an upstream tarball and some packaging/patches
3) with an upstream git, an upstream tarball and some packaging/patches
(eg where upstream does some post-processing after a git
checkout)
--base-on=<basetag>
The existing tag to base the packaging on.
Typically the upstream release tag.
If --pristine is used then it looks in <packaging
dir> for a tarball and uses that as the basis for
the build.
--unpack-to=<basetag>
Uses an empty git (implies --pristine); looks in
<packaging dir> for a tarball and uses that as the
basis for the build. Unpacks the tarball as an
initial commit and applies the given tag to the
unpacked tarball.
--ver=<ver>[-<rel>]
If the upstream <basetag> is not the X.Y.Z version
then specify the version and optionally the release.
(Could come from spec/.changes?)
--pkgdir=<packaging dir>
is the source dir for the spec/yaml/changes/patches
This could be a 'checked out' osc dir.
Any patches mentioned in the spec file and found in
pkgdir are applied at <tag> in the order they appear
in the spec file.
--fuzz=<fuzz>
Can be useful if the patches found in pkgdir don't
apply cleanly.
--use-all-packaging
Use this flag if pkgdir has been carefully prepared
to remove unwanted patches and tarballs but still
contains .gz / .bz2 / .xz files which would
otherwise be discarded
--pristine This allows an upstream git tree to be used in
conjunction with pristine-tar. It is useful when
upstream modify the source which is tagged in
git. Upstream modifications are preserved as an
initial commit which ensures that when mer-master is
checked-out it contains the same information as the
pristine tarball. For build purposes the actual
pristine tarball is used together with any
patches. Typically use with --base-on to specify a
suitable tag.
EOF
}
use_existing() {
gp_type="git"
unpack=
FUZZ="--fuzz=2"
# better option parsing welcomed
while [[ $1 ]]; do
case $1 in
--pristine )
gp_type="pristine-tar"
shift ;;
--base-on* )
basetag=${1#*=}
# if tag is empty, complain
shift ;;
--unpack-to=* )
# Would be nice to default to tag=version
unpack=true
basetag=${1#*=}
# Make a git repo if there isn't one
if ! [[ -d .git ]]; then git init; fi
shift ;;
--pkgdir=* )
pkgdir=${1#*=}
shift ;;
--ver=* )
# Would be nice to default to tag=version-1
verrel=${1#*=}
force_rel=${verrel##*-}
force_ver=${verrel%-*}
shift ;;
--fuzz=* )
# patch application fuzz
FUZZ="--fuzz=${1#*=}"
shift ;;
--use-all-packaging )
USE_ALL_PKG=true
shift ;;
* )
fatal "Error $1 not recognised";;
esac
done
# If --unpack-to didn't make one then complain if we're not in a git repo
[[ -d .git ]] || {
fatal usage "This is not a git repository; use gp_setup when you've cloned or created a normal src repo that is ready for packaging".
}
[[ $basetag ]] || { fatal usage "basetag not supplied. You must use either --base-on= or --unpack-to= "; }
[[ $pkgdir ]] || { fatal usage "You must supply --pkgdir when using --auto"; }
[[ -d $pkgdir ]] || { fatal usage "Supplied --pkgdir '$pkgdir' is not a directory"; }
# Determine version/release numbers
get_info_from_packaging $pkgdir
name=${name:-unnamed}
rel=${force_rel:-${rel:-1}}
ver=${force_ver:-${ver:-$basetag}}
ver_pattern='^[0-9.]*$'
if ! [[ $ver =~ $ver_pattern ]]; then
echo "WARNING: Version is set to $ver which is not a simple X.Y.Z version"
confirm_continue
fi
if [[ $(echo $ver | tr -dc '[:digit:]') != $(echo $basetag | tr -dc '[:digit:]') ]]; then
echo "WARNING: Version is $ver and basetag is $basetag : the numbers don't match"
confirm_continue
fi
src_tag=$DISTRO-${ver}
patches_tag=$DISTRO-${ver}-${rel}
pkg_tag=pkg-$DISTRO-${ver}-${rel}
pbranch="${DISTRO}-master"
if ! [[ -d .git ]]; then
fatal "This is not a git repository"
fi
# Verify there's only a single spec or yaml file.
numspec=$(ls $pkgdir/*spec 2>/dev/null | wc -l)
numyaml=$(ls $pkgdir/*yaml 2>/dev/null | wc -l)
if [[ $numspec -gt 1 ]] || [[ $numyaml -gt 1 ]]; then
fatal "gp_setup doesn't support packaging with >1 .spec or .yaml file"
fi
# ... and record it
specfile=$(cd $pkgdir; ls *.spec 2>/dev/null)
yamlfile=$(cd $pkgdir; ls *.yaml 2>/dev/null)
# Guess the tarball
tarball=$(cd $pkgdir; find * -name '*t*bz2' -o -name '*t*gz' -o -name '*t*xz')
tarball=${tarball:-$name.tar.bz2}
echo "Using tarball: $tarball"
# If this is an unpack then it is pristine-tar with no
# git tree so unpack the tarball as a starting point
if [[ $unpack ]] ; then
echo "Unpack so setting pristine-tar : Unpacking tarball as initial commit"
gp_type="pristine-tar"
unpack_tarball $pkgdir/$tarball
git add .
git commit -q -m"Initial commit from $tarball"
# Create a tag for the tarball - it's OK to do it now in unpack mode
git_tag_cleanly $basetag
fi
# Branch from the appropriate tag
git checkout -q -f $basetag
# We tag now since gp_mkpkg needs it
git_tag_cleanly $src_tag
# Ensure the patches branch is rooted at basetag
git branch -f $pbranch
branch_cleanup_list+=" $pbranch"
git checkout $pbranch
# Pristine tar approach needs some extra work
# 1. Commit the tarball in packaging to pristine tar
# 2. Replace the checked-out tree with the tarball
# 3. Commit any deltas (empty if needed)
# 4. Ready for patches
if [[ $gp_type == "pristine-tar" ]] ; then
echo "Pristine tar : removing all files and unpacking tarball to record any delta to $basetag"
pristine-tar commit $pkgdir/$tarball $basetag
branch_cleanup_list+=" pristine-tar"
unpack_tarball $pkgdir/$tarball
git add .; git ls-files --deleted | xargs --no-run-if-empty git rm
git commit -q --allow-empty -m"pristine-tar-delta: Import any changes from the released tarball into the $DISTRO source tree ready for local patches"
have_patches=1
fi
# Apply the patches mentioned in the spec file in the order they appear
# We'll probably need a --fuzz option at some point
# Keep the dir clean and we should abort/warn when patches don't apply
for patch in $(cd $pkgdir; grep Patch.*: *spec | cut -f2- -d:); do
echo Applying $patch
patch=$(basename $patch)
if ! patch $FUZZ --batch -p1 --no-backup-if-mismatch -s < $pkgdir/$patch; then
echo "Failed to apply -p1 - trying -p0"
if ! patch $FUZZ --batch -p0 --no-backup-if-mismatch -s < $pkgdir/$patch; then
echo "Patch $pkgdir/$patch seemed to apply badly - fixup in a different terminal and press return to commit it and continue"
read dummy
fi
fi
git add --all . # Ensure we get any added/removed files too
git commit -q -am"$(basename $patch .patch)"
have_patches=1
done
# Only do this next section if we actually found patches to apply
if [[ $have_patches ]] ; then
# We need to tag the patch branch head
git_tag_cleanly $patches_tag
# Pristine tar needs to skip the pristine-tar-delta patch
if [[ $gp_type == "pristine-tar" ]] ; then
tag1="${pbranch}~$(($(count_commits $basetag $pbranch ) - 1))"
else
tag1=$src_tag
fi
# We now have all we need to create the _src file
_src="$gp_type:$tarball:$src_tag:$patches_tag"
else
# No patches variant of _src
_src="$gp_type:$tarball:$src_tag"
fi
prepare_pkg_branch
# Copy all the packaging files in (assuming no hidden files)
cp $pkgdir/* .
# Clean up the tarball we found and any patches which are now autogenerated
# Allow --use-all-packaging to override complex cases
if [[ ! $USE_ALL_PKG ]] ; then
rm -f *t*gz *t*bz2 *t*xz
rm -f *patch
fi
# Provide patch information for yaml/spec
if [[ -e $yamlfile ]]; then
if [[ $gp_type != "pristine-tar" ]] ; then
echo "SetupOptions: -q -n src" >> $yamlfile
fi
gp_mkpkg --no-checkout --no-tarball || fatal "gp_mkpkg failed"
specify -s -N -n $yamlfile
else
if [[ $gp_type == "pristine-tar" ]] ; then
gp_mkpkg -n --no-tarball --no-src || fatal "gp_mkpkg failed"
else
gp_mkpkg -n --no-tarball || fatal "gp_mkpkg failed"
fi
fi
# Everything else is normal packaging
git add * >/dev/null 2>&1
# And finally a commit
git commit -q -m"Initial git package of $basetag as $pbranch"
git_tag_cleanly $pkg_tag
# Comment on what we've created
echo Used:
cat _src
echo for _src
# and a reminder not to bitch *too* much
echo "gp_setup --auto isn't thoroughly tested - please fix and/or report any bugs you find"
}
usage_pkg(){
cat <<EOF
The --manual mode is used for 'manual' setup.
This gives a chance to modify the packaging before doing a commit.
--manual
Used in an existing git repo this creates a pkg branch
called pkg-$DISTRO with a suitable .gitignore and a _src
file.
The user must then add packaging files to this branch and
manually create tags.
[--pkgdir=<packaging dir>]
If provided then any files in this source dir are copied
into the current dir ready for adding to the packaging
branch.
This could be a 'checked out' osc dir.
Also tries to find the Version:/Release: information from
any yaml/spec
[--ver=<ver>-<rel>]
Allow version and release to be overriden
EOF
}
do_pkg() {
verrel_regex="^[^-]+-[^-]+$"
pkgdir=
while [[ $1 ]]; do
case $1 in
--pkgdir=* )
pkgdir=${1#*=}
[[ -d $pkgdir ]] || { fatal "Supplied --pkgdir '$pkgdir' is not a directory"; }
shift ;;
--ver=* )
verrel=${1#*=}
if [[ $verrel =~ $verrel_regex ]]; then
ver=${verrel%-*}
rel=${verrel##*-}
else
fatal "The --ver= option must provide <ver>-<rel>"
fi
shift ;;
* )
fatal "Error $1 not recognised" ;;
esac
done
if ! [[ ${verrel} ]] && [[ $pkgdir ]]; then
get_info_from_packaging $pkgdir
fi
# If all goes well we'll tag current location
ver_tag_sha1=$(git rev-parse HEAD)
prepare_pkg_branch
if [[ $pkgdir ]]; then
cp $pkgdir/* .
tarball=$(find * -name '*t*bz2' -o -name '*t*gz' -o -name '*t*xz')
fi
tarball=${tarball:-name-version.tar.bz2}
cat <<EOF
Now on ${pkg_branch} branch with _src and .gitignore.
You should create suitable packaging on this branch.
See https://wiki.merproject.org/wiki/Git_pkg for more help.
These files are present:
$(ls -laF)
you may want to:
rm $tarball
EOF
if [[ $ver ]] && [[ $rel ]]; then
echo "echo git:$tarball:mer-$ver > _src"
else
echo "echo git:$tarball:mer-\$ver > _src using a reasonable value for \$ver"
fi
cat <<EOF
If you modify _src and have any patches to apply you may want to run:
gp_mkpkg -n --no-tarball
git add *
git commit -am"Initial packaging commit"
EOF
if [[ $ver ]] && [[ $rel ]]; then
echo "git tag pkg-$DISTRO-$ver-$rel"
fi
if ! git show-ref --verify --quiet refs/tags/mer-$ver; then
cat <<EOF
Tag mer-$ver does not exist: you may want to create it.
To create it at the commit you were on originally:
git tag mer-$ver $ver_tag_sha1
EOF
fi
}
prepare_pkg_branch() {
# Verify there's no packaging branch already
if git show-ref --verify --quiet refs/heads/${pkg_branch}; then
fatal "${pkg_branch} branch exists already"
fi
require_clean_work_tree "run $ME"
# This creates the orphaned pkg-* branch
branch_cleanup_list+=" $pkg_branch"
git checkout --orphan ${pkg_branch}
git rm -q -rf .
git commit --allow-empty -m"Initial packaging branch (empty)"
# Remove stray files that may have crept in but only if we're in a .git repo
if [[ -d .git ]] ; then
find . -mindepth 1 -maxdepth 1 -not -name .git -print0 | xargs -0 rm -rf
fi
# We typically expect to be used in OBS/osc projects
echo .osc > .gitignore
echo ${_src:-git:pkg.tar.bz2:srctag[:patchestag]} > _src
git add _src .gitignore
}
save_initial_branch
case $1 in
--auto )
shift
use_existing "$@" ;;
--manual )
shift
do_pkg "$@" ;;
* )
usage ;;
esac
trap - EXIT