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
abe71857
Commit
abe71857
authored
Dec 11, 2008
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user gear via vars, do not require it
parent
f9c85a95
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-5
rpmbs
bin/rpmbs
+3
-2
rpm
share/eterbuild/functions/rpm
+5
-3
No files found.
bin/rpmbs
View file @
abe71857
...
@@ -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"
...
...
share/eterbuild/functions/rpm
View file @
abe71857
...
@@ -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
"
$@
...
...
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