Commit 1cc0811f authored by Vitaly Lipatov's avatar Vitaly Lipatov

epm prescription i586-fix: check for installable only nvidia packages

parent c30de60d
...@@ -24,13 +24,13 @@ for i in glibc-nss glibc-gconv-modules \ ...@@ -24,13 +24,13 @@ for i in glibc-nss glibc-gconv-modules \
$(epmqp --short libnss | grep "^libnss-") \ $(epmqp --short libnss | grep "^libnss-") \
$(epmqp --short xorg-dri | grep "^xorg-dri-") $(epmqp --short xorg-dri | grep "^xorg-dri-")
do do
epm --quiet installed $i && LIST="$LIST i586-$i" epm status --installed $i && LIST="$LIST i586-$i"
done done
[ "$repo" = "p10" ] && for i in \ [ "$repo" = "p10" ] && for i in \
vulkan-amdgpu vulkan-amdgpu
do do
epm --quiet installed $i && LIST="$LIST i586-$i" epm status --installed $i && LIST="$LIST i586-$i"
done done
for i in \ for i in \
...@@ -38,7 +38,8 @@ for i in \ ...@@ -38,7 +38,8 @@ for i in \
libnvidia-ml \ libnvidia-ml \
$(epmqp --short nvidia_glx | grep "^nvidia_glx") $(epmqp --short nvidia_glx | grep "^nvidia_glx")
do do
epm --quiet installed $i && LIST="$LIST i586-$i" # https://bugs.etersoft.ru/show_bug.cgi?id=17831
epm status --installed $i && epm status --installable i586-$i && LIST="$LIST i586-$i"
done done
} }
...@@ -52,7 +53,7 @@ for i in \ ...@@ -52,7 +53,7 @@ for i in \
sssd-client \ sssd-client \
mesa-vulkan-drivers mesa-dri-drivers vulkan-loader mesa-libd3d mesa-vulkan-drivers mesa-dri-drivers vulkan-loader mesa-libd3d
do do
epm --quiet installed $i && LIST="$LIST $i.i686" epm status --installed $i && LIST="$LIST $i.i686"
done done
} }
...@@ -74,21 +75,14 @@ case "$vendor" in ...@@ -74,21 +75,14 @@ case "$vendor" in
;; ;;
esac esac
filtered_list=""
for pkg in $LIST; do
if epm status --installable $pkg; then
filtered_list="$filtered_list $pkg"
fi
done
echo echo
echo "Installing all appropiate 32 bit packages ..." info "Installing all appropiate 32 bit packages ..."
noremove='' noremove=''
[ -n "$auto" ] && noremove='--no-remove' [ -n "$auto" ] && noremove='--no-remove'
LIST="$filtered_list"
epm install $noremove $LIST epm install $noremove $LIST
RES=$? RES=$?
[ "$RES" = "0" ] || echo "Try do epm upgrade before." [ "$RES" = "0" ] || info "Try do epm upgrade before and check epm repo list."
exit $RES exit $RES
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