Skip to content

E
etersoft-build-utils
Commit 96eb7a32 authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

rpmreqs: smll fixes

parent b8cf0567
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
bin/rpmreqs
View file @ 96eb7a32
...@@ -52,7 +52,7 @@ convert_pkgfile_to_pkgname() ...@@ -52,7 +52,7 @@ convert_pkgfile_to_pkgname()
# drop internal reqs (already converted via apt) # drop internal reqs (already converted via apt)
#echo $ni | grep -q "/" && continue #echo $ni | grep -q "/" && continue
#echo $ni | grep -q "\.so" && continue #echo $ni | grep -q "\.so" && continue
#echo $ni | grep -q ")" && continue #echo $ni | grep -q "(OPENSSL_1)" && continue
# extra words when run on x86_64 # extra words when run on x86_64
ni=$(querypackage $ni NAME) ni=$(querypackage $ni NAME)
echo $ni | filter_pkgname echo $ni | filter_pkgname
...@@ -137,7 +137,7 @@ trans_rpmdeps_to_pkgname_lav() ...@@ -137,7 +137,7 @@ trans_rpmdeps_to_pkgname_lav()
# FIXME: strange regexp for drop libNAME.so.NUM and perl(Package) and /bin/sh # FIXME: strange regexp for drop libNAME.so.NUM and perl(Package) and /bin/sh
REALPKGNAMELIST=$(estrlist reg_exclude ".*\.so\..* .*/.* .*(.*" "$REQLIST") REALPKGNAMELIST=$(estrlist reg_exclude ".*\.so\..* .*/.* .*(.*" "$REQLIST")
# FIXME: external list? Set priorities/ # FIXME: external list? Set priorities/
REQCONVLIST=$(estrlist exclude "$REALPKGNAMELIST" "$REQLIST" | filter_multiple_provides | sed -e "s|(64bit)|.*(64bit)|g") REQCONVLIST=$(estrlist exclude "$REALPKGNAMELIST" "$REQLIST" | filter_multiple_provides | sed -e "s|\([^)]\)(64bit)|\1.*(64bit)|g")
# partially copied from aptU # partially copied from aptU
#VIRTREQ=$(LANG=C apt-get install --print-uris $REQLIST 2>&1 | grep "is a virtual package provided by" | cut -f2 -d" " | sort -u) #VIRTREQ=$(LANG=C apt-get install --print-uris $REQLIST 2>&1 | grep "is a virtual package provided by" | cut -f2 -d" " | sort -u)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment