Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2023-05-11 12:32:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kernel-source (Old) and /work/SRC/openSUSE:Factory/.kernel-source.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kernel-source" Thu May 11 12:32:41 2023 rev:689 rq:1085678 version:6.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes 2023-05-03 12:56:44.507643716 +0200 +++ /work/SRC/openSUSE:Factory/.kernel-source.new.1533/dtb-aarch64.changes 2023-05-11 12:33:04.890583735 +0200 @@ -1,0 +2,38 @@ +Tue May 9 08:08:50 CEST 2023 - jsl...@suse.cz + +- Revert "Update config files." (bsc#1211166) + This reverts commit 90a46594a115a4abf9381bd4c327fd875ac0da0b. + Lockdown is not ready and was disabled in stable. Since this is still + not resolved in 6.3/6.4-rc, let's disable it in master completely too. + And let's retry once everything is ready. +- commit 944713a + +------------------------------------------------------------------- +Fri May 5 15:03:15 CEST 2023 - msucha...@suse.de + +- Remove obsolete rpm spec constructs + defattr does not need to be specified anymore + buildroot does not need to be specified anymore +- commit c963185 + +------------------------------------------------------------------- +Fri May 5 13:15:09 CEST 2023 - msucha...@suse.de + +- kernel-spec-macros: Fix up obsolete_rebuilds_subpackage to generate + obsoletes correctly (boo#1172073 bsc#1191731). + rpm only supports full length release, no provides +- commit c9b5bc4 + +------------------------------------------------------------------- +Thu May 4 16:48:11 CEST 2023 - msucha...@suse.de + +- kernel-binary: install expoline.o (boo#1210791 bsc#1211089) +- commit d6c8c20 + +------------------------------------------------------------------- +Wed May 3 11:30:40 CEST 2023 - oneu...@suse.com + +- usbtv: usbtv_set_regs: the pipe is output (bsc#1209334). +- commit 98c1e01 + +------------------------------------------------------------------- dtb-armv6l.changes: same change dtb-armv7l.changes: same change dtb-riscv64.changes: same change kernel-64kb.changes: same change kernel-debug.changes: same change kernel-default.changes: same change kernel-docs.changes: same change kernel-kvmsmall.changes: same change kernel-lpae.changes: same change kernel-obs-build.changes: same change kernel-obs-qa.changes: same change kernel-pae.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-vanilla.changes: same change kernel-zfcpdump.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dtb-aarch64.spec ++++++ --- /var/tmp/diff_new_pack.kuQjtA/_old 2023-05-11 12:33:09.814607936 +0200 +++ /var/tmp/diff_new_pack.kuQjtA/_new 2023-05-11 12:33:09.822607975 +0200 @@ -31,7 +31,7 @@ Name: dtb-aarch64 Version: 6.3.1 %if 0%{?is_kotd} -Release: <RELEASE>.g8a31779 +Release: <RELEASE>.g78ee477 %else Release: 0 %endif dtb-armv6l.spec: same change dtb-armv7l.spec: same change dtb-riscv64.spec: same change ++++++ kernel-64kb.spec ++++++ --- /var/tmp/diff_new_pack.kuQjtA/_old 2023-05-11 12:33:09.954608624 +0200 +++ /var/tmp/diff_new_pack.kuQjtA/_new 2023-05-11 12:33:09.962608663 +0200 @@ -113,7 +113,7 @@ Group: System/Kernel Version: 6.3.1 %if 0%{?is_kotd} -Release: <RELEASE>.g8a31779 +Release: <RELEASE>.g78ee477 %else Release: 0 %endif @@ -238,10 +238,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-8a31779f5544166bb801a03085764c84a737a62d -Provides: kernel-srchash-8a31779f5544166bb801a03085764c84a737a62d +Provides: kernel-%build_flavor-base-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3 +Provides: kernel-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3 # END COMMON DEPS -Provides: %name-srchash-8a31779f5544166bb801a03085764c84a737a62d +Provides: %name-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3 %obsolete_rebuilds %name Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc @@ -377,7 +377,6 @@ NoSource: 120 NoSource: 121 -BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: aarch64 %define kmp_target_cpu %_target_cpu %ifarch %ix86 @@ -866,6 +865,10 @@ find %buildroot -name "*.ko" > kofiles.list dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi + expoline=arch/s390/lib/expoline/expoline.o + if test -f arch/s390/lib/expoline/expoline.o ; then + install -m 644 -D -t %rpm_install_dir/%cpu_arch_flavor/$(dirname $expoline) $expoline + fi %endif # Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor @@ -1237,7 +1240,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %endif %files -f kernel-main.files -%defattr(-, root, root) %package extra Summary: Kernel with 64kb PAGE_SIZE - Unsupported kernel modules @@ -1303,7 +1305,6 @@ %if %split_extra %files extra -f kernel-extra.files -%defattr(-, root, root) %endif %if %split_extra && %split_optional @@ -1367,7 +1368,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files optional -f kernel-optional.files -%defattr(-, root, root) %endif %if "%CONFIG_KMSG_IDS" == "y" @@ -1383,7 +1383,6 @@ %source_timestamp %files man -%defattr(-,root,root) /usr/share/man/man9/* %endif @@ -1400,7 +1399,6 @@ %source_timestamp %files vdso -%defattr(-,root,root) /%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor/vdso/ %endif @@ -1449,7 +1447,6 @@ relink ../../linux-%{kernelrelease}%{variant}-obj/"%cpu_arch_flavor" /usr/src/linux-obj/"%cpu_arch_flavor" %files devel -f kernel-devel.files -%defattr(-,root,root) %dir /usr/src/linux-obj %dir /usr/src/linux-obj/%cpu_arch %ghost /usr/src/linux-obj/%cpu_arch_flavor @@ -1486,7 +1483,6 @@ %files %{livepatch} # rpmlint complains about empty packages, so lets own something -%defattr(-, root, root) %dir %modules_dir %endif @@ -1555,7 +1551,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n cluster-md-kmp-%build_flavor -f cluster-md-kmp.files -%defattr(-, root, root) %package -n dlm-kmp-%build_flavor Summary: DLM kernel modules @@ -1604,7 +1599,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n dlm-kmp-%build_flavor -f dlm-kmp.files -%defattr(-, root, root) %package -n gfs2-kmp-%build_flavor Summary: GFS2 kernel modules @@ -1653,7 +1647,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n gfs2-kmp-%build_flavor -f gfs2-kmp.files -%defattr(-, root, root) %package -n kselftests-kmp-%build_flavor Summary: Kernel sefltests @@ -1717,7 +1710,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n kselftests-kmp-%build_flavor -f kselftests-kmp.files -%defattr(-, root, root) %package -n ocfs2-kmp-%build_flavor Summary: OCFS2 kernel modules @@ -1767,7 +1759,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n ocfs2-kmp-%build_flavor -f ocfs2-kmp.files -%defattr(-, root, root) %package -n reiserfs-kmp-%build_flavor Summary: Reiserfs kernel module @@ -1816,7 +1807,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n reiserfs-kmp-%build_flavor -f reiserfs-kmp.files -%defattr(-, root, root) %endif # %CONFIG_SUSE_KERNEL_SUPPORTED %endif # %CONFIG_MODULES ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.kuQjtA/_old 2023-05-11 12:33:09.990608801 +0200 +++ /var/tmp/diff_new_pack.kuQjtA/_new 2023-05-11 12:33:09.994608820 +0200 @@ -113,7 +113,7 @@ Group: System/Kernel Version: 6.3.1 %if 0%{?is_kotd} -Release: <RELEASE>.g8a31779 +Release: <RELEASE>.g78ee477 %else Release: 0 %endif @@ -238,10 +238,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-8a31779f5544166bb801a03085764c84a737a62d -Provides: kernel-srchash-8a31779f5544166bb801a03085764c84a737a62d +Provides: kernel-%build_flavor-base-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3 +Provides: kernel-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3 # END COMMON DEPS -Provides: %name-srchash-8a31779f5544166bb801a03085764c84a737a62d +Provides: %name-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3 %ifarch ppc64 Provides: kernel-kdump = 2.6.28 Obsoletes: kernel-kdump <= 2.6.28 @@ -385,7 +385,6 @@ NoSource: 120 NoSource: 121 -BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: aarch64 %ix86 ppc64 ppc64le x86_64 %define kmp_target_cpu %_target_cpu %ifarch %ix86 @@ -872,6 +871,10 @@ find %buildroot -name "*.ko" > kofiles.list dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi + expoline=arch/s390/lib/expoline/expoline.o + if test -f arch/s390/lib/expoline/expoline.o ; then + install -m 644 -D -t %rpm_install_dir/%cpu_arch_flavor/$(dirname $expoline) $expoline + fi %endif # Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor @@ -1243,7 +1246,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %endif %files -f kernel-main.files -%defattr(-, root, root) %package extra Summary: A Debug Version of the Kernel - Unsupported kernel modules @@ -1311,7 +1313,6 @@ %if %split_extra %files extra -f kernel-extra.files -%defattr(-, root, root) %endif %if %split_extra && %split_optional @@ -1377,7 +1378,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files optional -f kernel-optional.files -%defattr(-, root, root) %endif %if "%CONFIG_KMSG_IDS" == "y" @@ -1393,7 +1393,6 @@ %source_timestamp %files man -%defattr(-,root,root) /usr/share/man/man9/* %endif @@ -1410,7 +1409,6 @@ %source_timestamp %files vdso -%defattr(-,root,root) /%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor/vdso/ %endif @@ -1463,7 +1461,6 @@ relink ../../linux-%{kernelrelease}%{variant}-obj/"%cpu_arch_flavor" /usr/src/linux-obj/"%cpu_arch_flavor" %files devel -f kernel-devel.files -%defattr(-,root,root) %dir /usr/src/linux-obj %dir /usr/src/linux-obj/%cpu_arch %ghost /usr/src/linux-obj/%cpu_arch_flavor @@ -1500,7 +1497,6 @@ %files %{livepatch} # rpmlint complains about empty packages, so lets own something -%defattr(-, root, root) %dir %modules_dir %endif @@ -1569,7 +1565,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n cluster-md-kmp-%build_flavor -f cluster-md-kmp.files -%defattr(-, root, root) %package -n dlm-kmp-%build_flavor Summary: DLM kernel modules @@ -1618,7 +1613,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n dlm-kmp-%build_flavor -f dlm-kmp.files -%defattr(-, root, root) %package -n gfs2-kmp-%build_flavor Summary: GFS2 kernel modules @@ -1667,7 +1661,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n gfs2-kmp-%build_flavor -f gfs2-kmp.files -%defattr(-, root, root) %package -n kselftests-kmp-%build_flavor Summary: Kernel sefltests @@ -1731,7 +1724,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n kselftests-kmp-%build_flavor -f kselftests-kmp.files -%defattr(-, root, root) %package -n ocfs2-kmp-%build_flavor Summary: OCFS2 kernel modules @@ -1781,7 +1773,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n ocfs2-kmp-%build_flavor -f ocfs2-kmp.files -%defattr(-, root, root) %package -n reiserfs-kmp-%build_flavor Summary: Reiserfs kernel module @@ -1830,7 +1821,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n reiserfs-kmp-%build_flavor -f reiserfs-kmp.files -%defattr(-, root, root) %endif # %CONFIG_SUSE_KERNEL_SUPPORTED %endif # %CONFIG_MODULES ++++++ kernel-default.spec ++++++ --- /var/tmp/diff_new_pack.kuQjtA/_old 2023-05-11 12:33:10.018608938 +0200 +++ /var/tmp/diff_new_pack.kuQjtA/_new 2023-05-11 12:33:10.026608977 +0200 @@ -113,7 +113,7 @@ Group: System/Kernel Version: 6.3.1 %if 0%{?is_kotd} -Release: <RELEASE>.g8a31779 +Release: <RELEASE>.g78ee477 %else Release: 0 %endif @@ -238,10 +238,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-8a31779f5544166bb801a03085764c84a737a62d -Provides: kernel-srchash-8a31779f5544166bb801a03085764c84a737a62d +Provides: kernel-%build_flavor-base-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3 +Provides: kernel-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3 # END COMMON DEPS -Provides: %name-srchash-8a31779f5544166bb801a03085764c84a737a62d +Provides: %name-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3 %ifarch %ix86 Provides: kernel-smp = 2.6.17 Obsoletes: kernel-smp <= 2.6.17 @@ -429,7 +429,6 @@ NoSource: 120 NoSource: 121 -BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: aarch64 armv6hl armv7hl %ix86 ppc64 ppc64le riscv64 s390x x86_64 %define kmp_target_cpu %_target_cpu %ifarch %ix86 @@ -915,6 +914,10 @@ find %buildroot -name "*.ko" > kofiles.list dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi + expoline=arch/s390/lib/expoline/expoline.o + if test -f arch/s390/lib/expoline/expoline.o ; then + install -m 644 -D -t %rpm_install_dir/%cpu_arch_flavor/$(dirname $expoline) $expoline + fi %endif # Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor @@ -1286,7 +1289,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %endif %files -f kernel-main.files -%defattr(-, root, root) %package extra Summary: The Standard Kernel - Unsupported kernel modules @@ -1373,7 +1375,6 @@ %if %split_extra %files extra -f kernel-extra.files -%defattr(-, root, root) %endif %if %split_extra && %split_optional @@ -1458,7 +1459,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files optional -f kernel-optional.files -%defattr(-, root, root) %endif %if "%CONFIG_KMSG_IDS" == "y" @@ -1474,7 +1474,6 @@ %source_timestamp %files man -%defattr(-,root,root) /usr/share/man/man9/* %endif @@ -1491,7 +1490,6 @@ %source_timestamp %files vdso -%defattr(-,root,root) /%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor/vdso/ %endif @@ -1564,7 +1562,6 @@ relink ../../linux-%{kernelrelease}%{variant}-obj/"%cpu_arch_flavor" /usr/src/linux-obj/"%cpu_arch_flavor" %files devel -f kernel-devel.files -%defattr(-,root,root) %dir /usr/src/linux-obj %dir /usr/src/linux-obj/%cpu_arch %ghost /usr/src/linux-obj/%cpu_arch_flavor @@ -1601,7 +1598,6 @@ %files %{livepatch} # rpmlint complains about empty packages, so lets own something -%defattr(-, root, root) %dir %modules_dir %endif @@ -1670,7 +1666,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n cluster-md-kmp-%build_flavor -f cluster-md-kmp.files -%defattr(-, root, root) %package -n dlm-kmp-%build_flavor Summary: DLM kernel modules @@ -1719,7 +1714,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n dlm-kmp-%build_flavor -f dlm-kmp.files -%defattr(-, root, root) %package -n gfs2-kmp-%build_flavor Summary: GFS2 kernel modules @@ -1768,7 +1762,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n gfs2-kmp-%build_flavor -f gfs2-kmp.files -%defattr(-, root, root) %package -n kselftests-kmp-%build_flavor Summary: Kernel sefltests @@ -1832,7 +1825,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n kselftests-kmp-%build_flavor -f kselftests-kmp.files -%defattr(-, root, root) %package -n ocfs2-kmp-%build_flavor Summary: OCFS2 kernel modules @@ -1882,7 +1874,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n ocfs2-kmp-%build_flavor -f ocfs2-kmp.files -%defattr(-, root, root) %package -n reiserfs-kmp-%build_flavor Summary: Reiserfs kernel module @@ -1931,7 +1922,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n reiserfs-kmp-%build_flavor -f reiserfs-kmp.files -%defattr(-, root, root) %endif # %CONFIG_SUSE_KERNEL_SUPPORTED %endif # %CONFIG_MODULES ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.kuQjtA/_old 2023-05-11 12:33:10.046609076 +0200 +++ /var/tmp/diff_new_pack.kuQjtA/_new 2023-05-11 12:33:10.050609095 +0200 @@ -33,7 +33,7 @@ Group: Documentation/Man Version: 6.3.1 %if 0%{?is_kotd} -Release: <RELEASE>.g8a31779 +Release: <RELEASE>.g78ee477 %else Release: 0 %endif @@ -67,9 +67,8 @@ %endif URL: https://www.kernel.org/ Provides: %name = %version-%source_rel -Provides: %name-srchash-8a31779f5544166bb801a03085764c84a737a62d +Provides: %name-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3 BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc Source14: series.conf @@ -264,7 +263,6 @@ %endif %files -%defattr(-,root,root) %if 0%{?suse_version} && 0%{?suse_version} < 1500 %doc COPYING %else @@ -274,7 +272,6 @@ %if %build_pdf %files pdf -%defattr(-,root,root) %dir %{_datadir}/doc/kernel %docdir %{_datadir}/doc/kernel/pdf %{_datadir}/doc/kernel/pdf @@ -282,7 +279,6 @@ %if %build_html %files html -%defattr(-,root,root) %dir %{_datadir}/doc/kernel %docdir %{_datadir}/doc/kernel/html %{_datadir}/doc/kernel/html ++++++ kernel-kvmsmall.spec ++++++ --- /var/tmp/diff_new_pack.kuQjtA/_old 2023-05-11 12:33:10.074609213 +0200 +++ /var/tmp/diff_new_pack.kuQjtA/_new 2023-05-11 12:33:10.078609233 +0200 @@ -113,7 +113,7 @@ Group: System/Kernel Version: 6.3.1 %if 0%{?is_kotd} -Release: <RELEASE>.g8a31779 +Release: <RELEASE>.g78ee477 %else Release: 0 %endif @@ -238,10 +238,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-8a31779f5544166bb801a03085764c84a737a62d -Provides: kernel-srchash-8a31779f5544166bb801a03085764c84a737a62d +Provides: kernel-%build_flavor-base-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3 +Provides: kernel-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3 # END COMMON DEPS -Provides: %name-srchash-8a31779f5544166bb801a03085764c84a737a62d +Provides: %name-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3 %obsolete_rebuilds %name Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc @@ -377,7 +377,6 @@ NoSource: 120 NoSource: 121 -BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: aarch64 ppc64 ppc64le x86_64 %define kmp_target_cpu %_target_cpu %ifarch %ix86 @@ -870,6 +869,10 @@ find %buildroot -name "*.ko" > kofiles.list dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi + expoline=arch/s390/lib/expoline/expoline.o + if test -f arch/s390/lib/expoline/expoline.o ; then + install -m 644 -D -t %rpm_install_dir/%cpu_arch_flavor/$(dirname $expoline) $expoline + fi %endif # Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor @@ -1241,7 +1244,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %endif %files -f kernel-main.files -%defattr(-, root, root) %package extra Summary: The Small Developer Kernel for KVM - Unsupported kernel modules @@ -1311,7 +1313,6 @@ %if %split_extra %files extra -f kernel-extra.files -%defattr(-, root, root) %endif %if %split_extra && %split_optional @@ -1379,7 +1380,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files optional -f kernel-optional.files -%defattr(-, root, root) %endif %if "%CONFIG_KMSG_IDS" == "y" @@ -1395,7 +1395,6 @@ %source_timestamp %files man -%defattr(-,root,root) /usr/share/man/man9/* %endif @@ -1412,7 +1411,6 @@ %source_timestamp %files vdso -%defattr(-,root,root) /%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor/vdso/ %endif @@ -1461,7 +1459,6 @@ relink ../../linux-%{kernelrelease}%{variant}-obj/"%cpu_arch_flavor" /usr/src/linux-obj/"%cpu_arch_flavor" %files devel -f kernel-devel.files -%defattr(-,root,root) %dir /usr/src/linux-obj %dir /usr/src/linux-obj/%cpu_arch %ghost /usr/src/linux-obj/%cpu_arch_flavor @@ -1498,7 +1495,6 @@ %files %{livepatch} # rpmlint complains about empty packages, so lets own something -%defattr(-, root, root) %dir %modules_dir %endif @@ -1567,7 +1563,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n cluster-md-kmp-%build_flavor -f cluster-md-kmp.files -%defattr(-, root, root) %package -n dlm-kmp-%build_flavor Summary: DLM kernel modules @@ -1616,7 +1611,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n dlm-kmp-%build_flavor -f dlm-kmp.files -%defattr(-, root, root) %package -n gfs2-kmp-%build_flavor Summary: GFS2 kernel modules @@ -1665,7 +1659,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n gfs2-kmp-%build_flavor -f gfs2-kmp.files -%defattr(-, root, root) %package -n kselftests-kmp-%build_flavor Summary: Kernel sefltests @@ -1729,7 +1722,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n kselftests-kmp-%build_flavor -f kselftests-kmp.files -%defattr(-, root, root) %package -n ocfs2-kmp-%build_flavor Summary: OCFS2 kernel modules @@ -1779,7 +1771,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n ocfs2-kmp-%build_flavor -f ocfs2-kmp.files -%defattr(-, root, root) %package -n reiserfs-kmp-%build_flavor Summary: Reiserfs kernel module @@ -1828,7 +1819,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n reiserfs-kmp-%build_flavor -f reiserfs-kmp.files -%defattr(-, root, root) %endif # %CONFIG_SUSE_KERNEL_SUPPORTED %endif # %CONFIG_MODULES ++++++ kernel-lpae.spec ++++++ --- /var/tmp/diff_new_pack.kuQjtA/_old 2023-05-11 12:33:10.098609331 +0200 +++ /var/tmp/diff_new_pack.kuQjtA/_new 2023-05-11 12:33:10.102609351 +0200 @@ -113,7 +113,7 @@ Group: System/Kernel Version: 6.3.1 %if 0%{?is_kotd} -Release: <RELEASE>.g8a31779 +Release: <RELEASE>.g78ee477 %else Release: 0 %endif @@ -238,10 +238,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-8a31779f5544166bb801a03085764c84a737a62d -Provides: kernel-srchash-8a31779f5544166bb801a03085764c84a737a62d +Provides: kernel-%build_flavor-base-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3 +Provides: kernel-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3 # END COMMON DEPS -Provides: %name-srchash-8a31779f5544166bb801a03085764c84a737a62d +Provides: %name-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3 %obsolete_rebuilds %name Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc @@ -377,7 +377,6 @@ NoSource: 120 NoSource: 121 -BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: armv7hl %define kmp_target_cpu %_target_cpu %ifarch %ix86 @@ -864,6 +863,10 @@ find %buildroot -name "*.ko" > kofiles.list dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi + expoline=arch/s390/lib/expoline/expoline.o + if test -f arch/s390/lib/expoline/expoline.o ; then + install -m 644 -D -t %rpm_install_dir/%cpu_arch_flavor/$(dirname $expoline) $expoline + fi %endif # Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor @@ -1235,7 +1238,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %endif %files -f kernel-main.files -%defattr(-, root, root) %package extra Summary: Kernel for LPAE enabled systems - Unsupported kernel modules @@ -1299,7 +1301,6 @@ %if %split_extra %files extra -f kernel-extra.files -%defattr(-, root, root) %endif %if %split_extra && %split_optional @@ -1361,7 +1362,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files optional -f kernel-optional.files -%defattr(-, root, root) %endif %if "%CONFIG_KMSG_IDS" == "y" @@ -1377,7 +1377,6 @@ %source_timestamp %files man -%defattr(-,root,root) /usr/share/man/man9/* %endif @@ -1394,7 +1393,6 @@ %source_timestamp %files vdso -%defattr(-,root,root) /%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor/vdso/ %endif @@ -1443,7 +1441,6 @@ relink ../../linux-%{kernelrelease}%{variant}-obj/"%cpu_arch_flavor" /usr/src/linux-obj/"%cpu_arch_flavor" %files devel -f kernel-devel.files -%defattr(-,root,root) %dir /usr/src/linux-obj %dir /usr/src/linux-obj/%cpu_arch %ghost /usr/src/linux-obj/%cpu_arch_flavor @@ -1480,7 +1477,6 @@ %files %{livepatch} # rpmlint complains about empty packages, so lets own something -%defattr(-, root, root) %dir %modules_dir %endif @@ -1549,7 +1545,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n cluster-md-kmp-%build_flavor -f cluster-md-kmp.files -%defattr(-, root, root) %package -n dlm-kmp-%build_flavor Summary: DLM kernel modules @@ -1598,7 +1593,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n dlm-kmp-%build_flavor -f dlm-kmp.files -%defattr(-, root, root) %package -n gfs2-kmp-%build_flavor Summary: GFS2 kernel modules @@ -1647,7 +1641,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n gfs2-kmp-%build_flavor -f gfs2-kmp.files -%defattr(-, root, root) %package -n kselftests-kmp-%build_flavor Summary: Kernel sefltests @@ -1711,7 +1704,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n kselftests-kmp-%build_flavor -f kselftests-kmp.files -%defattr(-, root, root) %package -n ocfs2-kmp-%build_flavor Summary: OCFS2 kernel modules @@ -1761,7 +1753,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n ocfs2-kmp-%build_flavor -f ocfs2-kmp.files -%defattr(-, root, root) %package -n reiserfs-kmp-%build_flavor Summary: Reiserfs kernel module @@ -1810,7 +1801,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n reiserfs-kmp-%build_flavor -f reiserfs-kmp.files -%defattr(-, root, root) %endif # %CONFIG_SUSE_KERNEL_SUPPORTED %endif # %CONFIG_MODULES ++++++ kernel-obs-build.spec ++++++ --- /var/tmp/diff_new_pack.kuQjtA/_old 2023-05-11 12:33:10.138609528 +0200 +++ /var/tmp/diff_new_pack.kuQjtA/_new 2023-05-11 12:33:10.142609547 +0200 @@ -44,7 +44,7 @@ %endif %endif %endif -BuildRequires: kernel%kernel_flavor-srchash-8a31779f5544166bb801a03085764c84a737a62d +BuildRequires: kernel%kernel_flavor-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3 %if 0%{?rhel_version} BuildRequires: kernel @@ -58,7 +58,7 @@ Group: SLES Version: 6.3.1 %if 0%{?is_kotd} -Release: <RELEASE>.g8a31779 +Release: <RELEASE>.g78ee477 %else Release: 0 %endif ++++++ kernel-obs-qa.spec ++++++ --- /var/tmp/diff_new_pack.kuQjtA/_old 2023-05-11 12:33:10.166609666 +0200 +++ /var/tmp/diff_new_pack.kuQjtA/_new 2023-05-11 12:33:10.170609685 +0200 @@ -29,16 +29,12 @@ BuildRequires: kernel-obs-build BuildRequires: modutils ExclusiveArch: aarch64 armv6hl armv7hl ppc64 ppc64le riscv64 s390x x86_64 -%if 0%{?suse_version} < 1200 -# for SLE 11 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%endif Summary: Basic QA tests for the kernel License: GPL-2.0-only Group: SLES Version: 6.3.1 %if 0%{?is_kotd} -Release: <RELEASE>.g8a31779 +Release: <RELEASE>.g78ee477 %else Release: 0 %endif @@ -71,7 +67,6 @@ touch %{buildroot}/usr/share/%name/logfile %files -%defattr(-,root,root) /usr/share/%name %changelog ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.kuQjtA/_old 2023-05-11 12:33:10.198609822 +0200 +++ /var/tmp/diff_new_pack.kuQjtA/_new 2023-05-11 12:33:10.202609842 +0200 @@ -113,7 +113,7 @@ Group: System/Kernel Version: 6.3.1 %if 0%{?is_kotd} -Release: <RELEASE>.g8a31779 +Release: <RELEASE>.g78ee477 %else Release: 0 %endif @@ -238,10 +238,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-8a31779f5544166bb801a03085764c84a737a62d -Provides: kernel-srchash-8a31779f5544166bb801a03085764c84a737a62d +Provides: kernel-%build_flavor-base-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3 +Provides: kernel-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3 # END COMMON DEPS -Provides: %name-srchash-8a31779f5544166bb801a03085764c84a737a62d +Provides: %name-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3 %ifarch %ix86 Provides: kernel-bigsmp = 2.6.17 Obsoletes: kernel-bigsmp <= 2.6.17 @@ -399,7 +399,6 @@ NoSource: 120 NoSource: 121 -BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 %define kmp_target_cpu %_target_cpu %ifarch %ix86 @@ -892,6 +891,10 @@ find %buildroot -name "*.ko" > kofiles.list dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi + expoline=arch/s390/lib/expoline/expoline.o + if test -f arch/s390/lib/expoline/expoline.o ; then + install -m 644 -D -t %rpm_install_dir/%cpu_arch_flavor/$(dirname $expoline) $expoline + fi %endif # Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor @@ -1263,7 +1266,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %endif %files -f kernel-main.files -%defattr(-, root, root) %package extra Summary: Kernel with PAE Support - Unsupported kernel modules @@ -1343,7 +1345,6 @@ %if %split_extra %files extra -f kernel-extra.files -%defattr(-, root, root) %endif %if %split_extra && %split_optional @@ -1421,7 +1422,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files optional -f kernel-optional.files -%defattr(-, root, root) %endif %if "%CONFIG_KMSG_IDS" == "y" @@ -1437,7 +1437,6 @@ %source_timestamp %files man -%defattr(-,root,root) /usr/share/man/man9/* %endif @@ -1454,7 +1453,6 @@ %source_timestamp %files vdso -%defattr(-,root,root) /%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor/vdso/ %endif @@ -1513,7 +1511,6 @@ relink ../../linux-%{kernelrelease}%{variant}-obj/"%cpu_arch_flavor" /usr/src/linux-obj/"%cpu_arch_flavor" %files devel -f kernel-devel.files -%defattr(-,root,root) %dir /usr/src/linux-obj %dir /usr/src/linux-obj/%cpu_arch %ghost /usr/src/linux-obj/%cpu_arch_flavor @@ -1550,7 +1547,6 @@ %files %{livepatch} # rpmlint complains about empty packages, so lets own something -%defattr(-, root, root) %dir %modules_dir %endif @@ -1619,7 +1615,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n cluster-md-kmp-%build_flavor -f cluster-md-kmp.files -%defattr(-, root, root) %package -n dlm-kmp-%build_flavor Summary: DLM kernel modules @@ -1668,7 +1663,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n dlm-kmp-%build_flavor -f dlm-kmp.files -%defattr(-, root, root) %package -n gfs2-kmp-%build_flavor Summary: GFS2 kernel modules @@ -1717,7 +1711,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n gfs2-kmp-%build_flavor -f gfs2-kmp.files -%defattr(-, root, root) %package -n kselftests-kmp-%build_flavor Summary: Kernel sefltests @@ -1781,7 +1774,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n kselftests-kmp-%build_flavor -f kselftests-kmp.files -%defattr(-, root, root) %package -n ocfs2-kmp-%build_flavor Summary: OCFS2 kernel modules @@ -1831,7 +1823,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n ocfs2-kmp-%build_flavor -f ocfs2-kmp.files -%defattr(-, root, root) %package -n reiserfs-kmp-%build_flavor Summary: Reiserfs kernel module @@ -1880,7 +1871,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n reiserfs-kmp-%build_flavor -f reiserfs-kmp.files -%defattr(-, root, root) %endif # %CONFIG_SUSE_KERNEL_SUPPORTED %endif # %CONFIG_MODULES ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.kuQjtA/_old 2023-05-11 12:33:10.238610019 +0200 +++ /var/tmp/diff_new_pack.kuQjtA/_new 2023-05-11 12:33:10.238610019 +0200 @@ -32,7 +32,7 @@ Name: kernel-source Version: 6.3.1 %if 0%{?is_kotd} -Release: <RELEASE>.g8a31779 +Release: <RELEASE>.g78ee477 %else Release: 0 %endif @@ -49,7 +49,7 @@ BuildRequires: sed Requires(post): coreutils sed Provides: %name = %version-%source_rel -Provides: %name-srchash-8a31779f5544166bb801a03085764c84a737a62d +Provides: %name-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3 Provides: linux Provides: multiversion(kernel) Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz @@ -303,16 +303,13 @@ relink linux-%kernelrelease%variant /usr/src/linux%variant %files -f nondevel.files -%defattr(-, root, root) %files -n kernel-devel%variant -f devel.files -%defattr(-,root,root) %ghost /usr/src/linux%variant %doc /usr/share/doc/packages/* %if "%variant" == "" %files -n kernel-macros -%defattr(-,root,root) %{_rpmmacrodir}/macros.kernel-source /usr/lib/rpm/kernel-*-subpackage %dir /usr/lib/rpm/kernel @@ -323,7 +320,6 @@ %if %do_vanilla %files vanilla -%defattr(-, root, root) /usr/src/linux-%kernelrelease-vanilla %endif ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.kuQjtA/_old 2023-05-11 12:33:10.270610176 +0200 +++ /var/tmp/diff_new_pack.kuQjtA/_new 2023-05-11 12:33:10.274610196 +0200 @@ -27,7 +27,7 @@ Version: 6.3.1 %if %using_buildservice %if 0%{?is_kotd} -Release: <RELEASE>.g8a31779 +Release: <RELEASE>.g78ee477 %else Release: 0 %endif @@ -52,11 +52,10 @@ %endif Requires: pesign-obs-integration Provides: %name = %version-%source_rel -Provides: %name-srchash-8a31779f5544166bb801a03085764c84a737a62d +Provides: %name-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3 Provides: multiversion(kernel) Source: README.KSYMS Requires: kernel-devel%variant = %version-%source_rel -BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 aarch64 armv6hl armv7hl ppc64 ppc64le riscv64 s390x x86_64 Prefix: /usr/src @@ -81,7 +80,6 @@ install -m 644 -D %{SOURCE0} %buildroot/%_docdir/%name/README.SUSE %files -%defattr(-, root, root) %dir %_docdir/%name %_docdir/%name/README.SUSE ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.kuQjtA/_old 2023-05-11 12:33:10.302610333 +0200 +++ /var/tmp/diff_new_pack.kuQjtA/_new 2023-05-11 12:33:10.314610393 +0200 @@ -113,7 +113,7 @@ Group: System/Kernel Version: 6.3.1 %if 0%{?is_kotd} -Release: <RELEASE>.g8a31779 +Release: <RELEASE>.g78ee477 %else Release: 0 %endif @@ -238,10 +238,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-8a31779f5544166bb801a03085764c84a737a62d -Provides: kernel-srchash-8a31779f5544166bb801a03085764c84a737a62d +Provides: kernel-%build_flavor-base-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3 +Provides: kernel-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3 # END COMMON DEPS -Provides: %name-srchash-8a31779f5544166bb801a03085764c84a737a62d +Provides: %name-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3 %obsolete_rebuilds %name Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc @@ -377,7 +377,6 @@ NoSource: 120 NoSource: 121 -BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: aarch64 armv6hl armv7hl %ix86 ppc64 ppc64le riscv64 s390x x86_64 %define kmp_target_cpu %_target_cpu %ifarch %ix86 @@ -863,6 +862,10 @@ find %buildroot -name "*.ko" > kofiles.list dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi + expoline=arch/s390/lib/expoline/expoline.o + if test -f arch/s390/lib/expoline/expoline.o ; then + install -m 644 -D -t %rpm_install_dir/%cpu_arch_flavor/$(dirname $expoline) $expoline + fi %endif # Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor @@ -1234,7 +1237,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %endif %files -f kernel-main.files -%defattr(-, root, root) %package extra Summary: The Standard Kernel - without any SUSE patches - Unsupported kernel modules @@ -1297,7 +1299,6 @@ %if %split_extra %files extra -f kernel-extra.files -%defattr(-, root, root) %endif %if %split_extra && %split_optional @@ -1358,7 +1359,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files optional -f kernel-optional.files -%defattr(-, root, root) %endif %if "%CONFIG_KMSG_IDS" == "y" @@ -1374,7 +1374,6 @@ %source_timestamp %files man -%defattr(-,root,root) /usr/share/man/man9/* %endif @@ -1391,7 +1390,6 @@ %source_timestamp %files vdso -%defattr(-,root,root) /%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor/vdso/ %endif @@ -1440,7 +1438,6 @@ relink ../../linux-%{kernelrelease}%{variant}-obj/"%cpu_arch_flavor" /usr/src/linux-obj/"%cpu_arch_flavor" %files devel -f kernel-devel.files -%defattr(-,root,root) %dir /usr/src/linux-obj %dir /usr/src/linux-obj/%cpu_arch %ghost /usr/src/linux-obj/%cpu_arch_flavor @@ -1477,7 +1474,6 @@ %files %{livepatch} # rpmlint complains about empty packages, so lets own something -%defattr(-, root, root) %dir %modules_dir %endif @@ -1546,7 +1542,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n cluster-md-kmp-%build_flavor -f cluster-md-kmp.files -%defattr(-, root, root) %package -n dlm-kmp-%build_flavor Summary: DLM kernel modules @@ -1595,7 +1590,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n dlm-kmp-%build_flavor -f dlm-kmp.files -%defattr(-, root, root) %package -n gfs2-kmp-%build_flavor Summary: GFS2 kernel modules @@ -1644,7 +1638,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n gfs2-kmp-%build_flavor -f gfs2-kmp.files -%defattr(-, root, root) %package -n kselftests-kmp-%build_flavor Summary: Kernel sefltests @@ -1708,7 +1701,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n kselftests-kmp-%build_flavor -f kselftests-kmp.files -%defattr(-, root, root) %package -n ocfs2-kmp-%build_flavor Summary: OCFS2 kernel modules @@ -1758,7 +1750,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n ocfs2-kmp-%build_flavor -f ocfs2-kmp.files -%defattr(-, root, root) %package -n reiserfs-kmp-%build_flavor Summary: Reiserfs kernel module @@ -1807,7 +1798,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n reiserfs-kmp-%build_flavor -f reiserfs-kmp.files -%defattr(-, root, root) %endif # %CONFIG_SUSE_KERNEL_SUPPORTED %endif # %CONFIG_MODULES ++++++ kernel-zfcpdump.spec ++++++ --- /var/tmp/diff_new_pack.kuQjtA/_old 2023-05-11 12:33:10.350610570 +0200 +++ /var/tmp/diff_new_pack.kuQjtA/_new 2023-05-11 12:33:10.354610589 +0200 @@ -113,7 +113,7 @@ Group: System/Kernel Version: 6.3.1 %if 0%{?is_kotd} -Release: <RELEASE>.g8a31779 +Release: <RELEASE>.g78ee477 %else Release: 0 %endif @@ -238,10 +238,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-8a31779f5544166bb801a03085764c84a737a62d -Provides: kernel-srchash-8a31779f5544166bb801a03085764c84a737a62d +Provides: kernel-%build_flavor-base-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3 +Provides: kernel-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3 # END COMMON DEPS -Provides: %name-srchash-8a31779f5544166bb801a03085764c84a737a62d +Provides: %name-srchash-78ee4774aa1081a539cf0d8188072e4783bcf3b3 %obsolete_rebuilds %name Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz Source3: kernel-source.rpmlintrc @@ -377,7 +377,6 @@ NoSource: 120 NoSource: 121 -BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: s390x %define kmp_target_cpu %_target_cpu %ifarch %ix86 @@ -866,6 +865,10 @@ find %buildroot -name "*.ko" > kofiles.list dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi + expoline=arch/s390/lib/expoline/expoline.o + if test -f arch/s390/lib/expoline/expoline.o ; then + install -m 644 -D -t %rpm_install_dir/%cpu_arch_flavor/$(dirname $expoline) $expoline + fi %endif # Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor @@ -1237,7 +1240,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %endif %files -f kernel-main.files -%defattr(-, root, root) %package extra Summary: The IBM System Z zfcpdump Kernel - Unsupported kernel modules @@ -1303,7 +1305,6 @@ %if %split_extra %files extra -f kernel-extra.files -%defattr(-, root, root) %endif %if %split_extra && %split_optional @@ -1367,7 +1368,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files optional -f kernel-optional.files -%defattr(-, root, root) %endif %if "%CONFIG_KMSG_IDS" == "y" @@ -1383,7 +1383,6 @@ %source_timestamp %files man -%defattr(-,root,root) /usr/share/man/man9/* %endif @@ -1400,7 +1399,6 @@ %source_timestamp %files vdso -%defattr(-,root,root) /%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor/vdso/ %endif @@ -1449,7 +1447,6 @@ relink ../../linux-%{kernelrelease}%{variant}-obj/"%cpu_arch_flavor" /usr/src/linux-obj/"%cpu_arch_flavor" %files devel -f kernel-devel.files -%defattr(-,root,root) %dir /usr/src/linux-obj %dir /usr/src/linux-obj/%cpu_arch %ghost /usr/src/linux-obj/%cpu_arch_flavor @@ -1486,7 +1483,6 @@ %files %{livepatch} # rpmlint complains about empty packages, so lets own something -%defattr(-, root, root) %dir %modules_dir %endif @@ -1555,7 +1551,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n cluster-md-kmp-%build_flavor -f cluster-md-kmp.files -%defattr(-, root, root) %package -n dlm-kmp-%build_flavor Summary: DLM kernel modules @@ -1604,7 +1599,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n dlm-kmp-%build_flavor -f dlm-kmp.files -%defattr(-, root, root) %package -n gfs2-kmp-%build_flavor Summary: GFS2 kernel modules @@ -1653,7 +1647,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n gfs2-kmp-%build_flavor -f gfs2-kmp.files -%defattr(-, root, root) %package -n kselftests-kmp-%build_flavor Summary: Kernel sefltests @@ -1717,7 +1710,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n kselftests-kmp-%build_flavor -f kselftests-kmp.files -%defattr(-, root, root) %package -n ocfs2-kmp-%build_flavor Summary: OCFS2 kernel modules @@ -1767,7 +1759,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n ocfs2-kmp-%build_flavor -f ocfs2-kmp.files -%defattr(-, root, root) %package -n reiserfs-kmp-%build_flavor Summary: Reiserfs kernel module @@ -1816,7 +1807,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n reiserfs-kmp-%build_flavor -f reiserfs-kmp.files -%defattr(-, root, root) %endif # %CONFIG_SUSE_KERNEL_SUPPORTED %endif # %CONFIG_MODULES ++++++ config.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/arm64/default new/config/arm64/default --- old/config/arm64/default 2023-04-27 10:12:09.000000000 +0200 +++ new/config/arm64/default 2023-05-09 08:37:47.000000000 +0200 @@ -12308,7 +12308,7 @@ # CONFIG_IMA_WRITE_POLICY is not set CONFIG_IMA_READ_POLICY=y CONFIG_IMA_APPRAISE=y -CONFIG_IMA_ARCH_POLICY=y +# CONFIG_IMA_ARCH_POLICY is not set # CONFIG_IMA_APPRAISE_BUILD_POLICY is not set CONFIG_IMA_APPRAISE_BOOTPARAM=y CONFIG_IMA_APPRAISE_MODSIG=y @@ -12318,7 +12318,7 @@ # CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS=y CONFIG_IMA_QUEUE_EARLY_BOOT_KEYS=y -CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y +# CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set # CONFIG_IMA_DISABLE_HTABLE is not set CONFIG_EVM=y CONFIG_EVM_ATTR_FSUUID=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/default new/config/i386/default --- old/config/i386/default 2023-04-27 10:12:09.000000000 +0200 +++ new/config/i386/default 2023-05-09 08:37:47.000000000 +0200 @@ -31,8 +31,6 @@ CONFIG_HWPOISON_INJECT=m CONFIG_I2C_PCA_ISA=m CONFIG_I82365=m -CONFIG_IMA_ARCH_POLICY=y -CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y CONFIG_ISA=y CONFIG_ISAPNP=y CONFIG_LANCE=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/default new/config/x86_64/default --- old/config/x86_64/default 2023-04-27 10:12:09.000000000 +0200 +++ new/config/x86_64/default 2023-05-09 08:37:47.000000000 +0200 @@ -10340,7 +10340,7 @@ # CONFIG_IMA_WRITE_POLICY is not set CONFIG_IMA_READ_POLICY=y CONFIG_IMA_APPRAISE=y -CONFIG_IMA_ARCH_POLICY=y +# CONFIG_IMA_ARCH_POLICY is not set # CONFIG_IMA_APPRAISE_BUILD_POLICY is not set CONFIG_IMA_APPRAISE_BOOTPARAM=y CONFIG_IMA_APPRAISE_MODSIG=y @@ -10350,7 +10350,7 @@ # CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS=y CONFIG_IMA_QUEUE_EARLY_BOOT_KEYS=y -CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y +# CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set # CONFIG_IMA_DISABLE_HTABLE is not set CONFIG_EVM=y CONFIG_EVM_ATTR_FSUUID=y ++++++ kernel-binary.spec.in ++++++ --- /var/tmp/diff_new_pack.kuQjtA/_old 2023-05-11 12:33:11.010613814 +0200 +++ /var/tmp/diff_new_pack.kuQjtA/_new 2023-05-11 12:33:11.014613833 +0200 @@ -247,7 +247,6 @@ %obsolete_rebuilds %name @SOURCES@ -BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: @ARCHS@ %define kmp_target_cpu %_target_cpu %ifarch %ix86 @@ -733,6 +732,10 @@ find %buildroot -name "*.ko" > kofiles.list dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi + expoline=arch/s390/lib/expoline/expoline.o + if test -f arch/s390/lib/expoline/expoline.o ; then + install -m 644 -D -t %rpm_install_dir/%cpu_arch_flavor/$(dirname $expoline) $expoline + fi %endif # Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor @@ -1104,7 +1107,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %endif %files -f kernel-main.files -%defattr(-, root, root) %package extra Summary: @SUMMARY@ - Unsupported kernel modules @@ -1168,7 +1170,6 @@ %if %split_extra %files extra -f kernel-extra.files -%defattr(-, root, root) %endif %if %split_extra && %split_optional @@ -1230,7 +1231,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files optional -f kernel-optional.files -%defattr(-, root, root) %endif %if "%CONFIG_KMSG_IDS" == "y" @@ -1246,7 +1246,6 @@ %source_timestamp %files man -%defattr(-,root,root) /usr/share/man/man9/* %endif @@ -1263,7 +1262,6 @@ %source_timestamp %files vdso -%defattr(-,root,root) /%{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor/vdso/ %endif @@ -1313,7 +1311,6 @@ relink ../../linux-%{kernelrelease}%{variant}-obj/"%cpu_arch_flavor" /usr/src/linux-obj/"%cpu_arch_flavor" %files devel -f kernel-devel.files -%defattr(-,root,root) %dir /usr/src/linux-obj %dir /usr/src/linux-obj/%cpu_arch %ghost /usr/src/linux-obj/%cpu_arch_flavor @@ -1350,7 +1347,6 @@ %files %{livepatch} # rpmlint complains about empty packages, so lets own something -%defattr(-, root, root) %dir %modules_dir %endif @@ -1418,7 +1414,6 @@ --usrmerged "0%{?usrmerged}" --certs "%certs" "$@" %files -n @KMP_NAME@-%build_flavor -f @KMP_NAME@.files -%defattr(-, root, root) # END KMP %endif # %CONFIG_SUSE_KERNEL_SUPPORTED %endif # %CONFIG_MODULES ++++++ kernel-docs.spec.in ++++++ --- /var/tmp/diff_new_pack.kuQjtA/_old 2023-05-11 12:33:11.082614167 +0200 +++ /var/tmp/diff_new_pack.kuQjtA/_new 2023-05-11 12:33:11.086614187 +0200 @@ -69,7 +69,6 @@ Provides: %name = %version-%source_rel Provides: %name-srchash-@COMMIT_FULL@ BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build @SOURCES@ %description @@ -132,7 +131,6 @@ %endif %files -%defattr(-,root,root) %if 0%{?suse_version} && 0%{?suse_version} < 1500 %doc COPYING %else @@ -142,7 +140,6 @@ %if %build_pdf %files pdf -%defattr(-,root,root) %dir %{_datadir}/doc/kernel %docdir %{_datadir}/doc/kernel/pdf %{_datadir}/doc/kernel/pdf @@ -150,7 +147,6 @@ %if %build_html %files html -%defattr(-,root,root) %dir %{_datadir}/doc/kernel %docdir %{_datadir}/doc/kernel/html %{_datadir}/doc/kernel/html ++++++ kernel-obs-qa.spec.in ++++++ --- /var/tmp/diff_new_pack.kuQjtA/_old 2023-05-11 12:33:11.154614521 +0200 +++ /var/tmp/diff_new_pack.kuQjtA/_new 2023-05-11 12:33:11.158614541 +0200 @@ -29,10 +29,6 @@ BuildRequires: kernel-obs-build BuildRequires: modutils ExclusiveArch: @ARCHS@ -%if 0%{?suse_version} < 1200 -# for SLE 11 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%endif Summary: Basic QA tests for the kernel License: GPL-2.0-only Group: SLES @@ -71,7 +67,6 @@ touch %{buildroot}/usr/share/%name/logfile %files -%defattr(-,root,root) /usr/share/%name %changelog ++++++ kernel-source.spec.in ++++++ --- /var/tmp/diff_new_pack.kuQjtA/_old 2023-05-11 12:33:11.214614816 +0200 +++ /var/tmp/diff_new_pack.kuQjtA/_new 2023-05-11 12:33:11.214614816 +0200 @@ -303,16 +303,13 @@ relink linux-%kernelrelease%variant /usr/src/linux%variant %files -f nondevel.files -%defattr(-, root, root) %files -n kernel-devel%variant -f devel.files -%defattr(-,root,root) %ghost /usr/src/linux%variant %doc /usr/share/doc/packages/* %if "%variant" == "" %files -n kernel-macros -%defattr(-,root,root) %{_rpmmacrodir}/macros.kernel-source /usr/lib/rpm/kernel-*-subpackage %dir /usr/lib/rpm/kernel @@ -323,7 +320,6 @@ %if %do_vanilla %files vanilla -%defattr(-, root, root) /usr/src/linux-%kernelrelease-vanilla %endif ++++++ kernel-spec-macros ++++++ --- /var/tmp/diff_new_pack.kuQjtA/_old 2023-05-11 12:33:11.242614954 +0200 +++ /var/tmp/diff_new_pack.kuQjtA/_new 2023-05-11 12:33:11.242614954 +0200 @@ -30,15 +30,17 @@ %define obsolete_rebuilds() %( \ set -- $(echo %release | sed -rn 's/(.*\\.)([0-9]+)($|\\.[^.]*[^.0-9][^.]*$)/\\1 \\2 \\3/p') \ if test -n "$2" && test "$2" -gt 99; then echo "warning: Rebuild counter too high in %release" >&2; exit 0; fi \ - seq 1 $(($2-1)) | sed "s/.*/Obsoletes: %1 = %version-$1&$3/" \ + for i in $(seq 1 $(($2-1))) ; do echo "Obsoletes: %1 = %version-$1$i$3" ; done \ ) -%define obsolete_rebuilds_subpackage() %( %{verbose:set -x} \ +%define obsolete_rebuilds_subpackage() %( \ set -- $(echo %release | sed -rn 's/(.*\\.)([0-9]+)($|\\.[^.]*[^.0-9][^.]*$)/\\1 \\2 \\3/p') \ if test -n "$2" && test "$2" -gt 99; then echo "warning: Rebuild counter too high in %release" >&2; exit 0; fi \ - seq 1 $(($2-1)) | sed "s/.*/Obsoletes: %1 = %version-$1&$3/" \ + cnt=$2 set -- $(echo %source_rel | sed -rn 's/(.*\\.)([0-9]+)($|\\.[^.]*[^.0-9][^.]*$)/\\1 \\2 \\3/p') \ - if test -n "$2" && test "$2" -gt 99; then echo "warning: Upload counter too high in %release" >&2; exit 0; fi \ - seq 1 $(($2-1)) | sed "s/.*/Obsoletes: %1 = %version-$1&$3/" \ + if test -n "$2" && test "$2" -gt 99; then echo "warning: Upload counter too high in %source_rel" >&2; exit 0; fi \ + for i in $(seq 1 $2) ; do for j in $(seq 1 $cnt) ; do [ $i = $2 ] && [ $j = $cnt ] && break \ + echo "Obsoletes: %1 = %version-$1$i.$j$3" \ + done ; done \ ) %endif ++++++ kernel-syms.spec.in ++++++ --- /var/tmp/diff_new_pack.kuQjtA/_old 2023-05-11 12:33:11.294615209 +0200 +++ /var/tmp/diff_new_pack.kuQjtA/_new 2023-05-11 12:33:11.298615229 +0200 @@ -45,7 +45,6 @@ Provides: multiversion(kernel) Source: README.KSYMS Requires: kernel-devel%variant = %version-%source_rel -BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: @ARCHS@ Prefix: /usr/src @@ -70,7 +69,6 @@ install -m 644 -D %{SOURCE0} %buildroot/%_docdir/%name/README.SUSE %files -%defattr(-, root, root) %dir %_docdir/%name %_docdir/%name/README.SUSE ++++++ patches.suse.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/usbtv-usbtv_set_regs-the-pipe-is-output.patch new/patches.suse/usbtv-usbtv_set_regs-the-pipe-is-output.patch --- old/patches.suse/usbtv-usbtv_set_regs-the-pipe-is-output.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.suse/usbtv-usbtv_set_regs-the-pipe-is-output.patch 2023-05-03 15:53:59.000000000 +0200 @@ -0,0 +1,33 @@ +From 91f1312069bdf51ed5f4eb979f90b78351876cc0 Mon Sep 17 00:00:00 2001 +From: Oliver Neukum <oneu...@suse.com> +Date: Thu, 16 Mar 2023 14:15:07 +0100 +Subject: [PATCH] usbtv: usbtv_set_regs: the pipe is output +Git-commit: 91f1312069bdf51ed5f4eb979f90b78351876cc0 +References: bsc#1209334 +Patch-mainline: v6.4-rc1 + +We are setting a value. That is output and +the pipe has to match that. + +Signed-off-by: Oliver Neukum <oneu...@suse.com> +Signed-off-by: Hans Verkuil <hverkuil-ci...@xs4all.nl> +--- + drivers/media/usb/usbtv/usbtv-core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/media/usb/usbtv/usbtv-core.c b/drivers/media/usb/usbtv/usbtv-core.c +index 2308c0b4f5e7..1f7620cd2996 100644 +--- a/drivers/media/usb/usbtv/usbtv-core.c ++++ b/drivers/media/usb/usbtv/usbtv-core.c +@@ -47,7 +47,7 @@ + int usbtv_set_regs(struct usbtv *usbtv, const u16 regs[][2], int size) + { + int ret; +- int pipe = usb_rcvctrlpipe(usbtv->udev, 0); ++ int pipe = usb_sndctrlpipe(usbtv->udev, 0); + int i; + + for (i = 0; i < size; i++) { +-- +2.40.1 + ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.kuQjtA/_old 2023-05-11 12:33:11.570616565 +0200 +++ /var/tmp/diff_new_pack.kuQjtA/_new 2023-05-11 12:33:11.574616585 +0200 @@ -66,6 +66,7 @@ # sorted patches ######################################################## + patches.suse/usbtv-usbtv_set_regs-the-pipe-is-output.patch patches.suse/ath11k-pci-Add-more-MODULE_FIRMWARE-entries.patch ######################################################## # end of sorted patches ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.kuQjtA/_old 2023-05-11 12:33:11.598616703 +0200 +++ /var/tmp/diff_new_pack.kuQjtA/_new 2023-05-11 12:33:11.598616703 +0200 @@ -1,4 +1,4 @@ -2023-05-03 05:18:39 +0000 -GIT Revision: 8a31779f5544166bb801a03085764c84a737a62d +2023-05-09 07:50:57 +0000 +GIT Revision: 78ee4774aa1081a539cf0d8188072e4783bcf3b3 GIT Branch: stable