Commit abe71857 authored by Vitaly Lipatov's avatar Vitaly Lipatov

user gear via vars, do not require it

parent f9c85a95
...@@ -155,8 +155,9 @@ if [ -n "$SIGN" ]; then ...@@ -155,8 +155,9 @@ if [ -n "$SIGN" ]; then
release_check $LISTBUILT release_check $LISTBUILT
# create tag according to package release # create tag according to package release
if is_git $SPECDIR ; then if is_git $SPECDIR ; then
# needed corrent user.name/user.email for get GPG id local GEARCTAG=gear-create-tag
gear-create-tag --force # needed corrent user.name/user.email for get GPG id
$GEARCTAG --force
# git push ? # git push ?
fi fi
echog "Will try to sign follow packages with GPG: \$LISTBUILT" echog "Will try to sign follow packages with GPG: \$LISTBUILT"
......
...@@ -16,6 +16,8 @@ uni_rpmbuild() ...@@ -16,6 +16,8 @@ uni_rpmbuild()
shift shift
local SPECNAME=$1 local SPECNAME=$1
local SPECDIR=`dirname $SPECNAME` local SPECDIR=`dirname $SPECNAME`
local GEAR=gear
local GEARBUILDREQ=gear-buildreq
if [ -n "$USE_LEGACY_COMPRESSION" ] ; then if [ -n "$USE_LEGACY_COMPRESSION" ] ; then
# FIXME: do not override -v # FIXME: do not override -v
ONEPARAM="--define=_source_payload w9.gzdio" ONEPARAM="--define=_source_payload w9.gzdio"
...@@ -23,7 +25,7 @@ uni_rpmbuild() ...@@ -23,7 +25,7 @@ uni_rpmbuild()
# TODO: add support for git # TODO: add support for git
if [ "$COMMAND" = "buildreq" ] ; then if [ "$COMMAND" = "buildreq" ] ; then
if is_git $SPECDIR ; then if is_git $SPECDIR ; then
$NICE gear-buildreq --commit -- $@ $NICE $GEARBUILDREQ --commit -- $@
else else
$NICE $COMMAND $@ $NICE $COMMAND $@
fi fi
...@@ -34,11 +36,11 @@ uni_rpmbuild() ...@@ -34,11 +36,11 @@ uni_rpmbuild()
shift # skip spec name shift # skip spec name
[ -n "$SPECDIR" ] && [ "$SPECDIR" != "." ] && warning "Spec is not in git dir" [ -n "$SPECDIR" ] && [ "$SPECDIR" != "." ] && warning "Spec is not in git dir"
if [ "$MENV" = "SS" ] ; then if [ "$MENV" = "SS" ] ; then
$NICE gear --commit --rpmbuild -- $COMMAND "$ONEPARAM" $@ $NICE $GEAR --commit --rpmbuild -- $COMMAND "$ONEPARAM" $@
else else
# build src.rpm via hasher (on ALT) # build src.rpm via hasher (on ALT)
# $NICE gear-hsh --build-args="-bs" --rpmbuild -- $COMMAND "$ONEPARAM" $@ # $NICE gear-hsh --build-args="-bs" --rpmbuild -- $COMMAND "$ONEPARAM" $@
$NICE gear --hasher -- myhsh --build-prog=$ETERBUILDDIR/functions/rebuild $@ $NICE $GEAR --hasher -- myhsh --build-prog=$ETERBUILDDIR/functions/rebuild $@
fi fi
else else
$NICE $COMMAND "$ONEPARAM" $@ $NICE $COMMAND "$ONEPARAM" $@
......
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