Skip to content

Commit 609c72e

Browse files
author
Junio C Hamano
committed
Update to prepare catching perl-Git RPM
1 parent 30d3872 commit 609c72e

File tree

1 file changed

+19
-6
lines changed

1 file changed

+19
-6
lines changed

DoKernelOrg

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,23 +55,36 @@ maint | master)
5555
mkdir -p $G/RPMS/$arch $G/RPMS/SRPMS &&
5656
echo "* Building $1" &&
5757
git checkout "$1" &&
58+
make $J git >./:all.log 2>&1 &&
59+
V=`./git --version | sed -e 's/git version //'` &&
5860
make rpm >>./:all.log 2>&1 &&
5961
case "$arch" in
6062
i386)
6163
status=$?
62-
echo >&2 "Done -- move RPMS to the master machine."
63-
make clean
64+
case "$status" in
65+
0)
66+
echo >&2 "Done -- move RPMS to the master machine."
67+
(
68+
cd "$HOME/rpms/RPMS/$arch" &&
69+
tar cf "$HOME/$V.tar" *-$V-*.$a.rpm &&
70+
ls -ld $HOME/$V.tar
71+
)
72+
make clean
73+
;;
74+
?)
75+
echo >&2 "Failed with status $status"
76+
;;
77+
esac
6478
exit $status ;;
6579
esac &&
6680
make dist-doc >>./:all.log 2>&1 &&
67-
make $J git >>./:all.log 2>&1 &&
68-
V=`./git --version | sed -e 's/git version //'` &&
6981
ln git-$V.tar.gz git-htmldocs-$V.tar.gz git-manpages-$V.tar.gz $G/. &&
7082
for a in $narch
7183
do
72-
ln $HOME/rpms/RPMS/$a/git*-$V-* $G/RPMS/$a/.
84+
mkdir -p "$G/RPMS/$a"
85+
ln $HOME/rpms/RPMS/$a/*-$V-*.$a.rpm $G/RPMS/$a/.
7386
done &&
74-
ln $HOME/rpms/SRPMS/git-$V-* $G/RPMS/SRPMS/. &&
87+
ln $HOME/rpms/SRPMS/git-$V-*.src.rpm $G/RPMS/SRPMS/. &&
7588
{
7689
# I do not know how it exits, and I do not care much.
7790
for a in $narch

0 commit comments

Comments
 (0)