commit kernel-source for openSUSE:Factory
Hello community,
here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2015-04-27 22:07:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kernel-source (Old)
and /work/SRC/openSUSE:Factory/.kernel-source.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kernel-source"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kernel-source/kernel-debug.changes 2015-04-15 17:42:59.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-debug.changes 2015-04-27 22:08:43.000000000 +0200
@@ -1,0 +2,57 @@
+Wed Apr 22 16:37:02 CEST 2015 - pmladek@suse.cz
+
+- ftrace/x86/xen: use kernel identity mapping only when really needed
+ (bsc#873195, bsc#886272, bsc#903727, bsc#927725)
+- commit 63ed720
+
+-------------------------------------------------------------------
+Wed Apr 22 13:54:15 CEST 2015 - mmarek@suse.cz
+
+- scripts/refresh: Obsoleted by refresh_patch.sh
+- commit d1dd729
+
+-------------------------------------------------------------------
+Wed Apr 22 09:26:15 CEST 2015 - mmarek@suse.cz
+
+- rpm/kernel-obs-build.spec.in: Add .build.hostarch.kvm to the filelist
+- commit c65f3ca
+
+-------------------------------------------------------------------
+Tue Apr 21 17:04:11 CEST 2015 - jbeulich@suse.com
+
+- Update Xen patches to 4.0-final.
+- commit eee4e07
+
+-------------------------------------------------------------------
+Tue Apr 21 16:33:44 CEST 2015 - mmarek@suse.cz
+
+- rpm/mkspec: Do not build kernel-obs-* on 32bit ppc
+ The buildservice uses the ppc64 kernel-obs-build package for 32bit
+ workers.
+- commit d1e0beb
+
+-------------------------------------------------------------------
+Tue Apr 21 16:23:11 CEST 2015 - dvaleev@suse.com
+
+- create .build.hostarch.kvm for kernel-obs-build
+ OBS needs to know hostarch, with ppc64/ppc64le this is not that easy.
+ Lets create a marker file to help with it.
+ See obs-build commit: e47399d738e51
+- commit e5d9da9
+
+-------------------------------------------------------------------
+Tue Apr 14 15:36:11 CEST 2015 - mmarek@suse.cz
+
+- rpm/kernel-obs-qa.spec.in: Do not fail if the kernel versions do not match
+- commit 28e9e74
+
+-------------------------------------------------------------------
+Tue Apr 14 08:32:12 CEST 2015 - jlee@suse.com
+
+- Update config files. (boo#925479)
+ Do not set CONFIG_SYSTEM_TRUSTED_KEYRING until we need it in future
+ openSUSE version:
+ e.g. MODULE_SIG, IMA, PKCS7(new), KEXEC_BZIMAGE_VERIFY_SIG(new)
+- commit 5c4d917
+
+-------------------------------------------------------------------
@@ -10,0 +68,6 @@
+Mon Apr 13 16:11:20 CEST 2015 - jeffm@suse.com
+
+- Update to 4.0-final.
+- commit 6dbc1a6
+
+-------------------------------------------------------------------
@@ -16,0 +80,20 @@
+Fri Apr 10 16:44:35 CEST 2015 - jeffm@suse.com
+
+- Update to 4.0-rc7.
+- Config changes:
+ - x86_64/pv:
+ - CONFIG_XEN_BALLOON_MEMORY_HOTPLUG_LIMIT=512 (default)
+- commit 1925449
+
+-------------------------------------------------------------------
+Thu Apr 9 21:17:01 CEST 2015 - agraf@suse.de
+
+- of: Fix size when dma-range is not used.
+- of: Move of_dma_configure() to device.c to help re-use.
+- of: iommu: Add ptr to OF node arg to of_iommu_configure().
+- PCI: Add helper functions pci_get[put]_host_bridge_device().
+- PCI: Update DMA configuration from DT.
+- of/pci: Add of_pci_dma_configure() to update DMA configuration.
+- commit 7d1f328
+
+-------------------------------------------------------------------
@@ -20 +103 @@
-- commit 0f5134a
+- commit ba5700e
@@ -34,0 +118,97 @@
+Tue Apr 7 18:45:12 CEST 2015 - agraf@suse.de
+
+- Update XGBE-A0 support to latest code
+- commit 2121347
+
+-------------------------------------------------------------------
+Mon Apr 6 11:40:41 CEST 2015 - dmueller@suse.com
+
+- ARMv7: config: Enable more features
+ Sync over config settings that have been enabled on x86_64 in the
+ last few years also to ARMv7
+- commit d480a34
+
+-------------------------------------------------------------------
+Sun Apr 5 18:06:56 CEST 2015 - dmueller@suse.com
+
+- ARMv8: config: Enable more modules / feature flags
+- commit 107eae5
+
+-------------------------------------------------------------------
+Sun Apr 5 06:25:25 CEST 2015 - dmueller@suse.com
+
+- ARM64: config: Disable CONFIG_INPUT_E3X0_BUTTON
+- commit 9774a1b
+
+-------------------------------------------------------------------
+Sun Apr 5 06:16:00 CEST 2015 - dmueller@suse.com
+
+- ARMv6/v7/v8: config: Disable ISA bus related drivers
+ There is no ISA bus here
+- commit 469d5c3
+
+-------------------------------------------------------------------
+Sun Apr 5 06:09:18 CEST 2015 - dmueller@suse.com
+
+- ARMv7/v8: config: Disable IIO dummy drivers
+ Not enabled on any other arch either.
+- commit b10b70d
+
+-------------------------------------------------------------------
+Sun Apr 5 05:59:33 CEST 2015 - dmueller@suse.com
+
+- ARMv7: config: Disable accessibility
+ Its not enabled on any other architecture, and enablement was
+ an accident.
+- commit 7197f38
+
+-------------------------------------------------------------------
+Sun Apr 5 05:47:29 CEST 2015 - dmueller@suse.com
+
+- ARMv6/v7/v8: config: Disable debug/compat/self test options
+ Disable those options that shouldn't be enabled on a production
+ kernel and are not either enabled on x86_64
+- commit 5f7e741
+
+-------------------------------------------------------------------
+Sun Apr 5 05:04:45 CEST 2015 - dmueller@suse.com
+
+- ARMv8/v7: config: Sync more features from x86_64
+ Enable various feature flags on ARM if they're also set on x86_64
+ to ensure that the feature sets available is roughly compareable
+- commit f250654
+
+-------------------------------------------------------------------
+Sat Apr 4 14:39:27 CEST 2015 - dmueller@suse.com
+
+- ARMv6/v7: config: build uncommon HID drivers as modules
+ 92db3f1ad forgot to update ARM configs accordingly.
+- commit a83ec68
+
+-------------------------------------------------------------------
+Sat Apr 4 13:46:11 CEST 2015 - dmueller@suse.com
+
+- ARM64: config: Sync vanilla with default config
+- commit 7be032d
+
+-------------------------------------------------------------------
+Sat Apr 4 13:40:00 CEST 2015 - dmueller@suse.com
+
+- ARM64/ARMv6/ARMv7: config: Sync tunables with x86_64
+ Set numeric tunables to the same values as on x86_64 if they're
+ available for both platforms.
+- commit e4e34f2
+
+-------------------------------------------------------------------
+Fri Apr 3 17:49:40 CEST 2015 - mmarek@suse.cz
+
+- Automatically Provide/Obsolete all subpackages of old flavors (bnc#925567)
+- commit e3547a5
+
+-------------------------------------------------------------------
+Thu Apr 2 13:32:51 CEST 2015 - dmueller@suse.com
+
+- ARMv6: config: Update and reenable for 4.0-rc6
+- commit e32301a
+
+-------------------------------------------------------------------
@@ -41 +221,7 @@
-- commit a30f81d
+- commit f54483c
+
+-------------------------------------------------------------------
+Tue Mar 31 22:38:51 CEST 2015 - dmueller@suse.com
+
+- ARM: config: Enable Stack Protector
+- commit 0f06efd
@@ -52 +238,26 @@
-- commit b5dbf85
++++ 500 more lines (skipped)
++++ between /work/SRC/openSUSE:Factory/kernel-source/kernel-debug.changes
++++ and /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-debug.changes
kernel-default.changes: same change
kernel-desktop.changes: same change
kernel-docs.changes: same change
kernel-ec2.changes: same change
kernel-lpae.changes: same change
kernel-obs-build.changes: same change
kernel-obs-qa-xen.changes: same change
kernel-obs-qa.changes: same change
kernel-pae.changes: same change
kernel-pv.changes: same change
kernel-source.changes: same change
kernel-syms.changes: same change
kernel-vanilla.changes: same change
kernel-xen.changes: same change
Old:
----
linux-3.19.tar.xz
New:
----
linux-4.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-debug.spec ++++++
--- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200
+++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200
@@ -19,8 +19,8 @@
# This makes the OBS store the project cert as %_sourcedir/_projectcert.crt
# needssslcertforbuild
-%define srcversion 3.19
-%define patchversion 3.19.4
+%define srcversion 4.0
+%define patchversion 4.0.0
%define variant %{nil}
%define vanilla_only 0
@@ -59,9 +59,9 @@
Summary: A Debug Version of the Kernel
License: GPL-2.0
Group: System/Kernel
-Version: 3.19.4
+Version: 4.0.0
%if 0%{?is_kotd}
-Release: <RELEASE>.g74c332b
+Release: <RELEASE>.g27299c0
%else
Release: 0
%endif
@@ -149,7 +149,11 @@
Provides: kernel-kdump = 2.6.28
Obsoletes: kernel-kdump <= 2.6.28
%endif
-Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz
+%ifarch ppc64
+Provides: kernel-kdump-base = 2.6.28
+Obsoletes: kernel-kdump-base <= 2.6.28
+%endif
+Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh
@@ -955,7 +959,10 @@
Requires(post): modutils
Requires(post): perl-Bootloader
Requires(post): mkinitrd
-
+%ifarch ppc64
+Provides: kernel-kdump-base = 2.6.28
+Obsoletes: kernel-kdump-base <= 2.6.28
+%endif
%ifarch %ix86
Conflicts: libc.so.6()(64bit)
%endif
@@ -994,7 +1001,10 @@
Requires(post): modutils
Requires(post): perl-Bootloader
Requires(post): mkinitrd
-
+%ifarch ppc64
+Provides: kernel-kdump-extra = 2.6.28
+Obsoletes: kernel-kdump-extra <= 2.6.28
+%endif
Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu)
%ifarch %ix86
Conflicts: libc.so.6()(64bit)
@@ -1046,7 +1056,10 @@
Provides: multiversion(kernel)
Requires: kernel-devel%variant = %version-%source_rel
Supplements: packageand(%name:kernel-devel%variant)
-
+%ifarch ppc64
+Provides: kernel-kdump-devel = 2.6.28
+Obsoletes: kernel-kdump-devel <= 2.6.28
+%endif
PreReq: coreutils
%description devel
++++++ kernel-default.spec ++++++
--- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200
+++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200
@@ -19,8 +19,8 @@
# This makes the OBS store the project cert as %_sourcedir/_projectcert.crt
# needssslcertforbuild
-%define srcversion 3.19
-%define patchversion 3.19.4
+%define srcversion 4.0
+%define patchversion 4.0.0
%define variant %{nil}
%define vanilla_only 0
@@ -59,9 +59,9 @@
Summary: The Standard Kernel
License: GPL-2.0
Group: System/Kernel
-Version: 3.19.4
+Version: 4.0.0
%if 0%{?is_kotd}
-Release: <RELEASE>.g74c332b
+Release: <RELEASE>.g27299c0
%else
Release: 0
%endif
@@ -150,8 +150,6 @@
Obsoletes: kernel-smp <= 2.6.17
Provides: kernel-trace = 3.13
Obsoletes: kernel-trace <= 3.13
-Provides: kernel-trace-base = 3.13
-Obsoletes: kernel-trace-base <= 3.13
%endif
%ifarch ppc64
Provides: kernel-kdump = 2.6.28
@@ -160,20 +158,34 @@
%ifarch s390x
Provides: kernel-trace = 3.13
Obsoletes: kernel-trace <= 3.13
-Provides: kernel-trace-base = 3.13
-Obsoletes: kernel-trace-base <= 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-trace-base = 3.13
-Obsoletes: kernel-trace-base <= 3.13
Provides: kernel-bigsmp = 3.1
Obsoletes: kernel-bigsmp <= 3.1
%endif
-Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz
+%ifarch %ix86
+Provides: kernel-trace-base = 3.13
+Obsoletes: kernel-trace-base <= 3.13
+%endif
+%ifarch ppc64
+Provides: kernel-kdump-base = 2.6.28
+Obsoletes: kernel-kdump-base <= 2.6.28
+%endif
+%ifarch s390x
+Provides: kernel-trace-base = 3.13
+Obsoletes: kernel-trace-base <= 3.13
+%endif
+%ifarch x86_64
+Provides: kernel-trace-base = 3.13
+Obsoletes: kernel-trace-base <= 3.13
+Provides: kernel-bigsmp-base = 3.1
+Obsoletes: kernel-bigsmp-base <= 3.1
+%endif
+Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh
@@ -978,7 +990,24 @@
Requires(post): modutils
Requires(post): perl-Bootloader
Requires(post): mkinitrd
-
+%ifarch %ix86
+Provides: kernel-trace-base = 3.13
+Obsoletes: kernel-trace-base <= 3.13
+%endif
+%ifarch ppc64
+Provides: kernel-kdump-base = 2.6.28
+Obsoletes: kernel-kdump-base <= 2.6.28
+%endif
+%ifarch s390x
+Provides: kernel-trace-base = 3.13
+Obsoletes: kernel-trace-base <= 3.13
+%endif
+%ifarch x86_64
+Provides: kernel-trace-base = 3.13
+Obsoletes: kernel-trace-base <= 3.13
+Provides: kernel-bigsmp-base = 3.1
+Obsoletes: kernel-bigsmp-base <= 3.1
+%endif
%ifarch %ix86
Conflicts: libc.so.6()(64bit)
%endif
@@ -1020,6 +1049,10 @@
Provides: kernel-trace-extra = 3.13
Obsoletes: kernel-trace-extra <= 3.13
%endif
+%ifarch ppc64
+Provides: kernel-kdump-extra = 2.6.28
+Obsoletes: kernel-kdump-extra <= 2.6.28
+%endif
%ifarch s390x
Provides: kernel-trace-extra = 3.13
Obsoletes: kernel-trace-extra <= 3.13
@@ -1027,6 +1060,8 @@
%ifarch x86_64
Provides: kernel-trace-extra = 3.13
Obsoletes: kernel-trace-extra <= 3.13
+Provides: kernel-bigsmp-extra = 3.1
+Obsoletes: kernel-bigsmp-extra <= 3.1
%endif
Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu)
%ifarch %ix86
@@ -1082,6 +1117,10 @@
Provides: kernel-trace-devel = 3.13
Obsoletes: kernel-trace-devel <= 3.13
%endif
+%ifarch ppc64
+Provides: kernel-kdump-devel = 2.6.28
+Obsoletes: kernel-kdump-devel <= 2.6.28
+%endif
%ifarch s390x
Provides: kernel-trace-devel = 3.13
Obsoletes: kernel-trace-devel <= 3.13
@@ -1089,6 +1128,8 @@
%ifarch x86_64
Provides: kernel-trace-devel = 3.13
Obsoletes: kernel-trace-devel <= 3.13
+Provides: kernel-bigsmp-devel = 3.1
+Obsoletes: kernel-bigsmp-devel <= 3.1
%endif
PreReq: coreutils
++++++ kernel-desktop.spec ++++++
--- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200
+++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200
@@ -19,8 +19,8 @@
# This makes the OBS store the project cert as %_sourcedir/_projectcert.crt
# needssslcertforbuild
-%define srcversion 3.19
-%define patchversion 3.19.4
+%define srcversion 4.0
+%define patchversion 4.0.0
%define variant %{nil}
%define vanilla_only 0
@@ -59,9 +59,9 @@
Summary: Kernel optimized for the desktop
License: GPL-2.0
Group: System/Kernel
-Version: 3.19.4
+Version: 4.0.0
%if 0%{?is_kotd}
-Release: <RELEASE>.g74c332b
+Release: <RELEASE>.g27299c0
%else
Release: 0
%endif
@@ -146,7 +146,8 @@
%endif
Provides: kernel = %version-%source_rel
-Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz
+
+Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh
++++++ kernel-docs.spec ++++++
--- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200
+++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200
@@ -16,7 +16,7 @@
#
-%define patchversion 3.19.4
+%define patchversion 4.0.0
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -27,9 +27,9 @@
Summary: Kernel Documentation (man pages)
License: GPL-2.0
Group: Documentation/Man
-Version: 3.19.4
+Version: 4.0.0
%if 0%{?is_kotd}
-Release: <RELEASE>.g74c332b
+Release: <RELEASE>.g27299c0
%else
Release: 0
%endif
++++++ kernel-ec2.spec ++++++
--- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200
+++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200
@@ -19,8 +19,8 @@
# This makes the OBS store the project cert as %_sourcedir/_projectcert.crt
# needssslcertforbuild
-%define srcversion 3.19
-%define patchversion 3.19.4
+%define srcversion 4.0
+%define patchversion 4.0.0
%define variant %{nil}
%define vanilla_only 0
@@ -59,9 +59,9 @@
Summary: The Amazon EC2 Xen Kernel
License: GPL-2.0
Group: System/Kernel
-Version: 3.19.4
+Version: 4.0.0
%if 0%{?is_kotd}
-Release: <RELEASE>.g74c332b
+Release: <RELEASE>.g27299c0
%else
Release: 0
%endif
@@ -146,7 +146,8 @@
%endif
Provides: kernel = %version-%source_rel
-Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz
+
+Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh
kernel-lpae.spec: same change
++++++ kernel-obs-build.spec ++++++
--- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200
+++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200
@@ -19,7 +19,7 @@
#!BuildIgnore: post-build-checks
-%define patchversion 3.19.4
+%define patchversion 4.0.0
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -33,7 +33,7 @@
%ifarch %ix86 x86_64
BuildRequires: kernel-xen
%endif
-ExclusiveArch: aarch64 armv6hl armv7hl %ix86 ppc 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
@@ -45,9 +45,9 @@
Summary: package kernel and initrd for OBS VM builds
License: GPL-2.0
Group: SLES
-Version: 3.19.4
+Version: 4.0.0
%if 0%{?is_kotd}
-Release: <RELEASE>.g74c332b
+Release: <RELEASE>.g27299c0
%else
Release: 0
%endif
@@ -147,9 +147,14 @@
cp -v /tmp/initrd.xen $RPM_BUILD_ROOT/.build.initrd.xen
%endif
+#inform worker about arch
+#see obs-build commit e47399d738e51
+uname -m > $RPM_BUILD_ROOT/.build.hostarch.kvm
+
%files
%defattr(-,root,root)
/.build.kernel.*
/.build.initrd.*
+/.build.hostarch.*
%changelog
++++++ kernel-obs-qa-xen.spec ++++++
--- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200
+++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200
@@ -17,7 +17,7 @@
# needsrootforbuild
-%define patchversion 3.19.4
+%define patchversion 4.0.0
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -36,9 +36,9 @@
Summary: Basic QA tests for the kernel
License: GPL-2.0
Group: SLES
-Version: 3.19.4
+Version: 4.0.0
%if 0%{?is_kotd}
-Release: <RELEASE>.g74c332b
+Release: <RELEASE>.g27299c0
%else
Release: 0
%endif
@@ -59,15 +59,12 @@
# test suites should be packaged in other packages, but build required
# and called here.
-if ! /sbin/modprobe loop; then
- echo "ERROR: Unable to load the kernel loop module."
- echo "Usually the wrong kernel is running, this is atm"
- cat /proc/version
- echo "Installed kernel modules are:"
- rpm -q kernel-xen
- exit 1
+krel=$(uname -r)
+if test ! -d "/lib/modules/$krel/kernel"; then
+ echo "Kernel package for $krel not installed; exiting"
+ exit 0
fi
-
+/sbin/modprobe loop
%install
mkdir -p %{buildroot}/usr/share/%name
++++++ kernel-obs-qa.spec ++++++
--- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200
+++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200
@@ -17,7 +17,7 @@
# needsrootforbuild
-%define patchversion 3.19.4
+%define patchversion 4.0.0
%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 armv6hl armv7hl %ix86 ppc 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: 3.19.4
+Version: 4.0.0
%if 0%{?is_kotd}
-Release: <RELEASE>.g74c332b
+Release: <RELEASE>.g27299c0
%else
Release: 0
%endif
@@ -59,15 +59,12 @@
# test suites should be packaged in other packages, but build required
# and called here.
-if ! /sbin/modprobe loop; then
- echo "ERROR: Unable to load the kernel loop module."
- echo "Usually the wrong kernel is running, this is atm"
- cat /proc/version
- echo "Installed kernel modules are:"
- rpm -q kernel-default
- exit 1
+krel=$(uname -r)
+if test ! -d "/lib/modules/$krel/kernel"; then
+ echo "Kernel package for $krel not installed; exiting"
+ exit 0
fi
-
+/sbin/modprobe loop
%install
mkdir -p %{buildroot}/usr/share/%name
++++++ kernel-pae.spec ++++++
--- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200
+++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200
@@ -19,8 +19,8 @@
# This makes the OBS store the project cert as %_sourcedir/_projectcert.crt
# needssslcertforbuild
-%define srcversion 3.19
-%define patchversion 3.19.4
+%define srcversion 4.0
+%define patchversion 4.0.0
%define variant %{nil}
%define vanilla_only 0
@@ -59,9 +59,9 @@
Summary: Kernel with PAE Support
License: GPL-2.0
Group: System/Kernel
-Version: 3.19.4
+Version: 4.0.0
%if 0%{?is_kotd}
-Release: <RELEASE>.g74c332b
+Release: <RELEASE>.g27299c0
%else
Release: 0
%endif
@@ -151,7 +151,11 @@
Provides: kernel-vmi = 2.6.38
Obsoletes: kernel-vmi <= 2.6.38
%endif
-Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz
+%ifarch %ix86
+Provides: kernel-vmi-base = 2.6.38
+Obsoletes: kernel-vmi-base <= 2.6.38
+%endif
+Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh
@@ -1011,7 +1015,10 @@
Requires(post): modutils
Requires(post): perl-Bootloader
Requires(post): mkinitrd
-
+%ifarch %ix86
+Provides: kernel-vmi-extra = 2.6.38
+Obsoletes: kernel-vmi-extra <= 2.6.38
+%endif
Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu)
%ifarch %ix86
Conflicts: libc.so.6()(64bit)
@@ -1069,7 +1076,10 @@
Provides: multiversion(kernel)
Requires: kernel-devel%variant = %version-%source_rel
Supplements: packageand(%name:kernel-devel%variant)
-
+%ifarch %ix86
+Provides: kernel-vmi-devel = 2.6.38
+Obsoletes: kernel-vmi-devel <= 2.6.38
+%endif
PreReq: coreutils
%description devel
++++++ kernel-pv.spec ++++++
--- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200
+++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200
@@ -19,8 +19,8 @@
# This makes the OBS store the project cert as %_sourcedir/_projectcert.crt
# needssslcertforbuild
-%define srcversion 3.19
-%define patchversion 3.19.4
+%define srcversion 4.0
+%define patchversion 4.0.0
%define variant %{nil}
%define vanilla_only 0
@@ -59,9 +59,9 @@
Summary: The para-virtualized Kernel
License: GPL-2.0
Group: System/Kernel
-Version: 3.19.4
+Version: 4.0.0
%if 0%{?is_kotd}
-Release: <RELEASE>.g74c332b
+Release: <RELEASE>.g27299c0
%else
Release: 0
%endif
@@ -146,7 +146,8 @@
%endif
Provides: kernel = %version-%source_rel
-Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz
+
+Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200
+++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200
@@ -17,8 +17,8 @@
# icecream 0
-%define srcversion 3.19
-%define patchversion 3.19.4
+%define srcversion 4.0
+%define patchversion 4.0.0
%define variant %{nil}
%define vanilla_only 0
@@ -30,9 +30,9 @@
Summary: The Linux Kernel Sources
License: GPL-2.0
Group: Development/Sources
-Version: 3.19.4
+Version: 4.0.0
%if 0%{?is_kotd}
-Release: <RELEASE>.g74c332b
+Release: <RELEASE>.g27299c0
%else
Release: 0
%endif
@@ -45,7 +45,7 @@
Provides: %name = %version-%source_rel
Provides: linux
Provides: multiversion(kernel)
-Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz
+Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200
+++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200
@@ -24,10 +24,10 @@
Summary: Kernel Symbol Versions (modversions)
License: GPL-2.0
Group: Development/Sources
-Version: 3.19.4
+Version: 4.0.0
%if %using_buildservice
%if 0%{?is_kotd}
-Release: <RELEASE>.g74c332b
+Release: <RELEASE>.g27299c0
%else
Release: 0
%endif
++++++ kernel-vanilla.spec ++++++
--- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200
+++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200
@@ -19,8 +19,8 @@
# This makes the OBS store the project cert as %_sourcedir/_projectcert.crt
# needssslcertforbuild
-%define srcversion 3.19
-%define patchversion 3.19.4
+%define srcversion 4.0
+%define patchversion 4.0.0
%define variant %{nil}
%define vanilla_only 0
@@ -59,9 +59,9 @@
Summary: The Standard Kernel - without any SUSE patches
License: GPL-2.0
Group: System/Kernel
-Version: 3.19.4
+Version: 4.0.0
%if 0%{?is_kotd}
-Release: <RELEASE>.g74c332b
+Release: <RELEASE>.g27299c0
%else
Release: 0
%endif
@@ -146,7 +146,8 @@
%endif
Provides: kernel = %version-%source_rel
-Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz
+
+Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh
++++++ kernel-xen.spec ++++++
--- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200
+++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200
@@ -19,8 +19,8 @@
# This makes the OBS store the project cert as %_sourcedir/_projectcert.crt
# needssslcertforbuild
-%define srcversion 3.19
-%define patchversion 3.19.4
+%define srcversion 4.0
+%define patchversion 4.0.0
%define variant %{nil}
%define vanilla_only 0
@@ -59,9 +59,9 @@
Summary: The Xen Kernel
License: GPL-2.0
Group: System/Kernel
-Version: 3.19.4
+Version: 4.0.0
%if 0%{?is_kotd}
-Release: <RELEASE>.g74c332b
+Release: <RELEASE>.g27299c0
%else
Release: 0
%endif
@@ -149,7 +149,8 @@
Provides: kernel-xenpae = 2.6.17
Obsoletes: kernel-xenpae <= 2.6.17
%endif
-Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz
+
+Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh
++++++ config.sh ++++++
--- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:53.000000000 +0200
+++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:53.000000000 +0200
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=3.19
+SRCVERSION=4.0
# variant of the kernel-source package, either empty or "-rt"
VARIANT=
# buildservice projects to build the kernel against
++++++ config.tar.bz2 ++++++
++++ 30154 lines of diff (skipped)
++++++ guards ++++++
--- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:53.000000000 +0200
+++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:53.000000000 +0200
@@ -53,7 +53,17 @@
my $dh = new FileHandle;
my (@files, $file);
-
+ # @<file> syntax
+ if ($path =~ s/^@//) {
+ my $fh;
+ open($fh, '<', $path) or die "$path: $!\n";
+ @files = <$fh>;
+ close($fh);
+ chomp(@files);
+ s:^$dir:: for @files;
+ return @files;
+ }
+ $path = slashme($path);
opendir $dh, length("$dir$path") ? "$dir$path" : '.'
or die "$dir$path: $!\n";
while ($file = readdir($dh)) {
@@ -112,8 +122,8 @@
print "SYNOPSIS: $0 [--prefix=dir] [--path=dir1:dir2:...]\n" .
" [--default=0|1] [--check|--list] [--invert-match]\n" .
" [--with-guards] [--config=file] symbol ...\n\n" .
- " (Default values: --path='" . join(':', @path) . "', " .
- "--default=$default)\n";
+ " Defaults: --default=$default\n" .
+ " Use --path=\@<file> to read the list of entries from <file>\n";
exit 0;
}
@@ -158,7 +168,7 @@
my @files;
foreach (@path) {
- @files = (@files, files_in($dir, slashme($_)));
+ @files = (@files, files_in($dir,$_));
}
my %files = map { $_ => 0 } @files;
@@ -167,7 +177,11 @@
if (exists $files{$patch}) {
$files{$patch}++;
} else {
- print "Not found: $dir$patch\n";
+ if ($config eq '-') {
+ print "Not found: $dir$patch\n";
+ } else {
+ print "Not found in $config: $dir$patch\n";
+ }
$problems++;
}});
++++++ kernel-binary.spec.in ++++++
--- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:53.000000000 +0200
+++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:53.000000000 +0200
@@ -146,6 +146,7 @@
%endif
Provides: kernel = %version-%source_rel
@PROVIDES_OBSOLETES@
+@PROVIDES_OBSOLETES_BASE@
@SOURCES@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: @ARCHS@
++++++ kernel-obs-build.spec.in ++++++
--- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:53.000000000 +0200
+++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:53.000000000 +0200
@@ -147,9 +147,14 @@
cp -v /tmp/initrd.xen $RPM_BUILD_ROOT/.build.initrd.xen
%endif
+#inform worker about arch
+#see obs-build commit e47399d738e51
+uname -m > $RPM_BUILD_ROOT/.build.hostarch.kvm
+
%files
%defattr(-,root,root)
/.build.kernel.*
/.build.initrd.*
+/.build.hostarch.*
%changelog
++++++ kernel-obs-qa.spec.in ++++++
--- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:53.000000000 +0200
+++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:53.000000000 +0200
@@ -59,15 +59,12 @@
# test suites should be packaged in other packages, but build required
# and called here.
-if ! /sbin/modprobe loop; then
- echo "ERROR: Unable to load the kernel loop module."
- echo "Usually the wrong kernel is running, this is atm"
- cat /proc/version
- echo "Installed kernel modules are:"
- rpm -q kernel-@FLAVOR@
- exit 1
+krel=$(uname -r)
+if test ! -d "/lib/modules/$krel/kernel"; then
+ echo "Kernel package for $krel not installed; exiting"
+ exit 0
fi
-
+/sbin/modprobe loop
%install
mkdir -p %{buildroot}/usr/share/%name
++++++ linux-3.19.tar.xz -> linux-4.0.tar.xz ++++++
/work/SRC/openSUSE:Factory/kernel-source/linux-3.19.tar.xz /work/SRC/openSUSE:Factory/.kernel-source.new/linux-4.0.tar.xz differ: char 26, line 1
++++++ mkspec ++++++
--- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:53.000000000 +0200
+++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:53.000000000 +0200
@@ -99,19 +99,19 @@
$description = $binary_descriptions{"kernel-$flavor"}->[1];
}
+ my %obsolete_macros;
+ for my $subpac ("", "-base", "-extra", "-devel", "-hmac") {
+ (my $macro = "PROVIDES_OBSOLETES" . uc($subpac)) =~ s/-/_/;
+ $obsolete_macros{$macro} =
+ provides_obsoletes($flavor, $subpac, @{$flavor_archs{$flavor}});
+ }
+
do_spec('binary', "kernel-$flavor.spec", %macros,
FLAVOR => $flavor,
SUMMARY => $summary,
DESCRIPTION => $description,
ARCHS => join(" ", arch2rpm(@{$flavor_archs{$flavor}})),
- PROVIDES_OBSOLETES =>
- provides_obsoletes($flavor, @{$flavor_archs{$flavor}}),
- PROVIDES_OBSOLETES_BASE =>
- provides_obsoletes("$flavor-base", @{$flavor_archs{$flavor}}),
- PROVIDES_OBSOLETES_EXTRA =>
- provides_obsoletes("$flavor-extra", @{$flavor_archs{$flavor}}),
- PROVIDES_OBSOLETES_DEVEL =>
- provides_obsoletes("$flavor-devel", @{$flavor_archs{$flavor}}),
+ %obsolete_macros
);
}
# kernel-source.spec
@@ -144,7 +144,10 @@
# kernel-obs-*.spec
{
- my $default_archs = join(" ", arch2rpm(@{$flavor_archs{default}}));
+ my @default_archs = arch2rpm(@{$flavor_archs{default}});
+ # No kernel-obs-* for 32bit ppc
+ @default_archs = grep { $_ ne "ppc" } @default_archs;
+ my $default_archs = join(" ", @default_archs);
my $xen_archs = join(" ", arch2rpm(@{$flavor_archs{xen} || []}));
if (!$variant) {
do_spec('obs-build', "kernel-obs-build.spec", %macros,
@@ -329,22 +332,34 @@
sub provides_obsoletes {
my $flavor = shift;
+ my $subpac = shift;
my @archs = @_;
my $res = "";
for my $arch (@archs) {
my @packs = @{$obsolete_packages{$arch}{$flavor} || []};
+ my $printed;
+
next if (!@packs);
my $rpmarch = arch2rpm($arch);
chomp $rpmarch;
- $res .= "\%ifarch $rpmarch\n";
for my $pack (@packs) {
- my $name = $pack->[0];
+ my $name = $pack->[0] . $subpac;
my $version = $pack->[1];
+ if ($subpac) {
+ # The -base and -extra split has been
+ # introduced in SLE11 (2.6.27)
+ my ($v1, $v2, $v3) = split(/\./, $version);
+ next if ($v1 <= 2 && $v2 <= 6 && $v3 < 27);
+ }
+ if (!$printed) {
+ $res .= "\%ifarch $rpmarch\n";
+ $printed = 1;
+ }
$res .= "Provides: $name = $version\n";
$res .= "Obsoletes: $name <= $version\n";
}
- $res .= "\%endif\n";
+ $res .= "\%endif\n" if $printed;
}
chomp $res;
return $res;
++++++ old-flavors ++++++
--- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:53.000000000 +0200
+++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:53.000000000 +0200
@@ -26,21 +26,11 @@
# SLES 11 GA only / 11.4
i386/pae vmi 2.6.38
-i386/pae-base vmi-base 2.6.38
# SLES 11 SP3 / openSUSE 13.1
i386/default trace 3.13
-i386/default trace-base 3.13
-i386/default-extra trace-extra 3.13
-i386/default-devel trace-devel 3.13
x86_64/default trace 3.13
-x86_64/default trace-base 3.13
-x86_64/default-extra trace-extra 3.13
-x86_64/default-devel trace-devel 3.13
x86_64/default bigsmp 3.1
s390x/default trace 3.13
-s390x/default trace-base 3.13
-s390x/default-extra trace-extra 3.13
-s390x/default-devel trace-devel 3.13
++++++ patches.arch.tar.bz2 ++++++
++++ 8653 lines of diff (skipped)
++++++ patches.drivers.tar.bz2 ++++++
++++++ patches.fixes.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/0001-DocBook-Do-not-exceed-argument-list-limit.patch new/patches.fixes/0001-DocBook-Do-not-exceed-argument-list-limit.patch
--- old/patches.fixes/0001-DocBook-Do-not-exceed-argument-list-limit.patch 2015-04-08 15:45:02.000000000 +0200
+++ new/patches.fixes/0001-DocBook-Do-not-exceed-argument-list-limit.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,35 +0,0 @@
-From f06b6b4778a54a4b5af39b59af01ff6106c8ab68 Mon Sep 17 00:00:00 2001
-From: Michal Marek
participants (1)
-
root@hilbert.suse.de