Hello community,
here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2019-09-02 13:18:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kernel-source (Old)
and /work/SRC/openSUSE:Factory/.kernel-source.new.7948 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kernel-source"
Mon Sep 2 13:18:07 2019 rev:503 rq:727147 version:5.2.11
Changes:
--------
--- /work/SRC/openSUSE:Factory/kernel-source/kernel-64kb.changes 2019-08-27 10:11:07.939980544 +0200
+++ /work/SRC/openSUSE:Factory/.kernel-source.new.7948/kernel-64kb.changes 2019-09-02 13:18:18.237385141 +0200
@@ -1,0 +2,331 @@
+Thu Aug 29 08:41:19 CEST 2019 - jslaby@suse.cz
+
+- Linux 5.2.11 (bnc#1012628).
+- ASoC: simple_card_utils.h: care NULL dai at
+ asoc_simple_debug_dai() (bnc#1012628).
+- ASoC: simple-card: fix an use-after-free in
+ simple_dai_link_of_dpcm() (bnc#1012628).
+- ASoC: simple-card: fix an use-after-free in
+ simple_for_each_link() (bnc#1012628).
+- ASoC: audio-graph-card: fix use-after-free in
+ graph_dai_link_of_dpcm() (bnc#1012628).
+- ASoC: audio-graph-card: fix an use-after-free in
+ graph_get_dai_id() (bnc#1012628).
+- ASoC: audio-graph-card: add missing const at graph_get_dai_id()
+ (bnc#1012628).
+- regulator: axp20x: fix DCDCA and DCDCD for AXP806 (bnc#1012628).
+- regulator: axp20x: fix DCDC5 and DCDC6 for AXP803 (bnc#1012628).
+- ASoC: samsung: odroid: fix an use-after-free issue for codec
+ (bnc#1012628).
+- ASoC: samsung: odroid: fix a double-free issue for cpu_dai
+ (bnc#1012628).
+- ASoC: Intel: bytcht_es8316: Add quirk for Irbis NB41 netbook
+ (bnc#1012628).
+- HID: logitech-hidpp: add USB PID for a few more supported mice
+ (bnc#1012628).
+- HID: Add 044f:b320 ThrustMaster, Inc. 2 in 1 DT (bnc#1012628).
+- MIPS: kernel: only use i8253 clocksource with periodic
+ clockevent (bnc#1012628).
+- mips: fix cacheinfo (bnc#1012628).
+- libbpf: sanitize VAR to conservative 1-byte INT (bnc#1012628).
+- netfilter: ebtables: fix a memory leak bug in compat
+ (bnc#1012628).
+- ASoC: dapm: Fix handling of custom_stop_condition on DAPM
+ graph walks (bnc#1012628).
+- ASoC: SOF: use __u32 instead of uint32_t in uapi headers
+ (bnc#1012628).
+- spi: pxa2xx: Balance runtime PM enable/disable on error
+ (bnc#1012628).
+- bpf: sockmap, sock_map_delete needs to use xchg (bnc#1012628).
+- bpf: sockmap, synchronize_rcu before free'ing map (bnc#1012628).
+- bpf: sockmap, only create entry if ulp is not already enabled
+ (bnc#1012628).
+- selftests/bpf: fix sendmsg6_prog on s390 (bnc#1012628).
+- ASoC: dapm: fix a memory leak bug (bnc#1012628).
+- bonding: Force slave speed check after link state recovery
+ for 802.3ad (bnc#1012628).
+- net: mvpp2: Don't check for 3 consecutive Idle frames for 10G
+ links (bnc#1012628).
+- selftests: forwarding: gre_multipath: Enable IPv4 forwarding
+ (bnc#1012628).
+- selftests: forwarding: gre_multipath: Fix flower filters
+ (bnc#1012628).
+- selftests/bpf: add another gso_segs access (bnc#1012628).
+- libbpf: fix using uninitialized ioctl results (bnc#1012628).
+- can: dev: call netif_carrier_off() in register_candev()
+ (bnc#1012628).
+- can: mcp251x: add error check when wq alloc failed
+ (bnc#1012628).
+- can: gw: Fix error path of cgw_module_init (bnc#1012628).
+- ASoC: Fail card instantiation if DAI format setup fails
+ (bnc#1012628).
+- Staging: fbtft: Fix GPIO handling (bnc#1012628).
+- libbpf: silence GCC8 warning about string truncation
+ (bnc#1012628).
+- st21nfca_connectivity_event_received: null check the allocation
+ (bnc#1012628).
+- st_nci_hci_connectivity_event_received: null check the
+ allocation (bnc#1012628).
+- {nl,mac}80211: fix interface combinations on crypto controlled
+ devices (bnc#1012628).
+- ASoC: ti: davinci-mcasp: Fix clk PDIR handling for i2s master
+ mode (bnc#1012628).
+- ASoC: rockchip: Fix mono capture (bnc#1012628).
+- ASoC: ti: davinci-mcasp: Correct slot_width posed constraint
+ (bnc#1012628).
+- net: usb: qmi_wwan: Add the BroadMobi BM818 card (bnc#1012628).
+- qed: RDMA - Fix the hw_ver returned in device attributes
+ (bnc#1012628).
+- isdn: mISDN: hfcsusb: Fix possible null-pointer dereferences
+ in start_isoc_chain() (bnc#1012628).
+- habanalabs: fix F/W download in BE architecture (bnc#1012628).
+- mac80211_hwsim: Fix possible null-pointer dereferences in
+ hwsim_dump_radio_nl() (bnc#1012628).
+- net: stmmac: manage errors returned by of_get_mac_address()
+ (bnc#1012628).
+- netfilter: ipset: Actually allow destination MAC address for
+ hash:ip,mac sets too (bnc#1012628).
+- netfilter: ipset: Copy the right MAC address in bitmap:ip,mac
+ and hash:ip,mac sets (bnc#1012628).
+- netfilter: ipset: Fix rename concurrency with listing
+ (bnc#1012628).
+- rxrpc: Fix potential deadlock (bnc#1012628).
+- rxrpc: Fix the lack of notification when sendmsg() fails on
+ a DATA packet (bnc#1012628).
+- nvmem: Use the same permissions for eeprom as for nvmem
+ (bnc#1012628).
+- iwlwifi: mvm: avoid races in rate init and rate perform
+ (bnc#1012628).
+- iwlwifi: dbg_ini: move iwl_dbg_tlv_load_bin out of debug
+ override ifdef (bnc#1012628).
+- iwlwifi: dbg_ini: move iwl_dbg_tlv_free outside of debugfs ifdef
+ (bnc#1012628).
+- iwlwifi: fix locking in delayed GTK setting (bnc#1012628).
+- iwlwifi: mvm: send LQ command always ASYNC (bnc#1012628).
+- enetc: Fix build error without PHYLIB (bnc#1012628).
+- isdn: hfcsusb: Fix mISDN driver crash caused by transfer buffer
+ on the stack (bnc#1012628).
+- net: phy: phy_led_triggers: Fix a possible null-pointer
+ dereference in phy_led_trigger_change_speed() (bnc#1012628).
+- perf bench numa: Fix cpu0 binding (bnc#1012628).
+- spi: pxa2xx: Add support for Intel Tiger Lake (bnc#1012628).
+- can: sja1000: force the string buffer NULL-terminated
+ (bnc#1012628).
+- can: peak_usb: force the string buffer NULL-terminated
+ (bnc#1012628).
+- ASoC: amd: acp3x: use dma_ops of parent device for acp3x dma
+ driver (bnc#1012628).
+- net/ethernet/qlogic/qed: force the string buffer NULL-terminated
+ (bnc#1012628).
+- enetc: Select PHYLIB while CONFIG_FSL_ENETC_VF is set
+ (bnc#1012628).
+- NFSv4: Fix a credential refcount leak in
+ nfs41_check_delegation_stateid (bnc#1012628).
+- NFSv4: When recovering state fails with EAGAIN, retry the same
+ recovery (bnc#1012628).
+- NFSv4.1: Fix open stateid recovery (bnc#1012628).
+- NFSv4.1: Only reap expired delegations (bnc#1012628).
+- NFSv4: Fix a potential sleep while atomic in nfs4_do_reclaim()
+ (bnc#1012628).
+- NFS: Fix regression whereby fscache errors are appearing on
+ 'nofsc' mounts (bnc#1012628).
+- HID: quirks: Set the INCREMENT_USAGE_ON_DUPLICATE quirk on
+ Saitek X52 (bnc#1012628).
+- HID: input: fix a4tech horizontal wheel custom usage
+ (bnc#1012628).
+- drm/rockchip: Suspend DP late (bnc#1012628).
+- SMB3: Fix potential memory leak when processing compound chain
+ (bnc#1012628).
+- SMB3: Kernel oops mounting a encryptData share with
+ CONFIG_DEBUG_VIRTUAL (bnc#1012628).
+- sched/deadline: Fix double accounting of rq/running bw in push &
+ pull (bnc#1012628).
+- sched/psi: Reduce psimon FIFO priority (bnc#1012628).
+- sched/psi: Do not require setsched permission from the trigger
+ creator (bnc#1012628).
+- s390/protvirt: avoid memory sharing for diag 308 set/store
+ (bnc#1012628).
+- s390/mm: fix dump_pagetables top level page table walking
+ (bnc#1012628).
+- s390: put _stext and _etext into .text section (bnc#1012628).
+- ata: rb532_cf: Fix unused variable warning in
+ rb532_pata_driver_probe (bnc#1012628).
+- net: cxgb3_main: Fix a resource leak in a error path in
+ 'init_one()' (bnc#1012628).
+- net: stmmac: Fix issues when number of Queues >= 4
+ (bnc#1012628).
+- net: stmmac: tc: Do not return a fragment entry (bnc#1012628).
+- drm/amdgpu: pin the csb buffer on hw init for gfx v8
+ (bnc#1012628).
+- net: hisilicon: make hip04_tx_reclaim non-reentrant
+ (bnc#1012628).
+- net: hisilicon: fix hip04-xmit never return TX_BUSY
+ (bnc#1012628).
+- net: hisilicon: Fix dma_map_single failed on arm64
+ (bnc#1012628).
+- NFSv4: Ensure state recovery handles ETIMEDOUT correctly
+ (bnc#1012628).
+- libata: have ata_scsi_rw_xlat() fail invalid passthrough
+ requests (bnc#1012628).
+- libata: add SG safety checks in SFF pio transfers (bnc#1012628).
+- x86/lib/cpu: Address missing prototypes warning (bnc#1012628).
+- drm/vmwgfx: fix memory leak when too many retries have occurred
+ (bnc#1012628).
+- block: aoe: Fix kernel crash due to atomic sleep when exiting
+ (bnc#1012628).
+- block, bfq: handle NULL return value by bfq_init_rq()
+ (bnc#1012628).
+- perf ftrace: Fix failure to set cpumask when only one cpu is
+ present (bnc#1012628).
+- perf cpumap: Fix writing to illegal memory in handling cpumap
+ mask (bnc#1012628).
+- perf pmu-events: Fix missing "cpu_clk_unhalted.core" event
+ (bnc#1012628).
+- dt-bindings: riscv: fix the schema compatible string for the
+ HiFive Unleashed board (bnc#1012628).
+- KVM: arm64: Don't write junk to sysregs on reset (bnc#1012628).
+- KVM: arm: Don't write junk to CP15 registers on reset
+ (bnc#1012628).
+- selftests: kvm: Adding config fragments (bnc#1012628).
+- iwlwifi: mvm: disable TX-AMSDU on older NICs (bnc#1012628).
+- HID: wacom: correct misreported EKR ring values (bnc#1012628).
+- HID: wacom: Correct distance scale for 2nd-gen Intuos devices
+ (bnc#1012628).
+- Revert "KVM: x86/mmu: Zap only the relevant pages when removing
+ a memslot" (bnc#1012628).
+- Revert "dm bufio: fix deadlock with loop device" (bnc#1012628).
+- clk: socfpga: stratix10: fix rate caclulationg for cnt_clks
++++ 211 more lines (skipped)
++++ between /work/SRC/openSUSE:Factory/kernel-source/kernel-64kb.changes
++++ and /work/SRC/openSUSE:Factory/.kernel-source.new.7948/kernel-64kb.changes
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:
----
dtb-aarch64.changes
dtb-aarch64.spec
dtb-armv6l.changes
dtb-armv6l.spec
dtb-armv7l.changes
dtb-armv7l.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-64kb.spec ++++++
--- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:29.581383396 +0200
+++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:29.585383395 +0200
@@ -18,10 +18,11 @@
%define srcversion 5.2
-%define patchversion 5.2.10
+%define patchversion 5.2.11
%define variant %{nil}
%define vanilla_only 0
%define compress_modules none
+%define livepatch %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -63,9 +64,9 @@
Summary: Kernel with 64kb PAGE_SIZE
License: GPL-2.0
Group: System/Kernel
-Version: 5.2.10
+Version: 5.2.11
%if 0%{?is_kotd}
-Release: <RELEASE>.g5878ee6
+Release: <RELEASE>.g6385110
%else
Release: 0
%endif
@@ -170,10 +171,10 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides: kernel-%build_flavor-base-srchash-5878ee66182973951394c95f74851a1df456dd71
-Provides: kernel-srchash-5878ee66182973951394c95f74851a1df456dd71
+Provides: kernel-%build_flavor-base-srchash-638511006109a60917e424dc002a3599671ec2c0
+Provides: kernel-srchash-638511006109a60917e424dc002a3599671ec2c0
# END COMMON DEPS
-Provides: %name-srchash-5878ee66182973951394c95f74851a1df456dd71
+Provides: %name-srchash-638511006109a60917e424dc002a3599671ec2c0
%obsolete_rebuilds %name
Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
Source2: source-post.sh
@@ -1202,42 +1203,46 @@
/usr/src/linux-obj/%kmp_target_cpu
%endif
-%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
-%package livepatch
-Summary: Metapackage to pull in matching kernel-livepatch package
+%if "%livepatch" != "" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y" && "%variant" == ""
+%if %livepatch == kgraft
+%define patch_package %{livepatch}-patch
+%else
+%define patch_package kernel-%{livepatch}
+%endif
+%package %{livepatch}
+Summary: Metapackage to pull in matching %patch_package package
Group: System/Kernel
-Requires: kernel-livepatch-%(echo %version-%source_rel | sed 'y/\./_/')-%build_flavor
+Requires: %{patch_package}-%(echo %{version}-%{source_rel} | sed 'y/\./_/')-%{build_flavor}
Provides: kernel-default-kgraft = %version
Provides: kernel-xen-kgraft = %version
Provides: multiversion(kernel)
Obsoletes: kernel-default-kgraft < %version
Obsoletes: kernel-xen-kgraft < %version
-%description livepatch
-This is a metapackage that pulls in the matching kernel-livepatch package for a
+%description %{livepatch}
+This is a metapackage that pulls in the matching %patch_package package for a
given kernel version. The advantage of the metapackage is that its name is
-static, unlike the kernel-livepatch-<kernel-version>-flavor package names.
+static, unlike the %{patch_package}-<kernel-version>-flavor package names.
-%files livepatch
+%files %{livepatch}
# rpmlint complains about empty packages, so lets own something
%defattr(-, root, root)
%dir /lib/modules/%kernelrelease-%build_flavor
%endif
-%if 0%{?klp_symbols}
-
-%package livepatch-devel
-Summary: Kernel symbols file used during livepatch development
+%if 0%{?klp_symbols} && "%livepatch" != ""
+%package %{livepatch}-devel
+Summary: Kernel symbols file used during kGraft patch development
Group: System/Kernel
Provides: klp-symbols = %version
-%description livepatch-devel
+%description %{livepatch}-devel
This package brings a file named Symbols.list, which contains a list of all
kernel symbols and its respective kernel object . This list is to be used by
the klp-convert tool, which helps livepatch developers by enabling automatic
symbol resolution.
-%files livepatch-devel
+%files %{livepatch}-devel
%defattr(-, root, root)
%dir %obj_install_dir
%dir %obj_install_dir/%cpu_arch
++++++ kernel-debug.spec ++++++
--- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:29.597383394 +0200
+++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:29.601383393 +0200
@@ -18,10 +18,11 @@
%define srcversion 5.2
-%define patchversion 5.2.10
+%define patchversion 5.2.11
%define variant %{nil}
%define vanilla_only 0
%define compress_modules none
+%define livepatch %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -63,9 +64,9 @@
Summary: A Debug Version of the Kernel
License: GPL-2.0
Group: System/Kernel
-Version: 5.2.10
+Version: 5.2.11
%if 0%{?is_kotd}
-Release: <RELEASE>.g5878ee6
+Release: <RELEASE>.g6385110
%else
Release: 0
%endif
@@ -170,10 +171,10 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides: kernel-%build_flavor-base-srchash-5878ee66182973951394c95f74851a1df456dd71
-Provides: kernel-srchash-5878ee66182973951394c95f74851a1df456dd71
+Provides: kernel-%build_flavor-base-srchash-638511006109a60917e424dc002a3599671ec2c0
+Provides: kernel-srchash-638511006109a60917e424dc002a3599671ec2c0
# END COMMON DEPS
-Provides: %name-srchash-5878ee66182973951394c95f74851a1df456dd71
+Provides: %name-srchash-638511006109a60917e424dc002a3599671ec2c0
%ifarch ppc64
Provides: kernel-kdump = 2.6.28
Obsoletes: kernel-kdump <= 2.6.28
@@ -1214,42 +1215,46 @@
/usr/src/linux-obj/%kmp_target_cpu
%endif
-%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
-%package livepatch
-Summary: Metapackage to pull in matching kernel-livepatch package
+%if "%livepatch" != "" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y" && "%variant" == ""
+%if %livepatch == kgraft
+%define patch_package %{livepatch}-patch
+%else
+%define patch_package kernel-%{livepatch}
+%endif
+%package %{livepatch}
+Summary: Metapackage to pull in matching %patch_package package
Group: System/Kernel
-Requires: kernel-livepatch-%(echo %version-%source_rel | sed 'y/\./_/')-%build_flavor
+Requires: %{patch_package}-%(echo %{version}-%{source_rel} | sed 'y/\./_/')-%{build_flavor}
Provides: kernel-default-kgraft = %version
Provides: kernel-xen-kgraft = %version
Provides: multiversion(kernel)
Obsoletes: kernel-default-kgraft < %version
Obsoletes: kernel-xen-kgraft < %version
-%description livepatch
-This is a metapackage that pulls in the matching kernel-livepatch package for a
+%description %{livepatch}
+This is a metapackage that pulls in the matching %patch_package package for a
given kernel version. The advantage of the metapackage is that its name is
-static, unlike the kernel-livepatch-<kernel-version>-flavor package names.
+static, unlike the %{patch_package}-<kernel-version>-flavor package names.
-%files livepatch
+%files %{livepatch}
# rpmlint complains about empty packages, so lets own something
%defattr(-, root, root)
%dir /lib/modules/%kernelrelease-%build_flavor
%endif
-%if 0%{?klp_symbols}
-
-%package livepatch-devel
-Summary: Kernel symbols file used during livepatch development
+%if 0%{?klp_symbols} && "%livepatch" != ""
+%package %{livepatch}-devel
+Summary: Kernel symbols file used during kGraft patch development
Group: System/Kernel
Provides: klp-symbols = %version
-%description livepatch-devel
+%description %{livepatch}-devel
This package brings a file named Symbols.list, which contains a list of all
kernel symbols and its respective kernel object . This list is to be used by
the klp-convert tool, which helps livepatch developers by enabling automatic
symbol resolution.
-%files livepatch-devel
+%files %{livepatch}-devel
%defattr(-, root, root)
%dir %obj_install_dir
%dir %obj_install_dir/%cpu_arch
++++++ kernel-default.spec ++++++
--- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:29.625383389 +0200
+++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:29.625383389 +0200
@@ -18,10 +18,11 @@
%define srcversion 5.2
-%define patchversion 5.2.10
+%define patchversion 5.2.11
%define variant %{nil}
%define vanilla_only 0
%define compress_modules none
+%define livepatch %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -63,9 +64,9 @@
Summary: The Standard Kernel
License: GPL-2.0
Group: System/Kernel
-Version: 5.2.10
+Version: 5.2.11
%if 0%{?is_kotd}
-Release: <RELEASE>.g5878ee6
+Release: <RELEASE>.g6385110
%else
Release: 0
%endif
@@ -170,10 +171,10 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides: kernel-%build_flavor-base-srchash-5878ee66182973951394c95f74851a1df456dd71
-Provides: kernel-srchash-5878ee66182973951394c95f74851a1df456dd71
+Provides: kernel-%build_flavor-base-srchash-638511006109a60917e424dc002a3599671ec2c0
+Provides: kernel-srchash-638511006109a60917e424dc002a3599671ec2c0
# END COMMON DEPS
-Provides: %name-srchash-5878ee66182973951394c95f74851a1df456dd71
+Provides: %name-srchash-638511006109a60917e424dc002a3599671ec2c0
%ifarch %ix86
Provides: kernel-smp = 2.6.17
Obsoletes: kernel-smp <= 2.6.17
@@ -1296,42 +1297,46 @@
/usr/src/linux-obj/%kmp_target_cpu
%endif
-%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
-%package livepatch
-Summary: Metapackage to pull in matching kernel-livepatch package
+%if "%livepatch" != "" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y" && "%variant" == ""
+%if %livepatch == kgraft
+%define patch_package %{livepatch}-patch
+%else
+%define patch_package kernel-%{livepatch}
+%endif
+%package %{livepatch}
+Summary: Metapackage to pull in matching %patch_package package
Group: System/Kernel
-Requires: kernel-livepatch-%(echo %version-%source_rel | sed 'y/\./_/')-%build_flavor
+Requires: %{patch_package}-%(echo %{version}-%{source_rel} | sed 'y/\./_/')-%{build_flavor}
Provides: kernel-default-kgraft = %version
Provides: kernel-xen-kgraft = %version
Provides: multiversion(kernel)
Obsoletes: kernel-default-kgraft < %version
Obsoletes: kernel-xen-kgraft < %version
-%description livepatch
-This is a metapackage that pulls in the matching kernel-livepatch package for a
+%description %{livepatch}
+This is a metapackage that pulls in the matching %patch_package package for a
given kernel version. The advantage of the metapackage is that its name is
-static, unlike the kernel-livepatch-<kernel-version>-flavor package names.
+static, unlike the %{patch_package}-<kernel-version>-flavor package names.
-%files livepatch
+%files %{livepatch}
# rpmlint complains about empty packages, so lets own something
%defattr(-, root, root)
%dir /lib/modules/%kernelrelease-%build_flavor
%endif
-%if 0%{?klp_symbols}
-
-%package livepatch-devel
-Summary: Kernel symbols file used during livepatch development
+%if 0%{?klp_symbols} && "%livepatch" != ""
+%package %{livepatch}-devel
+Summary: Kernel symbols file used during kGraft patch development
Group: System/Kernel
Provides: klp-symbols = %version
-%description livepatch-devel
+%description %{livepatch}-devel
This package brings a file named Symbols.list, which contains a list of all
kernel symbols and its respective kernel object . This list is to be used by
the klp-convert tool, which helps livepatch developers by enabling automatic
symbol resolution.
-%files livepatch-devel
+%files %{livepatch}-devel
%defattr(-, root, root)
%dir %obj_install_dir
%dir %obj_install_dir/%cpu_arch
++++++ kernel-docs.spec ++++++
--- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:29.641383386 +0200
+++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:29.641383386 +0200
@@ -17,7 +17,7 @@
%define srcversion 5.2
-%define patchversion 5.2.10
+%define patchversion 5.2.11
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -31,9 +31,9 @@
Summary: Kernel Documentation
License: GPL-2.0
Group: Documentation/Man
-Version: 5.2.10
+Version: 5.2.11
%if 0%{?is_kotd}
-Release: <RELEASE>.g5878ee6
+Release: <RELEASE>.g6385110
%else
Release: 0
%endif
@@ -63,7 +63,7 @@
%endif
Url: http://www.kernel.org/
Provides: %name = %version-%source_rel
-Provides: %name-srchash-5878ee66182973951394c95f74851a1df456dd71
+Provides: %name-srchash-638511006109a60917e424dc002a3599671ec2c0
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
++++++ kernel-kvmsmall.spec ++++++
--- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:29.665383383 +0200
+++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:29.665383383 +0200
@@ -18,10 +18,11 @@
%define srcversion 5.2
-%define patchversion 5.2.10
+%define patchversion 5.2.11
%define variant %{nil}
%define vanilla_only 0
%define compress_modules none
+%define livepatch %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -63,9 +64,9 @@
Summary: The Small Developer Kernel for KVM
License: GPL-2.0
Group: System/Kernel
-Version: 5.2.10
+Version: 5.2.11
%if 0%{?is_kotd}
-Release: <RELEASE>.g5878ee6
+Release: <RELEASE>.g6385110
%else
Release: 0
%endif
@@ -170,10 +171,10 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides: kernel-%build_flavor-base-srchash-5878ee66182973951394c95f74851a1df456dd71
-Provides: kernel-srchash-5878ee66182973951394c95f74851a1df456dd71
+Provides: kernel-%build_flavor-base-srchash-638511006109a60917e424dc002a3599671ec2c0
+Provides: kernel-srchash-638511006109a60917e424dc002a3599671ec2c0
# END COMMON DEPS
-Provides: %name-srchash-5878ee66182973951394c95f74851a1df456dd71
+Provides: %name-srchash-638511006109a60917e424dc002a3599671ec2c0
%obsolete_rebuilds %name
Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
Source2: source-post.sh
@@ -1210,42 +1211,46 @@
/usr/src/linux-obj/%kmp_target_cpu
%endif
-%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
-%package livepatch
-Summary: Metapackage to pull in matching kernel-livepatch package
+%if "%livepatch" != "" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y" && "%variant" == ""
+%if %livepatch == kgraft
+%define patch_package %{livepatch}-patch
+%else
+%define patch_package kernel-%{livepatch}
+%endif
+%package %{livepatch}
+Summary: Metapackage to pull in matching %patch_package package
Group: System/Kernel
-Requires: kernel-livepatch-%(echo %version-%source_rel | sed 'y/\./_/')-%build_flavor
+Requires: %{patch_package}-%(echo %{version}-%{source_rel} | sed 'y/\./_/')-%{build_flavor}
Provides: kernel-default-kgraft = %version
Provides: kernel-xen-kgraft = %version
Provides: multiversion(kernel)
Obsoletes: kernel-default-kgraft < %version
Obsoletes: kernel-xen-kgraft < %version
-%description livepatch
-This is a metapackage that pulls in the matching kernel-livepatch package for a
+%description %{livepatch}
+This is a metapackage that pulls in the matching %patch_package package for a
given kernel version. The advantage of the metapackage is that its name is
-static, unlike the kernel-livepatch-<kernel-version>-flavor package names.
+static, unlike the %{patch_package}-<kernel-version>-flavor package names.
-%files livepatch
+%files %{livepatch}
# rpmlint complains about empty packages, so lets own something
%defattr(-, root, root)
%dir /lib/modules/%kernelrelease-%build_flavor
%endif
-%if 0%{?klp_symbols}
-
-%package livepatch-devel
-Summary: Kernel symbols file used during livepatch development
+%if 0%{?klp_symbols} && "%livepatch" != ""
+%package %{livepatch}-devel
+Summary: Kernel symbols file used during kGraft patch development
Group: System/Kernel
Provides: klp-symbols = %version
-%description livepatch-devel
+%description %{livepatch}-devel
This package brings a file named Symbols.list, which contains a list of all
kernel symbols and its respective kernel object . This list is to be used by
the klp-convert tool, which helps livepatch developers by enabling automatic
symbol resolution.
-%files livepatch-devel
+%files %{livepatch}-devel
%defattr(-, root, root)
%dir %obj_install_dir
%dir %obj_install_dir/%cpu_arch
kernel-lpae.spec: same change
++++++ kernel-obs-build.spec ++++++
--- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:29.693383379 +0200
+++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:29.693383379 +0200
@@ -19,7 +19,7 @@
#!BuildIgnore: post-build-checks
-%define patchversion 5.2.10
+%define patchversion 5.2.11
%define variant %{nil}
%define vanilla_only 0
@@ -45,7 +45,7 @@
%endif
%endif
%endif
-BuildRequires: kernel%kernel_flavor-srchash-5878ee66182973951394c95f74851a1df456dd71
+BuildRequires: kernel%kernel_flavor-srchash-638511006109a60917e424dc002a3599671ec2c0
%if 0%{?rhel_version}
BuildRequires: kernel
@@ -64,9 +64,9 @@
Summary: package kernel and initrd for OBS VM builds
License: GPL-2.0
Group: SLES
-Version: 5.2.10
+Version: 5.2.11
%if 0%{?is_kotd}
-Release: <RELEASE>.g5878ee6
+Release: <RELEASE>.g6385110
%else
Release: 0
%endif
++++++ kernel-obs-qa.spec ++++++
--- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:29.705383377 +0200
+++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:29.705383377 +0200
@@ -17,7 +17,7 @@
# needsrootforbuild
-%define patchversion 5.2.10
+%define patchversion 5.2.11
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -36,9 +36,9 @@
Summary: Basic QA tests for the kernel
License: GPL-2.0
Group: SLES
-Version: 5.2.10
+Version: 5.2.11
%if 0%{?is_kotd}
-Release: <RELEASE>.g5878ee6
+Release: <RELEASE>.g6385110
%else
Release: 0
%endif
++++++ kernel-pae.spec ++++++
--- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:29.721383374 +0200
+++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:29.721383374 +0200
@@ -18,10 +18,11 @@
%define srcversion 5.2
-%define patchversion 5.2.10
+%define patchversion 5.2.11
%define variant %{nil}
%define vanilla_only 0
%define compress_modules none
+%define livepatch %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -63,9 +64,9 @@
Summary: Kernel with PAE Support
License: GPL-2.0
Group: System/Kernel
-Version: 5.2.10
+Version: 5.2.11
%if 0%{?is_kotd}
-Release: <RELEASE>.g5878ee6
+Release: <RELEASE>.g6385110
%else
Release: 0
%endif
@@ -170,10 +171,10 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides: kernel-%build_flavor-base-srchash-5878ee66182973951394c95f74851a1df456dd71
-Provides: kernel-srchash-5878ee66182973951394c95f74851a1df456dd71
+Provides: kernel-%build_flavor-base-srchash-638511006109a60917e424dc002a3599671ec2c0
+Provides: kernel-srchash-638511006109a60917e424dc002a3599671ec2c0
# END COMMON DEPS
-Provides: %name-srchash-5878ee66182973951394c95f74851a1df456dd71
+Provides: %name-srchash-638511006109a60917e424dc002a3599671ec2c0
%ifarch %ix86
Provides: kernel-bigsmp = 2.6.17
Obsoletes: kernel-bigsmp <= 2.6.17
@@ -1252,42 +1253,46 @@
/usr/src/linux-obj/%kmp_target_cpu
%endif
-%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
-%package livepatch
-Summary: Metapackage to pull in matching kernel-livepatch package
+%if "%livepatch" != "" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y" && "%variant" == ""
+%if %livepatch == kgraft
+%define patch_package %{livepatch}-patch
+%else
+%define patch_package kernel-%{livepatch}
+%endif
+%package %{livepatch}
+Summary: Metapackage to pull in matching %patch_package package
Group: System/Kernel
-Requires: kernel-livepatch-%(echo %version-%source_rel | sed 'y/\./_/')-%build_flavor
+Requires: %{patch_package}-%(echo %{version}-%{source_rel} | sed 'y/\./_/')-%{build_flavor}
Provides: kernel-default-kgraft = %version
Provides: kernel-xen-kgraft = %version
Provides: multiversion(kernel)
Obsoletes: kernel-default-kgraft < %version
Obsoletes: kernel-xen-kgraft < %version
-%description livepatch
-This is a metapackage that pulls in the matching kernel-livepatch package for a
+%description %{livepatch}
+This is a metapackage that pulls in the matching %patch_package package for a
given kernel version. The advantage of the metapackage is that its name is
-static, unlike the kernel-livepatch-<kernel-version>-flavor package names.
+static, unlike the %{patch_package}-<kernel-version>-flavor package names.
-%files livepatch
+%files %{livepatch}
# rpmlint complains about empty packages, so lets own something
%defattr(-, root, root)
%dir /lib/modules/%kernelrelease-%build_flavor
%endif
-%if 0%{?klp_symbols}
-
-%package livepatch-devel
-Summary: Kernel symbols file used during livepatch development
+%if 0%{?klp_symbols} && "%livepatch" != ""
+%package %{livepatch}-devel
+Summary: Kernel symbols file used during kGraft patch development
Group: System/Kernel
Provides: klp-symbols = %version
-%description livepatch-devel
+%description %{livepatch}-devel
This package brings a file named Symbols.list, which contains a list of all
kernel symbols and its respective kernel object . This list is to be used by
the klp-convert tool, which helps livepatch developers by enabling automatic
symbol resolution.
-%files livepatch-devel
+%files %{livepatch}-devel
%defattr(-, root, root)
%dir %obj_install_dir
%dir %obj_install_dir/%cpu_arch
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:29.741383371 +0200
+++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:29.741383371 +0200
@@ -18,7 +18,7 @@
%define srcversion 5.2
-%define patchversion 5.2.10
+%define patchversion 5.2.11
%define variant %{nil}
%define vanilla_only 0
@@ -30,9 +30,9 @@
Summary: The Linux Kernel Sources
License: GPL-2.0
Group: Development/Sources
-Version: 5.2.10
+Version: 5.2.11
%if 0%{?is_kotd}
-Release: <RELEASE>.g5878ee6
+Release: <RELEASE>.g6385110
%else
Release: 0
%endif
@@ -43,7 +43,7 @@
BuildRequires: sed
Requires(post): coreutils sed
Provides: %name = %version-%source_rel
-Provides: %name-srchash-5878ee66182973951394c95f74851a1df456dd71
+Provides: %name-srchash-638511006109a60917e424dc002a3599671ec2c0
Provides: linux
Provides: multiversion(kernel)
Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:29.757383369 +0200
+++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:29.757383369 +0200
@@ -24,10 +24,10 @@
Summary: Kernel Symbol Versions (modversions)
License: GPL-2.0
Group: Development/Sources
-Version: 5.2.10
+Version: 5.2.11
%if %using_buildservice
%if 0%{?is_kotd}
-Release: <RELEASE>.g5878ee6
+Release: <RELEASE>.g6385110
%else
Release: 0
%endif
@@ -50,12 +50,9 @@
%ifarch %ix86
Requires: kernel-pae-devel = %version-%source_rel
%endif
-%ifarch s390x
-Requires: kernel-zfcpdump-devel = %version-%source_rel
-%endif
Requires: pesign-obs-integration
Provides: %name = %version-%source_rel
-Provides: %name-srchash-5878ee66182973951394c95f74851a1df456dd71
+Provides: %name-srchash-638511006109a60917e424dc002a3599671ec2c0
Provides: multiversion(kernel)
Source: README.KSYMS
Requires: kernel-devel%variant = %version-%source_rel
++++++ kernel-vanilla.spec ++++++
--- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:29.769383367 +0200
+++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:29.769383367 +0200
@@ -18,10 +18,11 @@
%define srcversion 5.2
-%define patchversion 5.2.10
+%define patchversion 5.2.11
%define variant %{nil}
%define vanilla_only 0
%define compress_modules none
+%define livepatch %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -63,9 +64,9 @@
Summary: The Standard Kernel - without any SUSE patches
License: GPL-2.0
Group: System/Kernel
-Version: 5.2.10
+Version: 5.2.11
%if 0%{?is_kotd}
-Release: <RELEASE>.g5878ee6
+Release: <RELEASE>.g6385110
%else
Release: 0
%endif
@@ -170,10 +171,10 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides: kernel-%build_flavor-base-srchash-5878ee66182973951394c95f74851a1df456dd71
-Provides: kernel-srchash-5878ee66182973951394c95f74851a1df456dd71
+Provides: kernel-%build_flavor-base-srchash-638511006109a60917e424dc002a3599671ec2c0
+Provides: kernel-srchash-638511006109a60917e424dc002a3599671ec2c0
# END COMMON DEPS
-Provides: %name-srchash-5878ee66182973951394c95f74851a1df456dd71
+Provides: %name-srchash-638511006109a60917e424dc002a3599671ec2c0
%obsolete_rebuilds %name
Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
Source2: source-post.sh
@@ -1196,42 +1197,46 @@
/usr/src/linux-obj/%kmp_target_cpu
%endif
-%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
-%package livepatch
-Summary: Metapackage to pull in matching kernel-livepatch package
+%if "%livepatch" != "" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y" && "%variant" == ""
+%if %livepatch == kgraft
+%define patch_package %{livepatch}-patch
+%else
+%define patch_package kernel-%{livepatch}
+%endif
+%package %{livepatch}
+Summary: Metapackage to pull in matching %patch_package package
Group: System/Kernel
-Requires: kernel-livepatch-%(echo %version-%source_rel | sed 'y/\./_/')-%build_flavor
+Requires: %{patch_package}-%(echo %{version}-%{source_rel} | sed 'y/\./_/')-%{build_flavor}
Provides: kernel-default-kgraft = %version
Provides: kernel-xen-kgraft = %version
Provides: multiversion(kernel)
Obsoletes: kernel-default-kgraft < %version
Obsoletes: kernel-xen-kgraft < %version
-%description livepatch
-This is a metapackage that pulls in the matching kernel-livepatch package for a
+%description %{livepatch}
+This is a metapackage that pulls in the matching %patch_package package for a
given kernel version. The advantage of the metapackage is that its name is
-static, unlike the kernel-livepatch-<kernel-version>-flavor package names.
+static, unlike the %{patch_package}-<kernel-version>-flavor package names.
-%files livepatch
+%files %{livepatch}
# rpmlint complains about empty packages, so lets own something
%defattr(-, root, root)
%dir /lib/modules/%kernelrelease-%build_flavor
%endif
-%if 0%{?klp_symbols}
-
-%package livepatch-devel
-Summary: Kernel symbols file used during livepatch development
+%if 0%{?klp_symbols} && "%livepatch" != ""
+%package %{livepatch}-devel
+Summary: Kernel symbols file used during kGraft patch development
Group: System/Kernel
Provides: klp-symbols = %version
-%description livepatch-devel
+%description %{livepatch}-devel
This package brings a file named Symbols.list, which contains a list of all
kernel symbols and its respective kernel object . This list is to be used by
the klp-convert tool, which helps livepatch developers by enabling automatic
symbol resolution.
-%files livepatch-devel
+%files %{livepatch}-devel
%defattr(-, root, root)
%dir %obj_install_dir
%dir %obj_install_dir/%cpu_arch
kernel-zfcpdump.spec: same change
++++++ _constraints ++++++
--- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:29.905383346 +0200
+++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:29.909383345 +0200
@@ -1,5 +1,5 @@
<constraints>
- <!-- Default 25GB for binary packages -->
+ <!-- Default 35GB for binary packages -->
<overwrite>
<conditions>
<package>kernel-64kb</package>
@@ -13,7 +13,7 @@
</conditions>
<hardware>
<disk>
- <size unit="G">25</size>
+ <size unit="G">35</size>
</disk>
<memory>
<size unit="G">4</size>
@@ -49,7 +49,7 @@
</hardware>
</overwrite>
- <!-- 10GB of disk and 2GB of memory for binary package on s390x -->
+ <!-- 14GB for binary package on s390x -->
<overwrite>
<conditions>
<arch>s390x</arch>
@@ -64,7 +64,7 @@
</conditions>
<hardware>
<disk>
- <size unit="G">10</size>
+ <size unit="G">14</size>
</disk>
<memory>
<size unit="G">2</size>
++++++ check-module-license ++++++
--- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:29.941383341 +0200
+++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:29.941383341 +0200
@@ -1,7 +1,7 @@
#!/bin/sh
rc=0
-for file in $(find "$@" -name '*.ko'); do
+for file in $(find "$@" -name '*.ko' -o -name '*.ko.xz'); do
l=$(/sbin/modinfo -F license "$file")
if [ -z "$l" ]; then
echo "ERROR: No license is included for module ${file##*/lib/modules/}"
++++++ config.conf ++++++
--- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:29.989383333 +0200
+++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:29.989383333 +0200
@@ -39,4 +39,4 @@
+s390x s390x/default
+s390x s390x/vanilla
-+s390x s390x/zfcpdump
++s390x -syms s390x/zfcpdump
++++++ 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 2019-08-18 18:12:47.000000000 +0200
+++ new/config/arm64/default 2019-08-26 08:55:09.000000000 +0200
@@ -4499,7 +4499,7 @@
# CONFIG_I2C_EXYNOS5 is not set
CONFIG_I2C_GPIO=m
# CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
-# CONFIG_I2C_IMX is not set
+CONFIG_I2C_IMX=m
CONFIG_I2C_IMX_LPI2C=m
CONFIG_I2C_KEMPLD=m
CONFIG_I2C_MESON=m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/pae new/config/i386/pae
--- old/config/i386/pae 2019-08-18 18:12:47.000000000 +0200
+++ new/config/i386/pae 2019-08-26 08:55:09.000000000 +0200
@@ -408,7 +408,7 @@
CONFIG_MICROCODE=y
CONFIG_MICROCODE_INTEL=y
CONFIG_MICROCODE_AMD=y
-CONFIG_MICROCODE_OLD_INTERFACE=y
+# CONFIG_MICROCODE_OLD_INTERFACE is not set
CONFIG_X86_MSR=m
CONFIG_X86_CPUID=m
# CONFIG_NOHIGHMEM is not set
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 2019-08-18 18:12:47.000000000 +0200
+++ new/config/x86_64/default 2019-08-26 08:55:09.000000000 +0200
@@ -397,7 +397,7 @@
CONFIG_MICROCODE=y
CONFIG_MICROCODE_INTEL=y
CONFIG_MICROCODE_AMD=y
-CONFIG_MICROCODE_OLD_INTERFACE=y
+# CONFIG_MICROCODE_OLD_INTERFACE is not set
CONFIG_X86_MSR=m
CONFIG_X86_CPUID=m
# CONFIG_X86_5LEVEL is not set
++++++ constraints.in ++++++
--- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:30.241383294 +0200
+++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:30.245383294 +0200
@@ -1,12 +1,12 @@
<constraints>
- <!-- Default 25GB for binary packages -->
+ <!-- Default 35GB for binary packages -->
<overwrite>
<conditions>
@BINARY_PACKAGES_XML@
</conditions>
<hardware>
<disk>
- <size unit="G">25</size>
+ <size unit="G">35</size>
</disk>
<memory>
<size unit="G">4</size>
@@ -42,7 +42,7 @@
</hardware>
</overwrite>
- <!-- 10GB of disk and 2GB of memory for binary package on s390x -->
+ <!-- 14GB for binary package on s390x -->
<overwrite>
<conditions>
<arch>s390x</arch>
@@ -50,7 +50,7 @@
</conditions>
<hardware>
<disk>
- <size unit="G">10</size>
+ <size unit="G">14</size>
</disk>
<memory>
<size unit="G">2</size>
++++++ kernel-binary.spec.in ++++++
--- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:30.341383279 +0200
+++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:30.341383279 +0200
@@ -22,6 +22,7 @@
%define variant @VARIANT@%{nil}
%define vanilla_only @VANILLA_ONLY@
%define compress_modules @COMPRESS_MODULES@
+%define livepatch @LIVEPATCH@%{nil}
%include %_sourcedir/kernel-spec-macros
@@ -1056,42 +1057,46 @@
/usr/src/linux-obj/%kmp_target_cpu
%endif
-%if %CONFIG_SUSE_KERNEL_SUPPORTED == "y"
-%package livepatch
-Summary: Metapackage to pull in matching kernel-livepatch package
+%if "%livepatch" != "" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y" && "%variant" == ""
+%if %livepatch == kgraft
+%define patch_package %{livepatch}-patch
+%else
+%define patch_package kernel-%{livepatch}
+%endif
+%package %{livepatch}
+Summary: Metapackage to pull in matching %patch_package package
Group: System/Kernel
-Requires: kernel-livepatch-%(echo %version-%source_rel | sed 'y/\./_/')-%build_flavor
+Requires: %{patch_package}-%(echo %{version}-%{source_rel} | sed 'y/\./_/')-%{build_flavor}
Provides: kernel-default-kgraft = %version
Provides: kernel-xen-kgraft = %version
Provides: multiversion(kernel)
Obsoletes: kernel-default-kgraft < %version
Obsoletes: kernel-xen-kgraft < %version
-%description livepatch
-This is a metapackage that pulls in the matching kernel-livepatch package for a
+%description %{livepatch}
+This is a metapackage that pulls in the matching %patch_package package for a
given kernel version. The advantage of the metapackage is that its name is
-static, unlike the kernel-livepatch-<kernel-version>-flavor package names.
+static, unlike the %{patch_package}-<kernel-version>-flavor package names.
-%files livepatch
+%files %{livepatch}
# rpmlint complains about empty packages, so lets own something
%defattr(-, root, root)
%dir /lib/modules/%kernelrelease-%build_flavor
%endif
-%if 0%{?klp_symbols}
-
-%package livepatch-devel
-Summary: Kernel symbols file used during livepatch development
+%if 0%{?klp_symbols} && "%livepatch" != ""
+%package %{livepatch}-devel
+Summary: Kernel symbols file used during kGraft patch development
Group: System/Kernel
Provides: klp-symbols = %version
-%description livepatch-devel
+%description %{livepatch}-devel
This package brings a file named Symbols.list, which contains a list of all
kernel symbols and its respective kernel object . This list is to be used by
the klp-convert tool, which helps livepatch developers by enabling automatic
symbol resolution.
-%files livepatch-devel
+%files %{livepatch}-devel
%defattr(-, root, root)
%dir %obj_install_dir
%dir %obj_install_dir/%cpu_arch
++++++ kernel-module-subpackage ++++++
--- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:30.405383269 +0200
+++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:30.409383269 +0200
@@ -79,7 +79,7 @@
%{?regenerate_initrd_posttrans}
%preun -n %{-n*}-kmp-%1
nvr=%{-n*}-kmp-%1-%_this_kmp_version-%{-r*}
-rpm -ql $nvr | sed -n '/\.ko$/p' > /var/run/rpm-$nvr-modules
+rpm -ql $nvr | sed -n '/\.ko\(\.xz\)\?$/p' > /var/run/rpm-$nvr-modules
%postun -n %{-n*}-kmp-%1
nvr=%{-n*}-kmp-%1-%_this_kmp_version-%{-r*}
modules=( $(cat /var/run/rpm-$nvr-modules) )
++++++ mergedep ++++++
--- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:30.541383248 +0200
+++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:30.541383248 +0200
@@ -7,10 +7,12 @@
| \
while read l ; do
MOD=$(echo "$l" | sed -e 's/:.*//')
+ MOD=$(basename $MOD .xz)
MOD=$(basename $MOD .ko)
DEPS="$(echo "$l" | sed -e 's/.*://')"
moddeps=""
for dep in $DEPS ; do
+ dep=$(basename $dep .xz)
dep=$(basename $dep .ko)
moddeps="$moddeps $dep"
done
++++++ mkspec ++++++
--- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:30.549383247 +0200
+++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:30.549383247 +0200
@@ -38,9 +38,19 @@
my ($srcversion, $variant, $vanilla_only) =
($vars{'SRCVERSION'}, $vars{'VARIANT'}, $vars{'VANILLA_ONLY'});
my $compress_modules = 'none';
+my $build_dtbs = ();
+my $livepatch = "";
if (defined($vars{'COMPRESS_MODULES'})) {
$compress_modules = $vars{'COMPRESS_MODULES'};
}
+if (defined($vars{'BUILD_DTBS'})) {
+ $build_dtbs = $vars{'BUILD_DTBS'};
+ $build_dtbs = () if $build_dtbs =~ /^(0+|no|false)$/i;
+}
+if (defined($vars{'LIVEPATCH'})) {
+ $livepatch = $vars{'LIVEPATCH'};
+ $livepatch = "" if $livepatch =~ /^(0+|no|none)$/i;
+}
$vanilla_only ||= "0";
if (!defined ($rpmrelease)) {
$rpmrelease = $vars{'RELEASE'} || 0;
@@ -80,7 +90,8 @@
my $tarball_url;
if ($srcversion =~ /^(\d+)(?:\.\d+)*(-rc\d+)?$/) {
$tarball_url = "http://www.kernel.org/pub/linux/kernel/v$1.x/";
- $tarball_url .= "testing/" if $2;
+ $tarball_url = "" if $2; # kernel.org has no tarballs for rc kernels
+ # rc tarballs only available from git as https://git.kernel.org/torvalds/t/linux-*.gz
} else {
# kernel.org has no tarballs for linux-next or vanilla snapshots
$tarball_url = "";
@@ -103,6 +114,7 @@
NOSOURCE => $nosource,
UNPACK_PATCHES => $unpack_patches,
SCRIPTS => $scripts,
+ LIVEPATCH => $livepatch,
YEAR => (localtime time)[5] + 1900,
COMPRESS_MODULES => $compress_modules,
);
@@ -209,7 +221,7 @@
}
# dtb-*.spec
-if (!$variant) {
+if (!$variant && $build_dtbs) {
do_spec('dtb', "dtb.spec.in", %macros);
print "./mkspec-dtb $all_archs\n";
system("./mkspec-dtb $all_archs\n");
++++++ modflist ++++++
--- /var/tmp/diff_new_pack.zh2xi6/_old 2019-09-02 13:18:30.577383242 +0200
+++ /var/tmp/diff_new_pack.zh2xi6/_new 2019-09-02 13:18:30.577383242 +0200
@@ -6,5 +6,5 @@
while read MOD ; do
[ -n "$MOD" ] || continue
- cat $flist | grep /$MOD[.]ko\$ >> $output || { grep -q /$MOD[.]ko\$ $mod_builtin && echo Module $MOD built-in ;} || echo Module $MOD missing
+ cat $flist | grep -E "/$MOD[.]ko([.]xz)?\$" >> $output || { grep -q /$MOD[.]ko\$ $mod_builtin && echo Module $MOD built-in ;} || echo Module $MOD missing
done < $modules
++++++ patches.kernel.org.tar.bz2 ++++++
++++ 13385 lines of diff (skipped)
++++++ patches.suse.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/Fix-a-double-free-bug-in-rsi_91x_deinit.patch new/patches.suse/Fix-a-double-free-bug-in-rsi_91x_deinit.patch
--- old/patches.suse/Fix-a-double-free-bug-in-rsi_91x_deinit.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.suse/Fix-a-double-free-bug-in-rsi_91x_deinit.patch 2019-08-29 08:41:19.000000000 +0200
@@ -0,0 +1,40 @@
+From: Hui Peng