|
 |
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.094210445 +0200
|
|
|
09da20 |
+++ redhat-rpm-config-9.1.0/find-requires.ksyms 2018-09-14 12:40:34.744601952 +0200
|
|
|
09da20 |
@@ -12,8 +12,8 @@
|
|
|
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("0x%08x\t%s\n", $1, $2)}' \
|
|
|
09da20 |
- | LC_ALL=C sort -k2,2 -u
|
|
|
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 |
@@ -24,8 +24,8 @@
|
|
|
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("0x%08s\t%s\n", substr($3,($1*2)+1,8), $2)}' \
|
|
|
09da20 |
- | LC_ALL=C sort -k2,2 -u
|
|
|
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 |
|
|
|
09da20 |
@@ -36,15 +36,15 @@
|
|
|
09da20 |
/sbin/modprobe --dump-modversions "$module" \
|
|
|
09da20 |
| awk --non-decimal-data '
|
|
|
09da20 |
BEGIN { FS = "\t" ; OFS = "\t" }
|
|
|
09da20 |
- {printf("0x%08x\t%s\n", $1, $2)}' \
|
|
|
09da20 |
+ {printf("%s:0x%08x\n", $2, $1)}' \
|
|
|
09da20 |
| sed -r -e 's:$:\t'"$1"':'
|
|
|
09da20 |
done \
|
|
|
09da20 |
- | LC_ALL=C sort -k2,2 -u
|
|
|
09da20 |
+ | LC_ALL=C sort -k1,1 -u
|
|
|
09da20 |
}
|
|
|
09da20 |
|
|
|
09da20 |
# Filter out requirements fulfilled by the module itself.
|
|
|
09da20 |
mod_requires() {
|
|
|
09da20 |
- LC_ALL=C join -t $'\t' -j 2 -v 1 \
|
|
|
09da20 |
+ LC_ALL=C join -t $'\t' -j 1 -v 1 \
|
|
|
09da20 |
<(all_requires "$@") \
|
|
|
09da20 |
<(all_provides "$@") \
|
|
|
09da20 |
| LC_ALL=C sort -k1,1 -u
|
|
|
09da20 |
@@ -55,6 +55,8 @@
|
|
|
09da20 |
exit 0
|
|
|
09da20 |
fi
|
|
|
09da20 |
|
|
|
09da20 |
+export LC_ALL=C
|
|
|
09da20 |
+
|
|
|
09da20 |
check_kabi() {
|
|
|
09da20 |
arch=$(uname -m)
|
|
|
09da20 |
kabi_file="/lib/modules/kabi-current/kabi_whitelist_$arch"
|
|
|
09da20 |
@@ -107,22 +109,24 @@
|
|
|
09da20 |
|
|
|
09da20 |
cat /usr/src/kernels/$kernel/Module.symvers | awk '
|
|
|
09da20 |
BEGIN { FS = "\t" ; OFS = "\t" }
|
|
|
09da20 |
- { print $2 "\t" $1 }
|
|
|
09da20 |
+ { print $2 ":" $1 }
|
|
|
09da20 |
' \
|
|
|
09da20 |
| sed -r -e 's:$:\t'"$kernel"':' \
|
|
|
09da20 |
| LC_ALL=C sort -k1,1 -u > $symvers
|
|
|
09da20 |
|
|
|
09da20 |
# Symbols matching with the kernel get a "kernel" dependency
|
|
|
09da20 |
- LC_ALL=C join -t $'\t' -j 1 $symvers <(mod_requires "${modules[@]}") | LC_ALL=C sort -u \
|
|
|
09da20 |
- | awk '{ FS = "\t" ; OFS = "\t" } { print "kernel(" $1 ") = " $2 }'
|
|
|
09da20 |
+ mod_req=$(mktemp -t mod_req.XXXXX)
|
|
|
09da20 |
+ mod_requires "${modules[@]}" > "$mod_req"
|
|
|
09da20 |
+ LC_ALL=C join -t $'\t' -j 1 $symvers "$mod_req" | LC_ALL=C sort -u \
|
|
|
09da20 |
+ | awk 'BEGIN { FS = "[\t:]" ; OFS = "\t" } { print "kernel(" $1 ") = " $2 }'
|
|
|
09da20 |
|
|
|
09da20 |
# Symbols from elsewhere get a "ksym" dependency
|
|
|
09da20 |
- LC_ALL=C join -t $'\t' -j 1 -v 2 $symvers <(mod_requires "${modules[@]}") | LC_ALL=C sort -u \
|
|
|
09da20 |
- | awk '{ FS = "\t" ; OFS = "\t" } { print "ksym(" $1 ") = " $2 }'
|
|
|
09da20 |
+ LC_ALL=C join -t $'\t' -j 1 -v 2 $symvers "$mod_req" | LC_ALL=C sort -u \
|
|
|
09da20 |
+ | awk 'BEGIN { FS = "[\t:]" ; OFS = "\t" } { print "ksym(" $1 ") = " $2 }'
|
|
|
09da20 |
|
|
|
09da20 |
# Check kABI if the kabi-whitelists package is installed
|
|
|
09da20 |
# Do this last so we can try to output this error at the end
|
|
|
09da20 |
- kabi_check_symbols=($(LC_ALL=C join -t $'\t' -j 1 $symvers <(mod_requires "${modules[@]}") | LC_ALL=C sort -u \
|
|
|
09da20 |
- | awk '{ FS = "\t" ; OFS = "\t" } { print $1 }'))
|
|
|
09da20 |
+ kabi_check_symbols=($(LC_ALL=C join -t $'\t' -j 1 $symvers "$mod_req" | LC_ALL=C sort -u \
|
|
|
09da20 |
+ | awk 'BEGIN { FS = "[\t:]" ; OFS = "\t" } { print $1 }'))
|
|
|
09da20 |
check_kabi "${kabi_check_symbols[@]}"
|
|
|
09da20 |
fi
|