Commit e00369e8 authored by Vitaly Lipatov's avatar Vitaly Lipatov

fix extra requires

parent c2ad5f20
...@@ -26,7 +26,7 @@ __epm_apt_set_lists_pkg() ...@@ -26,7 +26,7 @@ __epm_apt_set_lists_pkg()
if [ "$BASEDISTRNAME" = "alt" ] ; then if [ "$BASEDISTRNAME" = "alt" ] ; then
pkg="pkglist" pkg="pkglist"
# see update-kernel: Use Dir::State::lists for apt update freshness check (ALT bug 46987) # see update-kernel: Use Dir::State::lists for apt update freshness check (ALT bug 46987)
eval "$(apt-config shell LISTS Dir::State::lists/f)" eval "$(a='' apt-config shell LISTS Dir::State::lists/f)"
fi fi
} }
......
...@@ -117,7 +117,7 @@ get_latest_kernel_rel() ...@@ -117,7 +117,7 @@ get_latest_kernel_rel()
kmaxver= kmaxver=
while read version while read version
do do
comparever="$(rpmevrcmp "$kmaxver" "$version")" comparever="$(a='' rpmevrcmp "$kmaxver" "$version")"
[ "$comparever" -lt 0 ] && kmaxver="$version" ||: [ "$comparever" -lt 0 ] && kmaxver="$version" ||:
done <<<"$(epm print version-release for package kernel-image-$kernel_flavour)" done <<<"$(epm print version-release for package kernel-image-$kernel_flavour)"
[ -z "$kmaxver" ] && echo "$rrel" && return [ -z "$kmaxver" ] && echo "$rrel" && return
......
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
load_helper epm-check_updated_repo load_helper epm-check_updated_repo
load_helper epm-sh-warmup load_helper epm-sh-warmup
EFI=$(bootctl -p 2>/dev/null) EFI=$(a="" bootctl -p 2>/dev/null)
sdboot_loader_id=$(bootctl status 2>/dev/null | grep -oP '(?<=id: ).*') sdboot_loader_id=$(a="" bootctl status 2>/dev/null | grep -oP '(?<=id: ).*')
if [ -f "$EFI/loader/entries/$sdboot_loader_id" ]; then if [ -f "$EFI/loader/entries/$sdboot_loader_id" ]; then
entry_file="$EFI/loader/entries/$sdboot_loader_id" entry_file="$EFI/loader/entries/$sdboot_loader_id"
......
...@@ -40,7 +40,7 @@ get_linked_shared_libs() ...@@ -40,7 +40,7 @@ get_linked_shared_libs()
assure_exists readelf binutils assure_exists readelf binutils
#is_command readelf || fatal "Can't get required shared library: readelf is missed. Try install binutils package." #is_command readelf || fatal "Can't get required shared library: readelf is missed. Try install binutils package."
#ldd "$exe" | sed -e 's|[[:space:]]*||' | grep "^lib.*[[:space:]]=>[[:space:]]\(/usr/lib\|/lib\)" | sed -e 's|[[:space:]].*||' #ldd "$exe" | sed -e 's|[[:space:]]*||' | grep "^lib.*[[:space:]]=>[[:space:]]\(/usr/lib\|/lib\)" | sed -e 's|[[:space:]].*||'
LC_ALL=C readelf -d "$1" | grep "(NEEDED)" | grep "Shared library:" | sed -e 's|.*Shared library: \[||' -e 's|\]$||' | grep "^lib" LC_ALL=C a="" readelf -d "$1" | grep "(NEEDED)" | grep "Shared library:" | sed -e 's|.*Shared library: \[||' -e 's|\]$||' | grep "^lib"
} }
__epm_elf32_requires() __epm_elf32_requires()
......
...@@ -11,10 +11,17 @@ if [ "$1" = "--detail" ] ; then ...@@ -11,10 +11,17 @@ if [ "$1" = "--detail" ] ; then
for i in $LIST ; do for i in $LIST ; do
echo echo
echo "==== $i:" echo "==== $i:"
/usr/lib/rpm/shell.req $i /usr/lib/rpm/shell.req $i | grep -v "coreutils"
done done
exit 0 exit 0
fi fi
/usr/lib/rpm/shell.req $LIST | sort -u | tee ./check_eepm.log for i in $LIST ; do
echo
echo "==== $i:"
/usr/lib/rpm/shell.req $i | grep -v "coreutils" | grep -v "^eepm$"
done | tee ./check_eepm-detail.log
#/usr/lib/rpm/shell.req $LIST | sort -u | tee ./check_eepm.log
cat ./check_eepm-detail.log | grep -v "^$" | grep -v "^===" | sort -u | tee ./check_eepm.log
git diff ./check_eepm.log git diff ./check_eepm.log
...@@ -24,7 +24,7 @@ a= setcap cap_setgid+ep /usr/bin/newgidmap ...@@ -24,7 +24,7 @@ a= setcap cap_setgid+ep /usr/bin/newgidmap
for i in $users ; do for i in $users ; do
if ! grep -q $i /etc/subuid /etc/subgid ; then if ! grep -q $i /etc/subuid /etc/subgid ; then
usermod --add-subuids 100000-165535 --add-subgids 100000-165535 "$i" a= usermod --add-subuids 100000-165535 --add-subgids 100000-165535 "$i"
fi fi
done done
......
...@@ -424,9 +424,11 @@ __get_library_provides() ...@@ -424,9 +424,11 @@ __get_library_provides()
{ {
local fdir="$1" local fdir="$1"
epm assure objdump binutils || fatal "Can't install needed binutils package"
info " Getting internal provides ..." info " Getting internal provides ..."
for libso in $(find "$fdir" -name "lib*.so*") ; do for libso in $(find "$fdir" -name "lib*.so*") ; do
objdump -p "$libso" | grep "SONAME" | sed -e 's|.* ||' a="" objdump -p "$libso" | grep "SONAME" | sed -e 's|.* ||'
basename "$libso" basename "$libso"
done done
......
...@@ -33,12 +33,13 @@ WantedBy=xdg-desktop-autostart.target ...@@ -33,12 +33,13 @@ WantedBy=xdg-desktop-autostart.target
EOF EOF
epm assure patchelf epm assure patchelf
epm assure ldd glibc-utils
BOOST_REPO_VERSION=$(LC_ALL=C epm info boost | grep -oP '^Version\s*:\s*\K[^\s]+' | sed 's/^[0-9]*://g' | cut -d '-' -f 1) BOOST_REPO_VERSION=$(LC_ALL=C epm info boost | grep -oP '^Version\s*:\s*\K[^\s]+' | sed 's/^[0-9]*://g' | cut -d '-' -f 1)
BOOST_FEDORA_VERSION=$(ldd usr/bin/sunshine | grep -oP 'libboost_[^ ]+\.so\.\K[0-9]+\.[0-9]+\.[0-9]+' | sort -u) BOOST_FEDORA_VERSION=$(a='' ldd usr/bin/sunshine | grep -oP 'libboost_[^ ]+\.so\.\K[0-9]+\.[0-9]+\.[0-9]+' | sort -u)
BOOST_LIBS=$(ldd usr/bin/sunshine | grep -oP 'libboost_[^ ]+\.so' | sort -u | sed 's/libboost_//; s/\.so//') BOOST_LIBS=$(a='' ldd usr/bin/sunshine | grep -oP 'libboost_[^ ]+\.so' | sort -u | sed 's/libboost_//; s/\.so//')
MINIUPNPC_FEDORA_VERSION=$(ldd usr/bin/sunshine | grep -oP 'libminiupnpc\.so\.\K[0-9]+') MINIUPNPC_FEDORA_VERSION=$(a='' ldd usr/bin/sunshine | grep -oP 'libminiupnpc\.so\.\K[0-9]+')
MINIUPNPC_REPO_VERSION=$(LC_ALL=C epm search miniupnpc | grep -Eo 'libminiupnpc[0-9]+' | grep -Eo '[0-9]+' | sort -V | tail -n1) MINIUPNPC_REPO_VERSION=$(LC_ALL=C epm search miniupnpc | grep -Eo 'libminiupnpc[0-9]+' | grep -Eo '[0-9]+' | sort -V | tail -n1)
if [ -z $MINIUPNPC_REPO_VERSION ] ; then if [ -z $MINIUPNPC_REPO_VERSION ] ; then
......
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