From 0685616cc19085d87dc0343cb96b2040be9d0ea2601390c06afc44da66ec7308 Mon Sep 17 00:00:00 2001 From: Michal Marek Date: Tue, 26 Jan 2016 07:03:18 +0000 Subject: [PATCH] commit 9b438ee432d677d5fd2fbe5a45c12f9d26781a2d OBS-URL: https://build.opensuse.org/package/show/Kernel:stable/kernel-source?expand=0&rev=473 --- kernel-binary.spec.in | 19 ++++++++---- kernel-debug.changes | 63 ++++++++++++++++++++++++++++++++++++++++ kernel-debug.spec | 21 ++++++++++---- kernel-default.changes | 63 ++++++++++++++++++++++++++++++++++++++++ kernel-default.spec | 21 ++++++++++---- kernel-docs.changes | 63 ++++++++++++++++++++++++++++++++++++++++ kernel-docs.spec | 2 +- kernel-lpae.changes | 63 ++++++++++++++++++++++++++++++++++++++++ kernel-lpae.spec | 21 ++++++++++---- kernel-obs-build.changes | 63 ++++++++++++++++++++++++++++++++++++++++ kernel-obs-build.spec | 4 +-- kernel-obs-build.spec.in | 2 +- kernel-obs-qa.changes | 63 ++++++++++++++++++++++++++++++++++++++++ kernel-obs-qa.spec | 2 +- kernel-pae.changes | 63 ++++++++++++++++++++++++++++++++++++++++ kernel-pae.spec | 21 ++++++++++---- kernel-source.changes | 63 ++++++++++++++++++++++++++++++++++++++++ kernel-source.spec | 3 +- kernel-source.spec.in | 1 + kernel-syms.changes | 63 ++++++++++++++++++++++++++++++++++++++++ kernel-syms.spec | 2 +- kernel-vanilla.changes | 63 ++++++++++++++++++++++++++++++++++++++++ kernel-vanilla.spec | 21 ++++++++++---- package-descriptions | 27 ++++++----------- patches.fixes.tar.bz2 | 4 +-- patches.suse.tar.bz2 | 4 +-- series.conf | 2 -- source-timestamp | 4 +-- 28 files changed, 743 insertions(+), 68 deletions(-) diff --git a/kernel-binary.spec.in b/kernel-binary.spec.in index fbcf073b..1364e950 100644 --- a/kernel-binary.spec.in +++ b/kernel-binary.spec.in @@ -30,8 +30,12 @@ %define build_default ("%build_flavor" == "default") %define build_vanilla ("%build_flavor" == "vanilla") +%if ! %build_vanilla %define src_install_dir /usr/src/linux-%kernelrelease%variant -%define obj_install_dir %src_install_dir-obj +%else +%define src_install_dir /usr/src/linux-%kernelrelease-vanilla +%endif +%define obj_install_dir /usr/src/linux-%kernelrelease%variant-obj %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-%srcversion/linux-obj @@ -130,10 +134,10 @@ BuildRequires: u-boot-tools Obsoletes: microcode_ctl -%if %build_vanilla -# force bzip2 instead of lzma compression to allow install on older dist versions +# 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 -%endif # dead network if installed on SLES10, otherwise it will work (mostly) Conflicts: sysfsutils < 2.0 Conflicts: apparmor-profiles <= 2.1 @@ -701,7 +705,7 @@ if [ %CONFIG_MODULES = y ]; then esac done # Recreate the generated Makefile with correct path - sh ../scripts/mkmakefile ../../../linux-%kernelrelease%variant \ + sh ../scripts/mkmakefile ../../../%{basename:%src_install_dir} \ %rpm_install_dir/%cpu_arch_flavor \ $(echo %srcversion | sed -r 's/^([0-9]+)\.([0-9]+).*/\1 \2/') fi @@ -910,8 +914,13 @@ Summary: Development files necessary for building kernel modules Group: Development/Sources Provides: %name-devel = %version-%source_rel Provides: multiversion(kernel) +%if ! %build_vanilla Requires: kernel-devel%variant = %version-%source_rel Supplements: packageand(%name:kernel-devel%variant) +%else +Requires: kernel-source-vanilla = %version-%source_rel +Supplements: packageand(%name:kernel-source-vanilla) +%endif @PROVIDES_OBSOLETES_DEVEL@ %obsolete_rebuilds %name-devel PreReq: coreutils diff --git a/kernel-debug.changes b/kernel-debug.changes index 35842217..9d30312c 100644 --- a/kernel-debug.changes +++ b/kernel-debug.changes @@ -1,9 +1,72 @@ +------------------------------------------------------------------- +Mon Jan 25 17:48:33 CET 2016 - jeffm@suse.com + +- Delete patches.fixes/tulip-quad-NIC-ifdown. + The original bug that this patch fixed was addressed in 2004, in v2.6.10 + (6379dd57 of linux-2.6-bk), but pci_disable_device was still required to + shut down the device. + Commit c321f7d7c87 in v3.14 added the pci_disable_device at the end of + tulip_remove_one just far enough out of context so that this patch still + applied. +- commit 05c9dcc + +------------------------------------------------------------------- +Sat Jan 23 10:03:57 CET 2016 - tiwai@suse.de + +- Delete obsoleted patches.fixes/ptrace-getsiginfo + This has been fixed in 2.6.26 by e16b278. +- commit 250ec53 + +------------------------------------------------------------------- +Fri Jan 22 15:20:00 CET 2016 - mmarek@suse.com + +- rpm/kernel-source.spec.in: Install kernel-macros for kernel-source-vanilla + (bsc#959090) +- commit cd33617 + +------------------------------------------------------------------- +Fri Jan 22 14:05:22 CET 2016 - mmarek@suse.com + +- rpm/kernel-binary.spec.in: Fix paths in kernel-vanilla-devel (bsc#959090). +- commit 2d2ec7f + +------------------------------------------------------------------- +Fri Jan 22 13:51:22 CET 2016 - mmarek@suse.com + +- rpm/kernel-binary.spec.in: Fix kernel-vanilla-devel dependency (bsc#959090) +- commit fbbc989 + +------------------------------------------------------------------- +Fri Jan 22 13:31:21 CET 2016 - mmarek@suse.com + +- rpm/kernel-binary.spec.in: Use bzip compression to speed up build (bsc#962356) +- commit e8f8f54 + +------------------------------------------------------------------- +Thu Jan 21 16:30:04 CET 2016 - dvaleev@suse.com + +- Add sd_mod to initrd modules + For some reason PowerVM backend can't work without sd_mod +- commit 7c2bd21 + +------------------------------------------------------------------- +Thu Jan 21 11:13:24 CET 2016 - mmarek@suse.com + +- rpm/package-descriptions: Add kernel-zfcpdump and drop -desktop +- commit 54e8f7c + ------------------------------------------------------------------- Wed Jan 20 18:02:28 CET 2016 - tiwai@suse.de - scsi: ignore errors from scsi_dh_add_device() (boo#962813). - commit 1b0ab71 +------------------------------------------------------------------- +Wed Jan 20 17:54:02 CET 2016 - mgorman@suse.com + +- Refresh patches.suse/readahead-request-tunables.patch. +- commit 02b8b18 + ------------------------------------------------------------------- Wed Jan 20 17:43:09 CET 2016 - tiwai@suse.de diff --git a/kernel-debug.spec b/kernel-debug.spec index faf53181..689b033d 100644 --- a/kernel-debug.spec +++ b/kernel-debug.spec @@ -30,8 +30,12 @@ %define build_default ("%build_flavor" == "default") %define build_vanilla ("%build_flavor" == "vanilla") +%if ! %build_vanilla %define src_install_dir /usr/src/linux-%kernelrelease%variant -%define obj_install_dir %src_install_dir-obj +%else +%define src_install_dir /usr/src/linux-%kernelrelease-vanilla +%endif +%define obj_install_dir /usr/src/linux-%kernelrelease%variant-obj %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-%srcversion/linux-obj @@ -59,7 +63,7 @@ License: GPL-2.0 Group: System/Kernel Version: 4.4.0 %if 0%{?is_kotd} -Release: .gb56b151 +Release: .g9b438ee %else Release: 0 %endif @@ -130,10 +134,10 @@ BuildRequires: u-boot-tools Obsoletes: microcode_ctl -%if %build_vanilla -# force bzip2 instead of lzma compression to allow install on older dist versions +# 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 -%endif # dead network if installed on SLES10, otherwise it will work (mostly) Conflicts: sysfsutils < 2.0 Conflicts: apparmor-profiles <= 2.1 @@ -832,7 +836,7 @@ if [ %CONFIG_MODULES = y ]; then esac done # Recreate the generated Makefile with correct path - sh ../scripts/mkmakefile ../../../linux-%kernelrelease%variant \ + sh ../scripts/mkmakefile ../../../%{basename:%src_install_dir} \ %rpm_install_dir/%cpu_arch_flavor \ $(echo %srcversion | sed -r 's/^([0-9]+)\.([0-9]+).*/\1 \2/') fi @@ -1049,8 +1053,13 @@ Summary: Development files necessary for building kernel modules Group: Development/Sources Provides: %name-devel = %version-%source_rel Provides: multiversion(kernel) +%if ! %build_vanilla Requires: kernel-devel%variant = %version-%source_rel Supplements: packageand(%name:kernel-devel%variant) +%else +Requires: kernel-source-vanilla = %version-%source_rel +Supplements: packageand(%name:kernel-source-vanilla) +%endif %ifarch ppc64 Provides: kernel-kdump-devel = 2.6.28 Obsoletes: kernel-kdump-devel <= 2.6.28 diff --git a/kernel-default.changes b/kernel-default.changes index 35842217..9d30312c 100644 --- a/kernel-default.changes +++ b/kernel-default.changes @@ -1,9 +1,72 @@ +------------------------------------------------------------------- +Mon Jan 25 17:48:33 CET 2016 - jeffm@suse.com + +- Delete patches.fixes/tulip-quad-NIC-ifdown. + The original bug that this patch fixed was addressed in 2004, in v2.6.10 + (6379dd57 of linux-2.6-bk), but pci_disable_device was still required to + shut down the device. + Commit c321f7d7c87 in v3.14 added the pci_disable_device at the end of + tulip_remove_one just far enough out of context so that this patch still + applied. +- commit 05c9dcc + +------------------------------------------------------------------- +Sat Jan 23 10:03:57 CET 2016 - tiwai@suse.de + +- Delete obsoleted patches.fixes/ptrace-getsiginfo + This has been fixed in 2.6.26 by e16b278. +- commit 250ec53 + +------------------------------------------------------------------- +Fri Jan 22 15:20:00 CET 2016 - mmarek@suse.com + +- rpm/kernel-source.spec.in: Install kernel-macros for kernel-source-vanilla + (bsc#959090) +- commit cd33617 + +------------------------------------------------------------------- +Fri Jan 22 14:05:22 CET 2016 - mmarek@suse.com + +- rpm/kernel-binary.spec.in: Fix paths in kernel-vanilla-devel (bsc#959090). +- commit 2d2ec7f + +------------------------------------------------------------------- +Fri Jan 22 13:51:22 CET 2016 - mmarek@suse.com + +- rpm/kernel-binary.spec.in: Fix kernel-vanilla-devel dependency (bsc#959090) +- commit fbbc989 + +------------------------------------------------------------------- +Fri Jan 22 13:31:21 CET 2016 - mmarek@suse.com + +- rpm/kernel-binary.spec.in: Use bzip compression to speed up build (bsc#962356) +- commit e8f8f54 + +------------------------------------------------------------------- +Thu Jan 21 16:30:04 CET 2016 - dvaleev@suse.com + +- Add sd_mod to initrd modules + For some reason PowerVM backend can't work without sd_mod +- commit 7c2bd21 + +------------------------------------------------------------------- +Thu Jan 21 11:13:24 CET 2016 - mmarek@suse.com + +- rpm/package-descriptions: Add kernel-zfcpdump and drop -desktop +- commit 54e8f7c + ------------------------------------------------------------------- Wed Jan 20 18:02:28 CET 2016 - tiwai@suse.de - scsi: ignore errors from scsi_dh_add_device() (boo#962813). - commit 1b0ab71 +------------------------------------------------------------------- +Wed Jan 20 17:54:02 CET 2016 - mgorman@suse.com + +- Refresh patches.suse/readahead-request-tunables.patch. +- commit 02b8b18 + ------------------------------------------------------------------- Wed Jan 20 17:43:09 CET 2016 - tiwai@suse.de diff --git a/kernel-default.spec b/kernel-default.spec index 1e3a4266..c183be32 100644 --- a/kernel-default.spec +++ b/kernel-default.spec @@ -30,8 +30,12 @@ %define build_default ("%build_flavor" == "default") %define build_vanilla ("%build_flavor" == "vanilla") +%if ! %build_vanilla %define src_install_dir /usr/src/linux-%kernelrelease%variant -%define obj_install_dir %src_install_dir-obj +%else +%define src_install_dir /usr/src/linux-%kernelrelease-vanilla +%endif +%define obj_install_dir /usr/src/linux-%kernelrelease%variant-obj %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-%srcversion/linux-obj @@ -59,7 +63,7 @@ License: GPL-2.0 Group: System/Kernel Version: 4.4.0 %if 0%{?is_kotd} -Release: .gb56b151 +Release: .g9b438ee %else Release: 0 %endif @@ -130,10 +134,10 @@ BuildRequires: u-boot-tools Obsoletes: microcode_ctl -%if %build_vanilla -# force bzip2 instead of lzma compression to allow install on older dist versions +# 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 -%endif # dead network if installed on SLES10, otherwise it will work (mostly) Conflicts: sysfsutils < 2.0 Conflicts: apparmor-profiles <= 2.1 @@ -875,7 +879,7 @@ if [ %CONFIG_MODULES = y ]; then esac done # Recreate the generated Makefile with correct path - sh ../scripts/mkmakefile ../../../linux-%kernelrelease%variant \ + sh ../scripts/mkmakefile ../../../%{basename:%src_install_dir} \ %rpm_install_dir/%cpu_arch_flavor \ $(echo %srcversion | sed -r 's/^([0-9]+)\.([0-9]+).*/\1 \2/') fi @@ -1130,8 +1134,13 @@ Summary: Development files necessary for building kernel modules Group: Development/Sources Provides: %name-devel = %version-%source_rel Provides: multiversion(kernel) +%if ! %build_vanilla Requires: kernel-devel%variant = %version-%source_rel Supplements: packageand(%name:kernel-devel%variant) +%else +Requires: kernel-source-vanilla = %version-%source_rel +Supplements: packageand(%name:kernel-source-vanilla) +%endif %ifarch %ix86 Provides: kernel-trace-devel = 3.13 Obsoletes: kernel-trace-devel <= 3.13 diff --git a/kernel-docs.changes b/kernel-docs.changes index 35842217..9d30312c 100644 --- a/kernel-docs.changes +++ b/kernel-docs.changes @@ -1,9 +1,72 @@ +------------------------------------------------------------------- +Mon Jan 25 17:48:33 CET 2016 - jeffm@suse.com + +- Delete patches.fixes/tulip-quad-NIC-ifdown. + The original bug that this patch fixed was addressed in 2004, in v2.6.10 + (6379dd57 of linux-2.6-bk), but pci_disable_device was still required to + shut down the device. + Commit c321f7d7c87 in v3.14 added the pci_disable_device at the end of + tulip_remove_one just far enough out of context so that this patch still + applied. +- commit 05c9dcc + +------------------------------------------------------------------- +Sat Jan 23 10:03:57 CET 2016 - tiwai@suse.de + +- Delete obsoleted patches.fixes/ptrace-getsiginfo + This has been fixed in 2.6.26 by e16b278. +- commit 250ec53 + +------------------------------------------------------------------- +Fri Jan 22 15:20:00 CET 2016 - mmarek@suse.com + +- rpm/kernel-source.spec.in: Install kernel-macros for kernel-source-vanilla + (bsc#959090) +- commit cd33617 + +------------------------------------------------------------------- +Fri Jan 22 14:05:22 CET 2016 - mmarek@suse.com + +- rpm/kernel-binary.spec.in: Fix paths in kernel-vanilla-devel (bsc#959090). +- commit 2d2ec7f + +------------------------------------------------------------------- +Fri Jan 22 13:51:22 CET 2016 - mmarek@suse.com + +- rpm/kernel-binary.spec.in: Fix kernel-vanilla-devel dependency (bsc#959090) +- commit fbbc989 + +------------------------------------------------------------------- +Fri Jan 22 13:31:21 CET 2016 - mmarek@suse.com + +- rpm/kernel-binary.spec.in: Use bzip compression to speed up build (bsc#962356) +- commit e8f8f54 + +------------------------------------------------------------------- +Thu Jan 21 16:30:04 CET 2016 - dvaleev@suse.com + +- Add sd_mod to initrd modules + For some reason PowerVM backend can't work without sd_mod +- commit 7c2bd21 + +------------------------------------------------------------------- +Thu Jan 21 11:13:24 CET 2016 - mmarek@suse.com + +- rpm/package-descriptions: Add kernel-zfcpdump and drop -desktop +- commit 54e8f7c + ------------------------------------------------------------------- Wed Jan 20 18:02:28 CET 2016 - tiwai@suse.de - scsi: ignore errors from scsi_dh_add_device() (boo#962813). - commit 1b0ab71 +------------------------------------------------------------------- +Wed Jan 20 17:54:02 CET 2016 - mgorman@suse.com + +- Refresh patches.suse/readahead-request-tunables.patch. +- commit 02b8b18 + ------------------------------------------------------------------- Wed Jan 20 17:43:09 CET 2016 - tiwai@suse.de diff --git a/kernel-docs.spec b/kernel-docs.spec index fcef0c90..528b71aa 100644 --- a/kernel-docs.spec +++ b/kernel-docs.spec @@ -29,7 +29,7 @@ License: GPL-2.0 Group: Documentation/Man Version: 4.4.0 %if 0%{?is_kotd} -Release: .gb56b151 +Release: .g9b438ee %else Release: 0 %endif diff --git a/kernel-lpae.changes b/kernel-lpae.changes index 35842217..9d30312c 100644 --- a/kernel-lpae.changes +++ b/kernel-lpae.changes @@ -1,9 +1,72 @@ +------------------------------------------------------------------- +Mon Jan 25 17:48:33 CET 2016 - jeffm@suse.com + +- Delete patches.fixes/tulip-quad-NIC-ifdown. + The original bug that this patch fixed was addressed in 2004, in v2.6.10 + (6379dd57 of linux-2.6-bk), but pci_disable_device was still required to + shut down the device. + Commit c321f7d7c87 in v3.14 added the pci_disable_device at the end of + tulip_remove_one just far enough out of context so that this patch still + applied. +- commit 05c9dcc + +------------------------------------------------------------------- +Sat Jan 23 10:03:57 CET 2016 - tiwai@suse.de + +- Delete obsoleted patches.fixes/ptrace-getsiginfo + This has been fixed in 2.6.26 by e16b278. +- commit 250ec53 + +------------------------------------------------------------------- +Fri Jan 22 15:20:00 CET 2016 - mmarek@suse.com + +- rpm/kernel-source.spec.in: Install kernel-macros for kernel-source-vanilla + (bsc#959090) +- commit cd33617 + +------------------------------------------------------------------- +Fri Jan 22 14:05:22 CET 2016 - mmarek@suse.com + +- rpm/kernel-binary.spec.in: Fix paths in kernel-vanilla-devel (bsc#959090). +- commit 2d2ec7f + +------------------------------------------------------------------- +Fri Jan 22 13:51:22 CET 2016 - mmarek@suse.com + +- rpm/kernel-binary.spec.in: Fix kernel-vanilla-devel dependency (bsc#959090) +- commit fbbc989 + +------------------------------------------------------------------- +Fri Jan 22 13:31:21 CET 2016 - mmarek@suse.com + +- rpm/kernel-binary.spec.in: Use bzip compression to speed up build (bsc#962356) +- commit e8f8f54 + +------------------------------------------------------------------- +Thu Jan 21 16:30:04 CET 2016 - dvaleev@suse.com + +- Add sd_mod to initrd modules + For some reason PowerVM backend can't work without sd_mod +- commit 7c2bd21 + +------------------------------------------------------------------- +Thu Jan 21 11:13:24 CET 2016 - mmarek@suse.com + +- rpm/package-descriptions: Add kernel-zfcpdump and drop -desktop +- commit 54e8f7c + ------------------------------------------------------------------- Wed Jan 20 18:02:28 CET 2016 - tiwai@suse.de - scsi: ignore errors from scsi_dh_add_device() (boo#962813). - commit 1b0ab71 +------------------------------------------------------------------- +Wed Jan 20 17:54:02 CET 2016 - mgorman@suse.com + +- Refresh patches.suse/readahead-request-tunables.patch. +- commit 02b8b18 + ------------------------------------------------------------------- Wed Jan 20 17:43:09 CET 2016 - tiwai@suse.de diff --git a/kernel-lpae.spec b/kernel-lpae.spec index f8472481..49a3cd8d 100644 --- a/kernel-lpae.spec +++ b/kernel-lpae.spec @@ -30,8 +30,12 @@ %define build_default ("%build_flavor" == "default") %define build_vanilla ("%build_flavor" == "vanilla") +%if ! %build_vanilla %define src_install_dir /usr/src/linux-%kernelrelease%variant -%define obj_install_dir %src_install_dir-obj +%else +%define src_install_dir /usr/src/linux-%kernelrelease-vanilla +%endif +%define obj_install_dir /usr/src/linux-%kernelrelease%variant-obj %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-%srcversion/linux-obj @@ -59,7 +63,7 @@ License: GPL-2.0 Group: System/Kernel Version: 4.4.0 %if 0%{?is_kotd} -Release: .gb56b151 +Release: .g9b438ee %else Release: 0 %endif @@ -130,10 +134,10 @@ BuildRequires: u-boot-tools Obsoletes: microcode_ctl -%if %build_vanilla -# force bzip2 instead of lzma compression to allow install on older dist versions +# 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 -%endif # dead network if installed on SLES10, otherwise it will work (mostly) Conflicts: sysfsutils < 2.0 Conflicts: apparmor-profiles <= 2.1 @@ -826,7 +830,7 @@ if [ %CONFIG_MODULES = y ]; then esac done # Recreate the generated Makefile with correct path - sh ../scripts/mkmakefile ../../../linux-%kernelrelease%variant \ + sh ../scripts/mkmakefile ../../../%{basename:%src_install_dir} \ %rpm_install_dir/%cpu_arch_flavor \ $(echo %srcversion | sed -r 's/^([0-9]+)\.([0-9]+).*/\1 \2/') fi @@ -1037,8 +1041,13 @@ Summary: Development files necessary for building kernel modules Group: Development/Sources Provides: %name-devel = %version-%source_rel Provides: multiversion(kernel) +%if ! %build_vanilla Requires: kernel-devel%variant = %version-%source_rel Supplements: packageand(%name:kernel-devel%variant) +%else +Requires: kernel-source-vanilla = %version-%source_rel +Supplements: packageand(%name:kernel-source-vanilla) +%endif %obsolete_rebuilds %name-devel PreReq: coreutils diff --git a/kernel-obs-build.changes b/kernel-obs-build.changes index 35842217..9d30312c 100644 --- a/kernel-obs-build.changes +++ b/kernel-obs-build.changes @@ -1,9 +1,72 @@ +------------------------------------------------------------------- +Mon Jan 25 17:48:33 CET 2016 - jeffm@suse.com + +- Delete patches.fixes/tulip-quad-NIC-ifdown. + The original bug that this patch fixed was addressed in 2004, in v2.6.10 + (6379dd57 of linux-2.6-bk), but pci_disable_device was still required to + shut down the device. + Commit c321f7d7c87 in v3.14 added the pci_disable_device at the end of + tulip_remove_one just far enough out of context so that this patch still + applied. +- commit 05c9dcc + +------------------------------------------------------------------- +Sat Jan 23 10:03:57 CET 2016 - tiwai@suse.de + +- Delete obsoleted patches.fixes/ptrace-getsiginfo + This has been fixed in 2.6.26 by e16b278. +- commit 250ec53 + +------------------------------------------------------------------- +Fri Jan 22 15:20:00 CET 2016 - mmarek@suse.com + +- rpm/kernel-source.spec.in: Install kernel-macros for kernel-source-vanilla + (bsc#959090) +- commit cd33617 + +------------------------------------------------------------------- +Fri Jan 22 14:05:22 CET 2016 - mmarek@suse.com + +- rpm/kernel-binary.spec.in: Fix paths in kernel-vanilla-devel (bsc#959090). +- commit 2d2ec7f + +------------------------------------------------------------------- +Fri Jan 22 13:51:22 CET 2016 - mmarek@suse.com + +- rpm/kernel-binary.spec.in: Fix kernel-vanilla-devel dependency (bsc#959090) +- commit fbbc989 + +------------------------------------------------------------------- +Fri Jan 22 13:31:21 CET 2016 - mmarek@suse.com + +- rpm/kernel-binary.spec.in: Use bzip compression to speed up build (bsc#962356) +- commit e8f8f54 + +------------------------------------------------------------------- +Thu Jan 21 16:30:04 CET 2016 - dvaleev@suse.com + +- Add sd_mod to initrd modules + For some reason PowerVM backend can't work without sd_mod +- commit 7c2bd21 + +------------------------------------------------------------------- +Thu Jan 21 11:13:24 CET 2016 - mmarek@suse.com + +- rpm/package-descriptions: Add kernel-zfcpdump and drop -desktop +- commit 54e8f7c + ------------------------------------------------------------------- Wed Jan 20 18:02:28 CET 2016 - tiwai@suse.de - scsi: ignore errors from scsi_dh_add_device() (boo#962813). - commit 1b0ab71 +------------------------------------------------------------------- +Wed Jan 20 17:54:02 CET 2016 - mgorman@suse.com + +- Refresh patches.suse/readahead-request-tunables.patch. +- commit 02b8b18 + ------------------------------------------------------------------- Wed Jan 20 17:43:09 CET 2016 - tiwai@suse.de diff --git a/kernel-obs-build.spec b/kernel-obs-build.spec index e91fa66a..8287c088 100644 --- a/kernel-obs-build.spec +++ b/kernel-obs-build.spec @@ -53,7 +53,7 @@ License: GPL-2.0 Group: SLES Version: 4.4.0 %if 0%{?is_kotd} -Release: .gb56b151 +Release: .g9b438ee %else Release: 0 %endif @@ -99,7 +99,7 @@ chmod a+rx /usr/lib/dracut/modules.d/80obs/setup_obs.sh # a longer list to have them also available for qemu cross builds where x86_64 kernel runs in eg. arm env. # this list of modules where available on build workers of build.opensuse.org, so we stay compatible. -export KERNEL_MODULES="loop dm-mod dm-snapshot binfmt-misc fuse kqemu squashfs ext2 ext3 ext4 reiserfs btrfs nf_conntrack_ipv6 binfmt_misc virtio_pci virtio_mmio virtio_blk virtio_rng fat vfat nls_cp437 nls_iso8859-1 ibmvscsi ibmvscsic" +export KERNEL_MODULES="loop dm-mod dm-snapshot binfmt-misc fuse kqemu squashfs ext2 ext3 ext4 reiserfs btrfs nf_conntrack_ipv6 binfmt_misc virtio_pci virtio_mmio virtio_blk virtio_rng fat vfat nls_cp437 nls_iso8859-1 ibmvscsi sd_mod" # manually load all modules to make sure they're available for i in $KERNEL_MODULES; do diff --git a/kernel-obs-build.spec.in b/kernel-obs-build.spec.in index 5cb60dee..ae8e38c0 100644 --- a/kernel-obs-build.spec.in +++ b/kernel-obs-build.spec.in @@ -99,7 +99,7 @@ chmod a+rx /usr/lib/dracut/modules.d/80obs/setup_obs.sh # a longer list to have them also available for qemu cross builds where x86_64 kernel runs in eg. arm env. # this list of modules where available on build workers of build.opensuse.org, so we stay compatible. -export KERNEL_MODULES="loop dm-mod dm-snapshot binfmt-misc fuse kqemu squashfs ext2 ext3 ext4 reiserfs btrfs nf_conntrack_ipv6 binfmt_misc virtio_pci virtio_mmio virtio_blk virtio_rng fat vfat nls_cp437 nls_iso8859-1 ibmvscsi ibmvscsic" +export KERNEL_MODULES="loop dm-mod dm-snapshot binfmt-misc fuse kqemu squashfs ext2 ext3 ext4 reiserfs btrfs nf_conntrack_ipv6 binfmt_misc virtio_pci virtio_mmio virtio_blk virtio_rng fat vfat nls_cp437 nls_iso8859-1 ibmvscsi sd_mod" # manually load all modules to make sure they're available for i in $KERNEL_MODULES; do diff --git a/kernel-obs-qa.changes b/kernel-obs-qa.changes index 35842217..9d30312c 100644 --- a/kernel-obs-qa.changes +++ b/kernel-obs-qa.changes @@ -1,9 +1,72 @@ +------------------------------------------------------------------- +Mon Jan 25 17:48:33 CET 2016 - jeffm@suse.com + +- Delete patches.fixes/tulip-quad-NIC-ifdown. + The original bug that this patch fixed was addressed in 2004, in v2.6.10 + (6379dd57 of linux-2.6-bk), but pci_disable_device was still required to + shut down the device. + Commit c321f7d7c87 in v3.14 added the pci_disable_device at the end of + tulip_remove_one just far enough out of context so that this patch still + applied. +- commit 05c9dcc + +------------------------------------------------------------------- +Sat Jan 23 10:03:57 CET 2016 - tiwai@suse.de + +- Delete obsoleted patches.fixes/ptrace-getsiginfo + This has been fixed in 2.6.26 by e16b278. +- commit 250ec53 + +------------------------------------------------------------------- +Fri Jan 22 15:20:00 CET 2016 - mmarek@suse.com + +- rpm/kernel-source.spec.in: Install kernel-macros for kernel-source-vanilla + (bsc#959090) +- commit cd33617 + +------------------------------------------------------------------- +Fri Jan 22 14:05:22 CET 2016 - mmarek@suse.com + +- rpm/kernel-binary.spec.in: Fix paths in kernel-vanilla-devel (bsc#959090). +- commit 2d2ec7f + +------------------------------------------------------------------- +Fri Jan 22 13:51:22 CET 2016 - mmarek@suse.com + +- rpm/kernel-binary.spec.in: Fix kernel-vanilla-devel dependency (bsc#959090) +- commit fbbc989 + +------------------------------------------------------------------- +Fri Jan 22 13:31:21 CET 2016 - mmarek@suse.com + +- rpm/kernel-binary.spec.in: Use bzip compression to speed up build (bsc#962356) +- commit e8f8f54 + +------------------------------------------------------------------- +Thu Jan 21 16:30:04 CET 2016 - dvaleev@suse.com + +- Add sd_mod to initrd modules + For some reason PowerVM backend can't work without sd_mod +- commit 7c2bd21 + +------------------------------------------------------------------- +Thu Jan 21 11:13:24 CET 2016 - mmarek@suse.com + +- rpm/package-descriptions: Add kernel-zfcpdump and drop -desktop +- commit 54e8f7c + ------------------------------------------------------------------- Wed Jan 20 18:02:28 CET 2016 - tiwai@suse.de - scsi: ignore errors from scsi_dh_add_device() (boo#962813). - commit 1b0ab71 +------------------------------------------------------------------- +Wed Jan 20 17:54:02 CET 2016 - mgorman@suse.com + +- Refresh patches.suse/readahead-request-tunables.patch. +- commit 02b8b18 + ------------------------------------------------------------------- Wed Jan 20 17:43:09 CET 2016 - tiwai@suse.de diff --git a/kernel-obs-qa.spec b/kernel-obs-qa.spec index ed048127..860819c2 100644 --- a/kernel-obs-qa.spec +++ b/kernel-obs-qa.spec @@ -38,7 +38,7 @@ License: GPL-2.0 Group: SLES Version: 4.4.0 %if 0%{?is_kotd} -Release: .gb56b151 +Release: .g9b438ee %else Release: 0 %endif diff --git a/kernel-pae.changes b/kernel-pae.changes index 35842217..9d30312c 100644 --- a/kernel-pae.changes +++ b/kernel-pae.changes @@ -1,9 +1,72 @@ +------------------------------------------------------------------- +Mon Jan 25 17:48:33 CET 2016 - jeffm@suse.com + +- Delete patches.fixes/tulip-quad-NIC-ifdown. + The original bug that this patch fixed was addressed in 2004, in v2.6.10 + (6379dd57 of linux-2.6-bk), but pci_disable_device was still required to + shut down the device. + Commit c321f7d7c87 in v3.14 added the pci_disable_device at the end of + tulip_remove_one just far enough out of context so that this patch still + applied. +- commit 05c9dcc + +------------------------------------------------------------------- +Sat Jan 23 10:03:57 CET 2016 - tiwai@suse.de + +- Delete obsoleted patches.fixes/ptrace-getsiginfo + This has been fixed in 2.6.26 by e16b278. +- commit 250ec53 + +------------------------------------------------------------------- +Fri Jan 22 15:20:00 CET 2016 - mmarek@suse.com + +- rpm/kernel-source.spec.in: Install kernel-macros for kernel-source-vanilla + (bsc#959090) +- commit cd33617 + +------------------------------------------------------------------- +Fri Jan 22 14:05:22 CET 2016 - mmarek@suse.com + +- rpm/kernel-binary.spec.in: Fix paths in kernel-vanilla-devel (bsc#959090). +- commit 2d2ec7f + +------------------------------------------------------------------- +Fri Jan 22 13:51:22 CET 2016 - mmarek@suse.com + +- rpm/kernel-binary.spec.in: Fix kernel-vanilla-devel dependency (bsc#959090) +- commit fbbc989 + +------------------------------------------------------------------- +Fri Jan 22 13:31:21 CET 2016 - mmarek@suse.com + +- rpm/kernel-binary.spec.in: Use bzip compression to speed up build (bsc#962356) +- commit e8f8f54 + +------------------------------------------------------------------- +Thu Jan 21 16:30:04 CET 2016 - dvaleev@suse.com + +- Add sd_mod to initrd modules + For some reason PowerVM backend can't work without sd_mod +- commit 7c2bd21 + +------------------------------------------------------------------- +Thu Jan 21 11:13:24 CET 2016 - mmarek@suse.com + +- rpm/package-descriptions: Add kernel-zfcpdump and drop -desktop +- commit 54e8f7c + ------------------------------------------------------------------- Wed Jan 20 18:02:28 CET 2016 - tiwai@suse.de - scsi: ignore errors from scsi_dh_add_device() (boo#962813). - commit 1b0ab71 +------------------------------------------------------------------- +Wed Jan 20 17:54:02 CET 2016 - mgorman@suse.com + +- Refresh patches.suse/readahead-request-tunables.patch. +- commit 02b8b18 + ------------------------------------------------------------------- Wed Jan 20 17:43:09 CET 2016 - tiwai@suse.de diff --git a/kernel-pae.spec b/kernel-pae.spec index b28c710e..daeb03b6 100644 --- a/kernel-pae.spec +++ b/kernel-pae.spec @@ -30,8 +30,12 @@ %define build_default ("%build_flavor" == "default") %define build_vanilla ("%build_flavor" == "vanilla") +%if ! %build_vanilla %define src_install_dir /usr/src/linux-%kernelrelease%variant -%define obj_install_dir %src_install_dir-obj +%else +%define src_install_dir /usr/src/linux-%kernelrelease-vanilla +%endif +%define obj_install_dir /usr/src/linux-%kernelrelease%variant-obj %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-%srcversion/linux-obj @@ -59,7 +63,7 @@ License: GPL-2.0 Group: System/Kernel Version: 4.4.0 %if 0%{?is_kotd} -Release: .gb56b151 +Release: .g9b438ee %else Release: 0 %endif @@ -130,10 +134,10 @@ BuildRequires: u-boot-tools Obsoletes: microcode_ctl -%if %build_vanilla -# force bzip2 instead of lzma compression to allow install on older dist versions +# 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 -%endif # dead network if installed on SLES10, otherwise it will work (mostly) Conflicts: sysfsutils < 2.0 Conflicts: apparmor-profiles <= 2.1 @@ -852,7 +856,7 @@ if [ %CONFIG_MODULES = y ]; then esac done # Recreate the generated Makefile with correct path - sh ../scripts/mkmakefile ../../../linux-%kernelrelease%variant \ + sh ../scripts/mkmakefile ../../../%{basename:%src_install_dir} \ %rpm_install_dir/%cpu_arch_flavor \ $(echo %srcversion | sed -r 's/^([0-9]+)\.([0-9]+).*/\1 \2/') fi @@ -1093,8 +1097,13 @@ Summary: Development files necessary for building kernel modules Group: Development/Sources Provides: %name-devel = %version-%source_rel Provides: multiversion(kernel) +%if ! %build_vanilla Requires: kernel-devel%variant = %version-%source_rel Supplements: packageand(%name:kernel-devel%variant) +%else +Requires: kernel-source-vanilla = %version-%source_rel +Supplements: packageand(%name:kernel-source-vanilla) +%endif %ifarch %ix86 Provides: kernel-vmi-devel = 2.6.38 Obsoletes: kernel-vmi-devel <= 2.6.38 diff --git a/kernel-source.changes b/kernel-source.changes index 35842217..9d30312c 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -1,9 +1,72 @@ +------------------------------------------------------------------- +Mon Jan 25 17:48:33 CET 2016 - jeffm@suse.com + +- Delete patches.fixes/tulip-quad-NIC-ifdown. + The original bug that this patch fixed was addressed in 2004, in v2.6.10 + (6379dd57 of linux-2.6-bk), but pci_disable_device was still required to + shut down the device. + Commit c321f7d7c87 in v3.14 added the pci_disable_device at the end of + tulip_remove_one just far enough out of context so that this patch still + applied. +- commit 05c9dcc + +------------------------------------------------------------------- +Sat Jan 23 10:03:57 CET 2016 - tiwai@suse.de + +- Delete obsoleted patches.fixes/ptrace-getsiginfo + This has been fixed in 2.6.26 by e16b278. +- commit 250ec53 + +------------------------------------------------------------------- +Fri Jan 22 15:20:00 CET 2016 - mmarek@suse.com + +- rpm/kernel-source.spec.in: Install kernel-macros for kernel-source-vanilla + (bsc#959090) +- commit cd33617 + +------------------------------------------------------------------- +Fri Jan 22 14:05:22 CET 2016 - mmarek@suse.com + +- rpm/kernel-binary.spec.in: Fix paths in kernel-vanilla-devel (bsc#959090). +- commit 2d2ec7f + +------------------------------------------------------------------- +Fri Jan 22 13:51:22 CET 2016 - mmarek@suse.com + +- rpm/kernel-binary.spec.in: Fix kernel-vanilla-devel dependency (bsc#959090) +- commit fbbc989 + +------------------------------------------------------------------- +Fri Jan 22 13:31:21 CET 2016 - mmarek@suse.com + +- rpm/kernel-binary.spec.in: Use bzip compression to speed up build (bsc#962356) +- commit e8f8f54 + +------------------------------------------------------------------- +Thu Jan 21 16:30:04 CET 2016 - dvaleev@suse.com + +- Add sd_mod to initrd modules + For some reason PowerVM backend can't work without sd_mod +- commit 7c2bd21 + +------------------------------------------------------------------- +Thu Jan 21 11:13:24 CET 2016 - mmarek@suse.com + +- rpm/package-descriptions: Add kernel-zfcpdump and drop -desktop +- commit 54e8f7c + ------------------------------------------------------------------- Wed Jan 20 18:02:28 CET 2016 - tiwai@suse.de - scsi: ignore errors from scsi_dh_add_device() (boo#962813). - commit 1b0ab71 +------------------------------------------------------------------- +Wed Jan 20 17:54:02 CET 2016 - mgorman@suse.com + +- Refresh patches.suse/readahead-request-tunables.patch. +- commit 02b8b18 + ------------------------------------------------------------------- Wed Jan 20 17:43:09 CET 2016 - tiwai@suse.de diff --git a/kernel-source.spec b/kernel-source.spec index 935f2b89..4b3c0aae 100644 --- a/kernel-source.spec +++ b/kernel-source.spec @@ -32,7 +32,7 @@ License: GPL-2.0 Group: Development/Sources Version: 4.4.0 %if 0%{?is_kotd} -Release: .gb56b151 +Release: .g9b438ee %else Release: 0 %endif @@ -157,6 +157,7 @@ Group: Development/Sources AutoReqProv: off Provides: %name-vanilla = %version-%source_rel Provides: multiversion(kernel) +Requires: kernel-macros %description vanilla Vanilla Linux kernel sources with minor build fixes. diff --git a/kernel-source.spec.in b/kernel-source.spec.in index 7e645ffa..d2677c7d 100644 --- a/kernel-source.spec.in +++ b/kernel-source.spec.in @@ -157,6 +157,7 @@ Group: Development/Sources AutoReqProv: off Provides: %name-vanilla = %version-%source_rel Provides: multiversion(kernel) +Requires: kernel-macros %description vanilla Vanilla Linux kernel sources with minor build fixes. diff --git a/kernel-syms.changes b/kernel-syms.changes index 35842217..9d30312c 100644 --- a/kernel-syms.changes +++ b/kernel-syms.changes @@ -1,9 +1,72 @@ +------------------------------------------------------------------- +Mon Jan 25 17:48:33 CET 2016 - jeffm@suse.com + +- Delete patches.fixes/tulip-quad-NIC-ifdown. + The original bug that this patch fixed was addressed in 2004, in v2.6.10 + (6379dd57 of linux-2.6-bk), but pci_disable_device was still required to + shut down the device. + Commit c321f7d7c87 in v3.14 added the pci_disable_device at the end of + tulip_remove_one just far enough out of context so that this patch still + applied. +- commit 05c9dcc + +------------------------------------------------------------------- +Sat Jan 23 10:03:57 CET 2016 - tiwai@suse.de + +- Delete obsoleted patches.fixes/ptrace-getsiginfo + This has been fixed in 2.6.26 by e16b278. +- commit 250ec53 + +------------------------------------------------------------------- +Fri Jan 22 15:20:00 CET 2016 - mmarek@suse.com + +- rpm/kernel-source.spec.in: Install kernel-macros for kernel-source-vanilla + (bsc#959090) +- commit cd33617 + +------------------------------------------------------------------- +Fri Jan 22 14:05:22 CET 2016 - mmarek@suse.com + +- rpm/kernel-binary.spec.in: Fix paths in kernel-vanilla-devel (bsc#959090). +- commit 2d2ec7f + +------------------------------------------------------------------- +Fri Jan 22 13:51:22 CET 2016 - mmarek@suse.com + +- rpm/kernel-binary.spec.in: Fix kernel-vanilla-devel dependency (bsc#959090) +- commit fbbc989 + +------------------------------------------------------------------- +Fri Jan 22 13:31:21 CET 2016 - mmarek@suse.com + +- rpm/kernel-binary.spec.in: Use bzip compression to speed up build (bsc#962356) +- commit e8f8f54 + +------------------------------------------------------------------- +Thu Jan 21 16:30:04 CET 2016 - dvaleev@suse.com + +- Add sd_mod to initrd modules + For some reason PowerVM backend can't work without sd_mod +- commit 7c2bd21 + +------------------------------------------------------------------- +Thu Jan 21 11:13:24 CET 2016 - mmarek@suse.com + +- rpm/package-descriptions: Add kernel-zfcpdump and drop -desktop +- commit 54e8f7c + ------------------------------------------------------------------- Wed Jan 20 18:02:28 CET 2016 - tiwai@suse.de - scsi: ignore errors from scsi_dh_add_device() (boo#962813). - commit 1b0ab71 +------------------------------------------------------------------- +Wed Jan 20 17:54:02 CET 2016 - mgorman@suse.com + +- Refresh patches.suse/readahead-request-tunables.patch. +- commit 02b8b18 + ------------------------------------------------------------------- Wed Jan 20 17:43:09 CET 2016 - tiwai@suse.de diff --git a/kernel-syms.spec b/kernel-syms.spec index 9ce03b2a..7625020a 100644 --- a/kernel-syms.spec +++ b/kernel-syms.spec @@ -27,7 +27,7 @@ Group: Development/Sources Version: 4.4.0 %if %using_buildservice %if 0%{?is_kotd} -Release: .gb56b151 +Release: .g9b438ee %else Release: 0 %endif diff --git a/kernel-vanilla.changes b/kernel-vanilla.changes index 35842217..9d30312c 100644 --- a/kernel-vanilla.changes +++ b/kernel-vanilla.changes @@ -1,9 +1,72 @@ +------------------------------------------------------------------- +Mon Jan 25 17:48:33 CET 2016 - jeffm@suse.com + +- Delete patches.fixes/tulip-quad-NIC-ifdown. + The original bug that this patch fixed was addressed in 2004, in v2.6.10 + (6379dd57 of linux-2.6-bk), but pci_disable_device was still required to + shut down the device. + Commit c321f7d7c87 in v3.14 added the pci_disable_device at the end of + tulip_remove_one just far enough out of context so that this patch still + applied. +- commit 05c9dcc + +------------------------------------------------------------------- +Sat Jan 23 10:03:57 CET 2016 - tiwai@suse.de + +- Delete obsoleted patches.fixes/ptrace-getsiginfo + This has been fixed in 2.6.26 by e16b278. +- commit 250ec53 + +------------------------------------------------------------------- +Fri Jan 22 15:20:00 CET 2016 - mmarek@suse.com + +- rpm/kernel-source.spec.in: Install kernel-macros for kernel-source-vanilla + (bsc#959090) +- commit cd33617 + +------------------------------------------------------------------- +Fri Jan 22 14:05:22 CET 2016 - mmarek@suse.com + +- rpm/kernel-binary.spec.in: Fix paths in kernel-vanilla-devel (bsc#959090). +- commit 2d2ec7f + +------------------------------------------------------------------- +Fri Jan 22 13:51:22 CET 2016 - mmarek@suse.com + +- rpm/kernel-binary.spec.in: Fix kernel-vanilla-devel dependency (bsc#959090) +- commit fbbc989 + +------------------------------------------------------------------- +Fri Jan 22 13:31:21 CET 2016 - mmarek@suse.com + +- rpm/kernel-binary.spec.in: Use bzip compression to speed up build (bsc#962356) +- commit e8f8f54 + +------------------------------------------------------------------- +Thu Jan 21 16:30:04 CET 2016 - dvaleev@suse.com + +- Add sd_mod to initrd modules + For some reason PowerVM backend can't work without sd_mod +- commit 7c2bd21 + +------------------------------------------------------------------- +Thu Jan 21 11:13:24 CET 2016 - mmarek@suse.com + +- rpm/package-descriptions: Add kernel-zfcpdump and drop -desktop +- commit 54e8f7c + ------------------------------------------------------------------- Wed Jan 20 18:02:28 CET 2016 - tiwai@suse.de - scsi: ignore errors from scsi_dh_add_device() (boo#962813). - commit 1b0ab71 +------------------------------------------------------------------- +Wed Jan 20 17:54:02 CET 2016 - mgorman@suse.com + +- Refresh patches.suse/readahead-request-tunables.patch. +- commit 02b8b18 + ------------------------------------------------------------------- Wed Jan 20 17:43:09 CET 2016 - tiwai@suse.de diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index dc24ab65..d87a3801 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -30,8 +30,12 @@ %define build_default ("%build_flavor" == "default") %define build_vanilla ("%build_flavor" == "vanilla") +%if ! %build_vanilla %define src_install_dir /usr/src/linux-%kernelrelease%variant -%define obj_install_dir %src_install_dir-obj +%else +%define src_install_dir /usr/src/linux-%kernelrelease-vanilla +%endif +%define obj_install_dir /usr/src/linux-%kernelrelease%variant-obj %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-%srcversion/linux-obj @@ -59,7 +63,7 @@ License: GPL-2.0 Group: System/Kernel Version: 4.4.0 %if 0%{?is_kotd} -Release: .gb56b151 +Release: .g9b438ee %else Release: 0 %endif @@ -130,10 +134,10 @@ BuildRequires: u-boot-tools Obsoletes: microcode_ctl -%if %build_vanilla -# force bzip2 instead of lzma compression to allow install on older dist versions +# 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 -%endif # dead network if installed on SLES10, otherwise it will work (mostly) Conflicts: sysfsutils < 2.0 Conflicts: apparmor-profiles <= 2.1 @@ -825,7 +829,7 @@ if [ %CONFIG_MODULES = y ]; then esac done # Recreate the generated Makefile with correct path - sh ../scripts/mkmakefile ../../../linux-%kernelrelease%variant \ + sh ../scripts/mkmakefile ../../../%{basename:%src_install_dir} \ %rpm_install_dir/%cpu_arch_flavor \ $(echo %srcversion | sed -r 's/^([0-9]+)\.([0-9]+).*/\1 \2/') fi @@ -1034,8 +1038,13 @@ Summary: Development files necessary for building kernel modules Group: Development/Sources Provides: %name-devel = %version-%source_rel Provides: multiversion(kernel) +%if ! %build_vanilla Requires: kernel-devel%variant = %version-%source_rel Supplements: packageand(%name:kernel-devel%variant) +%else +Requires: kernel-source-vanilla = %version-%source_rel +Supplements: packageand(%name:kernel-source-vanilla) +%endif %obsolete_rebuilds %name-devel PreReq: coreutils diff --git a/package-descriptions b/package-descriptions index aacc46d4..a6e697b3 100644 --- a/package-descriptions +++ b/package-descriptions @@ -20,24 +20,6 @@ The Standard Kernel The standard kernel for both uniprocessor and multiprocessor systems. -=== kernel-desktop === -Kernel optimized for the desktop - -This kernel is optimized for the desktop. It is configured for lower latency -and has many of the features that aren't usually used on desktop machines -disabled. - -%ifarch %ix86 -This kernel supports up to 64GB of main memory. It requires Physical -Addressing Extensions (PAE), which were introduced with the Pentium Pro -processor. - -PAE is not only more physical address space but also important for the -"no execute" feature which disables execution of code that is marked as -non-executable. Therefore, the PAE kernel should be used on any systems -that support it, regardless of the amount of main memory. -%endif - === kernel-pae === Kernel with PAE Support @@ -99,3 +81,12 @@ The standard kernel for Samsung's Exynos 4 & 5 SoC, as found in the Origen board Kernel for Versatile SoC The standard kernel for Versatile SoC, or for emulation with QEMU. + +=== kernel-zfcpdump === +The IBM System Z zfcpdump Kernel + +The Linux kernel for booting the zfcpdump process on IBM System Z. + +This kernel should only be used by the s390-tools package. This kernel +should not be installed as a regular booting kernel. + diff --git a/patches.fixes.tar.bz2 b/patches.fixes.tar.bz2 index f0b468e9..52c87ee5 100644 --- a/patches.fixes.tar.bz2 +++ b/patches.fixes.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:57462c5021b1384009e1fd4b4a0ab51a0248e020ce5e6ce72dd395e02fd634b1 -size 11260 +oid sha256:908be7e1652de48badde717ee32c17c0cdc0828d0b399d0c04e7e6d8d4d5b699 +size 10160 diff --git a/patches.suse.tar.bz2 b/patches.suse.tar.bz2 index c187c8f6..2c1a2622 100644 --- a/patches.suse.tar.bz2 +++ b/patches.suse.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:33bc7e0e0d476065a2ca7d40538df62e54377a475b18c5c2ec272668a13121cd -size 55160 +oid sha256:628bd412ed765214547d3a24e7859f3073d9ab852c05517c160d51ae3893456b +size 55390 diff --git a/series.conf b/series.conf index 4986814a..2cfda39a 100644 --- a/series.conf +++ b/series.conf @@ -128,7 +128,6 @@ patches.drivers/ppc64-adb patches.suse/suse-ppc64-branding patches.arch/ppc-prom-nodisplay.patch -+needs_update patches.fixes/ptrace-getsiginfo ######################################################## # powerpc/little endian @@ -342,7 +341,6 @@ ######################################################## # Network ######################################################## - patches.fixes/tulip-quad-NIC-ifdown patches.drivers/ethernet-atheros-alx-sanitize-buffer-sizing-and-padd ######################################################## diff --git a/source-timestamp b/source-timestamp index f943da64..346a3e21 100644 --- a/source-timestamp +++ b/source-timestamp @@ -1,3 +1,3 @@ -2016-01-21 08:47:10 +0100 -GIT Revision: b56b151e7b1fc4fcaa254ff3f950d4a89416635b +2016-01-25 18:01:54 +0100 +GIT Revision: 9b438ee432d677d5fd2fbe5a45c12f9d26781a2d GIT Branch: stable