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-07-11 15:56:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kernel-source (Old)
and /work/SRC/openSUSE:Factory/.kernel-source.new.8922 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kernel-source"
Tue Jul 11 15:56:48 2023 rev:695 rq:1097912 version:6.4.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes
2023-06-24 20:13:58.924158005 +0200
+++ /work/SRC/openSUSE:Factory/.kernel-source.new.8922/dtb-aarch64.changes
2023-07-11 15:56:54.373032780 +0200
@@ -1,0 +2,265 @@
+Mon Jul 10 12:03:25 CEST 2023 - jsl...@suse.cz
+
+- Refresh
+ patches.suse/fork-lock-VMAs-of-the-parent-process-when-forking.patch.
+ Replace by the correct one. It was merged to upstream twice. And this is
+ the right version.
+- commit b97b894
+
+-------------------------------------------------------------------
+Mon Jul 10 11:51:35 CEST 2023 - jsl...@suse.cz
+
+- Update vanilla config files.
+ Just run oldconfig for vanillas too. No actual changes.
+- commit dcdca04
+
+-------------------------------------------------------------------
+Mon Jul 10 11:50:41 CEST 2023 - jsl...@suse.cz
+
+- Update
+
patches.kernel.org/6.4.1-021-mm-always-expand-the-stack-with-the-mmap-write-.patch
+ (bsc#1012628 bsc#1212395 CVE-2023-3269).
+ Add references to CVE.
+- commit 5a45f18
+
+-------------------------------------------------------------------
+Mon Jul 10 07:07:20 CEST 2023 - jsl...@suse.cz
+
+- Update config files.
+ Only run_oldconfig.
+- commit 37ad463
+
+-------------------------------------------------------------------
+Mon Jul 10 07:05:48 CEST 2023 - jsl...@suse.cz
+
+- fork: lock VMAs of the parent process when forking
+ (bsc#1212775).
+- mm: lock a vma before stack expansion (bsc#1212775).
+- mm: lock newly mapped VMA which can be modified after it
+ becomes visible (bsc#1212775).
+- mm: lock newly mapped VMA with corrected ordering (bsc#1212775).
+- Update config files.
+- Delete
+ patches.suse/Revert-x86-mm-try-VMA-lock-based-page-fault-handling.patch.
+ Drop the downstream revert in favor of upstream fixes above and reset
+ the configs -- leave STATS off as per default.
+- commit e2dafc9
+
+-------------------------------------------------------------------
+Sun Jul 9 08:15:18 CEST 2023 - jsl...@suse.cz
+
+- Linux 6.4.2 (bsc#1012628).
+- arch/arm64/mm/fault: Fix undeclared variable error in
+ do_page_fault() (bsc#1012628).
+- drm/amdgpu: Validate VM ioctl flags (bsc#1012628).
+- dm ioctl: Avoid double-fetch of version (bsc#1012628).
+- docs: Set minimal gtags / GNU GLOBAL version to 6.6.5
+ (bsc#1012628).
+- scripts/tags.sh: Resolve gtags empty index generation
+ (bsc#1012628).
+- hugetlb: revert use of page_cache_next_miss() (bsc#1012628).
+- nubus: Partially revert proc_create_single_data() conversion
+ (bsc#1012628).
+- Revert "cxl/port: Enable the HDM decoder capability for switch
+ ports" (bsc#1012628).
+- nfs: don't report STATX_BTIME in ->getattr (bsc#1012628).
+- execve: always mark stack as growing down during early stack
+ setup (bsc#1012628).
+- PCI/ACPI: Call _REG when transitioning D-states (bsc#1012628).
+- PCI/ACPI: Validate acpi_pci_set_power_state() parameter
+ (bsc#1012628).
+- tools/nolibc: x86_64: disable stack protector for _start
+ (bsc#1012628).
+- xtensa: fix lock_mm_and_find_vma in case VMA not found
+ (bsc#1012628).
+- commit 648ac3b
+
+-------------------------------------------------------------------
+Fri Jul 7 17:08:32 CEST 2023 - d...@suse.de
+
+- regulator: axp20x: Add AXP15060 support.
+- commit db7b000
+
+-------------------------------------------------------------------
+Wed Jul 5 15:33:06 CEST 2023 - jsl...@suse.cz
+
+- Revert "Refresh
patches.rpmify/usrmerge-Adjust-module-path-in-the-kernel-sources.patch."
+ This reverts commit b8411965e8341c82ba2e01bb38698945be2390a0. It breaks
+ the build:
+ + ln -s /usr/src/linux-6.4.1-1
/home/abuild/rpmbuild/BUILDROOT/kernel-default-6.4.1-1.1.x86_64/usr/lib/modules/6.4.1-1-default/source
+ ln: failed to create symbolic link
'/home/abuild/rpmbuild/BUILDROOT/kernel-default-6.4.1-1.1.x86_64/usr/lib/modules/6.4.1-1-default/source':
No such file or directory
+- commit 3561b10
+
+-------------------------------------------------------------------
+Wed Jul 5 09:41:22 CEST 2023 - ti...@suse.de
+
+- drm/amd: Don't try to enable secure display TA multiple times
+ (bsc#1212848).
+- drm/amdgpu: fix number of fence calculations (bsc#1212848).
+- drm/amd/display: perform a bounds check before filling dirty
+ rectangles (bsc#1212848).
+- drm/amdgpu: check RAS irq existence for VCN/JPEG (bsc#1212848).
+- drm/amd/pm: add abnormal fan detection for smu 13.0.0
+ (bsc#1212848).
+- drm/amd: Disable PSR-SU on Parade 0803 TCON (bsc#1212848).
+- drm/amd/pm: update the LC_L1_INACTIVITY setting to address
+ possible noise issue (bsc#1212848).
+- drm/amd/display: Fix 128b132b link loss handling (bsc#1212848).
+- drm/amd/display: disable seamless boot if force_odm_combine
+ is enabled (bsc#1212848).
+- drm/amd/display: add a NULL pointer check (bsc#1212848).
+- drm/amd/pm: revise the ASPM settings for thunderbolt attached
+ scenario (bsc#1212848).
+- drm/amdgpu: fix clearing mappings for BOs that are always
+ valid in VM (bsc#1212848).
+- drm/amdgpu: Skip mark offset for high priority rings
+ (bsc#1212848).
+- drm/amdgpu: make sure that BOs have a backing store
+ (bsc#1212848).
+- drm/amdgpu: make sure BOs are locked in amdgpu_vm_get_memory
+ (bsc#1212848).
+- commit a695138
+
+-------------------------------------------------------------------
+Mon Jul 3 08:14:09 CEST 2023 - msucha...@suse.de
+
+- Remove more packaging cruft for SLE < 12 SP3
+- commit a16781c
+
+-------------------------------------------------------------------
+Mon Jul 3 07:30:04 CEST 2023 - jsl...@suse.cz
+
+- Linux 6.4.1 (bsc#1012628).
+- x86/microcode/AMD: Load late on both threads too (bsc#1012628).
+- x86/smp: Make stop_other_cpus() more robust (bsc#1012628).
+- x86/smp: Dont access non-existing CPUID leaf (bsc#1012628).
+- x86/smp: Remove pointless wmb()s from native_stop_other_cpus()
+ (bsc#1012628).
+- x86/smp: Use dedicated cache-line for mwait_play_dead()
+ (bsc#1012628).
+- x86/smp: Cure kexec() vs. mwait_play_dead() breakage
+ (bsc#1012628).
+- cpufreq: amd-pstate: Make amd-pstate EPP driver name hyphenated
+ (bsc#1012628).
+- can: isotp: isotp_sendmsg(): fix return error fix on TX path
+ (bsc#1012628).
+- maple_tree: fix potential out-of-bounds access in
+ mas_wr_end_piv() (bsc#1012628).
+- mm: introduce new 'lock_mm_and_find_vma()' page fault helper
+ (bsc#1012628).
+- mm: make the page fault mmap locking killable (bsc#1012628).
+- arm64/mm: Convert to using lock_mm_and_find_vma() (bsc#1012628).
+- powerpc/mm: Convert to using lock_mm_and_find_vma()
+ (bsc#1012628).
+- mips/mm: Convert to using lock_mm_and_find_vma() (bsc#1012628).
+- riscv/mm: Convert to using lock_mm_and_find_vma() (bsc#1012628).
+- arm/mm: Convert to using lock_mm_and_find_vma() (bsc#1012628).
+- mm/fault: convert remaining simple cases to
+ lock_mm_and_find_vma() (bsc#1012628).
+- powerpc/mm: convert coprocessor fault to lock_mm_and_find_vma()
+ (bsc#1012628).
+- mm: make find_extend_vma() fail if write lock not held
+ (bsc#1012628).
+- execve: expand new process stack manually ahead of time
+ (bsc#1012628).
+- mm: always expand the stack with the mmap write lock held
+ (bsc#1012628).
+- HID: wacom: Use ktime_t rather than int when dealing with
+ timestamps (bsc#1012628).
+- gup: add warning if some caller would seem to want stack
+ expansion (bsc#1012628).
+- mm/khugepaged: fix regression in collapse_file() (bsc#1012628).
+- fbdev: fix potential OOB read in fast_imageblit() (bsc#1012628).
+- HID: hidraw: fix data race on device refcount (bsc#1012628).
+- HID: logitech-hidpp: add HIDPP_QUIRK_DELAYED_INIT for the T651
+ (bsc#1012628).
+- Revert "thermal/drivers/mediatek: Use devm_of_iomap to avoid
+ resource leak in mtk_thermal_probe" (bsc#1012628).
+- sparc32: fix lock_mm_and_find_vma() conversion (bsc#1012628).
+- parisc: fix expand_stack() conversion (bsc#1012628).
+- csky: fix up lock_mm_and_find_vma() conversion (bsc#1012628).
+- xtensa: fix NOMMU build with lock_mm_and_find_vma() conversion
+ (bsc#1012628).
+- Refresh
+ patches.suse/Revert-x86-mm-try-VMA-lock-based-page-fault-handling.patch.
+- Update config files (CONFIG_LOCK_MM_AND_FIND_VMA=y).
+ There is no choice.
+- commit eb53035
+
+-------------------------------------------------------------------
+Fri Jun 30 21:46:24 CEST 2023 - msucha...@suse.de
+
+- Refresh
patches.rpmify/usrmerge-Adjust-module-path-in-the-kernel-sources.patch.
+ Get module prefix from kmod (bsc#1212835).
+ Uses jq to parse 'kmod config' output.
+- Refresh
patches.rpmify/usrmerge-Adjust-module-path-in-the-kernel-sources.patch.
+ Get module prefix from kmod (bsc#1212835).
+- commit 75e1d32
++++ 338 more lines (skipped)
++++ between /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes
++++ and /work/SRC/openSUSE:Factory/.kernel-source.new.8922/dtb-aarch64.changes
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
Old:
----
linux-6.3.tar.sign
linux-6.3.tar.xz
New:
----
linux-6.4.tar.sign
linux-6.4.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dtb-aarch64.spec ++++++
--- /var/tmp/diff_new_pack.6xIXCv/_old 2023-07-11 15:57:00.997071313 +0200
+++ /var/tmp/diff_new_pack.6xIXCv/_new 2023-07-11 15:57:01.005071359 +0200
@@ -16,22 +16,18 @@
#
-%define srcversion 6.3
-%define patchversion 6.3.9
+%define srcversion 6.4
+%define patchversion 6.4.2
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
-%if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 &&
0%{?sle_version} >= 120300 )
-%define dtc_symbols 1
-%endif
-
%(chmod +x
%_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb,check-module-license,klp-symbols,splitflist,mergedep,moddep,modflist,kernel-subpackage-build})
Name: dtb-aarch64
-Version: 6.3.9
+Version: 6.4.2
%if 0%{?is_kotd}
-Release: <RELEASE>.g0df701d
+Release: <RELEASE>.gb97b894
%else
Release: 0
%endif
@@ -41,11 +37,7 @@
URL: https://www.kernel.org/
ExclusiveArch: aarch64
BuildRequires: cpp
-%if 0%{?dtc_symbols}
BuildRequires: dtc >= 1.4.3
-%else
-BuildRequires: dtc >= 1.4.0
-%endif
BuildRequires: xz
Requires: kernel = %version
Source0:
https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
@@ -420,9 +412,7 @@
mkdir pp
PPDIR=$PWD/pp
export DTC_FLAGS="-R 4 -p 0x1000"
-%if 0%{?dtc_symbols}
DTC_FLAGS="$DTC_FLAGS -@"
-%endif
cd $source/arch/arm64/boot/dts
for dts in allwinner/*.dts altera/*.dts amazon/*.dts amd/*.dts amlogic/*.dts
apm/*.dts apple/*.dts arm/*.dts broadcom/*.dts cavium/*.dts exynos/*.dts
freescale/*.dts hisilicon/*.dts lg/*.dts marvell/*.dts mediatek/*.dts
nvidia/*.dts qcom/*.dts renesas/*.dts rockchip/*.dts socionext/*.dts sprd/*.dts
xilinx/*.dts ; do
++++++ dtb-armv6l.spec ++++++
--- /var/tmp/diff_new_pack.6xIXCv/_old 2023-07-11 15:57:01.025071476 +0200
+++ /var/tmp/diff_new_pack.6xIXCv/_new 2023-07-11 15:57:01.033071522 +0200
@@ -16,22 +16,18 @@
#
-%define srcversion 6.3
-%define patchversion 6.3.9
+%define srcversion 6.4
+%define patchversion 6.4.2
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
-%if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 &&
0%{?sle_version} >= 120300 )
-%define dtc_symbols 1
-%endif
-
%(chmod +x
%_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb,check-module-license,klp-symbols,splitflist,mergedep,moddep,modflist,kernel-subpackage-build})
Name: dtb-armv6l
-Version: 6.3.9
+Version: 6.4.2
%if 0%{?is_kotd}
-Release: <RELEASE>.g0df701d
+Release: <RELEASE>.gb97b894
%else
Release: 0
%endif
@@ -41,11 +37,7 @@
URL: https://www.kernel.org/
ExclusiveArch: armv6l armv6hl
BuildRequires: cpp
-%if 0%{?dtc_symbols}
BuildRequires: dtc >= 1.4.3
-%else
-BuildRequires: dtc >= 1.4.0
-%endif
BuildRequires: xz
Requires: kernel = %version
Source0:
https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
@@ -216,9 +208,7 @@
mkdir pp
PPDIR=$PWD/pp
export DTC_FLAGS="-R 4 -p 0x1000"
-%if 0%{?dtc_symbols}
DTC_FLAGS="$DTC_FLAGS -@"
-%endif
cd $source/arch/arm/boot/dts
for dts in bcm2835*.dts ; do
++++++ dtb-armv7l.spec ++++++
--- /var/tmp/diff_new_pack.6xIXCv/_old 2023-07-11 15:57:01.065071708 +0200
+++ /var/tmp/diff_new_pack.6xIXCv/_new 2023-07-11 15:57:01.069071732 +0200
@@ -16,22 +16,18 @@
#
-%define srcversion 6.3
-%define patchversion 6.3.9
+%define srcversion 6.4
+%define patchversion 6.4.2
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
-%if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 &&
0%{?sle_version} >= 120300 )
-%define dtc_symbols 1
-%endif
-
%(chmod +x
%_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb,check-module-license,klp-symbols,splitflist,mergedep,moddep,modflist,kernel-subpackage-build})
Name: dtb-armv7l
-Version: 6.3.9
+Version: 6.4.2
%if 0%{?is_kotd}
-Release: <RELEASE>.g0df701d
+Release: <RELEASE>.gb97b894
%else
Release: 0
%endif
@@ -41,11 +37,7 @@
URL: https://www.kernel.org/
ExclusiveArch: armv7l armv7hl
BuildRequires: cpp
-%if 0%{?dtc_symbols}
BuildRequires: dtc >= 1.4.3
-%else
-BuildRequires: dtc >= 1.4.0
-%endif
BuildRequires: xz
Requires: kernel = %version
Source0:
https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
@@ -596,9 +588,7 @@
mkdir pp
PPDIR=$PWD/pp
export DTC_FLAGS="-R 4 -p 0x1000"
-%if 0%{?dtc_symbols}
DTC_FLAGS="$DTC_FLAGS -@"
-%endif
cd $source/arch/arm/boot/dts
for dts in am335x-*.dts am3517*.dts am57xx-*.dts armada-370-*.dts
armada-375-*.dts armada-385-*.dts armada-388-*.dts armada-398-*.dts
armada-xp-*.dts bcm2836*.dts dove-*.dts exynos4*.dts exynos5*.dts imx5*.dts
imx6*.dts imx7*.dts keystone-*.dts meson6-*.dts meson8-*.dts meson8b-*.dts
mt76*.dts omap3*.dts omap4*.dts omap5*.dts qcom-*.dts rk3*.dts socfpga_*.dts
ste-*.dts sun4i-*.dts sun5i-*.dts sun6i-*.dts sun7i-*.dts sun8i-*.dts
sun9i-*.dts tegra20-*.dts tegra30-*.dts tegra114-*.dts tegra124-*.dts
vexpress-*.dts vf500-*.dts vf610-*.dts xenvm-*.dts zynq-*.dts ; do
++++++ dtb-riscv64.spec ++++++
--- /var/tmp/diff_new_pack.6xIXCv/_old 2023-07-11 15:57:01.093071871 +0200
+++ /var/tmp/diff_new_pack.6xIXCv/_new 2023-07-11 15:57:01.097071895 +0200
@@ -16,22 +16,18 @@
#
-%define srcversion 6.3
-%define patchversion 6.3.9
+%define srcversion 6.4
+%define patchversion 6.4.2
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
-%if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 &&
0%{?sle_version} >= 120300 )
-%define dtc_symbols 1
-%endif
-
%(chmod +x
%_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb,check-module-license,klp-symbols,splitflist,mergedep,moddep,modflist,kernel-subpackage-build})
Name: dtb-riscv64
-Version: 6.3.9
+Version: 6.4.2
%if 0%{?is_kotd}
-Release: <RELEASE>.g0df701d
+Release: <RELEASE>.gb97b894
%else
Release: 0
%endif
@@ -41,11 +37,7 @@
URL: https://www.kernel.org/
ExclusiveArch: riscv64
BuildRequires: cpp
-%if 0%{?dtc_symbols}
BuildRequires: dtc >= 1.4.3
-%else
-BuildRequires: dtc >= 1.4.0
-%endif
BuildRequires: xz
Requires: kernel = %version
Source0:
https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
@@ -243,9 +235,7 @@
mkdir pp
PPDIR=$PWD/pp
export DTC_FLAGS="-R 4 -p 0x1000"
-%if 0%{?dtc_symbols}
DTC_FLAGS="$DTC_FLAGS -@"
-%endif
cd $source/arch/riscv/boot/dts
for dts in microchip/*.dts renesas/*.dts sifive/*.dts starfive/*.dts ; do
++++++ kernel-64kb.spec ++++++
--- /var/tmp/diff_new_pack.6xIXCv/_old 2023-07-11 15:57:01.133072104 +0200
+++ /var/tmp/diff_new_pack.6xIXCv/_new 2023-07-11 15:57:01.133072104 +0200
@@ -17,8 +17,8 @@
# needssslcertforbuild
-%define srcversion 6.3
-%define patchversion 6.3.9
+%define srcversion 6.4
+%define patchversion 6.4.2
%define variant %{nil}
%define compress_modules zstd
%define compress_vmlinux xz
@@ -112,9 +112,9 @@
Summary: Kernel with 64kb PAGE_SIZE
License: GPL-2.0-only
Group: System/Kernel
-Version: 6.3.9
+Version: 6.4.2
%if 0%{?is_kotd}
-Release: <RELEASE>.g0df701d
+Release: <RELEASE>.gb97b894
%else
Release: 0
%endif
@@ -134,8 +134,9 @@
BuildRequires: gcc-c++
BuildRequires: gcc-devel
%endif
-%if 0%{?suse_version} > 1310
BuildRequires: hmaccalc
+%if 0%{?suse_version} > 1500
+BuildRequires: jq
%endif
BuildRequires: libopenssl-devel
BuildRequires: modutils
@@ -244,10 +245,10 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides:
kernel-%build_flavor-base-srchash-0df701dd2c208f4843cf219b4b26b533ada9bd34
-Provides: kernel-srchash-0df701dd2c208f4843cf219b4b26b533ada9bd34
+Provides:
kernel-%build_flavor-base-srchash-b97b89494481f3409297e494e466bdd42b1311ab
+Provides: kernel-srchash-b97b89494481f3409297e494e466bdd42b1311ab
# END COMMON DEPS
-Provides: %name-srchash-0df701dd2c208f4843cf219b4b26b533ada9bd34
+Provides: %name-srchash-b97b89494481f3409297e494e466bdd42b1311ab
%obsolete_rebuilds %name
Source0:
https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
Source3: kernel-source.rpmlintrc
@@ -505,10 +506,6 @@
--vanilla \
%endif
%_sourcedir/series.conf .. $SYMBOLS
-%if 0%{?usrmerged}
-# fix MODLIB so kmps install to /usr
-sed -ie 's,/lib/modules/,%{kernel_module_directory}/,' Makefile
scripts/depmod.sh
-%endif
cd %kernel_build_dir
@@ -1349,8 +1346,8 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides:
kernel-%build_flavor-base-srchash-0df701dd2c208f4843cf219b4b26b533ada9bd34
-Provides: kernel-srchash-0df701dd2c208f4843cf219b4b26b533ada9bd34
+Provides:
kernel-%build_flavor-base-srchash-b97b89494481f3409297e494e466bdd42b1311ab
+Provides: kernel-srchash-b97b89494481f3409297e494e466bdd42b1311ab
%obsolete_rebuilds %name-base
%ifarch %ix86
@@ -1583,6 +1580,9 @@
Recommends: make
Recommends: gcc
Recommends: perl
+%if 0%{?suse_version} > 1500
+Requires: jq
+%endif
# for objtool
Requires: libelf-devel
Supplements: packageand(%name:kernel-devel%variant)
++++++ kernel-debug.spec ++++++
--- /var/tmp/diff_new_pack.6xIXCv/_old 2023-07-11 15:57:01.169072313 +0200
+++ /var/tmp/diff_new_pack.6xIXCv/_new 2023-07-11 15:57:01.173072337 +0200
@@ -17,8 +17,8 @@
# needssslcertforbuild
-%define srcversion 6.3
-%define patchversion 6.3.9
+%define srcversion 6.4
+%define patchversion 6.4.2
%define variant %{nil}
%define compress_modules zstd
%define compress_vmlinux xz
@@ -112,9 +112,9 @@
Summary: A Debug Version of the Kernel
License: GPL-2.0-only
Group: System/Kernel
-Version: 6.3.9
+Version: 6.4.2
%if 0%{?is_kotd}
-Release: <RELEASE>.g0df701d
+Release: <RELEASE>.gb97b894
%else
Release: 0
%endif
@@ -134,8 +134,9 @@
BuildRequires: gcc-c++
BuildRequires: gcc-devel
%endif
-%if 0%{?suse_version} > 1310
BuildRequires: hmaccalc
+%if 0%{?suse_version} > 1500
+BuildRequires: jq
%endif
BuildRequires: libopenssl-devel
BuildRequires: modutils
@@ -244,10 +245,10 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides:
kernel-%build_flavor-base-srchash-0df701dd2c208f4843cf219b4b26b533ada9bd34
-Provides: kernel-srchash-0df701dd2c208f4843cf219b4b26b533ada9bd34
+Provides:
kernel-%build_flavor-base-srchash-b97b89494481f3409297e494e466bdd42b1311ab
+Provides: kernel-srchash-b97b89494481f3409297e494e466bdd42b1311ab
# END COMMON DEPS
-Provides: %name-srchash-0df701dd2c208f4843cf219b4b26b533ada9bd34
+Provides: %name-srchash-b97b89494481f3409297e494e466bdd42b1311ab
%ifarch ppc64
Provides: kernel-kdump = 2.6.28
Obsoletes: kernel-kdump <= 2.6.28
@@ -511,10 +512,6 @@
--vanilla \
%endif
%_sourcedir/series.conf .. $SYMBOLS
-%if 0%{?usrmerged}
-# fix MODLIB so kmps install to /usr
-sed -ie 's,/lib/modules/,%{kernel_module_directory}/,' Makefile
scripts/depmod.sh
-%endif
cd %kernel_build_dir
@@ -1355,8 +1352,8 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides:
kernel-%build_flavor-base-srchash-0df701dd2c208f4843cf219b4b26b533ada9bd34
-Provides: kernel-srchash-0df701dd2c208f4843cf219b4b26b533ada9bd34
+Provides:
kernel-%build_flavor-base-srchash-b97b89494481f3409297e494e466bdd42b1311ab
+Provides: kernel-srchash-b97b89494481f3409297e494e466bdd42b1311ab
%ifarch ppc64
Provides: kernel-kdump-base = 2.6.28
@@ -1595,6 +1592,9 @@
Recommends: make
Recommends: gcc
Recommends: perl
+%if 0%{?suse_version} > 1500
+Requires: jq
+%endif
# for objtool
Requires: libelf-devel
Supplements: packageand(%name:kernel-devel%variant)
++++++ kernel-default.spec ++++++
--- /var/tmp/diff_new_pack.6xIXCv/_old 2023-07-11 15:57:01.201072499 +0200
+++ /var/tmp/diff_new_pack.6xIXCv/_new 2023-07-11 15:57:01.213072570 +0200
@@ -17,8 +17,8 @@
# needssslcertforbuild
-%define srcversion 6.3
-%define patchversion 6.3.9
+%define srcversion 6.4
+%define patchversion 6.4.2
%define variant %{nil}
%define compress_modules zstd
%define compress_vmlinux xz
@@ -112,9 +112,9 @@
Summary: The Standard Kernel
License: GPL-2.0-only
Group: System/Kernel
-Version: 6.3.9
+Version: 6.4.2
%if 0%{?is_kotd}
-Release: <RELEASE>.g0df701d
+Release: <RELEASE>.gb97b894
%else
Release: 0
%endif
@@ -134,8 +134,9 @@
BuildRequires: gcc-c++
BuildRequires: gcc-devel
%endif
-%if 0%{?suse_version} > 1310
BuildRequires: hmaccalc
+%if 0%{?suse_version} > 1500
+BuildRequires: jq
%endif
BuildRequires: libopenssl-devel
BuildRequires: modutils
@@ -244,10 +245,10 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides:
kernel-%build_flavor-base-srchash-0df701dd2c208f4843cf219b4b26b533ada9bd34
-Provides: kernel-srchash-0df701dd2c208f4843cf219b4b26b533ada9bd34
+Provides:
kernel-%build_flavor-base-srchash-b97b89494481f3409297e494e466bdd42b1311ab
+Provides: kernel-srchash-b97b89494481f3409297e494e466bdd42b1311ab
# END COMMON DEPS
-Provides: %name-srchash-0df701dd2c208f4843cf219b4b26b533ada9bd34
+Provides: %name-srchash-b97b89494481f3409297e494e466bdd42b1311ab
%ifarch %ix86
Provides: kernel-smp = 2.6.17
Obsoletes: kernel-smp <= 2.6.17
@@ -554,10 +555,6 @@
--vanilla \
%endif
%_sourcedir/series.conf .. $SYMBOLS
-%if 0%{?usrmerged}
-# fix MODLIB so kmps install to /usr
-sed -ie 's,/lib/modules/,%{kernel_module_directory}/,' Makefile
scripts/depmod.sh
-%endif
cd %kernel_build_dir
@@ -1398,8 +1395,8 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides:
kernel-%build_flavor-base-srchash-0df701dd2c208f4843cf219b4b26b533ada9bd34
-Provides: kernel-srchash-0df701dd2c208f4843cf219b4b26b533ada9bd34
+Provides:
kernel-%build_flavor-base-srchash-b97b89494481f3409297e494e466bdd42b1311ab
+Provides: kernel-srchash-b97b89494481f3409297e494e466bdd42b1311ab
%ifarch %ix86
Provides: kernel-trace-base = 3.13
@@ -1695,6 +1692,9 @@
Recommends: make
Recommends: gcc
Recommends: perl
+%if 0%{?suse_version} > 1500
+Requires: jq
+%endif
# for objtool
Requires: libelf-devel
Supplements: packageand(%name:kernel-devel%variant)
++++++ kernel-docs.spec ++++++
--- /var/tmp/diff_new_pack.6xIXCv/_old 2023-07-11 15:57:01.237072709 +0200
+++ /var/tmp/diff_new_pack.6xIXCv/_new 2023-07-11 15:57:01.241072732 +0200
@@ -16,8 +16,8 @@
#
-%define srcversion 6.3
-%define patchversion 6.3.9
+%define srcversion 6.4
+%define patchversion 6.4.2
%define variant %{nil}
%define build_html 1
%define build_pdf 0
@@ -30,9 +30,9 @@
Summary: Kernel Documentation
License: GPL-2.0-only
Group: Documentation/Man
-Version: 6.3.9
+Version: 6.4.2
%if 0%{?is_kotd}
-Release: <RELEASE>.g0df701d
+Release: <RELEASE>.gb97b894
%else
Release: 0
%endif
@@ -59,6 +59,7 @@
BuildRequires: python-six
BuildRequires: python-Sphinx
%else
+BuildRequires: python3-base
BuildRequires: python3-Sphinx < 3
%endif
%endif
@@ -67,6 +68,7 @@
%if 0%{?suse_version} && 0%{?suse_version} < 1500
BuildRequires: python-Sphinx-latex
%else
+BuildRequires: python3-base
BuildRequires: python3-Sphinx-latex
%endif
BuildRequires: texlive-adjustbox
@@ -81,7 +83,7 @@
%endif
URL: https://www.kernel.org/
Provides: %name = %version-%source_rel
-Provides: %name-srchash-0df701dd2c208f4843cf219b4b26b533ada9bd34
+Provides: %name-srchash-b97b89494481f3409297e494e466bdd42b1311ab
BuildArch: noarch
Source0:
https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
Source3: kernel-source.rpmlintrc
@@ -262,7 +264,7 @@
%if %build_html
mkdir -p html
make %{?make_arg} O=$PWD/html \
-%if ! 0%{?suse_version} || 0%{?suse_version} > 1500
+%if ! 0%{?suse_version} || 0%{?suse_version} >= 1500
PYTHON=python3 \
%endif
htmldocs
@@ -270,7 +272,7 @@
%if %build_pdf
mkdir -p pdf
make %{?make_arg} O=$PWD/pdf \
-%if ! 0%{?suse_version} || 0%{?suse_version} > 1500
+%if ! 0%{?suse_version} || 0%{?suse_version} >= 1500
PYTHON=python3 \
%endif
pdfdocs
++++++ kernel-kvmsmall.spec ++++++
--- /var/tmp/diff_new_pack.6xIXCv/_old 2023-07-11 15:57:01.273072919 +0200
+++ /var/tmp/diff_new_pack.6xIXCv/_new 2023-07-11 15:57:01.281072965 +0200
@@ -17,8 +17,8 @@
# needssslcertforbuild
-%define srcversion 6.3
-%define patchversion 6.3.9
+%define srcversion 6.4
+%define patchversion 6.4.2
%define variant %{nil}
%define compress_modules zstd
%define compress_vmlinux xz
@@ -112,9 +112,9 @@
Summary: The Small Developer Kernel for KVM
License: GPL-2.0-only
Group: System/Kernel
-Version: 6.3.9
+Version: 6.4.2
%if 0%{?is_kotd}
-Release: <RELEASE>.g0df701d
+Release: <RELEASE>.gb97b894
%else
Release: 0
%endif
@@ -134,8 +134,9 @@
BuildRequires: gcc-c++
BuildRequires: gcc-devel
%endif
-%if 0%{?suse_version} > 1310
BuildRequires: hmaccalc
+%if 0%{?suse_version} > 1500
+BuildRequires: jq
%endif
BuildRequires: libopenssl-devel
BuildRequires: modutils
@@ -244,10 +245,10 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides:
kernel-%build_flavor-base-srchash-0df701dd2c208f4843cf219b4b26b533ada9bd34
-Provides: kernel-srchash-0df701dd2c208f4843cf219b4b26b533ada9bd34
+Provides:
kernel-%build_flavor-base-srchash-b97b89494481f3409297e494e466bdd42b1311ab
+Provides: kernel-srchash-b97b89494481f3409297e494e466bdd42b1311ab
# END COMMON DEPS
-Provides: %name-srchash-0df701dd2c208f4843cf219b4b26b533ada9bd34
+Provides: %name-srchash-b97b89494481f3409297e494e466bdd42b1311ab
%obsolete_rebuilds %name
Source0:
https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
Source3: kernel-source.rpmlintrc
@@ -509,10 +510,6 @@
--vanilla \
%endif
%_sourcedir/series.conf .. $SYMBOLS
-%if 0%{?usrmerged}
-# fix MODLIB so kmps install to /usr
-sed -ie 's,/lib/modules/,%{kernel_module_directory}/,' Makefile
scripts/depmod.sh
-%endif
cd %kernel_build_dir
@@ -1353,8 +1350,8 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides:
kernel-%build_flavor-base-srchash-0df701dd2c208f4843cf219b4b26b533ada9bd34
-Provides: kernel-srchash-0df701dd2c208f4843cf219b4b26b533ada9bd34
+Provides:
kernel-%build_flavor-base-srchash-b97b89494481f3409297e494e466bdd42b1311ab
+Provides: kernel-srchash-b97b89494481f3409297e494e466bdd42b1311ab
%obsolete_rebuilds %name-base
%ifarch %ix86
@@ -1599,6 +1596,9 @@
Recommends: make
Recommends: gcc
Recommends: perl
+%if 0%{?suse_version} > 1500
+Requires: jq
+%endif
# for objtool
Requires: libelf-devel
Supplements: packageand(%name:kernel-devel%variant)
kernel-lpae.spec: same change
++++++ kernel-obs-build.spec ++++++
--- /var/tmp/diff_new_pack.6xIXCv/_old 2023-07-11 15:57:01.345073337 +0200
+++ /var/tmp/diff_new_pack.6xIXCv/_new 2023-07-11 15:57:01.349073361 +0200
@@ -19,7 +19,7 @@
#!BuildIgnore: post-build-checks
-%define patchversion 6.3.9
+%define patchversion 6.4.2
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -44,7 +44,7 @@
%endif
%endif
%endif
-BuildRequires:
kernel%kernel_flavor-srchash-0df701dd2c208f4843cf219b4b26b533ada9bd34
+BuildRequires:
kernel%kernel_flavor-srchash-b97b89494481f3409297e494e466bdd42b1311ab
%if 0%{?rhel_version}
BuildRequires: kernel
@@ -56,9 +56,9 @@
Summary: package kernel and initrd for OBS VM builds
License: GPL-2.0-only
Group: SLES
-Version: 6.3.9
+Version: 6.4.2
%if 0%{?is_kotd}
-Release: <RELEASE>.g0df701d
+Release: <RELEASE>.gb97b894
%else
Release: 0
%endif
@@ -156,10 +156,6 @@
# inform worker kernel parameters to invoke
CMDLINE="elevator=noop nmi_watchdog=0 rw"
-%if 0%{?suse_version} && 0%{?suse_version} < 1315
-# kvmclock has always been disabled for old kernels, keep it for historic
compatibility
-CMDLINE+=" no-kvmclock"
-%endif
echo "$CMDLINE" > %{buildroot}/.build.cmdline.kvm
# inform worker about availability of virtio-serial
++++++ kernel-obs-qa.spec ++++++
--- /var/tmp/diff_new_pack.6xIXCv/_old 2023-07-11 15:57:01.369073477 +0200
+++ /var/tmp/diff_new_pack.6xIXCv/_new 2023-07-11 15:57:01.373073500 +0200
@@ -17,7 +17,7 @@
# needsrootforbuild
-%define patchversion 6.3.9
+%define patchversion 6.4.2
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -32,9 +32,9 @@
Summary: Basic QA tests for the kernel
License: GPL-2.0-only
Group: SLES
-Version: 6.3.9
+Version: 6.4.2
%if 0%{?is_kotd}
-Release: <RELEASE>.g0df701d
+Release: <RELEASE>.gb97b894
%else
Release: 0
%endif
++++++ kernel-pae.spec ++++++
--- /var/tmp/diff_new_pack.6xIXCv/_old 2023-07-11 15:57:01.397073640 +0200
+++ /var/tmp/diff_new_pack.6xIXCv/_new 2023-07-11 15:57:01.405073686 +0200
@@ -17,8 +17,8 @@
# needssslcertforbuild
-%define srcversion 6.3
-%define patchversion 6.3.9
+%define srcversion 6.4
+%define patchversion 6.4.2
%define variant %{nil}
%define compress_modules zstd
%define compress_vmlinux xz
@@ -112,9 +112,9 @@
Summary: Kernel with PAE Support
License: GPL-2.0-only
Group: System/Kernel
-Version: 6.3.9
+Version: 6.4.2
%if 0%{?is_kotd}
-Release: <RELEASE>.g0df701d
+Release: <RELEASE>.gb97b894
%else
Release: 0
%endif
@@ -134,8 +134,9 @@
BuildRequires: gcc-c++
BuildRequires: gcc-devel
%endif
-%if 0%{?suse_version} > 1310
BuildRequires: hmaccalc
+%if 0%{?suse_version} > 1500
+BuildRequires: jq
%endif
BuildRequires: libopenssl-devel
BuildRequires: modutils
@@ -244,10 +245,10 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides:
kernel-%build_flavor-base-srchash-0df701dd2c208f4843cf219b4b26b533ada9bd34
-Provides: kernel-srchash-0df701dd2c208f4843cf219b4b26b533ada9bd34
+Provides:
kernel-%build_flavor-base-srchash-b97b89494481f3409297e494e466bdd42b1311ab
+Provides: kernel-srchash-b97b89494481f3409297e494e466bdd42b1311ab
# END COMMON DEPS
-Provides: %name-srchash-0df701dd2c208f4843cf219b4b26b533ada9bd34
+Provides: %name-srchash-b97b89494481f3409297e494e466bdd42b1311ab
%ifarch %ix86
Provides: kernel-bigsmp = 2.6.17
Obsoletes: kernel-bigsmp <= 2.6.17
@@ -531,10 +532,6 @@
--vanilla \
%endif
%_sourcedir/series.conf .. $SYMBOLS
-%if 0%{?usrmerged}
-# fix MODLIB so kmps install to /usr
-sed -ie 's,/lib/modules/,%{kernel_module_directory}/,' Makefile
scripts/depmod.sh
-%endif
cd %kernel_build_dir
@@ -1375,8 +1372,8 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides:
kernel-%build_flavor-base-srchash-0df701dd2c208f4843cf219b4b26b533ada9bd34
-Provides: kernel-srchash-0df701dd2c208f4843cf219b4b26b533ada9bd34
+Provides:
kernel-%build_flavor-base-srchash-b97b89494481f3409297e494e466bdd42b1311ab
+Provides: kernel-srchash-b97b89494481f3409297e494e466bdd42b1311ab
%ifarch %ix86
Provides: kernel-vmi-base = 2.6.38
@@ -1651,6 +1648,9 @@
Recommends: make
Recommends: gcc
Recommends: perl
+%if 0%{?suse_version} > 1500
+Requires: jq
+%endif
# for objtool
Requires: libelf-devel
Supplements: packageand(%name:kernel-devel%variant)
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.6xIXCv/_old 2023-07-11 15:57:01.429073826 +0200
+++ /var/tmp/diff_new_pack.6xIXCv/_new 2023-07-11 15:57:01.437073872 +0200
@@ -16,8 +16,8 @@
#
-%define srcversion 6.3
-%define patchversion 6.3.9
+%define srcversion 6.4
+%define patchversion 6.4.2
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -30,9 +30,9 @@
%endif
Name: kernel-source
-Version: 6.3.9
+Version: 6.4.2
%if 0%{?is_kotd}
-Release: <RELEASE>.g0df701d
+Release: <RELEASE>.gb97b894
%else
Release: 0
%endif
@@ -49,7 +49,7 @@
BuildRequires: sed
Requires(post): coreutils sed
Provides: %name = %version-%source_rel
-Provides: %name-srchash-0df701dd2c208f4843cf219b4b26b533ada9bd34
+Provides: %name-srchash-b97b89494481f3409297e494e466bdd42b1311ab
Provides: linux
Provides: multiversion(kernel)
Source0:
https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
@@ -134,6 +134,9 @@
Recommends: bison
Recommends: flex
Recommends: libelf-devel
+%if 0%{?suse_version} > 1500
+Recommends: jq
+%endif
Recommends: openssl-devel
# pahole needed for BTF
%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150300
@@ -233,10 +236,6 @@
cd linux-%kernelrelease-vanilla
%_sourcedir/apply-patches --vanilla %_sourcedir/series.conf %my_builddir
%symbols
rm -f $(find . -name ".gitignore")
-%if 0%{?usrmerged}
-# fix MODLIB so kmps install to /usr
-sed -ie 's,/lib/modules/,%{kernel_module_directory}/,' Makefile
scripts/depmod.sh
-%endif
# Hardlink duplicate files automatically (from package fdupes).
%fdupes $PWD
cd ..
@@ -249,10 +248,6 @@
if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
-%if 0%{?usrmerged}
-# fix MODLIB so kmps install to /usr
-sed -ie 's,/lib/modules/,%{kernel_module_directory}/,' Makefile
scripts/depmod.sh
-%endif
# Hardlink duplicate files automatically (from package fdupes).
%fdupes $PWD
cd ..
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.6xIXCv/_old 2023-07-11 15:57:01.493074198 +0200
+++ /var/tmp/diff_new_pack.6xIXCv/_new 2023-07-11 15:57:01.501074245 +0200
@@ -24,10 +24,10 @@
Summary: Kernel Symbol Versions (modversions)
License: GPL-2.0-only
Group: Development/Sources
-Version: 6.3.9
+Version: 6.4.2
%if %using_buildservice
%if 0%{?is_kotd}
-Release: <RELEASE>.g0df701d
+Release: <RELEASE>.gb97b894
%else
Release: 0
%endif
@@ -52,7 +52,7 @@
%endif
Requires: pesign-obs-integration
Provides: %name = %version-%source_rel
-Provides: %name-srchash-0df701dd2c208f4843cf219b4b26b533ada9bd34
+Provides: %name-srchash-b97b89494481f3409297e494e466bdd42b1311ab
Provides: multiversion(kernel)
Source: README.KSYMS
Requires: kernel-devel%variant = %version-%source_rel
++++++ kernel-vanilla.spec ++++++
--- /var/tmp/diff_new_pack.6xIXCv/_old 2023-07-11 15:57:01.529074408 +0200
+++ /var/tmp/diff_new_pack.6xIXCv/_new 2023-07-11 15:57:01.533074431 +0200
@@ -17,8 +17,8 @@
# needssslcertforbuild
-%define srcversion 6.3
-%define patchversion 6.3.9
+%define srcversion 6.4
+%define patchversion 6.4.2
%define variant %{nil}
%define compress_modules zstd
%define compress_vmlinux xz
@@ -112,9 +112,9 @@
Summary: The Standard Kernel - without any SUSE patches
License: GPL-2.0-only
Group: System/Kernel
-Version: 6.3.9
+Version: 6.4.2
%if 0%{?is_kotd}
-Release: <RELEASE>.g0df701d
+Release: <RELEASE>.gb97b894
%else
Release: 0
%endif
@@ -134,8 +134,9 @@
BuildRequires: gcc-c++
BuildRequires: gcc-devel
%endif
-%if 0%{?suse_version} > 1310
BuildRequires: hmaccalc
+%if 0%{?suse_version} > 1500
+BuildRequires: jq
%endif
BuildRequires: libopenssl-devel
BuildRequires: modutils
@@ -244,10 +245,10 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides:
kernel-%build_flavor-base-srchash-0df701dd2c208f4843cf219b4b26b533ada9bd34
-Provides: kernel-srchash-0df701dd2c208f4843cf219b4b26b533ada9bd34
+Provides:
kernel-%build_flavor-base-srchash-b97b89494481f3409297e494e466bdd42b1311ab
+Provides: kernel-srchash-b97b89494481f3409297e494e466bdd42b1311ab
# END COMMON DEPS
-Provides: %name-srchash-0df701dd2c208f4843cf219b4b26b533ada9bd34
+Provides: %name-srchash-b97b89494481f3409297e494e466bdd42b1311ab
%obsolete_rebuilds %name
Source0:
https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
Source3: kernel-source.rpmlintrc
@@ -502,10 +503,6 @@
--vanilla \
%endif
%_sourcedir/series.conf .. $SYMBOLS
-%if 0%{?usrmerged}
-# fix MODLIB so kmps install to /usr
-sed -ie 's,/lib/modules/,%{kernel_module_directory}/,' Makefile
scripts/depmod.sh
-%endif
cd %kernel_build_dir
@@ -1346,8 +1343,8 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides:
kernel-%build_flavor-base-srchash-0df701dd2c208f4843cf219b4b26b533ada9bd34
-Provides: kernel-srchash-0df701dd2c208f4843cf219b4b26b533ada9bd34
+Provides:
kernel-%build_flavor-base-srchash-b97b89494481f3409297e494e466bdd42b1311ab
+Provides: kernel-srchash-b97b89494481f3409297e494e466bdd42b1311ab
%obsolete_rebuilds %name-base
%ifarch %ix86
@@ -1571,6 +1568,9 @@
Recommends: make
Recommends: gcc
Recommends: perl
+%if 0%{?suse_version} > 1500
+Requires: jq
+%endif
# for objtool
Requires: libelf-devel
Supplements: packageand(%name:kernel-devel%variant)
kernel-zfcpdump.spec: same change
++++++ check-for-config-changes ++++++
--- /var/tmp/diff_new_pack.6xIXCv/_old 2023-07-11 15:57:01.717075501 +0200
+++ /var/tmp/diff_new_pack.6xIXCv/_new 2023-07-11 15:57:01.721075525 +0200
@@ -16,6 +16,7 @@
'G*CC[0-9]*_NO_[A-Z_]*'
'HAVE_[A-Z]*_COMPILER'
'LD_VERSION'
+ 'PAHOLE_HAS_[A-Z0-9_]*'
'PAHOLE_VERSION'
'TOOLCHAIN_HAS_[A-Z_]*'
'TOOLCHAIN_NEEDS_[A-Z_]*'
++++++ config.sh ++++++
--- /var/tmp/diff_new_pack.6xIXCv/_old 2023-07-11 15:57:01.789075920 +0200
+++ /var/tmp/diff_new_pack.6xIXCv/_new 2023-07-11 15:57:01.793075943 +0200
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=6.3
+SRCVERSION=6.4
# variant of the kernel-source package, either empty or "-rt"
VARIANT=
# enable kernel module compression
++++++ config.tar.bz2 ++++++
++++ 8352 lines of diff (skipped)
++++++ dtb.spec.in.in ++++++
--- /var/tmp/diff_new_pack.6xIXCv/_old 2023-07-11 15:57:02.185078223 +0200
+++ /var/tmp/diff_new_pack.6xIXCv/_new 2023-07-11 15:57:02.189078247 +0200
@@ -22,10 +22,6 @@
%include %_sourcedir/kernel-spec-macros
-%if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 &&
0%{?sle_version} >= 120300 )
-%define dtc_symbols 1
-%endif
-
%(chmod +x %_sourcedir/{@SCRIPTS@})
Name: $NAME
@@ -41,11 +37,7 @@
URL: https://www.kernel.org/
$ARCH_RESTRICTIONS
BuildRequires: cpp
-%if 0%{?dtc_symbols}
BuildRequires: dtc >= 1.4.3
-%else
-BuildRequires: dtc >= 1.4.0
-%endif
BuildRequires: xz
Requires: kernel = %version
@SOURCES@
@@ -69,9 +61,7 @@
mkdir pp
PPDIR=$PWD/pp
export DTC_FLAGS="-R 4 -p 0x1000"
-%if 0%{?dtc_symbols}
DTC_FLAGS="$DTC_FLAGS -@"
-%endif
cd $source/$DTS_folder
for dts in $ALL_SUPPORTED_DTB; do
++++++ kernel-binary.spec.in ++++++
--- /var/tmp/diff_new_pack.6xIXCv/_old 2023-07-11 15:57:02.249078596 +0200
+++ /var/tmp/diff_new_pack.6xIXCv/_new 2023-07-11 15:57:02.253078619 +0200
@@ -134,8 +134,9 @@
BuildRequires: gcc-c++
BuildRequires: gcc-devel
%endif
-%if 0%{?suse_version} > 1310
BuildRequires: hmaccalc
+%if 0%{?suse_version} > 1500
+BuildRequires: jq
%endif
BuildRequires: libopenssl-devel
BuildRequires: modutils
@@ -366,10 +367,6 @@
--vanilla \
%endif
%_sourcedir/series.conf .. $SYMBOLS
-%if 0%{?usrmerged}
-# fix MODLIB so kmps install to /usr
-sed -ie 's,/lib/modules/,%{kernel_module_directory}/,' Makefile
scripts/depmod.sh
-%endif
cd %kernel_build_dir
@@ -1365,6 +1362,9 @@
Recommends: make
Recommends: gcc
Recommends: perl
+%if 0%{?suse_version} > 1500
+Requires: jq
+%endif
# for objtool
Requires: libelf-devel
Supplements: packageand(%name:kernel-devel%variant)
++++++ kernel-docs.spec.in ++++++
--- /var/tmp/diff_new_pack.6xIXCv/_old 2023-07-11 15:57:02.345079154 +0200
+++ /var/tmp/diff_new_pack.6xIXCv/_new 2023-07-11 15:57:02.349079178 +0200
@@ -59,6 +59,7 @@
BuildRequires: python-six
BuildRequires: python-Sphinx
%else
+BuildRequires: python3-base
BuildRequires: python3-Sphinx < 3
%endif
%endif
@@ -67,6 +68,7 @@
%if 0%{?suse_version} && 0%{?suse_version} < 1500
BuildRequires: python-Sphinx-latex
%else
+BuildRequires: python3-base
BuildRequires: python3-Sphinx-latex
%endif
BuildRequires: texlive-adjustbox
@@ -124,7 +126,7 @@
%if %build_html
mkdir -p html
make %{?make_arg} O=$PWD/html \
-%if ! 0%{?suse_version} || 0%{?suse_version} > 1500
+%if ! 0%{?suse_version} || 0%{?suse_version} >= 1500
PYTHON=python3 \
%endif
htmldocs
@@ -132,7 +134,7 @@
%if %build_pdf
mkdir -p pdf
make %{?make_arg} O=$PWD/pdf \
-%if ! 0%{?suse_version} || 0%{?suse_version} > 1500
+%if ! 0%{?suse_version} || 0%{?suse_version} >= 1500
PYTHON=python3 \
%endif
pdfdocs
++++++ kernel-obs-build.spec.in ++++++
--- /var/tmp/diff_new_pack.6xIXCv/_old 2023-07-11 15:57:02.393079434 +0200
+++ /var/tmp/diff_new_pack.6xIXCv/_new 2023-07-11 15:57:02.397079457 +0200
@@ -156,10 +156,6 @@
# inform worker kernel parameters to invoke
CMDLINE="elevator=noop nmi_watchdog=0 rw"
-%if 0%{?suse_version} && 0%{?suse_version} < 1315
-# kvmclock has always been disabled for old kernels, keep it for historic
compatibility
-CMDLINE+=" no-kvmclock"
-%endif
echo "$CMDLINE" > %{buildroot}/.build.cmdline.kvm
# inform worker about availability of virtio-serial
++++++ kernel-source.spec.in ++++++
--- /var/tmp/diff_new_pack.6xIXCv/_old 2023-07-11 15:57:02.453079783 +0200
+++ /var/tmp/diff_new_pack.6xIXCv/_new 2023-07-11 15:57:02.457079806 +0200
@@ -134,6 +134,9 @@
Recommends: bison
Recommends: flex
Recommends: libelf-devel
+%if 0%{?suse_version} > 1500
+Recommends: jq
+%endif
Recommends: openssl-devel
# pahole needed for BTF
%if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150300
@@ -233,10 +236,6 @@
cd linux-%kernelrelease-vanilla
%_sourcedir/apply-patches --vanilla %_sourcedir/series.conf %my_builddir
%symbols
rm -f $(find . -name ".gitignore")
-%if 0%{?usrmerged}
-# fix MODLIB so kmps install to /usr
-sed -ie 's,/lib/modules/,%{kernel_module_directory}/,' Makefile
scripts/depmod.sh
-%endif
# Hardlink duplicate files automatically (from package fdupes).
%fdupes $PWD
cd ..
@@ -249,10 +248,6 @@
if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
-%if 0%{?usrmerged}
-# fix MODLIB so kmps install to /usr
-sed -ie 's,/lib/modules/,%{kernel_module_directory}/,' Makefile
scripts/depmod.sh
-%endif
# Hardlink duplicate files automatically (from package fdupes).
%fdupes $PWD
cd ..
++++++ kernel-spec-macros ++++++
--- /var/tmp/diff_new_pack.6xIXCv/_old 2023-07-11 15:57:02.485079969 +0200
+++ /var/tmp/diff_new_pack.6xIXCv/_new 2023-07-11 15:57:02.501080062 +0200
@@ -84,5 +84,3 @@
} \
run_if_exists
-# vim: ft=spec
-
++++++ linux-6.3.tar.xz -> linux-6.4.tar.xz ++++++
/work/SRC/openSUSE:Factory/kernel-source/linux-6.3.tar.xz
/work/SRC/openSUSE:Factory/.kernel-source.new.8922/linux-6.4.tar.xz differ:
char 15, line 1
++++++ patches.kernel.org.tar.bz2 ++++++
++++ 201651 lines of diff (skipped)
++++++ patches.rpmify.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches.rpmify/usrmerge-Adjust-module-path-in-the-kernel-sources.patch
new/patches.rpmify/usrmerge-Adjust-module-path-in-the-kernel-sources.patch
--- old/patches.rpmify/usrmerge-Adjust-module-path-in-the-kernel-sources.patch
1970-01-01 01:00:00.000000000 +0100
+++ new/patches.rpmify/usrmerge-Adjust-module-path-in-the-kernel-sources.patch
2023-07-06 10:58:11.000000000 +0200
@@ -0,0 +1,62 @@
+From 5e6b2a46d4342a6a0ac2f2a3235666154f74d0f8 Mon Sep 17 00:00:00 2001
+From: Michal Suchanek <msucha...@suse.de>
+Date: Thu, 29 Jun 2023 17:47:16 +0200
+Subject: [PATCH] usrmerge: Adjust module path in the kernel sources.
+
+References: bsc#1212835
+Patch-mainline: not yet, to get throuhg more testing
+
+Get the module path prefix from patched kmod output.
+
+On systems with unpatched kmod the prefix correctly resolves to empty
+string.
+
+Signed-off-by: Michal Suchanek <msucha...@suse.de>
+---
+ Makefile | 4 +++-
+ scripts/depmod.sh | 8 ++++----
+ 2 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 1dc91aa36c1f..d702e7a637c6 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1166,7 +1166,9 @@ export INSTALL_DTBS_PATH ?=
$(INSTALL_PATH)/dtbs/$(KERNELRELEASE)
+ # makefile but the argument can be passed to make if needed.
+ #
+
+-MODLIB = $(INSTALL_MOD_PATH)/lib/modules/$(KERNELRELEASE)
++export KERNEL_MODULE_PREFIX := $(shell kmod config | jq -r .module_prefix)
++
++MODLIB =
$(INSTALL_MOD_PATH)$(KERNEL_MODULE_PREFIX)/lib/modules/$(KERNELRELEASE)
+ export MODLIB
+
+ PHONY += prepare0
+diff --git a/scripts/depmod.sh b/scripts/depmod.sh
+index 3643b4f896ed..88ac79056153 100755
+--- a/scripts/depmod.sh
++++ b/scripts/depmod.sh
+@@ -27,16 +27,16 @@ fi
+ # numbers, so we cheat with a symlink here
+ depmod_hack_needed=true
+ tmp_dir=$(mktemp -d ${TMPDIR:-/tmp}/depmod.XXXXXX)
+-mkdir -p "$tmp_dir/lib/modules/$KERNELRELEASE"
++mkdir -p "$tmp_dir$KERNEL_MODULE_PREFIX/lib/modules/$KERNELRELEASE"
+ if "$DEPMOD" -b "$tmp_dir" $KERNELRELEASE 2>/dev/null; then
+- if test -e "$tmp_dir/lib/modules/$KERNELRELEASE/modules.dep" -o \
+- -e "$tmp_dir/lib/modules/$KERNELRELEASE/modules.dep.bin"; then
++ if test -e
"$tmp_dir$KERNEL_MODULE_PREFIX/lib/modules/$KERNELRELEASE/modules.dep" -o \
++ -e
"$tmp_dir$KERNEL_MODULE_PREFIX/lib/modules/$KERNELRELEASE/modules.dep.bin"; then
+ depmod_hack_needed=false
+ fi
+ fi
+ rm -rf "$tmp_dir"
+ if $depmod_hack_needed; then
+- symlink="$INSTALL_MOD_PATH/lib/modules/99.98.$KERNELRELEASE"
++
symlink="$INSTALL_MOD_PATH$KERNEL_MODULE_PREFIX/lib/modules/99.98.$KERNELRELEASE"
+ ln -s "$KERNELRELEASE" "$symlink"
+ KERNELRELEASE=99.98.$KERNELRELEASE
+ fi
+--
+2.41.0
+
++++++ patches.suse.tar.bz2 ++++++
++++ 5538 lines of diff (skipped)
++++++ series.conf ++++++
++++ 2251 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/kernel-source/series.conf
++++ and /work/SRC/openSUSE:Factory/.kernel-source.new.8922/series.conf
++++++ source-timestamp ++++++
--- /var/tmp/diff_new_pack.6xIXCv/_old 2023-07-11 15:57:03.621086577 +0200
+++ /var/tmp/diff_new_pack.6xIXCv/_new 2023-07-11 15:57:03.625086600 +0200
@@ -1,4 +1,4 @@
-2023-06-22 03:53:43 +0000
-GIT Revision: 0df701dd2c208f4843cf219b4b26b533ada9bd34
+2023-07-10 10:03:25 +0000
+GIT Revision: b97b89494481f3409297e494e466bdd42b1311ab
GIT Branch: stable
