Commit 450a7ebf authored by Vitaly Lipatov's avatar Vitaly Lipatov

epm repack common.sh: add ignore_lib_requires()

parent 2d5af67a
...@@ -364,6 +364,16 @@ __get_binary_requires() ...@@ -364,6 +364,16 @@ __get_binary_requires()
epm req --short $(find "$fdir" -type f -name "lib*.so*") </dev/null 2>/dev/null | sed -e 's|().*||' epm req --short $(find "$fdir" -type f -name "lib*.so*") </dev/null 2>/dev/null | sed -e 's|().*||'
} }
__get_library_provides()
{
local fdir="$1"
info " Getting internal provides ..."
find "$fdir" -name "lib*.so*" | xargs -n1 objdump -p | grep "SONAME" | sed -e 's|.* ||'
echo "$EEPM_IGNORE_LIB_REQUIRES" | xargs -n1 echo
}
# fast hack to get all extra soname list # fast hack to get all extra soname list
get_libs_requires() get_libs_requires()
{ {
...@@ -373,8 +383,7 @@ get_libs_requires() ...@@ -373,8 +383,7 @@ get_libs_requires()
__get_binary_requires "$fdir" | LANG=C sort -u >$libreqlist __get_binary_requires "$fdir" | LANG=C sort -u >$libreqlist
info " Getting internal provides ..." __get_library_provides "$fdir" | LANG=C sort -u >$libpreslist
find "$fdir" -name "lib*.so*" | xargs -n1 objdump -p | grep "SONAME" | sed -e 's|.* ||' | LANG=C sort -u >$libpreslist
# print out result # print out result
LANG=C join -v2 $libpreslist $libreqlist LANG=C join -v2 $libpreslist $libreqlist
...@@ -413,6 +422,7 @@ add_by_ldd_deps() ...@@ -413,6 +422,7 @@ add_by_ldd_deps()
add_unirequires "$(epm requires --direct "$exe")" add_unirequires "$(epm requires --direct "$exe")"
} }
filter_from_requires() filter_from_requires()
{ {
# hack for uncompatible rpm-build # hack for uncompatible rpm-build
...@@ -424,6 +434,17 @@ filter_from_requires() ...@@ -424,6 +434,17 @@ filter_from_requires()
done done
} }
ignore_lib_requires()
{
#if [ -z "$EPM_RPMBUILD" ] ; then
# filter_from_requires "$@"
# return
#fi
EEPM_IGNORE_LIB_REQUIRES="$EEPM_IGNORE_LIB_REQUIRES $@"
}
add_findreq_skiplist() add_findreq_skiplist()
{ {
# hack for uncompatible rpm-build # hack for uncompatible rpm-build
......
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