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
074afbf7
You need to sign in or sign up before continuing.
Commit
074afbf7
authored
Mar 14, 2022
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rpmbsh: fix p10 support
parent
54665b7f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
myhsh
bin/myhsh
+1
-1
rpmbsh
bin/rpmbsh
+3
-3
No files found.
bin/myhsh
View file @
074afbf7
...
@@ -33,7 +33,7 @@ phelp()
...
@@ -33,7 +33,7 @@ phelp()
echog
" -b REPONAME binary repository name (p6, t6, c7, p8 and so on)"
echog
" -b REPONAME binary repository name (p6, t6, c7, p8 and so on)"
}
}
while
getopts
:habpnclr opt
;
do
while
getopts
:hab
:
pnclr opt
;
do
case
$opt
in
case
$opt
in
h
)
phelp
;
exit
0
;;
h
)
phelp
;
exit
0
;;
p
)
PRINTBINPKG
=
1
;;
p
)
PRINTBINPKG
=
1
;;
...
...
bin/rpmbsh
View file @
074afbf7
...
@@ -92,12 +92,12 @@ pack_src_rpm $COMMIT $(drop_args "$LISTRPMARGS" s u c e l f a A)
...
@@ -92,12 +92,12 @@ pack_src_rpm $COMMIT $(drop_args "$LISTRPMARGS" s u c e l f a A)
# FIXME: we can't make pkg.tar from non gear repo, so just run myhsh with -a
# FIXME: we can't make pkg.tar from non gear repo, so just run myhsh with -a
# build in hasher
# build in hasher
docmd
time
$ETERBUILDBIN
/myhsh
$MENVARG
$THOROUGH
$(
drop_args
"
$LISTRPMARGS
"
f u a A
)
$LISTBUILT
docmd
time
$ETERBUILDBIN
/myhsh
-b
$BINARYREPO
$THOROUGH
$(
drop_args
"
$LISTRPMARGS
"
f u a A
)
$LISTBUILT
RESULT
=
$?
RESULT
=
$?
# if ok and test install is requested, do it
# if ok and test install is requested, do it
if
[
"
$RESULT
"
=
"0"
]
&&
[
-n
"
$INSTALLPKG
"
]
;
then
if
[
"
$RESULT
"
=
"0"
]
&&
[
-n
"
$INSTALLPKG
"
]
;
then
BINPACKAGES
=
$(
$ETERBUILDBIN
/myhsh
$MENVARG
-p
$LISTBUILT
| estrlist reg_exclude
".*debuginfo.*"
-
)
||
fatal
"Can't get binary packages for
$LISTBUILT
"
BINPACKAGES
=
$(
$ETERBUILDBIN
/myhsh
-b
$BINARYREPO
-p
$LISTBUILT
| estrlist reg_exclude
".*debuginfo.*"
-
)
||
fatal
"Can't get binary packages for
$LISTBUILT
"
estrlist isempty
"
$BINPACKAGES
"
&&
fatal
"There is no binary packages after build"
estrlist isempty
"
$BINPACKAGES
"
&&
fatal
"There is no binary packages after build"
...
@@ -113,7 +113,7 @@ if [ "$RESULT" = "0" ] && [ -n "$INSTALLPKG" ] ; then
...
@@ -113,7 +113,7 @@ if [ "$RESULT" = "0" ] && [ -n "$INSTALLPKG" ] ; then
if
[
"
$RESULT
"
=
"0"
]
;
then
if
[
"
$RESULT
"
=
"0"
]
;
then
echog
"Remove packages from test hasher dir ..."
echog
"Remove packages from test hasher dir ..."
docmd
$ETERBUILDBIN
/myhsh
-r
$MENVARG
$BINPACKAGES
docmd
$ETERBUILDBIN
/myhsh
-r
-b
$BINARYREPO
$BINPACKAGES
else
else
echog
"Leave packages in the hasher due error result"
echog
"Leave packages in the hasher due error result"
fi
fi
...
...
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