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
475f6af6
Commit
475f6af6
authored
Feb 07, 2016
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rpmbb: restore PKGFORMAT detection for fix --nodeps
parent
d6790bb4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
5 deletions
+8
-5
rpmbb
bin/rpmbb
+8
-5
No files found.
bin/rpmbb
View file @
475f6af6
...
@@ -81,6 +81,12 @@ test -n "$LISTRPMARGS" && echog "Run $RPMBUILD with options: '$LISTRPMARGS'"
...
@@ -81,6 +81,12 @@ test -n "$LISTRPMARGS" && echog "Run $RPMBUILD with options: '$LISTRPMARGS'"
try_enable_ccache
try_enable_ccache
detect_target_env
assert_var PKGFORMAT
# Set nodeps if run in non rpm system
[
"
$PKGFORMAT
"
=
"rpm"
]
&&
NODEPS
=
""
||
NODEPS
=
"--nodeps"
# instead cbuild req
# instead cbuild req
if
[
-n
"
$BUILDREQ
"
]
;
then
if
[
-n
"
$BUILDREQ
"
]
;
then
uni_buildreq
$BUILDREQ
$LISTNAMES
uni_buildreq
$BUILDREQ
$LISTNAMES
...
@@ -91,15 +97,12 @@ fi
...
@@ -91,15 +97,12 @@ fi
if
[
-n
"
$BUILDOPT
"
]
;
then
if
[
-n
"
$BUILDOPT
"
]
;
then
is_alt
||
fatal
"Sorry, only ALT Linux rpm supports --short-circuit correctly"
is_alt
||
fatal
"Sorry, only ALT Linux rpm supports --short-circuit correctly"
for
it
in
$BUILDOPT
for
it
in
$BUILDOPT
;
do
do
uni_rpmbuild
--commit
$LISTNAMES
-b
$it
$LISTRPMARGS
$NODEPS
--target
$BUILDARCH
--short-circuit
uni_rpmbuild
--commit
$LISTNAMES
-b
$it
$LISTRPMARGS
--target
$BUILDARCH
--short-circuit
done
done
exit
0
exit
0
fi
fi
# Set nodeps if run in non rpm system
[
"
$PKGFORMAT
"
=
"rpm"
]
&&
NODEPS
=
""
||
NODEPS
=
"--nodeps"
for
i
in
$LISTNAMES
for
i
in
$LISTNAMES
do
do
...
...
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