Commit 507a29e7 authored by Vitaly Lipatov's avatar Vitaly Lipatov

small fix

parent 0c6fe3e3
...@@ -31,7 +31,7 @@ phelp() ...@@ -31,7 +31,7 @@ phelp()
echog " -u sign and upload after build" # will pass to rpmbs/rpmbsh echog " -u sign and upload after build" # will pass to rpmbs/rpmbsh
echog " -n skip build in hasher" echog " -n skip build in hasher"
echog " -i install built packages in test hasher" # will pass to rpmbs/rpmbsh echog " -i install built packages in test hasher" # will pass to rpmbs/rpmbsh
echog " -b REPONAME binary repository name (4.1, p5, t6 and so on)" echog " -b REPONAME binary repository name (4.1, p5, t6 and so on) (can be overrided with DISTRNAME)"
echo "$HELP_GIRAR" echo "$HELP_GIRAR"
echo echo
echog "Ext. options:" echog "Ext. options:"
......
...@@ -28,7 +28,7 @@ phelp() ...@@ -28,7 +28,7 @@ phelp()
echo "Usage: rpmbps -b $EXAMPLEALTDISTRVERSION for backport to ALT Linux $EXAMPLEALTDISTRVERSION and so on" echo "Usage: rpmbps -b $EXAMPLEALTDISTRVERSION for backport to ALT Linux $EXAMPLEALTDISTRVERSION and so on"
echo echo
echog "Options:" echog "Options:"
echog " -b REPONAME binary repository name (p8, t7 and so on)" echog " -b REPONAME binary repository name (p8, t7 and so on) (can be overrided with DISTRNAME)"
# echog " -q quiet" # echog " -q quiet"
echo echo
echog "Examples:" echog "Examples:"
...@@ -149,7 +149,7 @@ else ...@@ -149,7 +149,7 @@ else
# hack against very straight patch command # hack against very straight patch command
FIXPATCHFUZZ="%define _default_patch_fuzz 3" FIXPATCHFUZZ="%define _default_patch_fuzz 3"
# see install in Korinf, need concatenate # TODO: see install in Korinf, need concatenate
BUILDREQ="$BUILDREQ make gcc\n$FIXPATCHFUZZ" BUILDREQ="$BUILDREQ make gcc\n$FIXPATCHFUZZ"
# (do not modify BUILDREQ anymore) # (do not modify BUILDREQ anymore)
...@@ -202,7 +202,7 @@ if [ "$PKGVENDOR" = "mcbc" ] ; then ...@@ -202,7 +202,7 @@ if [ "$PKGVENDOR" = "mcbc" ] ; then
%__subst 's|mktemp -dt|mktemp -d|g' configure ; %__subst 's|readlink -mv|ls -1|g' configure ltmain.sh" %__subst 's|mktemp -dt|mktemp -d|g' configure ; %__subst 's|readlink -mv|ls -1|g' configure ltmain.sh"
fi fi
# eval_spec print only enabled sections (be cafe with if_with)
LISTBUILDDEP=`print_buildreq $SPECNAME` LISTBUILDDEP=`print_buildreq $SPECNAME`
LISTREQDEP="`print_pkgreq $SPECNAME` $ADDREQUIRES" LISTREQDEP="`print_pkgreq $SPECNAME` $ADDREQUIRES"
LISTDEP=`echo $LISTBUILDDEP $LISTREQDEP | xargs -n1 echo | sort -u` LISTDEP=`echo $LISTBUILDDEP $LISTREQDEP | xargs -n1 echo | sort -u`
......
...@@ -93,7 +93,7 @@ get_altdistr_version() ...@@ -93,7 +93,7 @@ get_altdistr_version()
# p6 -> M60P # p6 -> M60P
get_altdistr_mod() get_altdistr_mod()
{ {
echo "$1" | sed -e "s|Sisyphus|sisyphus|gi" -e "s|p\([5-9]\)|M\10P|g" -e "s|c\([6-9]\)|M\10C|g" -e "s|t\([6-9]\)|M\10T|g" echo "$1" | sed -e "s|Sisyphus|sisyphus|gi" -e "s|p\([5-9]\)|M\10P|g" -e "s|c\([6-8]\)|M\10C|g" -e "s|t\([6-9]\)|M\10T|g"
} }
# TODO: include in sisyphus_check # TODO: include in sisyphus_check
......
...@@ -85,7 +85,7 @@ prepare_aptconfig() ...@@ -85,7 +85,7 @@ prepare_aptconfig()
export OURSOURCES=$OURTMPDIR/sources.list.$MENV export OURSOURCES=$OURTMPDIR/sources.list.$MENV
print_tmp_sourceslist $APTCONF >$OURSOURCES || fatal "Can't create sources.list" print_tmp_sourceslist $APTCONF >$OURSOURCES || fatal "Can't create sources.list"
if [ -n "$ETERBUILD_APTREPO" ] ; then if [ -n "$ETERBUILD_APTREPO" ] ; then
cat <<EOF >>$OURSOURCES cat >>$OURSOURCES <<EOF
# Apply repo(s) from external ETERBUILD_APTREPO variable # Apply repo(s) from external ETERBUILD_APTREPO variable
$ETERBUILD_APTREPO $ETERBUILD_APTREPO
......
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