Skip to content

Commit 10db61d

Browse files
committed
New update-distgit.sh script
1 parent d58538a commit 10db61d

File tree

4 files changed

+60
-36
lines changed

4 files changed

+60
-36
lines changed

generate-rpm-spec.sh

Lines changed: 0 additions & 35 deletions
This file was deleted.

javapackages-bootstrap.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Source: javapackages-bootstrap-PACKAGE-LICENSING
4040
# ./downstream.sh prep
4141
# ./downstream.sh archive
4242
# The results are in the archive directory
43-
Source: [...].tar.zst
43+
Source: [...]
4444

4545
BuildRequires: byaccj
4646
BuildRequires: gcc

libbleed.sh

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
set -eu
2+
3+
ref=HEAD
4+
if [ $# -gt 0 ]; then
5+
ref="$1"
6+
shift
7+
fi
8+
9+
commit=$(git rev-parse $ref)
10+
version=$(git describe --tags $commit)
11+
rpmversion="$version"
12+
suffix="$version"
13+
14+
case "$version" in
15+
*-*)
16+
version=$(git describe --tags --abbrev=0 $commit)
17+
timestamp=$(git cat-file commit $commit | sed -n '/^author /s/.* \([0-9][0-9]*\) [+-][0-9][0-9]*$/\1/;T;p;q')
18+
time=$(TZ=UTC date -d @$timestamp '+%Y%m%d.%H%M%S')
19+
shortcommit=$(echo "$commit" | sed 's/\(.......\).*/\1/')
20+
rpmversion="$version^$time.git.$shortcommit"
21+
suffix="snapshot-$time-$shortcommit"
22+
;;
23+
esac
24+
25+
out=rpm
26+
if [[ $# -gt 0 ]]; then
27+
out="$1"
28+
shift
29+
else
30+
mkdir -p $out/
31+
fi
32+
33+
git archive $commit --prefix $name-$suffix/ | zstd -12 >$out/$name-$suffix.tar.zst
34+
(cd ./$out && sha512sum --tag $name-$suffix.tar.zst) >$out/sources
35+
36+
cp $name.spec $out/$name.spec
37+
sed -i "s/^Version:.*/Version: $rpmversion/" $out/$name.spec
38+
39+
if [ "$suffix" != "$version" ]; then
40+
sed -i "/^Source:.*https:/s/^Source:.*/Source: $name-$suffix.tar.zst/" $out/$name.spec
41+
fi

update-distgit.sh

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/bin/sh
2+
name=javapackages-bootstrap
3+
. ./libbleed.sh
4+
5+
#rm -rf archive/
6+
#./downstream.sh archive
7+
cp $out/$name-$suffix.tar.zst archive/
8+
cp archive/* $out/
9+
10+
./downstream.sh source-list | while read s; do
11+
sed -i '/^Source:.*\[\.\.\.\]/i'"$s" $out/$name.spec
12+
done
13+
sed -i '/^Source:.*\[\.\.\.\]/d' $out/$name.spec
14+
15+
./mbi.sh licensing >$out/$name-PACKAGE-LICENSING
16+
sed -i "s/^License:.*/$(sed -n /^License:/p $out/$name-PACKAGE-LICENSING)/" $out/$name.spec
17+
18+
./downstream.sh source-manifest >>$out/sources

0 commit comments

Comments
 (0)