Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2019-03-24 14:57:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kernel-source (Old) and /work/SRC/openSUSE:Factory/.kernel-source.new.25356 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kernel-source" Sun Mar 24 14:57:39 2019 rev:478 rq:687794 version:5.0.3 Changes: -------- --- /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes 2019-03-18 10:33:56.731551767 +0100 +++ /work/SRC/openSUSE:Factory/.kernel-source.new.25356/dtb-aarch64.changes 2019-03-24 14:57:41.467197030 +0100 @@ -1,0 +2,176 @@ +Fri Mar 22 15:48:19 CET 2019 - [email protected] + +- Do not provide kernel-default-srchash from kernel-default-base. +- commit d6c71ce + +------------------------------------------------------------------- +Wed Mar 20 15:06:09 CET 2019 - [email protected] + +- rpm/kernel-subpackage-build: handle arm kernel zImage. +- commit 81a63c3 + +------------------------------------------------------------------- +Wed Mar 20 12:47:44 CET 2019 - [email protected] + +- config: disable IMA_ARCH_POLICY for now + When IMA_ARCH_POLICY was enabled during the 5.0-rc* stage, IMA causes + kdump load to fail: + kexec_file_load failed: Permission denied + ima: impossible to appraise a kernel image without a file descriptor; try using kexec_file_load syscall. + We have to fix kexec tooling before enabling IMA for everyone. + BTW IMA_APPRAISE_BOOTPARAM was disabled by IMA_ARCH_POLICY=y. So + restore the original state (and functionality). +- commit 3fe0cfc + +------------------------------------------------------------------- +Wed Mar 20 10:46:11 CET 2019 - [email protected] + +- rpm/kernel-source.changes.old: Really drop old changelogs (bsc#1098995) +- commit 9e463cf + +------------------------------------------------------------------- +Tue Mar 19 19:45:44 CET 2019 - [email protected] + +- config: disable BPFILTER_UMH on arm (bsc#1127188). +- commit a705565 + +------------------------------------------------------------------- +Tue Mar 19 19:12:59 CET 2019 - [email protected] + +- Linux 5.0.3 (bnc#1012628). +- drm: Block fb changes for async plane updates (bnc#1012628). +- It's wrong to add len to sector_nr in raid10 reshape twice + (bnc#1012628). +- perf/x86/intel: Make dev_attr_allow_tsx_force_abort static + (bnc#1012628). +- perf/x86/intel: Fix memory corruption (bnc#1012628). +- ALSA: hda/realtek: Enable headset MIC of Acer TravelMate + X514-51T with ALC255 (bnc#1012628). +- ALSA: hda/realtek - Reduce click noise on Dell Precision 5820 + headphone (bnc#1012628). +- ALSA: hda/realtek: Enable audio jacks of ASUS UX362FA with + ALC294 (bnc#1012628). +- ALSA: hda - add more quirks for HP Z2 G4 and HP Z240 + (bnc#1012628). +- ALSA: hda: Extend i915 component bind timeout (bnc#1012628). +- ALSA: firewire-motu: fix construction of PCM frame for capture + direction (bnc#1012628). +- ALSA: bebob: use more identical mod_alias for Saffire Pro 10 + I/O against Liquid Saffire 56 (bnc#1012628). +- perf/x86: Fixup typo in stub functions (bnc#1012628). +- f2fs: wait on atomic writes to count F2FS_CP_WB_DATA + (bnc#1012628). +- net: sched: flower: insert new filter to idr after setting + its mask (bnc#1012628). +- vsock/virtio: fix kernel panic from + virtio_transport_reset_no_sock (bnc#1012628). +- net: hns3: fix to stop multiple HNS reset due to the AER changes + (bnc#1012628). +- net: dsa: mv88e6xxx: Set correct interface mode for CPU/DSA + ports (bnc#1012628). +- net/mlx4_core: Fix qp mtt size calculation (bnc#1012628). +- net/mlx4_core: Fix locking in SRIOV mode when switching between + events and polling (bnc#1012628). +- net/mlx4_core: Fix reset flow when in command polling mode + (bnc#1012628). +- vxlan: test dev->flags & IFF_UP before calling + gro_cells_receive() (bnc#1012628). +- vxlan: Fix GRO cells race condition between receive and link + delete (bnc#1012628). +- tcp: handle inet_csk_reqsk_queue_add() failures (bnc#1012628). +- tcp: Don't access TCP_SKB_CB before initializing it + (bnc#1012628). +- tcp: do not report TCP_CM_INQ of 0 for closed connections + (bnc#1012628). +- sctp: remove sched init from sctp_stream_init (bnc#1012628). +- rxrpc: Fix client call queueing, waiting for channel + (bnc#1012628). +- route: set the deleted fnhe fnhe_daddr to 0 in ip_del_fnhe to + fix a race (bnc#1012628). +- ravb: Decrease TxFIFO depth of Q3 and Q2 to one (bnc#1012628). +- pptp: dst_release sk_dst_cache in pptp_sock_destruct + (bnc#1012628). +- net/x25: reset state in x25_connect() (bnc#1012628). +- net/x25: fix use-after-free in x25_device_event() (bnc#1012628). +- net: sit: fix UBSAN Undefined behaviour in check_6rd + (bnc#1012628). +- net/hsr: fix possible crash in add_timer() (bnc#1012628). +- net: hsr: fix memory leak in hsr_dev_finalize() (bnc#1012628). +- net: hns3: add dma_rmb() for rx description (bnc#1012628). +- lan743x: Fix TX Stall Issue (bnc#1012628). +- lan743x: Fix RX Kernel Panic (bnc#1012628). +- l2tp: fix infoleak in l2tp_ip6_recvmsg() (bnc#1012628). +- ipv4/route: fail early when inet dev is missing (bnc#1012628). +- gro_cells: make sure device is up in gro_cells_receive() + (bnc#1012628). +- fou, fou6: avoid uninit-value in gue_err() and gue6_err() + (bnc#1012628). +- connector: fix unsafe usage of ->real_parent (bnc#1012628). +- commit 843d1cc + +------------------------------------------------------------------- +Tue Mar 19 16:44:16 CET 2019 - [email protected] + +- config: armv6hl: Update to v5.0.2 +- commit a2d3030 + +------------------------------------------------------------------- +Tue Mar 19 12:01:12 CET 2019 - [email protected] + +- config: armv7hl: Update to v5.0.2 +- commit 70aaed6 + +------------------------------------------------------------------- +Mon Mar 18 09:47:16 CET 2019 - [email protected] + +- Trim build dependencies of sample subpackage spec file (FATE#326579, + jsc#SLE-4117, jsc#SLE-3853, bsc#1128910). +- commit 2eae420 + +------------------------------------------------------------------- +Mon Mar 18 07:50:55 CET 2019 - [email protected] + +- cifs: Fix NULL pointer dereference of devname (bnc#1129519). +- commit 018878b + +------------------------------------------------------------------- +Sun Mar 17 09:51:44 CET 2019 - [email protected] + +- config: enable RANDOM_TRUST_CPU + The outcome from mailing list discussion when this config option + appeared was that it makes more sense to enable it by default and let + those who do not trust their CPU override it on command line; but then + I forgot to actually change the value. +- commit 138b5df + +------------------------------------------------------------------- +Fri Mar 15 16:03:28 CET 2019 - [email protected] + +- Update config files: disable CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER (bsc#1127552) + The deferred fbcon takeover makes little sense with the current openSUSE + boot setup, and it's harmful (more glitches, etc). Disable it for now. +- commit 14fa903 + +------------------------------------------------------------------- +Fri Mar 15 00:32:22 CET 2019 - [email protected] + +- Remove the previous subpackage infrastructure. + This partially reverts commit 9b3ca32c11854156b2f950ff5e26131377d8445e + ("Add kernel-subpackage-build.spec (FATE#326579).") +- commit a5ee24e + +------------------------------------------------------------------- +Fri Mar 15 00:14:36 CET 2019 - [email protected] + +- Add sample kernel-default-base spec file (FATE#326579, jsc#SLE-4117, + jsc#SLE-3853, bsc#1128910). +- commit 35c4a52 + +------------------------------------------------------------------- +Thu Mar 14 19:01:12 CET 2019 - [email protected] + +- Install extra rpm scripts for kernel subpackaging (FATE#326579, + jsc#SLE-4117, jsc#SLE-3853, bsc#1128910). +- commit ad7c227 + +------------------------------------------------------------------- @@ -24416,12 +24591,0 @@ -Sat Jul 15 15:08:05 CEST 2017 - [email protected] - -- Linux 4.12.2 (bnc#1012628). -- commit 1b6adc0 - -------------------------------------------------------------------- -Wed Jul 12 17:08:35 CEST 2017 - [email protected] - -- Linux 4.12.1 (bnc#1012628). -- commit 77712d8 - -------------------------------------------------------------------- @@ -24436,224 +24599,0 @@ -Tue Jul 11 10:20:24 CEST 2017 - [email protected] - -- rpm/kernel-docs.spec.in: Fix and cleanup for 4.13 doc build (bsc#1048129) - The whole DocBook stuff has been deleted. The PDF build still non-working - thus the sub-packaging disabled so far. -- commit c9542b9 - ++++ 46259 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes ++++ and /work/SRC/openSUSE:Factory/.kernel-source.new.25356/dtb-aarch64.changes dtb-armv6l.changes: same change dtb-armv7l.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 New Changes file: --- /dev/null 2018-10-29 14:05:42.522318975 +0100 +++ /work/SRC/openSUSE:Factory/.kernel-source.new.25356/kernel-lpae.changes 2019-03-24 14:57:45.399196527 +0100 @@ -0,0 +1,24649 @@ +------------------------------------------------------------------- +Fri Mar 22 15:48:19 CET 2019 - [email protected] + +- Do not provide kernel-default-srchash from kernel-default-base. +- commit d6c71ce + +------------------------------------------------------------------- +Wed Mar 20 15:06:09 CET 2019 - [email protected] + +- rpm/kernel-subpackage-build: handle arm kernel zImage. +- commit 81a63c3 + +------------------------------------------------------------------- +Wed Mar 20 12:47:44 CET 2019 - [email protected] + +- config: disable IMA_ARCH_POLICY for now + When IMA_ARCH_POLICY was enabled during the 5.0-rc* stage, IMA causes + kdump load to fail: + kexec_file_load failed: Permission denied + ima: impossible to appraise a kernel image without a file descriptor; try using kexec_file_load syscall. + We have to fix kexec tooling before enabling IMA for everyone. + BTW IMA_APPRAISE_BOOTPARAM was disabled by IMA_ARCH_POLICY=y. So + restore the original state (and functionality). +- commit 3fe0cfc + +------------------------------------------------------------------- +Wed Mar 20 10:46:11 CET 2019 - [email protected] + +- rpm/kernel-source.changes.old: Really drop old changelogs (bsc#1098995) +- commit 9e463cf + +------------------------------------------------------------------- +Tue Mar 19 19:45:44 CET 2019 - [email protected] + +- config: disable BPFILTER_UMH on arm (bsc#1127188). +- commit a705565 + +------------------------------------------------------------------- +Tue Mar 19 19:12:59 CET 2019 - [email protected] + +- Linux 5.0.3 (bnc#1012628). +- drm: Block fb changes for async plane updates (bnc#1012628). +- It's wrong to add len to sector_nr in raid10 reshape twice + (bnc#1012628). +- perf/x86/intel: Make dev_attr_allow_tsx_force_abort static + (bnc#1012628). +- perf/x86/intel: Fix memory corruption (bnc#1012628). +- ALSA: hda/realtek: Enable headset MIC of Acer TravelMate + X514-51T with ALC255 (bnc#1012628). +- ALSA: hda/realtek - Reduce click noise on Dell Precision 5820 + headphone (bnc#1012628). +- ALSA: hda/realtek: Enable audio jacks of ASUS UX362FA with + ALC294 (bnc#1012628). +- ALSA: hda - add more quirks for HP Z2 G4 and HP Z240 + (bnc#1012628). +- ALSA: hda: Extend i915 component bind timeout (bnc#1012628). +- ALSA: firewire-motu: fix construction of PCM frame for capture + direction (bnc#1012628). +- ALSA: bebob: use more identical mod_alias for Saffire Pro 10 + I/O against Liquid Saffire 56 (bnc#1012628). +- perf/x86: Fixup typo in stub functions (bnc#1012628). +- f2fs: wait on atomic writes to count F2FS_CP_WB_DATA + (bnc#1012628). +- net: sched: flower: insert new filter to idr after setting + its mask (bnc#1012628). +- vsock/virtio: fix kernel panic from + virtio_transport_reset_no_sock (bnc#1012628). +- net: hns3: fix to stop multiple HNS reset due to the AER changes + (bnc#1012628). +- net: dsa: mv88e6xxx: Set correct interface mode for CPU/DSA + ports (bnc#1012628). +- net/mlx4_core: Fix qp mtt size calculation (bnc#1012628). +- net/mlx4_core: Fix locking in SRIOV mode when switching between + events and polling (bnc#1012628). +- net/mlx4_core: Fix reset flow when in command polling mode + (bnc#1012628). +- vxlan: test dev->flags & IFF_UP before calling + gro_cells_receive() (bnc#1012628). +- vxlan: Fix GRO cells race condition between receive and link + delete (bnc#1012628). +- tcp: handle inet_csk_reqsk_queue_add() failures (bnc#1012628). +- tcp: Don't access TCP_SKB_CB before initializing it + (bnc#1012628). +- tcp: do not report TCP_CM_INQ of 0 for closed connections + (bnc#1012628). +- sctp: remove sched init from sctp_stream_init (bnc#1012628). +- rxrpc: Fix client call queueing, waiting for channel + (bnc#1012628). +- route: set the deleted fnhe fnhe_daddr to 0 in ip_del_fnhe to + fix a race (bnc#1012628). +- ravb: Decrease TxFIFO depth of Q3 and Q2 to one (bnc#1012628). +- pptp: dst_release sk_dst_cache in pptp_sock_destruct + (bnc#1012628). +- net/x25: reset state in x25_connect() (bnc#1012628). +- net/x25: fix use-after-free in x25_device_event() (bnc#1012628). +- net: sit: fix UBSAN Undefined behaviour in check_6rd + (bnc#1012628). +- net/hsr: fix possible crash in add_timer() (bnc#1012628). +- net: hsr: fix memory leak in hsr_dev_finalize() (bnc#1012628). +- net: hns3: add dma_rmb() for rx description (bnc#1012628). +- lan743x: Fix TX Stall Issue (bnc#1012628). +- lan743x: Fix RX Kernel Panic (bnc#1012628). +- l2tp: fix infoleak in l2tp_ip6_recvmsg() (bnc#1012628). +- ipv4/route: fail early when inet dev is missing (bnc#1012628). +- gro_cells: make sure device is up in gro_cells_receive() + (bnc#1012628). +- fou, fou6: avoid uninit-value in gue_err() and gue6_err() + (bnc#1012628). +- connector: fix unsafe usage of ->real_parent (bnc#1012628). +- commit 843d1cc + +------------------------------------------------------------------- +Tue Mar 19 16:44:16 CET 2019 - [email protected] + +- config: armv6hl: Update to v5.0.2 +- commit a2d3030 + +------------------------------------------------------------------- +Tue Mar 19 12:01:12 CET 2019 - [email protected] + +- config: armv7hl: Update to v5.0.2 +- commit 70aaed6 + +------------------------------------------------------------------- +Mon Mar 18 09:47:16 CET 2019 - [email protected] + +- Trim build dependencies of sample subpackage spec file (FATE#326579, + jsc#SLE-4117, jsc#SLE-3853, bsc#1128910). +- commit 2eae420 + +------------------------------------------------------------------- +Mon Mar 18 07:50:55 CET 2019 - [email protected] + +- cifs: Fix NULL pointer dereference of devname (bnc#1129519). +- commit 018878b + +------------------------------------------------------------------- +Sun Mar 17 09:51:44 CET 2019 - [email protected] + +- config: enable RANDOM_TRUST_CPU + The outcome from mailing list discussion when this config option + appeared was that it makes more sense to enable it by default and let + those who do not trust their CPU override it on command line; but then + I forgot to actually change the value. +- commit 138b5df + +------------------------------------------------------------------- +Fri Mar 15 16:03:28 CET 2019 - [email protected] + +- Update config files: disable CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER (bsc#1127552) + The deferred fbcon takeover makes little sense with the current openSUSE + boot setup, and it's harmful (more glitches, etc). Disable it for now. +- commit 14fa903 + +------------------------------------------------------------------- +Fri Mar 15 00:32:22 CET 2019 - [email protected] + +- Remove the previous subpackage infrastructure. + This partially reverts commit 9b3ca32c11854156b2f950ff5e26131377d8445e + ("Add kernel-subpackage-build.spec (FATE#326579).") +- commit a5ee24e + +------------------------------------------------------------------- +Fri Mar 15 00:14:36 CET 2019 - [email protected] + +- Add sample kernel-default-base spec file (FATE#326579, jsc#SLE-4117, + jsc#SLE-3853, bsc#1128910). +- commit 35c4a52 + +------------------------------------------------------------------- +Thu Mar 14 19:01:12 CET 2019 - [email protected] + +- Install extra rpm scripts for kernel subpackaging (FATE#326579, + jsc#SLE-4117, jsc#SLE-3853, bsc#1128910). +- commit ad7c227 + +------------------------------------------------------------------- +Thu Mar 14 08:57:42 CET 2019 - [email protected] + +- Linux 5.0.2 (bnc#1012628). +- perf/x86/intel: Implement support for TSX Force Abort + (bnc#1012628). +- x86: Add TSX Force Abort CPUID/MSR (bnc#1012628). +- perf/x86/intel: Generalize dynamic constraint creation + (bnc#1012628). +- perf/x86/intel: Make cpuc allocations consistent (bnc#1012628). +- ath9k: Avoid OF no-EEPROM quirks without qca,no-eeprom + (bnc#1012628). +- scripts/gdb: replace flags (MS_xyz -> SB_xyz) (bnc#1012628). +- staging: erofs: compressed_pages should not be accessed again + after freed (bnc#1012628). +- staging: erofs: keep corrupted fs from crashing kernel in + erofs_namei() (bnc#1012628). +- gfs2: Fix missed wakeups in find_insert_glock (bnc#1012628). +- bpf: Stop the psock parser before canceling its work + (bnc#1012628). +- Revert "PCI/PME: Implement runtime PM callbacks" (bnc#1012628). ++++ 24452 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Factory/.kernel-source.new.25356/kernel-lpae.changes --- /work/SRC/openSUSE:Factory/kernel-source/kernel-obs-build.changes 2019-03-18 10:33:58.955551211 +0100 +++ /work/SRC/openSUSE:Factory/.kernel-source.new.25356/kernel-obs-build.changes 2019-03-24 14:57:45.875196465 +0100 @@ -1,0 +2,176 @@ +Fri Mar 22 15:48:19 CET 2019 - [email protected] + +- Do not provide kernel-default-srchash from kernel-default-base. +- commit d6c71ce + +------------------------------------------------------------------- +Wed Mar 20 15:06:09 CET 2019 - [email protected] + +- rpm/kernel-subpackage-build: handle arm kernel zImage. +- commit 81a63c3 + +------------------------------------------------------------------- +Wed Mar 20 12:47:44 CET 2019 - [email protected] + +- config: disable IMA_ARCH_POLICY for now + When IMA_ARCH_POLICY was enabled during the 5.0-rc* stage, IMA causes + kdump load to fail: + kexec_file_load failed: Permission denied + ima: impossible to appraise a kernel image without a file descriptor; try using kexec_file_load syscall. + We have to fix kexec tooling before enabling IMA for everyone. + BTW IMA_APPRAISE_BOOTPARAM was disabled by IMA_ARCH_POLICY=y. So + restore the original state (and functionality). +- commit 3fe0cfc + +------------------------------------------------------------------- +Wed Mar 20 10:46:11 CET 2019 - [email protected] + +- rpm/kernel-source.changes.old: Really drop old changelogs (bsc#1098995) +- commit 9e463cf + +------------------------------------------------------------------- +Tue Mar 19 19:45:44 CET 2019 - [email protected] + +- config: disable BPFILTER_UMH on arm (bsc#1127188). +- commit a705565 + +------------------------------------------------------------------- +Tue Mar 19 19:12:59 CET 2019 - [email protected] + +- Linux 5.0.3 (bnc#1012628). +- drm: Block fb changes for async plane updates (bnc#1012628). +- It's wrong to add len to sector_nr in raid10 reshape twice + (bnc#1012628). +- perf/x86/intel: Make dev_attr_allow_tsx_force_abort static + (bnc#1012628). +- perf/x86/intel: Fix memory corruption (bnc#1012628). +- ALSA: hda/realtek: Enable headset MIC of Acer TravelMate + X514-51T with ALC255 (bnc#1012628). +- ALSA: hda/realtek - Reduce click noise on Dell Precision 5820 + headphone (bnc#1012628). +- ALSA: hda/realtek: Enable audio jacks of ASUS UX362FA with + ALC294 (bnc#1012628). +- ALSA: hda - add more quirks for HP Z2 G4 and HP Z240 + (bnc#1012628). +- ALSA: hda: Extend i915 component bind timeout (bnc#1012628). +- ALSA: firewire-motu: fix construction of PCM frame for capture + direction (bnc#1012628). +- ALSA: bebob: use more identical mod_alias for Saffire Pro 10 + I/O against Liquid Saffire 56 (bnc#1012628). +- perf/x86: Fixup typo in stub functions (bnc#1012628). +- f2fs: wait on atomic writes to count F2FS_CP_WB_DATA + (bnc#1012628). +- net: sched: flower: insert new filter to idr after setting + its mask (bnc#1012628). +- vsock/virtio: fix kernel panic from + virtio_transport_reset_no_sock (bnc#1012628). +- net: hns3: fix to stop multiple HNS reset due to the AER changes + (bnc#1012628). +- net: dsa: mv88e6xxx: Set correct interface mode for CPU/DSA + ports (bnc#1012628). +- net/mlx4_core: Fix qp mtt size calculation (bnc#1012628). +- net/mlx4_core: Fix locking in SRIOV mode when switching between + events and polling (bnc#1012628). +- net/mlx4_core: Fix reset flow when in command polling mode + (bnc#1012628). +- vxlan: test dev->flags & IFF_UP before calling + gro_cells_receive() (bnc#1012628). +- vxlan: Fix GRO cells race condition between receive and link + delete (bnc#1012628). +- tcp: handle inet_csk_reqsk_queue_add() failures (bnc#1012628). +- tcp: Don't access TCP_SKB_CB before initializing it + (bnc#1012628). +- tcp: do not report TCP_CM_INQ of 0 for closed connections + (bnc#1012628). +- sctp: remove sched init from sctp_stream_init (bnc#1012628). +- rxrpc: Fix client call queueing, waiting for channel + (bnc#1012628). +- route: set the deleted fnhe fnhe_daddr to 0 in ip_del_fnhe to + fix a race (bnc#1012628). +- ravb: Decrease TxFIFO depth of Q3 and Q2 to one (bnc#1012628). +- pptp: dst_release sk_dst_cache in pptp_sock_destruct + (bnc#1012628). +- net/x25: reset state in x25_connect() (bnc#1012628). +- net/x25: fix use-after-free in x25_device_event() (bnc#1012628). +- net: sit: fix UBSAN Undefined behaviour in check_6rd + (bnc#1012628). +- net/hsr: fix possible crash in add_timer() (bnc#1012628). +- net: hsr: fix memory leak in hsr_dev_finalize() (bnc#1012628). +- net: hns3: add dma_rmb() for rx description (bnc#1012628). +- lan743x: Fix TX Stall Issue (bnc#1012628). +- lan743x: Fix RX Kernel Panic (bnc#1012628). +- l2tp: fix infoleak in l2tp_ip6_recvmsg() (bnc#1012628). +- ipv4/route: fail early when inet dev is missing (bnc#1012628). +- gro_cells: make sure device is up in gro_cells_receive() + (bnc#1012628). +- fou, fou6: avoid uninit-value in gue_err() and gue6_err() + (bnc#1012628). +- connector: fix unsafe usage of ->real_parent (bnc#1012628). +- commit 843d1cc + +------------------------------------------------------------------- +Tue Mar 19 16:44:16 CET 2019 - [email protected] + +- config: armv6hl: Update to v5.0.2 +- commit a2d3030 + +------------------------------------------------------------------- +Tue Mar 19 12:01:12 CET 2019 - [email protected] + +- config: armv7hl: Update to v5.0.2 +- commit 70aaed6 + +------------------------------------------------------------------- +Mon Mar 18 09:47:16 CET 2019 - [email protected] + +- Trim build dependencies of sample subpackage spec file (FATE#326579, + jsc#SLE-4117, jsc#SLE-3853, bsc#1128910). +- commit 2eae420 + +------------------------------------------------------------------- +Mon Mar 18 07:50:55 CET 2019 - [email protected] + +- cifs: Fix NULL pointer dereference of devname (bnc#1129519). +- commit 018878b + +------------------------------------------------------------------- +Sun Mar 17 09:51:44 CET 2019 - [email protected] + +- config: enable RANDOM_TRUST_CPU + The outcome from mailing list discussion when this config option + appeared was that it makes more sense to enable it by default and let + those who do not trust their CPU override it on command line; but then + I forgot to actually change the value. +- commit 138b5df + +------------------------------------------------------------------- +Fri Mar 15 16:03:28 CET 2019 - [email protected] + +- Update config files: disable CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER (bsc#1127552) + The deferred fbcon takeover makes little sense with the current openSUSE + boot setup, and it's harmful (more glitches, etc). Disable it for now. +- commit 14fa903 + +------------------------------------------------------------------- +Fri Mar 15 00:32:22 CET 2019 - [email protected] + +- Remove the previous subpackage infrastructure. + This partially reverts commit 9b3ca32c11854156b2f950ff5e26131377d8445e + ("Add kernel-subpackage-build.spec (FATE#326579).") +- commit a5ee24e + +------------------------------------------------------------------- +Fri Mar 15 00:14:36 CET 2019 - [email protected] + +- Add sample kernel-default-base spec file (FATE#326579, jsc#SLE-4117, + jsc#SLE-3853, bsc#1128910). +- commit 35c4a52 + +------------------------------------------------------------------- +Thu Mar 14 19:01:12 CET 2019 - [email protected] + +- Install extra rpm scripts for kernel subpackaging (FATE#326579, + jsc#SLE-4117, jsc#SLE-3853, bsc#1128910). +- commit ad7c227 + +------------------------------------------------------------------- @@ -24416,12 +24591,0 @@ -Sat Jul 15 15:08:05 CEST 2017 - [email protected] - -- Linux 4.12.2 (bnc#1012628). -- commit 1b6adc0 - -------------------------------------------------------------------- -Wed Jul 12 17:08:35 CEST 2017 - [email protected] - -- Linux 4.12.1 (bnc#1012628). -- commit 77712d8 - -------------------------------------------------------------------- @@ -24436,224 +24599,0 @@ -Tue Jul 11 10:20:24 CEST 2017 - [email protected] - -- rpm/kernel-docs.spec.in: Fix and cleanup for 4.13 doc build (bsc#1048129) - The whole DocBook stuff has been deleted. The PDF build still non-working - thus the sub-packaging disabled so far. -- commit c9542b9 - ++++ 46259 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kernel-source/kernel-obs-build.changes ++++ and /work/SRC/openSUSE:Factory/.kernel-source.new.25356/kernel-obs-build.changes 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: ---- kernel-default-base.changes kernel-default-base.spec kernel-subpackage-build.spec.in kernel-subpackage.conf subpackage-names.conf New: ---- kernel-default-base.spec.txt kernel-lpae.changes kernel-lpae.spec kernel-subpackage-build kernel-subpackage-spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dtb-aarch64.spec ++++++ --- /var/tmp/diff_new_pack.6y4H8g/_old 2019-03-24 14:57:58.475194852 +0100 +++ /var/tmp/diff_new_pack.6y4H8g/_new 2019-03-24 14:57:58.503194849 +0100 @@ -17,7 +17,7 @@ %define srcversion 5.0 -%define patchversion 5.0.2 +%define patchversion 5.0.3 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -26,12 +26,12 @@ %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}) +%(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: 5.0.2 +Version: 5.0.3 %if 0%{?is_kotd} -Release: <RELEASE>.gd1f1d19 +Release: <RELEASE>.g2a31831 %else Release: 0 %endif @@ -100,13 +100,13 @@ Source76: check-module-license Source77: klp-symbols Source78: modules.fips -Source79: kernel-subpackage-build.spec.in -Source80: kernel-subpackage.conf -Source81: subpackage-names.conf -Source82: splitflist -Source83: mergedep -Source84: moddep -Source85: modflist +Source79: splitflist +Source80: mergedep +Source81: moddep +Source82: modflist +Source83: kernel-subpackage-build +Source84: kernel-subpackage-spec +Source85: kernel-default-base.spec.txt Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 dtb-armv6l.spec: same change dtb-armv7l.spec: same change ++++++ kernel-64kb.spec ++++++ --- /var/tmp/diff_new_pack.6y4H8g/_old 2019-03-24 14:57:59.639194703 +0100 +++ /var/tmp/diff_new_pack.6y4H8g/_new 2019-03-24 14:57:59.667194700 +0100 @@ -18,7 +18,7 @@ %define srcversion 5.0 -%define patchversion 5.0.2 +%define patchversion 5.0.3 %define variant %{nil} %define vanilla_only 0 @@ -41,7 +41,7 @@ %define klp_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}) +%(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}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor @@ -62,9 +62,9 @@ Summary: Kernel with 64kb PAGE_SIZE License: GPL-2.0 Group: System/Kernel -Version: 5.0.2 +Version: 5.0.3 %if 0%{?is_kotd} -Release: <RELEASE>.gd1f1d19 +Release: <RELEASE>.g2a31831 %else Release: 0 %endif @@ -91,7 +91,6 @@ BuildRequires: pesign-obs-integration # for objtool BuildRequires: libelf-devel -# BEGIN BINARY DEPS Provides: %name = %version-%source_rel # bnc#901925 Provides: %name-%version-%source_rel @@ -104,7 +103,7 @@ # obsolete the -base subpackage from SLE11, so that the base files are not # owned by multiple packages now. The dependency is not correct wrt openSUSE # 11.2 - 11.4, but we primarily care about the supported upgrade path. -Obsoletes: kernel-%build_flavor-base < 3.1 +Obsoletes: %name-base < 3.1 Recommends: kernel-firmware # The following is copied to the -base subpackage as well # BEGIN COMMON DEPS @@ -170,10 +169,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-d1f1d19eba1b818d1d526bc8fffc7eb4eff5920c -Provides: kernel-srchash-d1f1d19eba1b818d1d526bc8fffc7eb4eff5920c +Provides: kernel-%build_flavor-base-srchash-2a318317524e454ff29faf9c19219c1f2c2d8e70 +Provides: kernel-srchash-2a318317524e454ff29faf9c19219c1f2c2d8e70 # END COMMON DEPS -Provides: %name-srchash-d1f1d19eba1b818d1d526bc8fffc7eb4eff5920c +Provides: %name-srchash-2a318317524e454ff29faf9c19219c1f2c2d8e70 %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source2: source-post.sh @@ -227,13 +226,13 @@ Source76: check-module-license Source77: klp-symbols Source78: modules.fips -Source79: kernel-subpackage-build.spec.in -Source80: kernel-subpackage.conf -Source81: subpackage-names.conf -Source82: splitflist -Source83: mergedep -Source84: moddep -Source85: modflist +Source79: splitflist +Source80: mergedep +Source81: moddep +Source82: modflist +Source83: kernel-subpackage-build +Source84: kernel-subpackage-spec +Source85: kernel-default-base.spec.txt Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -336,7 +335,6 @@ NoSource: 113 NoSource: 120 NoSource: 121 -# END BINARY DEPS # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. @@ -747,7 +745,7 @@ for sub in '' '-extra'; do case "$sub" in - '-base' | '') base_package=1 ;; + '') base_package=1 ;; *) base_package=0 ;; esac for script in preun postun pre post devel-pre devel-post; do @@ -758,9 +756,10 @@ sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \ -e "s:@IMAGE@:$image:g" \ -e "s:@FLAVOR""@:%build_flavor:g" \ - -e "s:@SUBPACKAGE""@:%name$sub:g" \ + -e "s:@SUBPACKAGE@:%name$sub:g" \ -e "s:@BASE_PACKAGE@:$base_package:g" \ -e "s:@RPM_VERSION_RELEASE@:%version-%release:g" \ + -e "s:@RPM_TARGET_CPU@:%_target_cpu:g" \ -e "s:@CPU_ARCH_FLAVOR@:%cpu_arch_flavor:g" \ -e "s:@SRCVARIANT@:%variant:g" \ %_sourcedir/$script.sh > %my_builddir/$script$sub.sh ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.6y4H8g/_old 2019-03-24 14:57:59.967194661 +0100 +++ /var/tmp/diff_new_pack.6y4H8g/_new 2019-03-24 14:58:00.003194656 +0100 @@ -18,7 +18,7 @@ %define srcversion 5.0 -%define patchversion 5.0.2 +%define patchversion 5.0.3 %define variant %{nil} %define vanilla_only 0 @@ -41,7 +41,7 @@ %define klp_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}) +%(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}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor @@ -62,9 +62,9 @@ Summary: A Debug Version of the Kernel License: GPL-2.0 Group: System/Kernel -Version: 5.0.2 +Version: 5.0.3 %if 0%{?is_kotd} -Release: <RELEASE>.gd1f1d19 +Release: <RELEASE>.g2a31831 %else Release: 0 %endif @@ -91,7 +91,6 @@ BuildRequires: pesign-obs-integration # for objtool BuildRequires: libelf-devel -# BEGIN BINARY DEPS Provides: %name = %version-%source_rel # bnc#901925 Provides: %name-%version-%source_rel @@ -104,7 +103,7 @@ # obsolete the -base subpackage from SLE11, so that the base files are not # owned by multiple packages now. The dependency is not correct wrt openSUSE # 11.2 - 11.4, but we primarily care about the supported upgrade path. -Obsoletes: kernel-%build_flavor-base < 3.1 +Obsoletes: %name-base < 3.1 Recommends: kernel-firmware # The following is copied to the -base subpackage as well # BEGIN COMMON DEPS @@ -170,10 +169,14 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-d1f1d19eba1b818d1d526bc8fffc7eb4eff5920c -Provides: kernel-srchash-d1f1d19eba1b818d1d526bc8fffc7eb4eff5920c +Provides: kernel-%build_flavor-base-srchash-2a318317524e454ff29faf9c19219c1f2c2d8e70 +Provides: kernel-srchash-2a318317524e454ff29faf9c19219c1f2c2d8e70 # END COMMON DEPS -Provides: %name-srchash-d1f1d19eba1b818d1d526bc8fffc7eb4eff5920c +Provides: %name-srchash-2a318317524e454ff29faf9c19219c1f2c2d8e70 +%ifarch ppc64 +Provides: kernel-kdump = 2.6.28 +Obsoletes: kernel-kdump <= 2.6.28 +%endif %ifarch ppc64 Provides: kernel-kdump-base = 2.6.28 Obsoletes: kernel-kdump-base <= 2.6.28 @@ -231,13 +234,13 @@ Source76: check-module-license Source77: klp-symbols Source78: modules.fips -Source79: kernel-subpackage-build.spec.in -Source80: kernel-subpackage.conf -Source81: subpackage-names.conf -Source82: splitflist -Source83: mergedep -Source84: moddep -Source85: modflist +Source79: splitflist +Source80: mergedep +Source81: moddep +Source82: modflist +Source83: kernel-subpackage-build +Source84: kernel-subpackage-spec +Source85: kernel-default-base.spec.txt Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -340,11 +343,6 @@ NoSource: 113 NoSource: 120 NoSource: 121 -# END BINARY DEPS -%ifarch ppc64 -Provides: kernel-kdump = 2.6.28 -Obsoletes: kernel-kdump <= 2.6.28 -%endif # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. @@ -753,7 +751,7 @@ for sub in '' '-extra'; do case "$sub" in - '-base' | '') base_package=1 ;; + '') base_package=1 ;; *) base_package=0 ;; esac for script in preun postun pre post devel-pre devel-post; do @@ -764,9 +762,10 @@ sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \ -e "s:@IMAGE@:$image:g" \ -e "s:@FLAVOR""@:%build_flavor:g" \ - -e "s:@SUBPACKAGE""@:%name$sub:g" \ + -e "s:@SUBPACKAGE@:%name$sub:g" \ -e "s:@BASE_PACKAGE@:$base_package:g" \ -e "s:@RPM_VERSION_RELEASE@:%version-%release:g" \ + -e "s:@RPM_TARGET_CPU@:%_target_cpu:g" \ -e "s:@CPU_ARCH_FLAVOR@:%cpu_arch_flavor:g" \ -e "s:@SRCVARIANT@:%variant:g" \ %_sourcedir/$script.sh > %my_builddir/$script$sub.sh ++++++ kernel-default.spec ++++++ --- /var/tmp/diff_new_pack.6y4H8g/_old 2019-03-24 14:58:00.331194614 +0100 +++ /var/tmp/diff_new_pack.6y4H8g/_new 2019-03-24 14:58:00.347194613 +0100 @@ -18,7 +18,7 @@ %define srcversion 5.0 -%define patchversion 5.0.2 +%define patchversion 5.0.3 %define variant %{nil} %define vanilla_only 0 @@ -41,7 +41,7 @@ %define klp_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}) +%(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}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor @@ -62,9 +62,9 @@ Summary: The Standard Kernel License: GPL-2.0 Group: System/Kernel -Version: 5.0.2 +Version: 5.0.3 %if 0%{?is_kotd} -Release: <RELEASE>.gd1f1d19 +Release: <RELEASE>.g2a31831 %else Release: 0 %endif @@ -91,7 +91,6 @@ BuildRequires: pesign-obs-integration # for objtool BuildRequires: libelf-devel -# BEGIN BINARY DEPS Provides: %name = %version-%source_rel # bnc#901925 Provides: %name-%version-%source_rel @@ -104,7 +103,7 @@ # obsolete the -base subpackage from SLE11, so that the base files are not # owned by multiple packages now. The dependency is not correct wrt openSUSE # 11.2 - 11.4, but we primarily care about the supported upgrade path. -Obsoletes: kernel-%build_flavor-base < 3.1 +Obsoletes: %name-base < 3.1 Recommends: kernel-firmware # The following is copied to the -base subpackage as well # BEGIN COMMON DEPS @@ -170,10 +169,38 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-d1f1d19eba1b818d1d526bc8fffc7eb4eff5920c -Provides: kernel-srchash-d1f1d19eba1b818d1d526bc8fffc7eb4eff5920c +Provides: kernel-%build_flavor-base-srchash-2a318317524e454ff29faf9c19219c1f2c2d8e70 +Provides: kernel-srchash-2a318317524e454ff29faf9c19219c1f2c2d8e70 # END COMMON DEPS -Provides: %name-srchash-d1f1d19eba1b818d1d526bc8fffc7eb4eff5920c +Provides: %name-srchash-2a318317524e454ff29faf9c19219c1f2c2d8e70 +%ifarch %ix86 +Provides: kernel-smp = 2.6.17 +Obsoletes: kernel-smp <= 2.6.17 +Provides: kernel-trace = 3.13 +Obsoletes: kernel-trace <= 3.13 +%endif +%ifarch ppc64 +Provides: kernel-kdump = 2.6.28 +Obsoletes: kernel-kdump <= 2.6.28 +%endif +%ifarch s390x +Provides: kernel-trace = 3.13 +Obsoletes: kernel-trace <= 3.13 +%endif +%ifarch x86_64 +Provides: kernel-smp = 2.6.17 +Obsoletes: kernel-smp <= 2.6.17 +Provides: kernel-trace = 3.13 +Obsoletes: kernel-trace <= 3.13 +Provides: kernel-bigsmp = 3.1 +Obsoletes: kernel-bigsmp <= 3.1 +Provides: kernel-desktop = 4.3 +Obsoletes: kernel-desktop <= 4.3 +Provides: kernel-xen = 4.4 +Obsoletes: kernel-xen <= 4.4 +Provides: kernel-ec2 = 4.4 +Obsoletes: kernel-ec2 <= 4.4 +%endif %ifarch %ix86 Provides: kernel-trace-base = 3.13 Obsoletes: kernel-trace-base <= 3.13 @@ -251,13 +278,13 @@ Source76: check-module-license Source77: klp-symbols Source78: modules.fips -Source79: kernel-subpackage-build.spec.in -Source80: kernel-subpackage.conf -Source81: subpackage-names.conf -Source82: splitflist -Source83: mergedep -Source84: moddep -Source85: modflist +Source79: splitflist +Source80: mergedep +Source81: moddep +Source82: modflist +Source83: kernel-subpackage-build +Source84: kernel-subpackage-spec +Source85: kernel-default-base.spec.txt Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -273,7 +300,7 @@ Source120: kabi.tar.bz2 Source121: sysctl.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: aarch64 %ix86 ppc64 ppc64le s390x x86_64 +ExclusiveArch: aarch64 armv6hl armv7hl %ix86 ppc64 ppc64le s390x x86_64 %define kmp_target_cpu %_target_cpu %ifarch %ix86 # Only i386/default supports i586, mark other flavors' packages as i686 @@ -360,35 +387,6 @@ NoSource: 113 NoSource: 120 NoSource: 121 -# END BINARY DEPS -%ifarch %ix86 -Provides: kernel-smp = 2.6.17 -Obsoletes: kernel-smp <= 2.6.17 -Provides: kernel-trace = 3.13 -Obsoletes: kernel-trace <= 3.13 -%endif -%ifarch ppc64 -Provides: kernel-kdump = 2.6.28 -Obsoletes: kernel-kdump <= 2.6.28 -%endif -%ifarch s390x -Provides: kernel-trace = 3.13 -Obsoletes: kernel-trace <= 3.13 -%endif -%ifarch x86_64 -Provides: kernel-smp = 2.6.17 -Obsoletes: kernel-smp <= 2.6.17 -Provides: kernel-trace = 3.13 -Obsoletes: kernel-trace <= 3.13 -Provides: kernel-bigsmp = 3.1 -Obsoletes: kernel-bigsmp <= 3.1 -Provides: kernel-desktop = 4.3 -Obsoletes: kernel-desktop <= 4.3 -Provides: kernel-xen = 4.4 -Obsoletes: kernel-xen <= 4.4 -Provides: kernel-ec2 = 4.4 -Obsoletes: kernel-ec2 <= 4.4 -%endif # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. @@ -796,7 +794,7 @@ for sub in '' '-extra'; do case "$sub" in - '-base' | '') base_package=1 ;; + '') base_package=1 ;; *) base_package=0 ;; esac for script in preun postun pre post devel-pre devel-post; do @@ -807,9 +805,10 @@ sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \ -e "s:@IMAGE@:$image:g" \ -e "s:@FLAVOR""@:%build_flavor:g" \ - -e "s:@SUBPACKAGE""@:%name$sub:g" \ + -e "s:@SUBPACKAGE@:%name$sub:g" \ -e "s:@BASE_PACKAGE@:$base_package:g" \ -e "s:@RPM_VERSION_RELEASE@:%version-%release:g" \ + -e "s:@RPM_TARGET_CPU@:%_target_cpu:g" \ -e "s:@CPU_ARCH_FLAVOR@:%cpu_arch_flavor:g" \ -e "s:@SRCVARIANT@:%variant:g" \ %_sourcedir/$script.sh > %my_builddir/$script$sub.sh ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.6y4H8g/_old 2019-03-24 14:58:00.603194580 +0100 +++ /var/tmp/diff_new_pack.6y4H8g/_new 2019-03-24 14:58:00.627194577 +0100 @@ -17,7 +17,7 @@ %define srcversion 5.0 -%define patchversion 5.0.2 +%define patchversion 5.0.3 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -25,15 +25,15 @@ %define build_html 1 %define build_pdf 0 -%(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}) +%(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: kernel-docs Summary: Kernel Documentation License: GPL-2.0 Group: Documentation/Man -Version: 5.0.2 +Version: 5.0.3 %if 0%{?is_kotd} -Release: <RELEASE>.gd1f1d19 +Release: <RELEASE>.g2a31831 %else Release: 0 %endif @@ -63,7 +63,7 @@ %endif Url: http://www.kernel.org/ Provides: %name = %version-%source_rel -Provides: %name-srchash-d1f1d19eba1b818d1d526bc8fffc7eb4eff5920c +Provides: %name-srchash-2a318317524e454ff29faf9c19219c1f2c2d8e70 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz @@ -118,13 +118,13 @@ Source76: check-module-license Source77: klp-symbols Source78: modules.fips -Source79: kernel-subpackage-build.spec.in -Source80: kernel-subpackage.conf -Source81: subpackage-names.conf -Source82: splitflist -Source83: mergedep -Source84: moddep -Source85: modflist +Source79: splitflist +Source80: mergedep +Source81: moddep +Source82: modflist +Source83: kernel-subpackage-build +Source84: kernel-subpackage-spec +Source85: kernel-default-base.spec.txt Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 ++++++ kernel-kvmsmall.spec ++++++ --- /var/tmp/diff_new_pack.6y4H8g/_old 2019-03-24 14:58:00.915194540 +0100 +++ /var/tmp/diff_new_pack.6y4H8g/_new 2019-03-24 14:58:00.955194535 +0100 @@ -18,7 +18,7 @@ %define srcversion 5.0 -%define patchversion 5.0.2 +%define patchversion 5.0.3 %define variant %{nil} %define vanilla_only 0 @@ -41,7 +41,7 @@ %define klp_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}) +%(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}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor @@ -62,9 +62,9 @@ Summary: The Small Developer Kernel for KVM License: GPL-2.0 Group: System/Kernel -Version: 5.0.2 +Version: 5.0.3 %if 0%{?is_kotd} -Release: <RELEASE>.gd1f1d19 +Release: <RELEASE>.g2a31831 %else Release: 0 %endif @@ -91,7 +91,6 @@ BuildRequires: pesign-obs-integration # for objtool BuildRequires: libelf-devel -# BEGIN BINARY DEPS Provides: %name = %version-%source_rel # bnc#901925 Provides: %name-%version-%source_rel @@ -104,7 +103,7 @@ # obsolete the -base subpackage from SLE11, so that the base files are not # owned by multiple packages now. The dependency is not correct wrt openSUSE # 11.2 - 11.4, but we primarily care about the supported upgrade path. -Obsoletes: kernel-%build_flavor-base < 3.1 +Obsoletes: %name-base < 3.1 Recommends: kernel-firmware # The following is copied to the -base subpackage as well # BEGIN COMMON DEPS @@ -170,10 +169,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-d1f1d19eba1b818d1d526bc8fffc7eb4eff5920c -Provides: kernel-srchash-d1f1d19eba1b818d1d526bc8fffc7eb4eff5920c +Provides: kernel-%build_flavor-base-srchash-2a318317524e454ff29faf9c19219c1f2c2d8e70 +Provides: kernel-srchash-2a318317524e454ff29faf9c19219c1f2c2d8e70 # END COMMON DEPS -Provides: %name-srchash-d1f1d19eba1b818d1d526bc8fffc7eb4eff5920c +Provides: %name-srchash-2a318317524e454ff29faf9c19219c1f2c2d8e70 %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source2: source-post.sh @@ -227,13 +226,13 @@ Source76: check-module-license Source77: klp-symbols Source78: modules.fips -Source79: kernel-subpackage-build.spec.in -Source80: kernel-subpackage.conf -Source81: subpackage-names.conf -Source82: splitflist -Source83: mergedep -Source84: moddep -Source85: modflist +Source79: splitflist +Source80: mergedep +Source81: moddep +Source82: modflist +Source83: kernel-subpackage-build +Source84: kernel-subpackage-spec +Source85: kernel-default-base.spec.txt Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -336,7 +335,6 @@ NoSource: 113 NoSource: 120 NoSource: 121 -# END BINARY DEPS # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. @@ -751,7 +749,7 @@ for sub in '' '-extra'; do case "$sub" in - '-base' | '') base_package=1 ;; + '') base_package=1 ;; *) base_package=0 ;; esac for script in preun postun pre post devel-pre devel-post; do @@ -762,9 +760,10 @@ sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \ -e "s:@IMAGE@:$image:g" \ -e "s:@FLAVOR""@:%build_flavor:g" \ - -e "s:@SUBPACKAGE""@:%name$sub:g" \ + -e "s:@SUBPACKAGE@:%name$sub:g" \ -e "s:@BASE_PACKAGE@:$base_package:g" \ -e "s:@RPM_VERSION_RELEASE@:%version-%release:g" \ + -e "s:@RPM_TARGET_CPU@:%_target_cpu:g" \ -e "s:@CPU_ARCH_FLAVOR@:%cpu_arch_flavor:g" \ -e "s:@SRCVARIANT@:%variant:g" \ %_sourcedir/$script.sh > %my_builddir/$script$sub.sh ++++++ kernel-lpae.spec ++++++ ++++ 1463 lines (skipped) ++++++ kernel-obs-build.spec ++++++ --- /var/tmp/diff_new_pack.6y4H8g/_old 2019-03-24 14:58:01.491194466 +0100 +++ /var/tmp/diff_new_pack.6y4H8g/_new 2019-03-24 14:58:01.511194463 +0100 @@ -19,7 +19,7 @@ #!BuildIgnore: post-build-checks -%define patchversion 5.0.2 +%define patchversion 5.0.3 %define variant %{nil} %define vanilla_only 0 @@ -45,14 +45,14 @@ %endif %endif %endif -BuildRequires: kernel%kernel_flavor-srchash-d1f1d19eba1b818d1d526bc8fffc7eb4eff5920c +BuildRequires: kernel%kernel_flavor-srchash-2a318317524e454ff29faf9c19219c1f2c2d8e70 %if 0%{?rhel_version} BuildRequires: kernel %define kernel_flavor "" %endif -ExclusiveArch: aarch64 %ix86 ppc64 ppc64le s390x x86_64 +ExclusiveArch: aarch64 armv6hl armv7hl %ix86 ppc64 ppc64le s390x x86_64 %if 0%{?suse_version} < 1315 # For SLE 11 BuildRequires: mkinitrd @@ -64,9 +64,9 @@ Summary: package kernel and initrd for OBS VM builds License: GPL-2.0 Group: SLES -Version: 5.0.2 +Version: 5.0.3 %if 0%{?is_kotd} -Release: <RELEASE>.gd1f1d19 +Release: <RELEASE>.g2a31831 %else Release: 0 %endif ++++++ kernel-obs-qa.spec ++++++ --- /var/tmp/diff_new_pack.6y4H8g/_old 2019-03-24 14:58:01.863194418 +0100 +++ /var/tmp/diff_new_pack.6y4H8g/_new 2019-03-24 14:58:01.899194414 +0100 @@ -17,7 +17,7 @@ # needsrootforbuild -%define patchversion 5.0.2 +%define patchversion 5.0.3 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -28,7 +28,7 @@ # here as well to avoid that qa and build package build parallel BuildRequires: kernel-obs-build BuildRequires: modutils -ExclusiveArch: aarch64 %ix86 ppc64 ppc64le s390x x86_64 +ExclusiveArch: aarch64 armv6hl armv7hl %ix86 ppc64 ppc64le s390x x86_64 %if 0%{?suse_version} < 1200 # for SLE 11 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -36,9 +36,9 @@ Summary: Basic QA tests for the kernel License: GPL-2.0 Group: SLES -Version: 5.0.2 +Version: 5.0.3 %if 0%{?is_kotd} -Release: <RELEASE>.gd1f1d19 +Release: <RELEASE>.g2a31831 %else Release: 0 %endif ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.6y4H8g/_old 2019-03-24 14:58:02.163194380 +0100 +++ /var/tmp/diff_new_pack.6y4H8g/_new 2019-03-24 14:58:02.187194377 +0100 @@ -18,7 +18,7 @@ %define srcversion 5.0 -%define patchversion 5.0.2 +%define patchversion 5.0.3 %define variant %{nil} %define vanilla_only 0 @@ -41,7 +41,7 @@ %define klp_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}) +%(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}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor @@ -62,9 +62,9 @@ Summary: Kernel with PAE Support License: GPL-2.0 Group: System/Kernel -Version: 5.0.2 +Version: 5.0.3 %if 0%{?is_kotd} -Release: <RELEASE>.gd1f1d19 +Release: <RELEASE>.g2a31831 %else Release: 0 %endif @@ -91,7 +91,6 @@ BuildRequires: pesign-obs-integration # for objtool BuildRequires: libelf-devel -# BEGIN BINARY DEPS Provides: %name = %version-%source_rel # bnc#901925 Provides: %name-%version-%source_rel @@ -104,7 +103,7 @@ # obsolete the -base subpackage from SLE11, so that the base files are not # owned by multiple packages now. The dependency is not correct wrt openSUSE # 11.2 - 11.4, but we primarily care about the supported upgrade path. -Obsoletes: kernel-%build_flavor-base < 3.1 +Obsoletes: %name-base < 3.1 Recommends: kernel-firmware # The following is copied to the -base subpackage as well # BEGIN COMMON DEPS @@ -170,10 +169,22 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-d1f1d19eba1b818d1d526bc8fffc7eb4eff5920c -Provides: kernel-srchash-d1f1d19eba1b818d1d526bc8fffc7eb4eff5920c +Provides: kernel-%build_flavor-base-srchash-2a318317524e454ff29faf9c19219c1f2c2d8e70 +Provides: kernel-srchash-2a318317524e454ff29faf9c19219c1f2c2d8e70 # END COMMON DEPS -Provides: %name-srchash-d1f1d19eba1b818d1d526bc8fffc7eb4eff5920c +Provides: %name-srchash-2a318317524e454ff29faf9c19219c1f2c2d8e70 +%ifarch %ix86 +Provides: kernel-bigsmp = 2.6.17 +Obsoletes: kernel-bigsmp <= 2.6.17 +Provides: kernel-vmi = 2.6.38 +Obsoletes: kernel-vmi <= 2.6.38 +Provides: kernel-desktop = 4.3 +Obsoletes: kernel-desktop <= 4.3 +Provides: kernel-xen = 4.4 +Obsoletes: kernel-xen <= 4.4 +Provides: kernel-ec2 = 4.4 +Obsoletes: kernel-ec2 <= 4.4 +%endif %ifarch %ix86 Provides: kernel-vmi-base = 2.6.38 Obsoletes: kernel-vmi-base <= 2.6.38 @@ -237,13 +248,13 @@ Source76: check-module-license Source77: klp-symbols Source78: modules.fips -Source79: kernel-subpackage-build.spec.in -Source80: kernel-subpackage.conf -Source81: subpackage-names.conf -Source82: splitflist -Source83: mergedep -Source84: moddep -Source85: modflist +Source79: splitflist +Source80: mergedep +Source81: moddep +Source82: modflist +Source83: kernel-subpackage-build +Source84: kernel-subpackage-spec +Source85: kernel-default-base.spec.txt Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -346,19 +357,6 @@ NoSource: 113 NoSource: 120 NoSource: 121 -# END BINARY DEPS -%ifarch %ix86 -Provides: kernel-bigsmp = 2.6.17 -Obsoletes: kernel-bigsmp <= 2.6.17 -Provides: kernel-vmi = 2.6.38 -Obsoletes: kernel-vmi <= 2.6.38 -Provides: kernel-desktop = 4.3 -Obsoletes: kernel-desktop <= 4.3 -Provides: kernel-xen = 4.4 -Obsoletes: kernel-xen <= 4.4 -Provides: kernel-ec2 = 4.4 -Obsoletes: kernel-ec2 <= 4.4 -%endif # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. @@ -773,7 +771,7 @@ for sub in '' '-extra'; do case "$sub" in - '-base' | '') base_package=1 ;; + '') base_package=1 ;; *) base_package=0 ;; esac for script in preun postun pre post devel-pre devel-post; do @@ -784,9 +782,10 @@ sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \ -e "s:@IMAGE@:$image:g" \ -e "s:@FLAVOR""@:%build_flavor:g" \ - -e "s:@SUBPACKAGE""@:%name$sub:g" \ + -e "s:@SUBPACKAGE@:%name$sub:g" \ -e "s:@BASE_PACKAGE@:$base_package:g" \ -e "s:@RPM_VERSION_RELEASE@:%version-%release:g" \ + -e "s:@RPM_TARGET_CPU@:%_target_cpu:g" \ -e "s:@CPU_ARCH_FLAVOR@:%cpu_arch_flavor:g" \ -e "s:@SRCVARIANT@:%variant:g" \ %_sourcedir/$script.sh > %my_builddir/$script$sub.sh ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.6y4H8g/_old 2019-03-24 14:58:02.503194336 +0100 +++ /var/tmp/diff_new_pack.6y4H8g/_new 2019-03-24 14:58:02.527194333 +0100 @@ -18,7 +18,7 @@ %define srcversion 5.0 -%define patchversion 5.0.2 +%define patchversion 5.0.3 %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.0.2 +Version: 5.0.3 %if 0%{?is_kotd} -Release: <RELEASE>.gd1f1d19 +Release: <RELEASE>.g2a31831 %else Release: 0 %endif @@ -43,7 +43,7 @@ BuildRequires: sed Requires(post): coreutils sed Provides: %name = %version-%source_rel -Provides: %name-srchash-d1f1d19eba1b818d1d526bc8fffc7eb4eff5920c +Provides: %name-srchash-2a318317524e454ff29faf9c19219c1f2c2d8e70 Provides: linux Provides: multiversion(kernel) Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz @@ -98,13 +98,13 @@ Source76: check-module-license Source77: klp-symbols Source78: modules.fips -Source79: kernel-subpackage-build.spec.in -Source80: kernel-subpackage.conf -Source81: subpackage-names.conf -Source82: splitflist -Source83: mergedep -Source84: moddep -Source85: modflist +Source79: splitflist +Source80: mergedep +Source81: moddep +Source82: modflist +Source83: kernel-subpackage-build +Source84: kernel-subpackage-spec +Source85: kernel-default-base.spec.txt Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -131,7 +131,7 @@ Recommends: libelf-devel Recommends: openssl-devel -%(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}) +%(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}) %define symbols %(set -- $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define variant_symbols %(case %name in (*-rt) echo "RT" ;; esac) @@ -162,6 +162,7 @@ %package -n kernel-macros Summary: RPM macros for building Kernel Module Packages Group: Development/Sources +Provides: kernel-subpackage-macros %description -n kernel-macros This package provides the rpm macros and templates for Kernel Module Pakcages @@ -241,6 +242,10 @@ install -m 755 -d $RPM_BUILD_ROOT/usr/lib/rpm install -m 644 %_sourcedir/kernel-{module,cert}-subpackage \ $RPM_BUILD_ROOT/usr/lib/rpm/ +install -m 755 -d $RPM_BUILD_ROOT/usr/lib/rpm/kernel +install -m 755 %_sourcedir/{splitflist,mergedep,moddep,modflist,kernel-subpackage-build} $RPM_BUILD_ROOT/usr/lib/rpm/kernel +install -m 644 %_sourcedir/kernel-subpackage-spec $RPM_BUILD_ROOT/usr/lib/rpm/kernel +install -m 644 -T %_sourcedir/kernel-default-base.spec.txt $RPM_BUILD_ROOT/usr/lib/rpm/kernel/kernel-default-base.spec %endif sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \ @@ -278,6 +283,8 @@ %defattr(-,root,root) /etc/rpm/macros.kernel-source /usr/lib/rpm/kernel-*-subpackage +%dir /usr/lib/rpm/kernel +/usr/lib/rpm/kernel/* %endif %endif ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.6y4H8g/_old 2019-03-24 14:58:02.935194281 +0100 +++ /var/tmp/diff_new_pack.6y4H8g/_new 2019-03-24 14:58:02.975194276 +0100 @@ -24,10 +24,10 @@ Summary: Kernel Symbol Versions (modversions) License: GPL-2.0 Group: Development/Sources -Version: 5.0.2 +Version: 5.0.3 %if %using_buildservice %if 0%{?is_kotd} -Release: <RELEASE>.gd1f1d19 +Release: <RELEASE>.g2a31831 %else Release: 0 %endif @@ -41,9 +41,12 @@ %ifarch aarch64 Requires: kernel-64kb-devel = %version-%source_rel %endif -%ifarch aarch64 %ix86 ppc64 ppc64le s390x x86_64 +%ifarch aarch64 armv6hl armv7hl %ix86 ppc64 ppc64le s390x x86_64 Requires: kernel-default-devel = %version-%source_rel %endif +%ifarch armv7hl +Requires: kernel-lpae-devel = %version-%source_rel +%endif %ifarch %ix86 Requires: kernel-pae-devel = %version-%source_rel %endif @@ -52,12 +55,12 @@ %endif Requires: pesign-obs-integration Provides: %name = %version-%source_rel -Provides: %name-srchash-d1f1d19eba1b818d1d526bc8fffc7eb4eff5920c +Provides: %name-srchash-2a318317524e454ff29faf9c19219c1f2c2d8e70 Provides: multiversion(kernel) Source: README.KSYMS Requires: kernel-devel%variant = %version-%source_rel BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: %ix86 aarch64 ppc64 ppc64le s390x x86_64 +ExclusiveArch: %ix86 aarch64 armv6hl armv7hl ppc64 ppc64le s390x x86_64 Prefix: /usr/src %description ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.6y4H8g/_old 2019-03-24 14:58:03.255194240 +0100 +++ /var/tmp/diff_new_pack.6y4H8g/_new 2019-03-24 14:58:03.311194233 +0100 @@ -18,7 +18,7 @@ %define srcversion 5.0 -%define patchversion 5.0.2 +%define patchversion 5.0.3 %define variant %{nil} %define vanilla_only 0 @@ -41,7 +41,7 @@ %define klp_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}) +%(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}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor @@ -62,9 +62,9 @@ Summary: The Standard Kernel - without any SUSE patches License: GPL-2.0 Group: System/Kernel -Version: 5.0.2 +Version: 5.0.3 %if 0%{?is_kotd} -Release: <RELEASE>.gd1f1d19 +Release: <RELEASE>.g2a31831 %else Release: 0 %endif @@ -91,7 +91,6 @@ BuildRequires: pesign-obs-integration # for objtool BuildRequires: libelf-devel -# BEGIN BINARY DEPS Provides: %name = %version-%source_rel # bnc#901925 Provides: %name-%version-%source_rel @@ -104,7 +103,7 @@ # obsolete the -base subpackage from SLE11, so that the base files are not # owned by multiple packages now. The dependency is not correct wrt openSUSE # 11.2 - 11.4, but we primarily care about the supported upgrade path. -Obsoletes: kernel-%build_flavor-base < 3.1 +Obsoletes: %name-base < 3.1 Recommends: kernel-firmware # The following is copied to the -base subpackage as well # BEGIN COMMON DEPS @@ -170,10 +169,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-d1f1d19eba1b818d1d526bc8fffc7eb4eff5920c -Provides: kernel-srchash-d1f1d19eba1b818d1d526bc8fffc7eb4eff5920c +Provides: kernel-%build_flavor-base-srchash-2a318317524e454ff29faf9c19219c1f2c2d8e70 +Provides: kernel-srchash-2a318317524e454ff29faf9c19219c1f2c2d8e70 # END COMMON DEPS -Provides: %name-srchash-d1f1d19eba1b818d1d526bc8fffc7eb4eff5920c +Provides: %name-srchash-2a318317524e454ff29faf9c19219c1f2c2d8e70 %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source2: source-post.sh @@ -227,13 +226,13 @@ Source76: check-module-license Source77: klp-symbols Source78: modules.fips -Source79: kernel-subpackage-build.spec.in -Source80: kernel-subpackage.conf -Source81: subpackage-names.conf -Source82: splitflist -Source83: mergedep -Source84: moddep -Source85: modflist +Source79: splitflist +Source80: mergedep +Source81: moddep +Source82: modflist +Source83: kernel-subpackage-build +Source84: kernel-subpackage-spec +Source85: kernel-default-base.spec.txt Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -249,7 +248,7 @@ Source120: kabi.tar.bz2 Source121: sysctl.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: aarch64 %ix86 ppc64 ppc64le s390x x86_64 +ExclusiveArch: aarch64 armv6hl armv7hl %ix86 ppc64 ppc64le s390x x86_64 %define kmp_target_cpu %_target_cpu %ifarch %ix86 # Only i386/default supports i586, mark other flavors' packages as i686 @@ -336,7 +335,6 @@ NoSource: 113 NoSource: 120 NoSource: 121 -# END BINARY DEPS # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. @@ -744,7 +742,7 @@ for sub in '' '-extra'; do case "$sub" in - '-base' | '') base_package=1 ;; + '') base_package=1 ;; *) base_package=0 ;; esac for script in preun postun pre post devel-pre devel-post; do @@ -755,9 +753,10 @@ sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \ -e "s:@IMAGE@:$image:g" \ -e "s:@FLAVOR""@:%build_flavor:g" \ - -e "s:@SUBPACKAGE""@:%name$sub:g" \ + -e "s:@SUBPACKAGE@:%name$sub:g" \ -e "s:@BASE_PACKAGE@:$base_package:g" \ -e "s:@RPM_VERSION_RELEASE@:%version-%release:g" \ + -e "s:@RPM_TARGET_CPU@:%_target_cpu:g" \ -e "s:@CPU_ARCH_FLAVOR@:%cpu_arch_flavor:g" \ -e "s:@SRCVARIANT@:%variant:g" \ %_sourcedir/$script.sh > %my_builddir/$script$sub.sh ++++++ kernel-zfcpdump.spec ++++++ --- /var/tmp/diff_new_pack.6y4H8g/_old 2019-03-24 14:58:03.579194199 +0100 +++ /var/tmp/diff_new_pack.6y4H8g/_new 2019-03-24 14:58:03.607194195 +0100 @@ -18,7 +18,7 @@ %define srcversion 5.0 -%define patchversion 5.0.2 +%define patchversion 5.0.3 %define variant %{nil} %define vanilla_only 0 @@ -41,7 +41,7 @@ %define klp_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}) +%(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}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor @@ -62,9 +62,9 @@ Summary: The IBM System Z zfcpdump Kernel License: GPL-2.0 Group: System/Kernel -Version: 5.0.2 +Version: 5.0.3 %if 0%{?is_kotd} -Release: <RELEASE>.gd1f1d19 +Release: <RELEASE>.g2a31831 %else Release: 0 %endif @@ -91,7 +91,6 @@ BuildRequires: pesign-obs-integration # for objtool BuildRequires: libelf-devel -# BEGIN BINARY DEPS Provides: %name = %version-%source_rel # bnc#901925 Provides: %name-%version-%source_rel @@ -104,7 +103,7 @@ # obsolete the -base subpackage from SLE11, so that the base files are not # owned by multiple packages now. The dependency is not correct wrt openSUSE # 11.2 - 11.4, but we primarily care about the supported upgrade path. -Obsoletes: kernel-%build_flavor-base < 3.1 +Obsoletes: %name-base < 3.1 Recommends: kernel-firmware # The following is copied to the -base subpackage as well # BEGIN COMMON DEPS @@ -170,10 +169,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-d1f1d19eba1b818d1d526bc8fffc7eb4eff5920c -Provides: kernel-srchash-d1f1d19eba1b818d1d526bc8fffc7eb4eff5920c +Provides: kernel-%build_flavor-base-srchash-2a318317524e454ff29faf9c19219c1f2c2d8e70 +Provides: kernel-srchash-2a318317524e454ff29faf9c19219c1f2c2d8e70 # END COMMON DEPS -Provides: %name-srchash-d1f1d19eba1b818d1d526bc8fffc7eb4eff5920c +Provides: %name-srchash-2a318317524e454ff29faf9c19219c1f2c2d8e70 %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source2: source-post.sh @@ -227,13 +226,13 @@ Source76: check-module-license Source77: klp-symbols Source78: modules.fips -Source79: kernel-subpackage-build.spec.in -Source80: kernel-subpackage.conf -Source81: subpackage-names.conf -Source82: splitflist -Source83: mergedep -Source84: moddep -Source85: modflist +Source79: splitflist +Source80: mergedep +Source81: moddep +Source82: modflist +Source83: kernel-subpackage-build +Source84: kernel-subpackage-spec +Source85: kernel-default-base.spec.txt Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -336,7 +335,6 @@ NoSource: 113 NoSource: 120 NoSource: 121 -# END BINARY DEPS # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. @@ -747,7 +745,7 @@ for sub in '' '-extra'; do case "$sub" in - '-base' | '') base_package=1 ;; + '') base_package=1 ;; *) base_package=0 ;; esac for script in preun postun pre post devel-pre devel-post; do @@ -758,9 +756,10 @@ sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \ -e "s:@IMAGE@:$image:g" \ -e "s:@FLAVOR""@:%build_flavor:g" \ - -e "s:@SUBPACKAGE""@:%name$sub:g" \ + -e "s:@SUBPACKAGE@:%name$sub:g" \ -e "s:@BASE_PACKAGE@:$base_package:g" \ -e "s:@RPM_VERSION_RELEASE@:%version-%release:g" \ + -e "s:@RPM_TARGET_CPU@:%_target_cpu:g" \ -e "s:@CPU_ARCH_FLAVOR@:%cpu_arch_flavor:g" \ -e "s:@SRCVARIANT@:%variant:g" \ %_sourcedir/$script.sh > %my_builddir/$script$sub.sh ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.6y4H8g/_old 2019-03-24 14:58:03.923194155 +0100 +++ /var/tmp/diff_new_pack.6y4H8g/_new 2019-03-24 14:58:03.927194155 +0100 @@ -6,6 +6,7 @@ <package>kernel-debug</package> <package>kernel-default</package> <package>kernel-kvmsmall</package> +<package>kernel-lpae</package> <package>kernel-pae</package> <package>kernel-vanilla</package> <package>kernel-zfcpdump</package> @@ -56,6 +57,7 @@ <package>kernel-debug</package> <package>kernel-default</package> <package>kernel-kvmsmall</package> +<package>kernel-lpae</package> <package>kernel-pae</package> <package>kernel-vanilla</package> <package>kernel-zfcpdump</package> @@ -79,6 +81,7 @@ <package>kernel-debug</package> <package>kernel-default</package> <package>kernel-kvmsmall</package> +<package>kernel-lpae</package> <package>kernel-pae</package> <package>kernel-vanilla</package> <package>kernel-zfcpdump</package> @@ -98,6 +101,7 @@ <package>kernel-debug</package> <package>kernel-default</package> <package>kernel-kvmsmall</package> +<package>kernel-lpae</package> <package>kernel-pae</package> <package>kernel-vanilla</package> <package>kernel-zfcpdump</package> @@ -117,6 +121,7 @@ <package>kernel-debug</package> <package>kernel-default</package> <package>kernel-kvmsmall</package> +<package>kernel-lpae</package> <package>kernel-pae</package> <package>kernel-vanilla</package> <package>kernel-zfcpdump</package> ++++++ config.conf ++++++ --- /var/tmp/diff_new_pack.6y4H8g/_old 2019-03-24 14:58:04.839194037 +0100 +++ /var/tmp/diff_new_pack.6y4H8g/_new 2019-03-24 14:58:04.855194035 +0100 @@ -28,11 +28,11 @@ +ppc64le ppc64le/vanilla # ARM architectures -+armv6hl -!needs_updating armv6hl/default -+armv6hl -!needs_updating armv6hl/vanilla -+armv7hl -!needs_updating armv7hl/default -+armv7hl -!needs_updating armv7hl/vanilla -+armv7hl -!needs_updating armv7hl/lpae ++armv6hl armv6hl/default ++armv6hl armv6hl/vanilla ++armv7hl armv7hl/default ++armv7hl armv7hl/vanilla ++armv7hl armv7hl/lpae +arm64 arm64/default +arm64 arm64/64kb +arm64 arm64/vanilla ++++++ config.tar.bz2 ++++++ ++++ 3156 lines of diff (skipped) ++++++ kernel-binary.spec.in ++++++ --- /var/tmp/diff_new_pack.6y4H8g/_old 2019-03-24 14:58:06.859193779 +0100 +++ /var/tmp/diff_new_pack.6y4H8g/_new 2019-03-24 14:58:06.887193775 +0100 @@ -91,7 +91,6 @@ BuildRequires: pesign-obs-integration # for objtool BuildRequires: libelf-devel -# BEGIN BINARY DEPS Provides: %name = %version-%source_rel # bnc#901925 Provides: %name-%version-%source_rel @@ -104,7 +103,7 @@ # obsolete the -base subpackage from SLE11, so that the base files are not # owned by multiple packages now. The dependency is not correct wrt openSUSE # 11.2 - 11.4, but we primarily care about the supported upgrade path. -Obsoletes: kernel-%build_flavor-base < 3.1 +Obsoletes: %name-base < 3.1 Recommends: kernel-firmware # The following is copied to the -base subpackage as well # BEGIN COMMON DEPS @@ -174,6 +173,7 @@ Provides: kernel-srchash-@COMMIT_FULL@ # END COMMON DEPS Provides: %name-srchash-@COMMIT_FULL@ +@PROVIDES_OBSOLETES@ @PROVIDES_OBSOLETES_BASE@ %obsolete_rebuilds %name @SOURCES@ @@ -193,8 +193,6 @@ # These files are found in the kernel-source package: @NOSOURCE@ -# END BINARY DEPS -@PROVIDES_OBSOLETES@ # The following KMPs have been integrated into the kernel package, # grouped by the last product that contained them. @@ -602,7 +600,7 @@ for sub in '' '-extra'; do case "$sub" in - '-base' | '') base_package=1 ;; + '') base_package=1 ;; *) base_package=0 ;; esac for script in preun postun pre post devel-pre devel-post; do @@ -613,9 +611,10 @@ sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \ -e "s:@IMAGE@:$image:g" \ -e "s:@FLAVOR""@:%build_flavor:g" \ - -e "s:@SUBPACKAGE""@:%name$sub:g" \ + -e "s:@SUBPACKAGE@:%name$sub:g" \ -e "s:@BASE_PACKAGE@:$base_package:g" \ -e "s:@RPM_VERSION_RELEASE@:%version-%release:g" \ + -e "s:@RPM_TARGET_CPU@:%_target_cpu:g" \ -e "s:@CPU_ARCH_FLAVOR@:%cpu_arch_flavor:g" \ -e "s:@SRCVARIANT@:%variant:g" \ %_sourcedir/$script.sh > %my_builddir/$script$sub.sh ++++++ kernel-default-base.spec.txt ++++++ # # Sample spec file using the subpackage infrastructure. # # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # needssslcertforbuild # To be defined by user %define build_flavor default # variant includes dash: %%define variant -azure %define variant %{nil} %define subpackage base %define extrasummary base modules %define extradescription This package contains only the base modules, required in all installs. %define misc_modules button edd iscsi_ibft i6300esb %define virtio_modules virtio_blk virtio-rng virtio_console virtio-gpu \ virtio_net virtio_scsi virtio virtio_balloon virtio_input virtio_mmio \ virtio_pci virtio_ring %define xen_modules xen-blkfront xen-kbdfront xen-netfront xen-fbfront xenblk xennet %define vmware_modules vmw_balloon vmw_vmci vmxnet3 vmw_pvscsi vmw_vsock_vmci_transport %define hyperv_modules hid-hyperv hv_balloon hv_utils \ hv_vmbus hyperv-keyboard hv_netvsc hv_storvsc scsi_transport_fc hyperv_fb %define net_drivers 8390 ne2k-pci tulip e100 e1000 e1000e 8139cp 8139too %define scsi_modules scsi_transport_iscsi sd_mod sg sr_mod st scsi_mod %define block_drivers loop dm-mod ahci ata_piix mptsas mptspi BusLogic sym53c8xx aam53c974 %define usb_modules usb-common usbcore ehci-hcd ehci-pci ohci-hcd ohci-pci uhci-hcd \ xhci-hcd xhci-pci typec_ucsi ucsi_acpi typec ums-alauda ums-cypress ums-datafab \ ums-eneub6250 ums-freecom ums-isd200 ums-jumpshot ums-karma ums-onetouch \ ums-realtek ums-sddr09 ums-sddr55 ums-usbat usb-storage %define filesystems autofs4 btrfs ext4 vfat isofs jbd2 mbcache nfsv2 nfsv3 nfsv4 overlay xfs \ nls_cp437 nls_iso8859-1 %define networking tun veth bridge arp_tables arpt_mangle arptable_filter \ ip_tables ipt_ECN ipt_MASQUERADE ipt_REJECT ipt_SYNPROXY ipt_ah ipt_rpfilter \ iptable_filter iptable_mangle iptable_nat iptable_raw iptable_security \ nf_conntrack_ipv4 nf_defrag_ipv4 nf_dup_ipv4 nf_log_arp nf_log_ipv4 nf_nat_h323 \ nf_nat_ipv4 nf_nat_masquerade_ipv4 nf_nat_pptp nf_nat_proto_gre \ nf_nat_snmp_basic ip6_tables ip6t_MASQUERADE ip6t_NPT ip6t_REJECT ip6t_SYNPROXY \ ip6t_ah ip6t_eui64 ip6t_frag ip6t_hbh ip6t_ipv6header ip6t_mh ip6t_rpfilter \ ip6t_rt ip6table_filter ip6table_mangle ip6table_nat ip6table_raw \ ip6table_security nf_conntrack_ipv6 nf_defrag_ipv6 nf_dup_ipv6 nf_log_ipv6 \ nf_nat_ipv6 nf_nat_masquerade_ipv6 ip_set ip_set_bitmap_ip ip_set_bitmap_ipmac \ ip_set_bitmap_port ip_set_hash_ip ip_set_hash_ipmark ip_set_hash_ipport \ ip_set_hash_ipportip ip_set_hash_ipportnet ip_set_hash_mac ip_set_hash_net \ ip_set_hash_netiface ip_set_hash_netnet ip_set_hash_netport \ ip_set_hash_netportnet ip_set_list_set nf_conntrack nf_conntrack_amanda \ nf_conntrack_broadcast nf_conntrack_ftp nf_conntrack_h323 nf_conntrack_irc \ nf_conntrack_netbios_ns nf_conntrack_netlink nf_conntrack_pptp \ nf_conntrack_proto_gre nf_conntrack_sane nf_conntrack_sip nf_conntrack_slp \ nf_conntrack_snmp nf_conntrack_tftp nf_log_common nf_nat nf_nat_amanda \ nf_nat_ftp nf_nat_irc nf_nat_redirect nf_nat_sip nf_nat_tftp nf_synproxy_core \ nfnetlink nfnetlink_acct nfnetlink_cthelper nfnetlink_cttimeout nfnetlink_log \ nfnetlink_queue x_tables xt_AUDIT xt_CHECKSUM xt_CLASSIFY xt_CONNSECMARK xt_CT \ xt_DSCP xt_HL xt_HMARK xt_IDLETIMER xt_LED xt_LOG xt_NETMAP xt_NFLOG xt_NFQUEUE \ xt_RATEEST xt_REDIRECT xt_SECMARK xt_TCPMSS xt_TCPOPTSTRIP xt_TEE xt_TPROXY \ xt_TRACE xt_addrtype xt_bpf xt_cgroup xt_cluster xt_comment xt_connbytes \ xt_connlabel xt_connlimit xt_connmark xt_conntrack xt_cpu xt_dccp xt_devgroup \ xt_dscp xt_ecn xt_esp xt_hashlimit xt_helper xt_hl xt_ipcomp xt_iprange xt_l2tp \ xt_length xt_limit xt_mac xt_mark xt_multiport xt_nat xt_nfacct xt_osf xt_owner \ xt_physdev xt_pkttype xt_policy xt_quota xt_rateest xt_realm xt_recent xt_sctp \ xt_set xt_socket xt_state xt_statistic xt_string xt_tcpmss xt_tcpudp xt_time \ xt_u32 af_packet %define modules %usb_modules %net_drivers %scsi_modules %block_drivers \ %hyperv_modules %virtio_modules %vmware_modules %xen_modules \ %networking %filesystems %misc_modules # Reasonable defaults that might be overriden if needed %define kernel_package_name kernel-%build_flavor %define package_name %kernel_package_name-%subpackage %define url %(rpm -q --qf '%%{URL}' %kernel_package_name) %define group %(rpm -q --qf '%%{GROUP}' %kernel_package_name) %define summary %(rpm -q --qf '%%{SUMMARY}' %kernel_package_name) - %extrasummary Name: %package_name BuildRequires: %kernel_package_name BuildRequires: %kernel_package_name-devel BuildRequires: kernel-subpackage-macros Summary: %summary URL: %url Group: %group License: GPL-2.0 # Internal stuff begins %define rpm_kver %(rpm -q --qf '%%{VERSION}' %kernel_package_name) %define rpm_krel %(rpm -q --qf '%%{RELEASE}' %kernel_package_name) Version: %rpm_kver Release: %rpm_krel.<RELEASE> %define scriptdir /usr/lib/rpm/kernel %include %scriptdir/kernel-subpackage-spec ++++++ kernel-source.spec.in ++++++ --- /var/tmp/diff_new_pack.6y4H8g/_old 2019-03-24 14:58:07.903193645 +0100 +++ /var/tmp/diff_new_pack.6y4H8g/_new 2019-03-24 14:58:07.919193643 +0100 @@ -98,13 +98,13 @@ Source76: check-module-license Source77: klp-symbols Source78: modules.fips -Source79: kernel-subpackage-build.spec.in -Source80: kernel-subpackage.conf -Source81: subpackage-names.conf -Source82: splitflist -Source83: mergedep -Source84: moddep -Source85: modflist +Source79: splitflist +Source80: mergedep +Source81: moddep +Source82: modflist +Source83: kernel-subpackage-build +Source84: kernel-subpackage-spec +Source85: kernel-default-base.spec.txt Source100: config.tar.bz2 Source101: config.addon.tar.bz2 Source102: patches.arch.tar.bz2 @@ -162,6 +162,7 @@ %package -n kernel-macros Summary: RPM macros for building Kernel Module Packages Group: Development/Sources +Provides: kernel-subpackage-macros %description -n kernel-macros This package provides the rpm macros and templates for Kernel Module Pakcages @@ -241,6 +242,10 @@ install -m 755 -d $RPM_BUILD_ROOT/usr/lib/rpm install -m 644 %_sourcedir/kernel-{module,cert}-subpackage \ $RPM_BUILD_ROOT/usr/lib/rpm/ +install -m 755 -d $RPM_BUILD_ROOT/usr/lib/rpm/kernel +install -m 755 %_sourcedir/{splitflist,mergedep,moddep,modflist,kernel-subpackage-build} $RPM_BUILD_ROOT/usr/lib/rpm/kernel +install -m 644 %_sourcedir/kernel-subpackage-spec $RPM_BUILD_ROOT/usr/lib/rpm/kernel +install -m 644 -T %_sourcedir/kernel-default-base.spec.txt $RPM_BUILD_ROOT/usr/lib/rpm/kernel/kernel-default-base.spec %endif sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \ @@ -278,6 +283,8 @@ %defattr(-,root,root) /etc/rpm/macros.kernel-source /usr/lib/rpm/kernel-*-subpackage +%dir /usr/lib/rpm/kernel +/usr/lib/rpm/kernel/* %endif %endif ++++++ kernel-spec-macros ++++++ --- /var/tmp/diff_new_pack.6y4H8g/_old 2019-03-24 14:58:08.127193616 +0100 +++ /var/tmp/diff_new_pack.6y4H8g/_new 2019-03-24 14:58:08.143193614 +0100 @@ -10,25 +10,20 @@ %define using_buildservice 0%(echo %disturl | grep -q '^obs://build\.[^.]*suse\.' && echo 1) %endif -# allow override in kernel-subpackage -%if %{?kernel_spec_release:0}%{!?kernel_spec_release:1} -%define kernel_spec_release %release -%endif - # source_rel is the package release string, without the rebuild counter # generated by the build service. If the release string has a non-digit # suffix, we keep that suffix and strip the rightmost digit component. # This is used in KOTD builds: 2.1.g1234567 -> 2.g1234567 # In PTF projects, there is no rebuild counter, so we leave the release # string intact. -%define source_rel %kernel_spec_release +%define source_rel %release %define obsolete_rebuilds() %nil %if %using_buildservice && ! 0%{?is_ptf} -%define source_rel %(echo %kernel_spec_release | sed -r 's/\\.[0-9]+($|\\.[^.]*[^.0-9][^.]*$)/\\1/') +%define source_rel %(echo %release | sed -r 's/\\.[0-9]+($|\\.[^.]*[^.0-9][^.]*$)/\\1/') # If the rebuild counter is > 1, obsolete all previous rebuilds (boo#867595) %define obsolete_rebuilds() %( %{verbose:set -x} \ - set -- $(echo %kernel_spec_release | sed -rn 's/(.*\\.)([0-9]+)($|\\.[^.]*[^.0-9][^.]*$)/\\1 \\2 \\3/p') \ - if test -n "$2" && test "$2" -gt 99; then echo "warning: Rebuild counter too high in %kernel_spec_release" >&2; exit 0; fi \ + set -- $(echo %release | sed -rn 's/(.*\\.)([0-9]+)($|\\.[^.]*[^.0-9][^.]*$)/\\1 \\2 \\3/p') \ + if test -n "$2" && test "$2" -gt 99; then echo "warning: Rebuild counter too high in %release" >&2; exit 0; fi \ seq 1 $(($2-1)) | sed "s/.*/Obsoletes: %1 = %version-$1&$3/" \ ) %endif ++++++ kernel-subpackage-build ++++++ #!/bin/bash -xe # %scriptdir/kernel-subpackage-build %kernel_package_name %rpm_kver-%rpm_krel %package_name-%version-%release scriptdir=$(dirname $0) kernel_package_name=$1 kernel_nvrq=$(echo $1-$2 | sed -e 's/[.]/[.]/g') package_nvr=$3 set -o pipefail install -d -m 0755 $RPM_BUILD_ROOT/boot $scriptdir/splitflist $kernel_package_name kernel.flist kernel-ghost.flist echo Missing files: cat kernel-ghost.flist rpm -q --qf '%{PREIN}' $kernel_package_name | sed -e "s/$kernel_nvrq/$package_nvr/g" > prein.sh rpm -q --qf '%{PREUN}' $kernel_package_name | sed -e "s/$kernel_nvrq/$package_nvr/g" > preun.sh rpm -q --qf '%{POSTIN}' $kernel_package_name | sed -e "s/$kernel_nvrq/$package_nvr/g" > postin.sh rpm -q --qf '%{POSTUN}' $kernel_package_name | sed -e "s/$kernel_nvrq/$package_nvr/g" > postun.sh [ -z "$(rpm -q --triggers $kernel_package_name)" ] # not handled KREL=$(cat kernel.flist | grep ^/lib/modules | { sort -r ||: ;} | head -n 1 | sed -e s,^/lib/modules/,, -e 's,/.*,,') $scriptdir/mergedep $KREL > modules.dep $scriptdir/moddep modules.dep request-modules modules $scriptdir/modflist kernel.flist modules modules.flist /lib/modules/$KREL/modules.builtin cat kernel.flist | grep -v ^/lib/modules >> modules.flist [ -d /lib/modules/$KREL/vdso ] && echo /lib/modules/$KREL/vdso >> modules.flist ||: echo /lib/modules/$KREL/modules.* | tr ' ' '\n' >> modules.flist tar -C / -cf- -T modules.flist | tar -C $RPM_BUILD_ROOT -xvf- moderr="$(/usr/sbin/depmod -b $RPM_BUILD_ROOT -e -F /boot/System.map-$KREL $KREL 2>&1 > /dev/null)" if [ "$moderr" ] ; then echo Picked modules have errors: echo $moderr exit 1 fi echo "%defattr(-,root,root)" > subpackage.flist cat kernel.flist | grep -v ^/lib/modules >> subpackage.flist echo /lib/modules/$KREL >> subpackage.flist cat kernel-ghost.flist | sed -e 's/^/%ghost /' >> subpackage.flist cat kernel-ghost.flist | while read ghost ; do case $ghost in /boot/image-%build_flavor | /boot/vmlinux-%build_flavor | /boot/vmlinuz-%build_flavor | \ /boot/Image-%build_flavor | /boot/initrd-%build_flavor) ln -s $(basename $ghost -%build_flavor)-$KREL $RPM_BUILD_ROOT$ghost ;; /boot/vmlinux | /boot/vmlinuz | /boot/zImage | /boot/Image | /boot/image | /boot/initrd) ln -s $ghost-$KREL $RPM_BUILD_ROOT$ghost ;; /boot/vmlinux-$KREL) [ -f /boot/vmlinux-$KREL.gz ] && gunzip -dc < /boot/vmlinux-$KREL.gz > vmlinux-$KREL size="$(ls -l vmlinux-$KREL | sed -e 's/^\([^ ]* \)\{4\}//' -e 's/ .*//')" dd if=/dev/zero bs=1 count=1 seek="$(expr $size - 1)" of=$RPM_BUILD_ROOT$ghost ;; /boot/initrd-$KREL | /boot/initrd-$KREL-kdump) # Create a dummy initrd with roughly the size the real one will have. # That way, YaST will know that this package requires some additional # space in /boot. dd if=/dev/zero of=$RPM_BUILD_ROOT$ghost \ bs=1024 seek=2047 count=1 chmod 0600 $RPM_BUILD_ROOT$ghost ;; /lib/modules/$KREL/modules.*) [ -f $RPM_BUILD_ROOT$ghost ] ;; *) echo Missing file "$ghost" not handled. exit 1; ;; esac done ++++++ kernel-subpackage-spec ++++++ %define rpm_kver %(rpm -q --qf '%%{VERSION}' %kernel_package_name) %define rpm_krel %(rpm -q --qf '%%{RELEASE}' %kernel_package_name) # Force bzip2 instead of lzma compression to # 1) allow install on older dist versions, and # 2) decrease build times (bsc#962356) # %%define _binary_payload w9.bzdio # Do not recompute the build-id of vmlinux in find-debuginfo.sh (bsc#964063) %undefine _unique_build_ids %define _no_recompute_build_ids 1 # prevent usr/lib/debug/boot/vmlinux-4.12.14-11.10-default-4.12.14-11.10.ppc64le.debug %undefine _unique_debug_names %define kernel_requires %(rpm -q --queryformat '[%%{REQUIREFLAGS:deptype},%%{REQUIRENEVRS}\\n]' %kernel_package_name | grep -vE 'rpmlib,|interp,' | grep -E 'manual,' | sed -e 's/.*,//' | tr '\\n' ' ') %define kernel_requires_pre %(rpm -q --queryformat '[%%{REQUIREFLAGS:deptype},%%{REQUIRENEVRS}\\n]' %kernel_package_name | grep -vE 'rpmlib,|interp,' | grep -E 'pre,' | sed -e 's/.*,//' | tr '\\n' ' ') %define kernel_requires_preun %(rpm -q --queryformat '[%%{REQUIREFLAGS:deptype},%%{REQUIRENEVRS}\\n]' %kernel_package_name | grep -vE 'rpmlib,|interp,' | grep -E 'preun,' | sed -e 's/.*,//' | tr '\\n' ' ') %define kernel_requires_post %(rpm -q --queryformat '[%%{REQUIREFLAGS:deptype},%%{REQUIRENEVRS}\\n]' %kernel_package_name | grep -vE 'rpmlib,|interp,' | grep -E 'post,' | sed -e 's/.*,//' | tr '\\n' ' ') %define kernel_requires_postun %(rpm -q --queryformat '[%%{REQUIREFLAGS:deptype},%%{REQUIRENEVRS}\\n]' %kernel_package_name | grep -vE 'rpmlib,|interp,' | grep -E 'postun,' | sed -e 's/.*,//' | tr '\\n' ' ') %if ! %(expr 1 - 1) %if "%{kernel_requires}" != "" Requires: %kernel_requires %endif %if "%{kernel_requires_pre}" != "" Requires(pre): %kernel_requires_pre %endif %if "%{kernel_requires_preun}" != "" Requires(preun):%kernel_requires_preun %endif %if "%{kernel_requires_post}" != "" Requires(post): %kernel_requires_post %endif %if "%{kernel_requires_postun}" != "" Requires(postun):%kernel_requires_postun %endif %endif Provides: %(rpm -q --queryformat '[%%{PROVIDENEVRS}\n]' %kernel_package_name | sed -e 's/%kernel_package_name-srchash/%name-srchash/g' | grep -vE '^ksym|^kmod' | tr '\n' ' ') Conflicts: %(rpm -q --queryformat '[%%{CONFLICTNEVRS}\n]' %kernel_package_name | grep -vE '^ksym|^kmod' | tr '\n' ' ') Obsoletes: %(rpm -q --queryformat '[%%{OBSOLETENEVRS}\n]' %kernel_package_name | grep -vE '^ksym|^kmod' | tr '\n' ' ') Recommends: %(rpm -q --queryformat '[%%{RECOMMENDNEVRS}\n]' %kernel_package_name | grep -vE '^ksym|^kmod' | tr '\n' ' ') # This is in place of obsolete_rebuilds. This should give Conflicts: %%kernel_package_name = %%source_rel as old kernel-default-base did. Conflicts: %(rpm -q --queryformat '[%%{PROVIDENEVRS}\n]' %kernel_package_name | grep '^%kernel_package_name =' | sort -V | head -n 1) %description %(rpm -q --qf '%%{DESCRIPTION}' %kernel_package_name) %extradescription This is a subpackage of %kernel_package_name. Development files are in %kernel_package_name-devel and sources in kernel-source%variant. %prep %build %install echo "%{?modules}" | tr ', ' '\n\n' > request-modules %scriptdir/kernel-subpackage-build %kernel_package_name %rpm_kver-%rpm_krel %package_name-%version-%release %preun -f preun.sh %postun -f postun.sh %pre -f prein.sh %post -f postin.sh %files -f subpackage.flist %changelog ++++++ mkspec ++++++ --- /var/tmp/diff_new_pack.6y4H8g/_old 2019-03-24 14:58:09.163193483 +0100 +++ /var/tmp/diff_new_pack.6y4H8g/_new 2019-03-24 14:58:09.175193482 +0100 @@ -20,8 +20,6 @@ # subset to include in kernel-syms my %syms_flavor_archs = parse_config_conf("syms"); -my %subpackages = parse_subpackages(); - my %all_archs = parse_config_conf("needs_updating"); my @all_archs; for my $flavor (keys(%all_archs)) { @@ -156,17 +154,6 @@ KMP_DEFINITIONS => $kmp_definitions, %obsolete_macros ); - for my $subpackage (@{$subpackages{$flavor}}) { - do_spec('subpackage-build', "kernel-$flavor-$subpackage.spec", %macros, - FLAVOR => $flavor, - SUMMARY => $summary, - SUBPACKAGE => $subpackage, - DESCRIPTION => $description, - ARCHS => join(" ", arch2rpm(@{$flavor_archs{$flavor}})), - BINARY_DEPS => $templates{binary_deps}, - %obsolete_macros - ); - } } # kernel-source.spec do_spec('source', "kernel-source$variant.spec", %macros); @@ -240,27 +227,6 @@ exit 0; -sub parse_subpackages { - my %subpackage_names = (); - my $file = "$dir/subpackage-names.conf"; - open my $config, $file or return %subpackage_names; - while(my $line = <$config>) { - $line !~ /^#/ or next; - chomp($line); - my @flavor = split(/:/, $line); - if($#flavor != 1) { - print "Malformed line in $file: $line\n"; - next; - } - my @subpackages = grep { $_ =~ /./ } split(/[ \t]+/, $flavor[1]); - $flavor[0] =~ s/^\s+|\s+$//g; - @subpackages = map { s/^\s+|\s+$//g ; $_ } @subpackages; - @{$subpackage_names{$flavor[0]}} = @subpackages; - } - print "Subpackages:\n"; - print "$_:" . join(",", @{$subpackage_names{$_}}) . "\n" for (sort(keys %subpackage_names)); - return %subpackage_names; -} sub parse_config_conf { my @symbols = @_; @@ -286,7 +252,7 @@ sub read_spec_templates { my %res; - for my $template (qw(binary source syms docs obs-build obs-qa subpackage-build)) { + for my $template (qw(binary source syms docs obs-build obs-qa)) { xopen(my $fh, '<', "$dir/kernel-$template.spec.in"); local $/ = undef; $res{$template} = <$fh>; @@ -298,12 +264,6 @@ print STDERR "warning: Expected # BEGIN COMMON DEPS in kernel-binary.spec.in\n"; $res{common_deps} = ""; } - if ($res{$template} =~ /^# BEGIN BINARY DEPS\n?(.*)^# END BINARY DEPS/ms) { - $res{binary_deps} = $1; - } else { - print STDERR "warning: Expected # BINARY COMMON DEPS in kernel-binary.spec.in\n"; - $res{binary_deps} = ""; - } if ($res{$template} =~ s/^# BEGIN KMP\n?(.*)^# END KMP/\@KMP_DEFINITIONS\@/ms) { $res{kmp} = $1; } else { ++++++ modflist ++++++ --- /var/tmp/diff_new_pack.6y4H8g/_old 2019-03-24 14:58:09.463193445 +0100 +++ /var/tmp/diff_new_pack.6y4H8g/_new 2019-03-24 14:58:09.487193442 +0100 @@ -2,8 +2,9 @@ flist=$1 modules=$2 output=$3 +mod_builtin=$4 while read MOD ; do [ -n "$MOD" ] || continue - cat $flist | grep /$MOD[.]ko\$ >> $output || echo Module $MOD missing + cat $flist | grep /$MOD[.]ko\$ >> $output || { grep -q /$MOD[.]ko\$ $mod_builtin && echo Module $MOD built-in ;} || echo Module $MOD missing done < $modules ++++++ patches.kernel.org.tar.bz2 ++++++ ++++ 4088 lines of diff (skipped) ++++++ patches.suse.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/cifs-Fix-NULL-pointer-dereference-of-devname.patch new/patches.suse/cifs-Fix-NULL-pointer-dereference-of-devname.patch --- old/patches.suse/cifs-Fix-NULL-pointer-dereference-of-devname.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.suse/cifs-Fix-NULL-pointer-dereference-of-devname.patch 2019-03-18 07:50:55.000000000 +0100 @@ -0,0 +1,55 @@ +From: Yao Liu <[email protected]> +Date: Mon, 28 Jan 2019 19:47:28 +0800 +Subject: cifs: Fix NULL pointer dereference of devname +Git-commit: 68e2672f8fbd1e04982b8d2798dd318bf2515dd2 +Patch-mainline: v5.1-rc1 +References: bnc#1129519 + +There is a NULL pointer dereference of devname in strspn() + +The oops looks something like: + + CIFS: Attempting to mount (null) + BUG: unable to handle kernel NULL pointer dereference at 0000000000000000 + ... + RIP: 0010:strspn+0x0/0x50 + ... + Call Trace: + ? cifs_parse_mount_options+0x222/0x1710 [cifs] + ? cifs_get_volume_info+0x2f/0x80 [cifs] + cifs_setup_volume_info+0x20/0x190 [cifs] + cifs_get_volume_info+0x50/0x80 [cifs] + cifs_smb3_do_mount+0x59/0x630 [cifs] + ? ida_alloc_range+0x34b/0x3d0 + cifs_do_mount+0x11/0x20 [cifs] + mount_fs+0x52/0x170 + vfs_kern_mount+0x6b/0x170 + do_mount+0x216/0xdc0 + ksys_mount+0x83/0xd0 + __x64_sys_mount+0x25/0x30 + do_syscall_64+0x65/0x220 + entry_SYSCALL_64_after_hwframe+0x49/0xbe + +Fix this by adding a NULL check on devname in cifs_parse_devname() + +Signed-off-by: Yao Liu <[email protected]> +Signed-off-by: Steve French <[email protected]> +Signed-off-by: Jiri Slaby <[email protected]> +--- + fs/cifs/connect.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/fs/cifs/connect.c ++++ b/fs/cifs/connect.c +@@ -1486,6 +1486,11 @@ cifs_parse_devname(const char *devname, + const char *delims = "/\\"; + size_t len; + ++ if (unlikely(!devname || !*devname)) { ++ cifs_dbg(VFS, "Device name not specified.\n"); ++ return -EINVAL; ++ } ++ + /* make sure we have a valid UNC double delimiter prefix */ + len = strspn(devname, delims); + if (len != 2) ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.6y4H8g/_old 2019-03-24 14:58:10.851193267 +0100 +++ /var/tmp/diff_new_pack.6y4H8g/_new 2019-03-24 14:58:10.851193267 +0100 @@ -100,6 +100,50 @@ patches.kernel.org/5.0.2-024-x86-Add-TSX-Force-Abort-CPUID-MSR.patch patches.kernel.org/5.0.2-025-perf-x86-intel-Implement-support-for-TSX-Force-.patch patches.kernel.org/5.0.2-026-Linux-5.0.2.patch + patches.kernel.org/5.0.3-001-connector-fix-unsafe-usage-of-real_parent.patch + patches.kernel.org/5.0.3-002-fou-fou6-avoid-uninit-value-in-gue_err-and-gue6.patch + patches.kernel.org/5.0.3-003-gro_cells-make-sure-device-is-up-in-gro_cells_r.patch + patches.kernel.org/5.0.3-004-ipv4-route-fail-early-when-inet-dev-is-missing.patch + patches.kernel.org/5.0.3-005-l2tp-fix-infoleak-in-l2tp_ip6_recvmsg.patch + patches.kernel.org/5.0.3-006-lan743x-Fix-RX-Kernel-Panic.patch + patches.kernel.org/5.0.3-007-lan743x-Fix-TX-Stall-Issue.patch + patches.kernel.org/5.0.3-008-net-hns3-add-dma_rmb-for-rx-description.patch + patches.kernel.org/5.0.3-009-net-hsr-fix-memory-leak-in-hsr_dev_finalize.patch + patches.kernel.org/5.0.3-010-net-hsr-fix-possible-crash-in-add_timer.patch + patches.kernel.org/5.0.3-011-net-sit-fix-UBSAN-Undefined-behaviour-in-check_.patch + patches.kernel.org/5.0.3-012-net-x25-fix-use-after-free-in-x25_device_event.patch + patches.kernel.org/5.0.3-013-net-x25-reset-state-in-x25_connect.patch + patches.kernel.org/5.0.3-014-pptp-dst_release-sk_dst_cache-in-pptp_sock_dest.patch + patches.kernel.org/5.0.3-015-ravb-Decrease-TxFIFO-depth-of-Q3-and-Q2-to-one.patch + patches.kernel.org/5.0.3-016-route-set-the-deleted-fnhe-fnhe_daddr-to-0-in-i.patch + patches.kernel.org/5.0.3-017-rxrpc-Fix-client-call-queueing-waiting-for-chan.patch + patches.kernel.org/5.0.3-018-sctp-remove-sched-init-from-sctp_stream_init.patch + patches.kernel.org/5.0.3-019-tcp-do-not-report-TCP_CM_INQ-of-0-for-closed-co.patch + patches.kernel.org/5.0.3-020-tcp-Don-t-access-TCP_SKB_CB-before-initializing.patch + patches.kernel.org/5.0.3-021-tcp-handle-inet_csk_reqsk_queue_add-failures.patch + patches.kernel.org/5.0.3-022-vxlan-Fix-GRO-cells-race-condition-between-rece.patch + patches.kernel.org/5.0.3-023-vxlan-test-dev-flags-IFF_UP-before-calling-gro_.patch + patches.kernel.org/5.0.3-024-net-mlx4_core-Fix-reset-flow-when-in-command-po.patch + patches.kernel.org/5.0.3-025-net-mlx4_core-Fix-locking-in-SRIOV-mode-when-sw.patch + patches.kernel.org/5.0.3-026-net-mlx4_core-Fix-qp-mtt-size-calculation.patch + patches.kernel.org/5.0.3-027-net-dsa-mv88e6xxx-Set-correct-interface-mode-fo.patch + patches.kernel.org/5.0.3-028-net-hns3-fix-to-stop-multiple-HNS-reset-due-to-.patch + patches.kernel.org/5.0.3-029-vsock-virtio-fix-kernel-panic-from-virtio_trans.patch + patches.kernel.org/5.0.3-030-net-sched-flower-insert-new-filter-to-idr-after.patch + patches.kernel.org/5.0.3-031-f2fs-wait-on-atomic-writes-to-count-F2FS_CP_WB_.patch + patches.kernel.org/5.0.3-032-perf-x86-Fixup-typo-in-stub-functions.patch + patches.kernel.org/5.0.3-033-ALSA-bebob-use-more-identical-mod_alias-for-Saf.patch + patches.kernel.org/5.0.3-034-ALSA-firewire-motu-fix-construction-of-PCM-fram.patch + patches.kernel.org/5.0.3-035-ALSA-hda-Extend-i915-component-bind-timeout.patch + patches.kernel.org/5.0.3-036-ALSA-hda-add-more-quirks-for-HP-Z2-G4-and-HP-Z2.patch + patches.kernel.org/5.0.3-037-ALSA-hda-realtek-Enable-audio-jacks-of-ASUS-UX3.patch + patches.kernel.org/5.0.3-038-ALSA-hda-realtek-Reduce-click-noise-on-Dell-Pre.patch + patches.kernel.org/5.0.3-039-ALSA-hda-realtek-Enable-headset-MIC-of-Acer-Tra.patch + patches.kernel.org/5.0.3-040-perf-x86-intel-Fix-memory-corruption.patch + patches.kernel.org/5.0.3-041-perf-x86-intel-Make-dev_attr_allow_tsx_force_ab.patch + patches.kernel.org/5.0.3-042-It-s-wrong-to-add-len-to-sector_nr-in-raid10-re.patch + patches.kernel.org/5.0.3-043-drm-Block-fb-changes-for-async-plane-updates.patch + patches.kernel.org/5.0.3-044-Linux-5.0.3.patch ######################################################## # Build fixes that apply to the vanilla kernel too. @@ -293,6 +337,7 @@ ######################################################## # cifs patches ######################################################## + patches.suse/cifs-Fix-NULL-pointer-dereference-of-devname.patch ######################################################## # ext2/ext3 ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.6y4H8g/_old 2019-03-24 14:58:10.871193265 +0100 +++ /var/tmp/diff_new_pack.6y4H8g/_new 2019-03-24 14:58:10.871193265 +0100 @@ -1,3 +1,3 @@ -2019-03-14 08:29:17 +0000 -GIT Revision: d1f1d19eba1b818d1d526bc8fffc7eb4eff5920c +2019-03-22 17:30:35 +0000 +GIT Revision: 2a318317524e454ff29faf9c19219c1f2c2d8e70 GIT Branch: stable
