Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package rpm-config-SUSE for openSUSE:Factory
checked in at 2021-07-07 18:29:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rpm-config-SUSE (Old)
and /work/SRC/openSUSE:Factory/.rpm-config-SUSE.new.2625 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpm-config-SUSE"
Wed Jul 7 18:29:26 2021 rev:19 rq:902705 version:0.g83
Changes:
--------
--- /work/SRC/openSUSE:Factory/rpm-config-SUSE/rpm-config-SUSE.changes
2021-04-18 21:44:13.960632773 +0200
+++
/work/SRC/openSUSE:Factory/.rpm-config-SUSE.new.2625/rpm-config-SUSE.changes
2021-07-07 18:29:27.455472183 +0200
@@ -1,0 +2,14 @@
+Fri Jun 25 13:45:53 UTC 2021 - [email protected]
+
+- Update to version 0.g83:
+ * Find kernel modules also in /usr/lib/modules
+
+-------------------------------------------------------------------
+Wed Jun 23 12:39:18 UTC 2021 - [email protected]
+
+- Update to version 0.g81:
+ * Support ZSTD compressed kernel modules
+ * Fix a typo: povides -> provides
+ * Quote %buildroot in makeinstall macros
+
+-------------------------------------------------------------------
Old:
----
rpm-config-SUSE-0.g76.tar.xz
New:
----
rpm-config-SUSE-0.g83.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rpm-config-SUSE.spec ++++++
--- /var/tmp/diff_new_pack.D4a47h/_old 2021-07-07 18:29:28.011467819 +0200
+++ /var/tmp/diff_new_pack.D4a47h/_new 2021-07-07 18:29:28.015467788 +0200
@@ -18,11 +18,11 @@
Name: rpm-config-SUSE
-Version: 0.g76
+Version: 0.g83
Release: 0
Summary: SUSE specific RPM configuration files
License: GPL-2.0-or-later
-Group: Development/Tools/Building
+Group: System/Packages
URL: https://github.com/openSUSE/rpm-config-SUSE
Source: %{name}-%{version}.tar.xz
++++++ _service ++++++
--- /var/tmp/diff_new_pack.D4a47h/_old 2021-07-07 18:29:28.055467474 +0200
+++ /var/tmp/diff_new_pack.D4a47h/_new 2021-07-07 18:29:28.055467474 +0200
@@ -1,5 +1,5 @@
<services>
- <service name="tar_scm" mode="disabled">
+ <service name="tar_scm" mode="manual">
<param name="scm">git</param>
<param
name="url">https://github.com/openSUSE/rpm-config-SUSE</param>
<param
name="parent-tag">e56ce28a20ccfa1d37d3b66eb943bd12922b61ae</param>
@@ -7,9 +7,9 @@
<param name="changesgenerate">enable</param>
<param name="extract">package/rpm-config-SUSE.spec</param>
</service>
- <service name="recompress" mode="disabled">
+ <service name="recompress" mode="manual">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
- <service name="set_version" mode="disabled"/>
+ <service name="set_version" mode="manual"/>
</services>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.D4a47h/_old 2021-07-07 18:29:28.079467286 +0200
+++ /var/tmp/diff_new_pack.D4a47h/_new 2021-07-07 18:29:28.079467286 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/openSUSE/rpm-config-SUSE</param>
- <param
name="changesrevision">3f94ae98928a02f0b4c1679849e149d0896a13c9</param>
+ <param
name="changesrevision">f474c6cbce8c7f34d20586c332fad3d1dfe3d708</param>
</service>
</servicedata>
\ No newline at end of file
++++++ rpm-config-SUSE-0.g76.tar.xz -> rpm-config-SUSE-0.g83.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpm-config-SUSE-0.g76/fileattrs/kernel.attr
new/rpm-config-SUSE-0.g83/fileattrs/kernel.attr
--- old/rpm-config-SUSE-0.g76/fileattrs/kernel.attr 2021-03-05
14:21:50.000000000 +0100
+++ new/rpm-config-SUSE-0.g83/fileattrs/kernel.attr 2021-06-25
15:44:08.000000000 +0200
@@ -1,2 +1,2 @@
%__kernel_provides %{_rpmconfigdir}/find-provides.ksyms --tumbleweed
%{?sle_version:0}%{!?sle_version:1}
-%__kernel_path
^(/lib/modules/[^/]*/kernel/.*\.ko(\.gz|\.xz)?|/boot/vmlinu[xz].*)$
+%__kernel_path
^((/usr)?/lib/modules/[^/]*/kernel/(.*\.ko(\.gz|\.xz|\.zst)?|vmlinu[xz])|/boot/vmlinu[xz].*)$
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpm-config-SUSE-0.g76/fileattrs/kmp.attr
new/rpm-config-SUSE-0.g83/fileattrs/kmp.attr
--- old/rpm-config-SUSE-0.g76/fileattrs/kmp.attr 2021-03-05
14:21:50.000000000 +0100
+++ new/rpm-config-SUSE-0.g83/fileattrs/kmp.attr 2021-06-25
15:44:08.000000000 +0200
@@ -1,4 +1,4 @@
%__kmp_provides %{_rpmconfigdir}/find-provides.ksyms
--tumbleweed %{?sle_version:0}%{!?sle_version:1}
%__kmp_requires %{_rpmconfigdir}/find-requires.ksyms
--tumbleweed %{?sle_version:0}%{!?sle_version:1}
%__kmp_supplements %{_rpmconfigdir}/find-supplements.ksyms
-%__kmp_path ^/lib/modules/[^/]*/(updates|extra)/.*\.ko(\.gz|\.xz)?
+%__kmp_path
^(/usr)?/lib/modules/[^/]*/(updates|extra)/.*\.ko(\.gz|\.xz|\.zst)?
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpm-config-SUSE-0.g76/fileattrs/modulesload.attr
new/rpm-config-SUSE-0.g83/fileattrs/modulesload.attr
--- old/rpm-config-SUSE-0.g76/fileattrs/modulesload.attr 2021-03-05
14:21:50.000000000 +0100
+++ new/rpm-config-SUSE-0.g83/fileattrs/modulesload.attr 2021-06-25
15:44:08.000000000 +0200
@@ -1,2 +1,2 @@
%__modulesload_requires %{_rpmconfigdir}/find-requires.ksyms
--tumbleweed %{?sle_version:0}%{!?sle_version:1}
-%__modulesload_path ^/usr/lib/modules-load.d/.*\.conf$
+%__modulesload_path ^(/usr)?/lib/modules-load.d/.*\.conf$
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpm-config-SUSE-0.g76/scripts/find-provides.ksyms
new/rpm-config-SUSE-0.g83/scripts/find-provides.ksyms
--- old/rpm-config-SUSE-0.g76/scripts/find-provides.ksyms 2021-03-05
14:21:50.000000000 +0100
+++ new/rpm-config-SUSE-0.g83/scripts/find-provides.ksyms 2021-06-25
15:44:08.000000000 +0200
@@ -30,19 +30,21 @@
inst_prefix="$(dirname $f)"
inst_prefix="$(dirname $inst_prefix)"
echo "kernel-uname-r = $version"
- builtin="$inst_prefix/lib/modules/$version/modules.builtin"
- if [ -e "$builtin" ] ; then
+ builtin="/lib/modules/$version/modules.builtin"
+ [ -e "$inst_prefix/usr$builtin" ] && builtin="/usr$builtin"
+ if [ -e "$inst_prefix/$builtin" ] ; then
while read modname ; do
echo "kmod($(basename "$modname" | tr '-' '_'))"
- done < "$builtin"
+ done < "$inst_prefix/$builtin"
else
echo "Builtin modules for $f not available in $builtin" >&2
fi
flavor=${version##*-}
;;
- */lib/modules/*/*.ko | */lib/modules/*/*.ko.[gx]z)
+ */lib/modules/*/*.ko | */lib/modules/*/*.ko.[gx]z |
*/lib/modules/*/*.ko.zst)
is_module="1"
modname="${f%%.[gx]z}"
+ modname="${modname%%.zst}"
echo "kmod($(basename "$modname" | tr '-' '_'))"
;;
*)
@@ -57,6 +59,8 @@
unzip="gzip -cd";;
*.xz)
unzip="xz -cd";;
+ *.zst)
+ unzip="zstd -cd";;
esac
if test -n "$unzip" && $unzip "$f" >"$tmp"; then
f=$tmp
@@ -70,9 +74,7 @@
echo "warning: cannot determine kernel flavor from $(/sbin/modinfo -F
vermagic "$f" 2>&1)" >&2
continue
fi
- objdir=$(readlink /lib/modules/$version/build)
- objdir_build=$RPM_BUILD_ROOT$(readlink
$RPM_BUILD_ROOT/lib/modules/$version/build)
- for i in $objdir_build $objdir ; do
+ for i in {,$RPM_BUILD_ROOT}{/usr,}/lib/modules/$version/build; do
ksym_provides=$i/scripts/mod/ksym-provides
[ -x "$ksym_provides" ] && break
done
@@ -83,7 +85,7 @@
sub=${version#*.}
sub=${sub%%.*}
if [ "$major" -gt 4 -o \( "$major" -eq 4 -a "$sub" -ge 10 \) ] ;
then
- echo "error: cannot determine ksym provides of $f -
missing ksym-povides tool." >&2
+ echo "error: cannot determine ksym provides of $f -
missing ksym-provides tool." >&2
else
nm "$f" \
| sed -r -ne "s/^0*([0-9a-f]+) A
__crc_(.+)/ksym($flavor:\\2) = \\1/p"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpm-config-SUSE-0.g76/scripts/find-requires.ksyms
new/rpm-config-SUSE-0.g83/scripts/find-requires.ksyms
--- old/rpm-config-SUSE-0.g76/scripts/find-requires.ksyms 2021-03-05
14:21:50.000000000 +0100
+++ new/rpm-config-SUSE-0.g83/scripts/find-requires.ksyms 2021-06-25
15:44:08.000000000 +0200
@@ -24,6 +24,7 @@
case "$f" in
*/lib/modules/*.ko) modules[${#modules[*]}]="$f" ;;
*/lib/modules/*.ko.[gx]z) modules[${#modules[*]}]="${f%.*}" ;;
+ */lib/modules/*.ko.zst) modules[${#modules[*]}]="${f%.*}" ;;
*/lib/modules/*/modules.builtin) while read x; do
modsexp="$modsexp|$(basename "$x" .ko | tr '-' '_')"; done < $f ;;
*/usr/lib/modules-load.d/*.conf) while read x; do
case "$x" in
@@ -64,6 +65,8 @@
gzip -cd "$module".gz > "$tmp"
elif [ -f "$module".xz ]; then
xz -cd "$module".xz > "$tmp"
+ elif [ -f "$module".zst ]; then
+ zstd -cd "$module".zst > "$tmp"
else
continue
fi
@@ -81,6 +84,8 @@
module="$module".gz
elif [ -f "$module".xz ]; then
module="$module".xz
+ elif [ -f "$module".zst ]; then
+ module="$module".zst
else
continue
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpm-config-SUSE-0.g76/scripts/find-supplements.ksyms
new/rpm-config-SUSE-0.g83/scripts/find-supplements.ksyms
--- old/rpm-config-SUSE-0.g76/scripts/find-supplements.ksyms 2021-03-05
14:21:50.000000000 +0100
+++ new/rpm-config-SUSE-0.g83/scripts/find-supplements.ksyms 2021-06-25
15:44:08.000000000 +0200
@@ -50,7 +50,7 @@
done
}
-for module in $(grep -E '/lib/modules/.+\.ko(\.[gx]z)?$' | grep -v
'/lib/modules/[^/]*/kernel/'); do
+for module in $(grep -E '/lib/modules/.+\.ko(\.[gx]z)?(.zst)?$' | grep -v
'/lib/modules/[^/]*/kernel/'); do
vermagic=$(/sbin/modinfo -F vermagic "$module")
krel=${vermagic%% *}
/sbin/modinfo -F alias "$module" \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rpm-config-SUSE-0.g76/suse_macros.in
new/rpm-config-SUSE-0.g83/suse_macros.in
--- old/rpm-config-SUSE-0.g76/suse_macros.in 2021-03-05 14:21:50.000000000
+0100
+++ new/rpm-config-SUSE-0.g83/suse_macros.in 2021-06-25 15:44:08.000000000
+0200
@@ -14,8 +14,8 @@
%_firmwaredir %{?usrmerged:%{_usr}}/lib/firmware
# package build macros
-%make_install make install DESTDIR=%{?buildroot}
-%makeinstall make DESTDIR=%{?buildroot:%{buildroot}} install
+%make_install make install DESTDIR="%{?buildroot}"
+%makeinstall make DESTDIR="%{?buildroot:%{buildroot}}" install
%insserv_prereq insserv sed
%fillup_prereq fillup /usr/bin/mkdir /usr/bin/touch
# to be removed. deprecated since 11/2019 boo#1152105
