fix extra requires

bin/epm-check_updated_repo

@@ -26,7 +26,7 @@ __epm_apt_set_lists_pkg()
     if [ "$BASEDISTRNAME" = "alt" ] ; then
         pkg="pkglist"
         # 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
 }
 

bin/epm-install-alt

@@ -117,7 +117,7 @@ get_latest_kernel_rel()
     kmaxver=
     while read version
     do
-        comparever="$(rpmevrcmp "$kmaxver" "$version")"
+        comparever="$(a='' rpmevrcmp "$kmaxver" "$version")"
         [ "$comparever" -lt 0 ] && kmaxver="$version" ||:
     done <<<"$(epm print version-release for package kernel-image-$kernel_flavour)"
     [ -z "$kmaxver" ] && echo "$rrel" && return

bin/epm-kernel_update

@@ -20,8 +20,8 @@
 load_helper epm-check_updated_repo
 load_helper epm-sh-warmup
 
-EFI=$(bootctl -p 2>/dev/null)
-sdboot_loader_id=$(bootctl status 2>/dev/null | grep -oP '(?<=id: ).*')
+EFI=$(a="" bootctl -p 2>/dev/null)
+sdboot_loader_id=$(a="" bootctl status 2>/dev/null | grep -oP '(?<=id: ).*')
 
 if [ -f "$EFI/loader/entries/$sdboot_loader_id" ]; then
     entry_file="$EFI/loader/entries/$sdboot_loader_id"

bin/epm-requires

@@ -40,7 +40,7 @@ get_linked_shared_libs()
     assure_exists readelf binutils
     #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:]].*||'
-    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()

check_reqs.sh

@@ -11,10 +11,17 @@ if [ "$1" = "--detail" ] ; then
     for i in $LIST  ; do
         echo
         echo "==== $i:"
-        /usr/lib/rpm/shell.req $i
+        /usr/lib/rpm/shell.req $i | grep -v "coreutils"
     done
     exit 0
 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

prescription.d/podman-enable-rootless.sh

@@ -24,7 +24,7 @@ a= setcap cap_setgid+ep /usr/bin/newgidmap
 
 for i in $users ; do
     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
 done
 

repack.d/common.sh

@@ -424,9 +424,11 @@ __get_library_provides()
 {
     local fdir="$1"
 
+    epm assure objdump binutils || fatal "Can't install needed binutils package"
+
     info "  Getting internal provides ..."
     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"
     done
 

repack.d/sunshine.sh

@@ -33,12 +33,13 @@ WantedBy=xdg-desktop-autostart.target
 EOF
 
 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_FEDORA_VERSION=$(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_FEDORA_VERSION=$(a='' ldd usr/bin/sunshine | grep -oP 'libboost_[^ ]+\.so\.\K[0-9]+\.[0-9]+\.[0-9]+' | sort -u)
+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)
 
 if [ -z $MINIUPNPC_REPO_VERSION ] ; then