Attachment 14224 Details for Bug 31835 – dkms 3.0.12 version of norpm patch

[patch] dkms 3.0.12 version of norpm patch

dkms-3.0.12-norpm.patch (text/plain), 1.04 KB, created by katnatek on 2023-12-18 03:04:03 CET

(hide)

Description:

Filename:

MIME Type:

Creator: katnatek

Created: 2023-12-18 03:04:03 CET

Size: 1.04 KB

patch

obsolete

>Index: dkms-3.0.12/dkms.in
>===================================================================
>--- dkms-3.0.12/dkms.in
>+++ dkms-3.0.12/dkms.in	2023-12-15 15:50:28.556609672 -0600
>@@ -278,10 +278,11 @@
>             kernelver[0]=$(uname -r)
>         fi
>         if [[ ! $arch ]]; then
>-            kernelver_rpm=$(rpm -qf "/lib/modules/$kernelver" 2>/dev/null | \
>+            [ -z "$rpm_safe_upgrade" ] && kernelver_rpm=$(rpm -qf "/lib/modules/$kernelver" 2>/dev/null | \
>             grep -v "not owned by any package" | grep kernel | head -n 1)
>-            if ! arch[0]=$(rpm -q --queryformat "%{ARCH}" "$kernelver_rpm" 2>/dev/null); then
>+            if [ -n "$rpm_safe_upgrade" ] || ! arch[0]=$(rpm -q --queryformat "%{ARCH}" "$kernelver_rpm" 2>/dev/null); then
>                 arch[0]=$(uname -m)
>+                [[ ${arch[0]} = i?86 ]] && arch[0]=i586
>                 if [[ $arch = x86_64 ]] && grep -q Intel /proc/cpuinfo && ls $install_tree/$kernelver/build/configs 2>/dev/null | grep -q "ia32e"; then
>                     arch[0]="ia32e"
>                 fi

Index: dkms-3.0.12/dkms.in
===================================================================
--- dkms-3.0.12/dkms.in
+++ dkms-3.0.12/dkms.in	2023-12-15 15:50:28.556609672 -0600
@@ -278,10 +278,11 @@
             kernelver[0]=$(uname -r)
         fi
         if [[ ! $arch ]]; then
-            kernelver_rpm=$(rpm -qf "/lib/modules/$kernelver" 2>/dev/null | \
+            [ -z "$rpm_safe_upgrade" ] && kernelver_rpm=$(rpm -qf "/lib/modules/$kernelver" 2>/dev/null | \
             grep -v "not owned by any package" | grep kernel | head -n 1)
-            if ! arch[0]=$(rpm -q --queryformat "%{ARCH}" "$kernelver_rpm" 2>/dev/null); then
+            if [ -n "$rpm_safe_upgrade" ] || ! arch[0]=$(rpm -q --queryformat "%{ARCH}" "$kernelver_rpm" 2>/dev/null); then
                 arch[0]=$(uname -m)
+                [[ ${arch[0]} = i?86 ]] && arch[0]=i586
                 if [[ $arch = x86_64 ]] && grep -q Intel /proc/cpuinfo && ls $install_tree/$kernelver/build/configs 2>/dev/null | grep -q "ia32e"; then
                     arch[0]="ia32e"
                 fi

Actions: View | Diff

Attachments on bug 31835: 14222 | 14223 | 14224 | 14225 | 14344 | 14353 | 14354 | 14355 | 14434 | 14588