Blame SOURCES/redhat-rpm-config-9.1.0-compressed-kmods-support.patch

09da20
Index: redhat-rpm-config-9.1.0/find-requires
09da20
===================================================================
09da20
--- redhat-rpm-config-9.1.0.orig/find-requires	2018-08-24 09:58:45.437193389 +0200
09da20
+++ redhat-rpm-config-9.1.0/find-requires	2018-08-24 09:59:31.902739176 +0200
09da20
@@ -143,7 +143,7 @@
09da20
 unset is_kmod
09da20
 
09da20
 for f in $filelist; do
09da20
-    if [ $(echo "$f" | sed -r -ne 's:^.*/lib/modules/(.*)/(.*).ko$:\2:p') ]
09da20
+    if [ $(echo "$f" | sed -r -ne 's:^.*/lib/modules/(.*)/(.*)\.ko(\.gz|\.bz2|\.xz)?$:\2:p') ]
09da20
     then
09da20
         is_kmod=1;
09da20
     elif [ $(echo "$f" | sed -r -ne 's:^.*/boot/(.*):\1:p') ]
09da20
Index: redhat-rpm-config-9.1.0/find-requires.ksyms
09da20
===================================================================
09da20
--- redhat-rpm-config-9.1.0.orig/find-requires.ksyms	2018-08-24 09:55:19.122210171 +0200
09da20
+++ redhat-rpm-config-9.1.0/find-requires.ksyms	2018-08-24 10:01:02.895849695 +0200
09da20
@@ -9,24 +9,49 @@
09da20
 
09da20
 # Extract all of the symbols provided by this module.
09da20
 all_provides() {
09da20
-    if [[ -n $(nm "$@" | sed -r -ne 's:^0*([0-9a-f]+) A __crc_(.+):0x\1 \2:p') ]]; then
09da20
-        nm "$@" \
09da20
-        | sed -r -ne 's:^0*([0-9a-f]+) A __crc_(.+):0x\1 \2:p' \
09da20
-        | awk --non-decimal-data '{printf("%s:0x%08x\n", $2, $1)}' \
09da20
-        | LC_ALL=C sort -k1,1 -u
09da20
-    else
09da20
-        ELFRODATA=$(readelf -R .rodata "$@" | awk '/0x/{printf $2$3$4$5}')
09da20
-        if [[ -n $(readelf -h "$@" | grep "little endian") ]]; then
09da20
-            RODATA=$(echo $ELFRODATA | sed 's/\(..\)\(..\)\(..\)\(..\)/\4\3\2\1/g')
09da20
+    for module in "$@"; do
09da20
+        tmpfile=""
09da20
+        if [ "x${module%.ko}" = "x${module}" ]; then
09da20
+            tmpfile=$(mktemp -t ${0##*/}.XXXXXX.ko)
09da20
+            proc_bin=
09da20
+            case "${module##*.}" in
09da20
+            xz)
09da20
+                    proc_bin=xz
09da20
+                    ;;
09da20
+            bz2)
09da20
+                    proc_bin=bzip2
09da20
+                    ;;
09da20
+            gz)
09da20
+                    proc_bin=gzip
09da20
+                    ;;
09da20
+            esac
09da20
+
09da20
+            [ -n "$proc_bin" ] || continue
09da20
+
09da20
+            "$proc_bin" -d -c - < "$module" > "$tmpfile"
09da20
+            module="$tmpfile"
09da20
+        fi
09da20
+
09da20
+        if [[ -n $(nm "$module" | sed -r -ne 's:^0*([0-9a-f]+) A __crc_(.+):0x\1 \2:p') ]]; then
09da20
+            nm "$module" \
09da20
+            | sed -r -ne 's:^0*([0-9a-f]+) A __crc_(.+):0x\1 \2:p' \
09da20
+            | awk --non-decimal-data '{printf("%s:0x%08x\n", $2, $1)}'
09da20
         else
09da20
-            RODATA=$ELFRODATA
09da20
+            ELFRODATA=$(readelf -R .rodata "$module" | awk '/0x/{printf $2$3$4$5}')
09da20
+            if [[ -n $(readelf -h "$module" | grep "little endian") ]]; then
09da20
+                RODATA=$(echo $ELFRODATA | sed 's/\(..\)\(..\)\(..\)\(..\)/\4\3\2\1/g')
09da20
+            else
09da20
+                RODATA=$ELFRODATA
09da20
+            fi
09da20
+            for sym in $(nm "$module" | sed -r -ne 's:^0*([0-9a-f]+) R __crc_(.+):0x\1 \2:p'); do
09da20
+                echo $sym $RODATA
09da20
+            done \
09da20
+            | awk --non-decimal-data '{printf("%s:0x%08s\n", $2, substr($3,($1*2)+1,8))}'
09da20
         fi
09da20
-        for sym in $(nm "$@" | sed -r -ne 's:^0*([0-9a-f]+) R __crc_(.+):0x\1 \2:p'); do
09da20
-            echo $sym $RODATA
09da20
-        done \
09da20
-        | awk --non-decimal-data '{printf("%s:0x%08s\n", $2, substr($3,($1*2)+1,8))}' \
09da20
-        | LC_ALL=C sort -k1,1 -u
09da20
-    fi
09da20
+
09da20
+        [ -z "$tmpfile" ] || rm -f -- "$tmpfile"
09da20
+    done \
09da20
+    | LC_ALL=C sort -k1,1 -u
09da20
 }
09da20
 
09da20
 # Extract all of the requirements of this module.
09da20
@@ -100,7 +125,7 @@
09da20
     fi
09da20
 }
09da20
 
09da20
-modules=($(grep -E '/lib/modules/.+\.ko$'))
09da20
+modules=($(grep -E '/lib/modules/.+\.ko(\.gz|\.bz2|\.xz)?$'))
09da20
 if [ ${#modules[@]} -gt 0 ]; then
09da20
     kernel=$(/sbin/modinfo -F vermagic "${modules[0]}" | sed -e 's: .*::' -e q)
09da20
 
09da20
Index: redhat-rpm-config-9.1.0/find-provides
09da20
===================================================================
09da20
--- redhat-rpm-config-9.1.0.orig/find-provides	2010-02-02 10:24:04.000000000 +0100
09da20
+++ redhat-rpm-config-9.1.0/find-provides	2018-08-24 10:02:26.666030820 +0200
09da20
@@ -92,7 +92,7 @@
09da20
 
09da20
 is_kmod=1
09da20
 for f in $filelist; do
09da20
-    if [ $(echo "$f" | sed -r -ne 's:^.*/lib/modules/(.*)/(.*).ko$:\2:p') ]
09da20
+    if [ $(echo "$f" | sed -r -ne 's:^.*/lib/modules/(.*)/(.*)\.ko(\.gz|\.bz2|\.xz)?$:\2:p') ]
09da20
     then
09da20
         is_kernel=1;
09da20
     fi
09da20
Index: redhat-rpm-config-9.1.0/find-provides.ksyms
09da20
===================================================================
09da20
--- redhat-rpm-config-9.1.0.orig/find-provides.ksyms	2018-08-24 09:55:19.065210728 +0200
09da20
+++ redhat-rpm-config-9.1.0/find-provides.ksyms	2018-08-24 10:03:17.727531681 +0200
09da20
@@ -2,7 +2,29 @@
09da20
 
09da20
 IFS=$'\n'
09da20
 
09da20
-for module in $(grep -E '/lib/modules/.+\.ko$'); do
09da20
+for module in $(grep -E '/lib/modules/.+\.ko(\.gz|\.bz2|\.xz)?$'); do
09da20
+    tmpfile=""
09da20
+    if [ "x${module%.ko}" = "x${module}" ]; then
09da20
+        tmpfile=$(mktemp -t ${0##*/}.XXXXXX.ko)
09da20
+        proc_bin=
09da20
+        case "${module##*.}" in
09da20
+        xz)
09da20
+                proc_bin=xz
09da20
+                ;;
09da20
+        bz2)
09da20
+                proc_bin=bzip2
09da20
+                ;;
09da20
+        gz)
09da20
+                proc_bin=gzip
09da20
+                ;;
09da20
+        esac
09da20
+
09da20
+        [ -n "$proc_bin" ] || continue
09da20
+
09da20
+        "$proc_bin" -d -c - < "$module" > "$tmpfile"
09da20
+        module="$tmpfile"
09da20
+    fi
09da20
+
09da20
     if [[ -n $(nm $module | sed -r -ne 's:^0*([0-9a-f]+) A __crc_(.+):0x\1 \2:p') ]]; then
09da20
         nm $module \
09da20
         | sed -r -ne 's:^0*([0-9a-f]+) A __crc_(.+):0x\1 \2:p' \
09da20
@@ -21,4 +43,6 @@
09da20
         | awk --non-decimal-data '{printf("ksym(%s) = 0x%08s\n", $2, substr($3,($1*2)+1,8))}' \
09da20
         | LC_ALL=C sort -u
09da20
     fi
09da20
+
09da20
+    [ -z "$tmpfile" ] || rm -f -- "$tmpfile"
09da20
 done