Mageia Bugzilla – Attachment 14225 Details for
Bug 31835
Update dkms to version 3.0.x
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
dkms 3.0.12 versionof detect-Mageia patch
dkms-3.0.12-detect-Mageia.patch (text/plain), 2.33 KB, created by
katnatek
on 2023-12-18 03:04:55 CET
(
hide
)
Description:
dkms 3.0.12 versionof detect-Mageia patch
Filename:
MIME Type:
Creator:
katnatek
Created:
2023-12-18 03:04:55 CET
Size:
2.33 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 14:53:39.469853559 -0600 >@@ -332,7 +332,7 @@ > [[ -r /etc/os-release ]] || die 4 $"System is missing /etc/os-release file." > ( > . /etc/os-release >- if [[ "$ID" = "ubuntu" ]]; then >+ if [[ "$ID" = "ubuntu" ]] || [[ "$ID" = "mageia" ]]; then > # ID_LIKE=debian in ubuntu > echo $ID > elif [[ ${#ID_LIKE[@]} != 0 ]]; then >@@ -366,6 +366,9 @@ > arch*) > echo "/updates/dkms" && return > ;; >+ mageia) >+ echo "/dkms" && return >+ ;; > *) > ;; > esac >@@ -561,9 +564,11 @@ > ;; > /extra*) > ;; >+ /dkms*) >+ ;; > *) > echo $"dkms.conf: Error! Directive 'DEST_MODULE_LOCATION' does not begin with">&2 >- echo $"'/kernel', '/updates', or '/extra' in record #$index.">&2 >+ echo $"'/kernel', '/updates', '/extra' or '/dkms' in record #$index.">&2 > return_value=1 > ;; > esac >@@ -1249,12 +1254,14 @@ > elif ! [[ -L $dkms_tree/$module/kernel-$kernelver-$arch ]]; then > local archive_pref1=$(compressed_or_uncompressed "$lib_tree/extra" "$m") > local archive_pref2=$(compressed_or_uncompressed "$lib_tree/updates" "$m") >- local archive_pref3=$(compressed_or_uncompressed "$lib_tree${dest_module_location[$count]}" "$m") >- local archive_pref4="" >+ local archive_pref3=$(compressed_or_uncompressed "$lib_tree/dkms" "$m") >+ local archive_pref4=$(compressed_or_uncompressed "$lib_tree/dkms-binary" "$m") >+ local archive_pref5=$(compressed_or_uncompressed "$lib_tree${dest_module_location[$count]}" "$m") >+ local archive_pref6="" > ((module_count == 1)) && archive_pref4=${installed_modules[0]} > local original_module="" > local found_orginal="" >- for original_module in $archive_pref1 $archive_pref2 $archive_pref3 $archive_pref4; do >+ for original_module in $archive_pref0 $archive_pref1 $archive_pref2 $archive_pref3 $archive_pref4 $archive_pref5 $archive_pref6; do > [[ -f $original_module ]] || continue > case "$running_distribution" in > debian* | ubuntu* )
Index: dkms-3.0.12/dkms.in =================================================================== --- dkms-3.0.12/dkms.in +++ dkms-3.0.12/dkms.in 2023-12-15 14:53:39.469853559 -0600 @@ -332,7 +332,7 @@ [[ -r /etc/os-release ]] || die 4 $"System is missing /etc/os-release file." ( . /etc/os-release - if [[ "$ID" = "ubuntu" ]]; then + if [[ "$ID" = "ubuntu" ]] || [[ "$ID" = "mageia" ]]; then # ID_LIKE=debian in ubuntu echo $ID elif [[ ${#ID_LIKE[@]} != 0 ]]; then @@ -366,6 +366,9 @@ arch*) echo "/updates/dkms" && return ;; + mageia) + echo "/dkms" && return + ;; *) ;; esac @@ -561,9 +564,11 @@ ;; /extra*) ;; + /dkms*) + ;; *) echo $"dkms.conf: Error! Directive 'DEST_MODULE_LOCATION' does not begin with">&2 - echo $"'/kernel', '/updates', or '/extra' in record #$index.">&2 + echo $"'/kernel', '/updates', '/extra' or '/dkms' in record #$index.">&2 return_value=1 ;; esac @@ -1249,12 +1254,14 @@ elif ! [[ -L $dkms_tree/$module/kernel-$kernelver-$arch ]]; then local archive_pref1=$(compressed_or_uncompressed "$lib_tree/extra" "$m") local archive_pref2=$(compressed_or_uncompressed "$lib_tree/updates" "$m") - local archive_pref3=$(compressed_or_uncompressed "$lib_tree${dest_module_location[$count]}" "$m") - local archive_pref4="" + local archive_pref3=$(compressed_or_uncompressed "$lib_tree/dkms" "$m") + local archive_pref4=$(compressed_or_uncompressed "$lib_tree/dkms-binary" "$m") + local archive_pref5=$(compressed_or_uncompressed "$lib_tree${dest_module_location[$count]}" "$m") + local archive_pref6="" ((module_count == 1)) && archive_pref4=${installed_modules[0]} local original_module="" local found_orginal="" - for original_module in $archive_pref1 $archive_pref2 $archive_pref3 $archive_pref4; do + for original_module in $archive_pref0 $archive_pref1 $archive_pref2 $archive_pref3 $archive_pref4 $archive_pref5 $archive_pref6; do [[ -f $original_module ]] || continue case "$running_distribution" in debian* | ubuntu* )
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 31835
:
14222
|
14223
|
14224
| 14225 |
14344
|
14353
|
14354
|
14355
|
14434
|
14588