Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
etersoft-build-utils
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
korinf
etersoft-build-utils
Commits
52bc0008
Commit
52bc0008
authored
Nov 26, 2009
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix GIRARHOST for subcommand
parent
ca8a615f
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
5 deletions
+10
-5
rpmbph
bin/rpmbph
+6
-1
rpmbs
bin/rpmbs
+1
-1
rpmbsh
bin/rpmbsh
+2
-2
rpmrb
bin/rpmrb
+1
-1
No files found.
bin/rpmbph
View file @
52bc0008
...
...
@@ -29,7 +29,7 @@ FIXPATCHFUZZ="%define _default_patch_fuzz 3"
# Set buildreq
if
[
"
$VENDOR
"
=
"alt"
]
;
then
BUILDREQ
=
"BuildRequires: rpm-build-compat >= 0.95"
[
-z
"
$BUILDCOMMAND
"
]
&&
BUILDCOMMAND
=
$ETERBUILDBIN
/rpmbsh
[
-z
"
$BUILDCOMMAND
"
]
&&
BUILDCOMMAND
=
"
$ETERBUILDBIN
/rpmbsh
$GIRARHOST
"
# Change release according to alt policy with extensions
# General rule: alwars alt(N-1).MM.(N)
set_release
$SPECNAME
$(
get_txtrelease
$SPECNAME
)$(
decrement_release
$BASERELEASE
)
.
$MDISTR
.
$BASERELEASE
...
...
@@ -288,6 +288,11 @@ fi
LISTRPMARGS
=
$@
}
if
is_girar_name
$1
;
then
GIRARHOST
=
$1
shift
fi
parse_cmd_pre
"
$@
"
mygetopts
$LISTARGS
...
...
bin/rpmbs
View file @
52bc0008
...
...
@@ -168,7 +168,7 @@ if [ -n "$UPLOADNOW" ] && is_gear $SPECDIR ; then
build_rpms_name
"
$LISTNAMES
"
pkg_release_check
check_gear_and_tag
$ETERBUILDBIN
/gpush
$BASENAME
||
fatal
"Git push via gpush failed. Possibly you need to run ginit for create remote repo."
$ETERBUILDBIN
/gpush
$
GIRARHOST
$
BASENAME
||
fatal
"Git push via gpush failed. Possibly you need to run ginit for create remote repo."
TAG
=
$VERSION
-
$RELEASE
if
[
-n
"
$TASKNUMBER
"
]
;
then
ssh
$GIRARHOST
task add
$TASKNUMBER
repo
$BASENAME
$TAG
...
...
bin/rpmbsh
View file @
52bc0008
...
...
@@ -110,9 +110,9 @@ cd -
# 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
$ETERBUILDBIN
/rpmbs
$
GIRARHOST
$
MENVARG
$LISTRPMARGS
$LISTNAMES
else
$ETERBUILDBIN
/rpmbs
$MENVARG
$LISTRPMARGS
$LISTBUILT
$ETERBUILDBIN
/rpmbs
$
GIRARHOST
$
MENVARG
$LISTRPMARGS
$LISTBUILT
fi
fi
...
...
bin/rpmrb
View file @
52bc0008
...
...
@@ -47,4 +47,4 @@ if is_gear `pwd` ; then
fi
$ETERBUILDBIN
/rpmbsh
$REMOTE
-i
$SPEC
||
fatal
"Error with build in hasher"
$ETERBUILDBIN
/rpmbs
-u
$SPEC
||
fatal
"Error with upload"
$ETERBUILDBIN
/rpmbs
$GIRARHOST
-u
$SPEC
||
fatal
"Error with upload"
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment