Commit 9b3d7f87 authored by Vitaly Lipatov's avatar Vitaly Lipatov

move build src.rpm to rpmbsh from myhsh, fix gear support

parent 68070d6c
...@@ -22,8 +22,6 @@ phelp() ...@@ -22,8 +22,6 @@ phelp()
echog "$Descr" echog "$Descr"
echog "$Usage" echog "$Usage"
echog "Options:" echog "Options:"
echog " -s - sign package(s)"
echog " -u - sign and upload package(s) to Incoming"
echog " -i - install built packages in test hasher" echog " -i - install built packages in test hasher"
echog " -c - build without stuff (previous built packages)" echog " -c - build without stuff (previous built packages)"
} }
...@@ -134,12 +132,7 @@ if [ "$RESULT" = "0" -a -n "$TESTINSTALL" ] ; then ...@@ -134,12 +132,7 @@ if [ "$RESULT" = "0" -a -n "$TESTINSTALL" ] ; then
test -n "$BINPACKAGES" || fatal "Can't find binary packages for $LASTPACKAGE in `ls -l $HASHERDIR/repo/$DEFAULTARCH/RPMS.hasher`" test -n "$BINPACKAGES" || fatal "Can't find binary packages for $LASTPACKAGE in `ls -l $HASHERDIR/repo/$DEFAULTARCH/RPMS.hasher`"
echo "List: $BINPACKAGES" echo "List: $BINPACKAGES"
echo echo
loginhsh -t -i $MENVARG $BINPACKAGES || exit 1 $ETERBUILDBIN/loginhsh -t -i $MENVARG $BINPACKAGES || exit 1
fi
# make src.rpm if need
if [ "$RESULT" = "0" ] ; then
test -n "$LISTRPMARGS" && rpmbs $MENVARG $LISTRPMARGS $LISTBUILTSH
fi fi
exit $RESULT exit $RESULT
...@@ -96,6 +96,16 @@ if [ -n "$REMOTEBUILD" ] ; then ...@@ -96,6 +96,16 @@ if [ -n "$REMOTEBUILD" ] ; then
else else
cd $RPMTOPDIR/SRPMS && time $ETERBUILDBIN/myhsh $MENVARG $LISTRPMARGS $LISTBUILT cd $RPMTOPDIR/SRPMS && time $ETERBUILDBIN/myhsh $MENVARG $LISTRPMARGS $LISTBUILT
RESULT=$? RESULT=$?
# make src.rpm if build OK and we have options for rpmbs
if [ "$RESULT" = "0" ] && [ -n "$LISTRPMARGS" ]; then
if is_gear $SPECDIR ; then
$ETERBUILDBIN/rpmbs $MENVARG $LISTRPMARGS $LISTNAMES
else
$ETERBUILDBIN/rpmbs $MENVARG $LISTRPMARGS $LISTBUILT
fi
fi
date date
echo "-------------------------------" echo "-------------------------------"
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment