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
a02c0596
Commit
a02c0596
authored
Jan 16, 2009
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
small fixes and improve test for get binary packages for src.rpm
parent
d24ad919
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
3 deletions
+9
-3
myhsh
bin/myhsh
+1
-1
rpm
share/eterbuild/functions/rpm
+3
-1
test_get_bin.sh
tests/test_get_bin.sh
+5
-1
No files found.
bin/myhsh
View file @
a02c0596
...
...
@@ -129,7 +129,7 @@ echo
if
[
"
$RESULT
"
=
"0"
-a
-n
"
$TESTINSTALL
"
]
;
then
# test install (only for last package in list)
# some key for build hasher from scratch
echog
"Find binary packages for
$LASTPACKAGE
..."
echog
"Find binary packages for
'
$(
basename
$LASTPACKAGE
)
' in
$HASHERDIR
/repo/
$DEFAULTARCH
/RPMS.hasher
..."
BINPACKAGES
=
`
get_binpkg_list
$HASHERDIR
/repo/
$DEFAULTARCH
/RPMS.hasher
$LASTPACKAGE
`
test
-n
"
$BINPACKAGES
"
||
fatal
"Can't find binary packages for
$LASTPACKAGE
in
`
ls
-l
$HASHERDIR
/repo/
$DEFAULTARCH
/RPMS.hasher
`
"
echo
"List:
$BINPACKAGES
"
...
...
share/eterbuild/functions/rpm
View file @
a02c0596
...
...
@@ -157,12 +157,14 @@ test -z "$LISTBUILT" && fatal "Error: List for build is empty. Check if file is
}
# build binary package list (1st - repo dir, 2st - pkgname)
# algorithm: list all files in PKGDIR, print packages with our source pkg name
get_binpkg_list
()
{
local
PKGDIR
=
$1
local
PKGNAME
=
$(
basename
$2
)
find
"
$PKGDIR
"
!
-name
'*\.src\.rpm'
-name
'*\.rpm'
-execdir
\
rpmquery
-p
--qf
=
'%{sourcerpm}\t%{name}-%{version}-%{release}.%{arch}.rpm\n'
"{}"
\;
\
|
grep
"^
$
2
[[:space:]].*"
|
cut
-f2
| xargs
-n1
-I
"{}"
echo
"
$PKGDIR
/{} "
|
grep
"^
$
PKGNAME
[[:space:]].*"
|
cut
-f2
| xargs
-n1
-I
"{}"
echo
"
$PKGDIR
/{} "
}
drop_pkg_extensions
()
...
...
tests/test_get_bin.sh
View file @
a02c0596
...
...
@@ -4,4 +4,8 @@
.
$ETERBUILDDIR
/functions/rpm
HASHERDIR
=
$HASHERDIR
-SS
get_binpkg_list
$HASHERDIR
/repo/
$DEFAULTARCH
/RPMS.hasher asymptote-1.43-alt1.src.rpm
for
i
in
`
ls
-1
$HASHERDIR
/repo/SRPMS.hasher
`
;
do
echo
"get for
$i
:"
get_binpkg_list
$HASHERDIR
/repo/
$DEFAULTARCH
/RPMS.hasher
$(
basename
$i
)
done
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