Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2014-05-23 10:55: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 2014-04-13 08:28:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-debug.changes 2014-05-23 10:55:55.000000000 +0200 @@ -1,0 +2,601 @@ +Wed May 21 19:34:45 CEST 2014 - jdelvare@suse.de + +- Fix a typo in config/ppc/vanilla, sorry +- commit cc68f12 + +------------------------------------------------------------------- +Wed May 21 19:18:25 CEST 2014 - jdelvare@suse.de + +- Update config files: Disable unused RTC platform drivers +- commit 85c0b8b + +------------------------------------------------------------------- +Wed May 21 15:48:03 CEST 2014 - jdelvare@suse.de + +- Update config files: Disable the rtc-moxart driver + This driver is only needed on Moxa ART systems, which we do not + support. +- commit 9939e8f + +------------------------------------------------------------------- +Tue May 20 15:14:35 CEST 2014 - jbeulich@suse.com + +- supported.conf: Take care of a few driver renames/splits/etc. +- commit ed5e591 + +------------------------------------------------------------------- +Tue May 20 08:21:20 CEST 2014 - jbeulich@suse.com + +- Update Xen config files: Set compatibility level back to 4.1 + (bnc#851338). +- commit 22da852 + +------------------------------------------------------------------- +Mon May 19 17:13:58 CEST 2014 - jdelvare@suse.de + +- Update armv7hl/default config file: CONFIG_DRM_PTN3460=y + Align on what exynos has, in anticipation of both files being + merged someday. +- commit 8ba853c + +------------------------------------------------------------------- +Mon May 19 17:12:24 CEST 2014 - jdelvare@suse.de + +- Update config files: Disable DRM_PTN3460 + Currently it's only needed on arm/exynos. +- commit 6f380e7 + +------------------------------------------------------------------- +Mon May 19 14:33:16 CEST 2014 - jdelvare@suse.de + +- Update armv7hl/exynos config file: CONFIG_DRM_PTN3460=y + DRM_EXYNOS_DP depends on DRM_PTN3460, and we have the former built-in, + so the latter must be built-in as well. Otherwise we get a linker + failure like: + .../linux-3.15-rc5/drivers/gpu/drm/exynos/exynos_dp_core.c:1004: + undefined reference to `ptn3460_init' +- commit bb0a6e6 + +------------------------------------------------------------------- +Fri May 16 22:05:47 CEST 2014 - jdelvare@suse.de + +- Update config files: Disable all EG20T drivers except on i386 + EG20T (aka Topcliff PCH) is a chipset for 32-bit x86 processors, so + we only need these drivers on i386. +- commit 923c7d2 + +------------------------------------------------------------------- +Fri May 16 15:58:47 CEST 2014 - mhocko@suse.cz + +- memcg: fix swapcache charge from kernel thread context (bnc#878306). +- commit 8eaaed7 + +------------------------------------------------------------------- +Fri May 16 14:47:44 CEST 2014 - jdelvare@suse.de + +- Update arm64 config file to fix the build +- commit beb76a8 + +------------------------------------------------------------------- +Fri May 16 12:46:15 CEST 2014 - afaerber@suse.de + +- config: armv6hl: Update config to 3.15-rc5 +- commit 15546e3 + +------------------------------------------------------------------- +Fri May 16 12:46:14 CEST 2014 - afaerber@suse.de + +- config: armv7hl: Update configs to 3.15-rc5 +- commit de0d16f + +------------------------------------------------------------------- +Thu May 15 18:23:06 CEST 2014 - jdelvare@suse.de + +- Update armv7hl/lpae config file: Enable SERIAL_TEGRA + Despite what the Kconfig text says, the serial-tegra driver works on + all Tegra platforms. +- commit 222a09f + +------------------------------------------------------------------- +Thu May 15 17:39:27 CEST 2014 - jdelvare@suse.de + +- Update ppc64le config files: Disable DA903x support completely + It makes no sense to support some sub-drivers and not the rest. +- commit 269e033 + +------------------------------------------------------------------- +Thu May 15 17:02:27 CEST 2014 - duwe@suse.de + +- Update config files: + i386/x86_64/ppc64/ppc64le disable: + timeriomem-rng + pwm-pca9685 + unsupported RTC drivers + ssd1307fb/da903x_bl +- commit 7725871 + +------------------------------------------------------------------- +Wed May 14 18:41:03 CEST 2014 - afaerber@suse.de + +- config: arm64: Update config for 3.15 +- commit 2d96bf1 + +------------------------------------------------------------------- +Wed May 14 12:01:16 CEST 2014 - jbeulich@suse.com + +- Update Xen patches to 3.15-rc5. +- privcmd: actually batch hypercalls for batch ioctls. +- Refresh patches.xen/xen-blkfront-indirect (bnc#876786). +- config.conf: Re-enable Xen configs. +- Update x86 config files. +- commit 9ebd57d + +------------------------------------------------------------------- +Wed May 14 11:47:08 CEST 2014 - jbeulich@suse.com + +- Refresh patches.suse/stack-unwind (dump_trace_unwind() can be static). +- commit 47a05b6 + +------------------------------------------------------------------- +Tue May 13 18:16:15 CEST 2014 - jdelvare@suse.de + +- Update ec2 config files: Disable CAN support + It was enabled by accident. +- commit 4f49dd9 + +------------------------------------------------------------------- +Tue May 13 08:44:43 CEST 2014 - jbeulich@suse.com + +- patches.suse/stack-unwind: Drop bogus (redundant) asmlinkage from + unwind_init_running() definition. +- commit d2673c3 + +------------------------------------------------------------------- +Mon May 12 18:45:00 CEST 2014 - tiwai@suse.de + +- pvpanic: Set high notifier priority (bnc#875220). +- commit da0842c + +------------------------------------------------------------------- +Mon May 12 15:27:30 CEST 2014 - jeffm@suse.de + +- Update to 3.15-rc5. +- Eliminated 2 patches. +- Config changes: + - CAN_C_CAN_STRICT_FRAME_ORDERING=n (default) +- commit 7f2c6bf + +------------------------------------------------------------------- +Wed May 7 15:45:30 CEST 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Package .vmlinuz-*.hmac as well +- commit 3375bd7 + +------------------------------------------------------------------- +Wed May 7 14:48:12 CEST 2014 - jdelvare@suse.de + +- Update x86 config files: Disable unused CAN drivers + Disable platform, grcan and tscan1 CAN drivers. Disable ISA and EG20T + CAN drivers on x86_64. These are believed to be useless, and will + only be enabled upon explicit request. +- commit dab25a2 + +------------------------------------------------------------------- +Wed May 7 13:56:06 CEST 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Exclude /boot/symtypes* from the base/main package + Also, get rid of the comparison of the base and devel filelist. +- commit f1e303f + +------------------------------------------------------------------- +Wed May 7 12:02:52 CEST 2014 - tiwai@suse.de + +- ALSA: hda - Add dock pin setups for Thinkpad T440 (bnc#876699). +- commit efc8676 + +------------------------------------------------------------------- +Tue May 6 18:12:01 CEST 2014 - mmarek@suse.cz ++++ 462 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-exynos.changes: same change kernel-lpae.changes: same change kernel-obs-build.changes: same change New Changes file: --- /dev/null 2014-05-19 01:51:27.372033255 +0200 +++ /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-obs-qa-xen.changes 2014-05-23 10:55:56.000000000 +0200 @@ -0,0 +1,31472 @@ +------------------------------------------------------------------- +Wed May 21 19:34:45 CEST 2014 - jdelvare@suse.de + +- Fix a typo in config/ppc/vanilla, sorry +- commit cc68f12 + +------------------------------------------------------------------- +Wed May 21 19:18:25 CEST 2014 - jdelvare@suse.de + +- Update config files: Disable unused RTC platform drivers +- commit 85c0b8b + +------------------------------------------------------------------- +Wed May 21 15:48:03 CEST 2014 - jdelvare@suse.de + +- Update config files: Disable the rtc-moxart driver + This driver is only needed on Moxa ART systems, which we do not + support. +- commit 9939e8f + +------------------------------------------------------------------- +Tue May 20 15:14:35 CEST 2014 - jbeulich@suse.com + +- supported.conf: Take care of a few driver renames/splits/etc. +- commit ed5e591 + +------------------------------------------------------------------- +Tue May 20 08:21:20 CEST 2014 - jbeulich@suse.com + +- Update Xen config files: Set compatibility level back to 4.1 + (bnc#851338). +- commit 22da852 + +------------------------------------------------------------------- +Mon May 19 17:13:58 CEST 2014 - jdelvare@suse.de + +- Update armv7hl/default config file: CONFIG_DRM_PTN3460=y + Align on what exynos has, in anticipation of both files being + merged someday. +- commit 8ba853c + +------------------------------------------------------------------- +Mon May 19 17:12:24 CEST 2014 - jdelvare@suse.de + +- Update config files: Disable DRM_PTN3460 + Currently it's only needed on arm/exynos. +- commit 6f380e7 + +------------------------------------------------------------------- +Mon May 19 14:33:16 CEST 2014 - jdelvare@suse.de + +- Update armv7hl/exynos config file: CONFIG_DRM_PTN3460=y + DRM_EXYNOS_DP depends on DRM_PTN3460, and we have the former built-in, + so the latter must be built-in as well. Otherwise we get a linker + failure like: + .../linux-3.15-rc5/drivers/gpu/drm/exynos/exynos_dp_core.c:1004: + undefined reference to `ptn3460_init' +- commit bb0a6e6 + +------------------------------------------------------------------- +Fri May 16 22:05:47 CEST 2014 - jdelvare@suse.de + +- Update config files: Disable all EG20T drivers except on i386 + EG20T (aka Topcliff PCH) is a chipset for 32-bit x86 processors, so + we only need these drivers on i386. +- commit 923c7d2 + +------------------------------------------------------------------- +Fri May 16 15:58:47 CEST 2014 - mhocko@suse.cz + +- memcg: fix swapcache charge from kernel thread context (bnc#878306). +- commit 8eaaed7 + +------------------------------------------------------------------- +Fri May 16 14:47:44 CEST 2014 - jdelvare@suse.de + +- Update arm64 config file to fix the build +- commit beb76a8 + +------------------------------------------------------------------- +Fri May 16 12:46:15 CEST 2014 - afaerber@suse.de + +- config: armv6hl: Update config to 3.15-rc5 +- commit 15546e3 + +------------------------------------------------------------------- +Fri May 16 12:46:14 CEST 2014 - afaerber@suse.de + +- config: armv7hl: Update configs to 3.15-rc5 +- commit de0d16f + +------------------------------------------------------------------- +Thu May 15 18:23:06 CEST 2014 - jdelvare@suse.de + +- Update armv7hl/lpae config file: Enable SERIAL_TEGRA + Despite what the Kconfig text says, the serial-tegra driver works on + all Tegra platforms. +- commit 222a09f + +------------------------------------------------------------------- +Thu May 15 17:39:27 CEST 2014 - jdelvare@suse.de + +- Update ppc64le config files: Disable DA903x support completely + It makes no sense to support some sub-drivers and not the rest. +- commit 269e033 + +------------------------------------------------------------------- +Thu May 15 17:02:27 CEST 2014 - duwe@suse.de + +- Update config files: + i386/x86_64/ppc64/ppc64le disable: + timeriomem-rng + pwm-pca9685 + unsupported RTC drivers + ssd1307fb/da903x_bl +- commit 7725871 + +------------------------------------------------------------------- +Wed May 14 18:41:03 CEST 2014 - afaerber@suse.de + +- config: arm64: Update config for 3.15 +- commit 2d96bf1 + +------------------------------------------------------------------- +Wed May 14 12:01:16 CEST 2014 - jbeulich@suse.com + +- Update Xen patches to 3.15-rc5. +- privcmd: actually batch hypercalls for batch ioctls. +- Refresh patches.xen/xen-blkfront-indirect (bnc#876786). +- config.conf: Re-enable Xen configs. +- Update x86 config files. +- commit 9ebd57d + +------------------------------------------------------------------- +Wed May 14 11:47:08 CEST 2014 - jbeulich@suse.com + +- Refresh patches.suse/stack-unwind (dump_trace_unwind() can be static). +- commit 47a05b6 + +------------------------------------------------------------------- +Tue May 13 18:16:15 CEST 2014 - jdelvare@suse.de + +- Update ec2 config files: Disable CAN support + It was enabled by accident. +- commit 4f49dd9 + +------------------------------------------------------------------- +Tue May 13 08:44:43 CEST 2014 - jbeulich@suse.com + +- patches.suse/stack-unwind: Drop bogus (redundant) asmlinkage from + unwind_init_running() definition. +- commit d2673c3 + +------------------------------------------------------------------- +Mon May 12 18:45:00 CEST 2014 - tiwai@suse.de + +- pvpanic: Set high notifier priority (bnc#875220). +- commit da0842c + +------------------------------------------------------------------- +Mon May 12 15:27:30 CEST 2014 - jeffm@suse.de + +- Update to 3.15-rc5. +- Eliminated 2 patches. +- Config changes: + - CAN_C_CAN_STRICT_FRAME_ORDERING=n (default) +- commit 7f2c6bf + +------------------------------------------------------------------- +Wed May 7 15:45:30 CEST 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Package .vmlinuz-*.hmac as well +- commit 3375bd7 + +------------------------------------------------------------------- +Wed May 7 14:48:12 CEST 2014 - jdelvare@suse.de + +- Update x86 config files: Disable unused CAN drivers + Disable platform, grcan and tscan1 CAN drivers. Disable ISA and EG20T + CAN drivers on x86_64. These are believed to be useless, and will + only be enabled upon explicit request. +- commit dab25a2 + +------------------------------------------------------------------- +Wed May 7 13:56:06 CEST 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Exclude /boot/symtypes* from the base/main package + Also, get rid of the comparison of the base and devel filelist. +- commit f1e303f + +------------------------------------------------------------------- +Wed May 7 12:02:52 CEST 2014 - tiwai@suse.de + +- ALSA: hda - Add dock pin setups for Thinkpad T440 (bnc#876699). +- commit efc8676 + +------------------------------------------------------------------- ++++ 31275 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-obs-qa-xen.changes --- /work/SRC/openSUSE:Factory/kernel-source/kernel-obs-qa.changes 2014-04-13 08:28:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-obs-qa.changes 2014-05-23 10:55:56.000000000 +0200 @@ -1,0 +2,601 @@ +Wed May 21 19:34:45 CEST 2014 - jdelvare@suse.de + +- Fix a typo in config/ppc/vanilla, sorry +- commit cc68f12 + +------------------------------------------------------------------- +Wed May 21 19:18:25 CEST 2014 - jdelvare@suse.de + +- Update config files: Disable unused RTC platform drivers +- commit 85c0b8b + +------------------------------------------------------------------- +Wed May 21 15:48:03 CEST 2014 - jdelvare@suse.de + +- Update config files: Disable the rtc-moxart driver + This driver is only needed on Moxa ART systems, which we do not + support. +- commit 9939e8f + +------------------------------------------------------------------- +Tue May 20 15:14:35 CEST 2014 - jbeulich@suse.com + +- supported.conf: Take care of a few driver renames/splits/etc. +- commit ed5e591 + +------------------------------------------------------------------- +Tue May 20 08:21:20 CEST 2014 - jbeulich@suse.com + +- Update Xen config files: Set compatibility level back to 4.1 + (bnc#851338). +- commit 22da852 + +------------------------------------------------------------------- +Mon May 19 17:13:58 CEST 2014 - jdelvare@suse.de + +- Update armv7hl/default config file: CONFIG_DRM_PTN3460=y + Align on what exynos has, in anticipation of both files being + merged someday. +- commit 8ba853c + +------------------------------------------------------------------- +Mon May 19 17:12:24 CEST 2014 - jdelvare@suse.de + +- Update config files: Disable DRM_PTN3460 + Currently it's only needed on arm/exynos. +- commit 6f380e7 + +------------------------------------------------------------------- +Mon May 19 14:33:16 CEST 2014 - jdelvare@suse.de + +- Update armv7hl/exynos config file: CONFIG_DRM_PTN3460=y + DRM_EXYNOS_DP depends on DRM_PTN3460, and we have the former built-in, + so the latter must be built-in as well. Otherwise we get a linker + failure like: + .../linux-3.15-rc5/drivers/gpu/drm/exynos/exynos_dp_core.c:1004: + undefined reference to `ptn3460_init' +- commit bb0a6e6 + +------------------------------------------------------------------- +Fri May 16 22:05:47 CEST 2014 - jdelvare@suse.de + +- Update config files: Disable all EG20T drivers except on i386 + EG20T (aka Topcliff PCH) is a chipset for 32-bit x86 processors, so + we only need these drivers on i386. +- commit 923c7d2 + +------------------------------------------------------------------- +Fri May 16 15:58:47 CEST 2014 - mhocko@suse.cz + +- memcg: fix swapcache charge from kernel thread context (bnc#878306). +- commit 8eaaed7 + +------------------------------------------------------------------- +Fri May 16 14:47:44 CEST 2014 - jdelvare@suse.de + +- Update arm64 config file to fix the build +- commit beb76a8 + +------------------------------------------------------------------- +Fri May 16 12:46:15 CEST 2014 - afaerber@suse.de + +- config: armv6hl: Update config to 3.15-rc5 +- commit 15546e3 + +------------------------------------------------------------------- +Fri May 16 12:46:14 CEST 2014 - afaerber@suse.de + +- config: armv7hl: Update configs to 3.15-rc5 +- commit de0d16f + +------------------------------------------------------------------- +Thu May 15 18:23:06 CEST 2014 - jdelvare@suse.de + +- Update armv7hl/lpae config file: Enable SERIAL_TEGRA + Despite what the Kconfig text says, the serial-tegra driver works on + all Tegra platforms. +- commit 222a09f + +------------------------------------------------------------------- +Thu May 15 17:39:27 CEST 2014 - jdelvare@suse.de + +- Update ppc64le config files: Disable DA903x support completely + It makes no sense to support some sub-drivers and not the rest. +- commit 269e033 + +------------------------------------------------------------------- +Thu May 15 17:02:27 CEST 2014 - duwe@suse.de + +- Update config files: + i386/x86_64/ppc64/ppc64le disable: + timeriomem-rng + pwm-pca9685 + unsupported RTC drivers + ssd1307fb/da903x_bl +- commit 7725871 + +------------------------------------------------------------------- +Wed May 14 18:41:03 CEST 2014 - afaerber@suse.de + +- config: arm64: Update config for 3.15 +- commit 2d96bf1 + +------------------------------------------------------------------- +Wed May 14 12:01:16 CEST 2014 - jbeulich@suse.com + +- Update Xen patches to 3.15-rc5. +- privcmd: actually batch hypercalls for batch ioctls. +- Refresh patches.xen/xen-blkfront-indirect (bnc#876786). +- config.conf: Re-enable Xen configs. +- Update x86 config files. +- commit 9ebd57d + +------------------------------------------------------------------- +Wed May 14 11:47:08 CEST 2014 - jbeulich@suse.com + +- Refresh patches.suse/stack-unwind (dump_trace_unwind() can be static). +- commit 47a05b6 + +------------------------------------------------------------------- +Tue May 13 18:16:15 CEST 2014 - jdelvare@suse.de + +- Update ec2 config files: Disable CAN support + It was enabled by accident. +- commit 4f49dd9 + +------------------------------------------------------------------- +Tue May 13 08:44:43 CEST 2014 - jbeulich@suse.com + +- patches.suse/stack-unwind: Drop bogus (redundant) asmlinkage from + unwind_init_running() definition. +- commit d2673c3 + +------------------------------------------------------------------- +Mon May 12 18:45:00 CEST 2014 - tiwai@suse.de + +- pvpanic: Set high notifier priority (bnc#875220). +- commit da0842c + +------------------------------------------------------------------- +Mon May 12 15:27:30 CEST 2014 - jeffm@suse.de + +- Update to 3.15-rc5. +- Eliminated 2 patches. +- Config changes: + - CAN_C_CAN_STRICT_FRAME_ORDERING=n (default) +- commit 7f2c6bf + +------------------------------------------------------------------- +Wed May 7 15:45:30 CEST 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Package .vmlinuz-*.hmac as well +- commit 3375bd7 + +------------------------------------------------------------------- +Wed May 7 14:48:12 CEST 2014 - jdelvare@suse.de + +- Update x86 config files: Disable unused CAN drivers + Disable platform, grcan and tscan1 CAN drivers. Disable ISA and EG20T + CAN drivers on x86_64. These are believed to be useless, and will + only be enabled upon explicit request. +- commit dab25a2 + +------------------------------------------------------------------- +Wed May 7 13:56:06 CEST 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Exclude /boot/symtypes* from the base/main package + Also, get rid of the comparison of the base and devel filelist. +- commit f1e303f + +------------------------------------------------------------------- +Wed May 7 12:02:52 CEST 2014 - tiwai@suse.de + +- ALSA: hda - Add dock pin setups for Thinkpad T440 (bnc#876699). +- commit efc8676 + +------------------------------------------------------------------- +Tue May 6 18:12:01 CEST 2014 - mmarek@suse.cz ++++ 462 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kernel-source/kernel-obs-qa.changes ++++ and /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-obs-qa.changes kernel-pae.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-vanilla.changes: same change kernel-xen.changes: same change Old: ---- kernel-trace.changes kernel-trace.spec linux-3.14.tar.xz New: ---- kernel-obs-qa-xen.changes kernel-obs-qa-xen.spec linux-3.15-rc5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:01.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:01.000000000 +0200 @@ -19,8 +19,8 @@ # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild -%define srcversion 3.14 -%define patchversion 3.14.0 +%define srcversion 3.15-rc5 +%define patchversion 3.15.0-rc5 %define variant %{nil} %define vanilla_only 0 @@ -28,10 +28,8 @@ %define build_flavor debug %define build_default (%build_flavor == "default") -%define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") -%define build_ps3 (%build_flavor == "ps3") %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant @@ -61,9 +59,9 @@ Summary: A Debug Version of the Kernel License: GPL-2.0 Group: System/Kernel -Version: 3.14.0 +Version: 3.15.rc5 %if 0%{?is_kotd} -Release: <RELEASE>.ge0d4304 +Release: <RELEASE>.gcc68f12 %else Release: 0 %endif @@ -71,6 +69,7 @@ BuildRequires: bc BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: hmaccalc BuildRequires: modutils BuildRequires: sparse # Used to sign the kernel in the buildservice @@ -151,7 +150,7 @@ 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 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -533,49 +532,20 @@ add_vmlinux() { - local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor - if test $1 == "--compressed"; then - compressed=true - fi cp vmlinux %buildroot/$vmlinux - >%my_builddir/vmlinux.debug.files -%if 0%{?__debug_package:1} - if $compressed; then - local vmlinux_debug=usr/lib/debug/$vmlinux.debug - mkdir -p $(dirname %buildroot/$vmlinux_debug) - /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ - -l vmlinux.sourcefiles %buildroot/$vmlinux - # FIXME: create and package build-id symlinks - objcopy --only-keep-debug \ - %buildroot/$vmlinux \ - %buildroot/$vmlinux_debug || : - objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \ - --strip-debug \ - %buildroot/$vmlinux || : - mkdir -p %buildroot/usr/src/debug - LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \ - | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) - find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 - find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 - echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files - else - # make vmlinux executable so that find-debuginfo.sh picks it up - # (TODO: fix find-debuginfo.sh instead) + # make sure that find-debuginfo.sh picks it up. In the filelist, we + # mark the file 0644 again chmod +x %buildroot/$vmlinux - fi -%endif - if $compressed; then - gzip -n -9 %buildroot/$vmlinux - chmod a-x %buildroot/$vmlinux.gz + if test $1 == "--compressed"; then + gzip -n -k -9 %buildroot/$vmlinux + ghost_vmlinux=true + else + ghost_vmlinux=false fi } -%if %build_kdump - add_vmlinux - image=vmlinux -%else - # architecture specifics %ifarch %ix86 x86_64 add_vmlinux --compressed @@ -641,8 +611,9 @@ cp -p arch/arm64/boot/$image %buildroot/boot/$image-%kernelrelease-%build_flavor %endif -# end of build_kdump -%endif +if test -x /usr/lib/rpm/pesign/gen-hmac; then + $_ -r %buildroot /boot/$image-%kernelrelease-%build_flavor +fi # Package the compiled-in certificates as DER files in /etc/uefi/certs # and have mokutil enroll them when the kernel is installed @@ -698,7 +669,7 @@ done done -%if %build_kdump || %build_xen || %build_vanilla || %build_ps3 +%if %build_xen || %build_vanilla # keep this -suffix list in sync with post.sh and postun.sh suffix=-%build_flavor %endif @@ -726,6 +697,8 @@ # space in /boot. dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \ bs=1024 seek=2047 count=1 +# Also reserve some space for the kdump initrd +cp %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump} if [ %CONFIG_MODULES = y ]; then mkdir -p %rpm_install_dir/%cpu_arch_flavor @@ -869,7 +842,7 @@ } # Collect the file lists. -shopt -s nullglob +shopt -s nullglob dotglob
%my_builddir/kernel-devel.files for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do f=${file##%buildroot} @@ -877,22 +850,39 @@ done
{ cd %buildroot - find boot \ - \( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \ - -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \ - -type f -printf '/%%p\n' - - # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that - # the file gets removed when uninstalling the kernel. - echo '%%ghost /boot/initrd-%kernelrelease-%build_flavor-kdump' - touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-%build_flavor-kdump + for f in boot/*; do + if test -L "$f"; then + echo "%%ghost /$f" + continue + elif test ! -f "$f"; then + continue + fi + case "$f" in + boot/initrd-*) + echo "%%ghost /$f" + continue + ;; + boot/vmlinux-*.gz) + ;; + boot/vmlinux-*) + if $ghost_vmlinux; then + echo "%%ghost /$f" + continue + fi + ;; + boot/symtypes*) + continue + ;; + esac + echo "%%attr(0644, root, root) /$f" + done if [ %CONFIG_MODULES = y ]; then find lib/modules/%kernelrelease-%build_flavor \ -type d -o \ \( -path '*/modules.*' ! -path '*/modules.order' \ ! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \ - -o -name '*.ko' -prune -o -printf '/%%p\n' + -o -name '*.ko' -prune -o -type f -printf '/%%p\n' cat %my_builddir/base-modules fi if test %CONFIG_MODULE_SIG = "y"; then @@ -905,10 +895,7 @@ if [ -e .%_docdir/%name ]; then echo "%%doc %_docdir/%name" fi -} | sort -u >%my_builddir/tmp -cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \ - add_dirs_to_filelist >%my_builddir/kernel-base.files -rm %my_builddir/tmp +} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files %if %split_base add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \ @@ -1070,16 +1057,4 @@ %endif %endif -%package devel-debuginfo -# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz -Summary: Debug information for package %name-devel -Group: Development/Debug - -%description devel-debuginfo -Debug information for package %name-devel - - -%source_timestamp -%files devel-debuginfo -f vmlinux.debug.files - %changelog ++++++ kernel-default.spec ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:01.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:01.000000000 +0200 @@ -19,8 +19,8 @@ # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild -%define srcversion 3.14 -%define patchversion 3.14.0 +%define srcversion 3.15-rc5 +%define patchversion 3.15.0-rc5 %define variant %{nil} %define vanilla_only 0 @@ -28,10 +28,8 @@ %define build_flavor default %define build_default (%build_flavor == "default") -%define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") -%define build_ps3 (%build_flavor == "ps3") %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant @@ -61,9 +59,9 @@ Summary: The Standard Kernel License: GPL-2.0 Group: System/Kernel -Version: 3.14.0 +Version: 3.15.rc5 %if 0%{?is_kotd} -Release: <RELEASE>.ge0d4304 +Release: <RELEASE>.gcc68f12 %else Release: 0 %endif @@ -71,6 +69,7 @@ BuildRequires: bc BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: hmaccalc BuildRequires: modutils BuildRequires: sparse # Used to sign the kernel in the buildservice @@ -159,7 +158,7 @@ Provides: kernel-smp = 2.6.17 Obsoletes: kernel-smp <= 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/v3.x/testing/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -540,49 +539,20 @@ add_vmlinux() { - local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor - if test $1 == "--compressed"; then - compressed=true - fi cp vmlinux %buildroot/$vmlinux - >%my_builddir/vmlinux.debug.files -%if 0%{?__debug_package:1} - if $compressed; then - local vmlinux_debug=usr/lib/debug/$vmlinux.debug - mkdir -p $(dirname %buildroot/$vmlinux_debug) - /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ - -l vmlinux.sourcefiles %buildroot/$vmlinux - # FIXME: create and package build-id symlinks - objcopy --only-keep-debug \ - %buildroot/$vmlinux \ - %buildroot/$vmlinux_debug || : - objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \ - --strip-debug \ - %buildroot/$vmlinux || : - mkdir -p %buildroot/usr/src/debug - LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \ - | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) - find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 - find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 - echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files - else - # make vmlinux executable so that find-debuginfo.sh picks it up - # (TODO: fix find-debuginfo.sh instead) + # make sure that find-debuginfo.sh picks it up. In the filelist, we + # mark the file 0644 again chmod +x %buildroot/$vmlinux - fi -%endif - if $compressed; then - gzip -n -9 %buildroot/$vmlinux - chmod a-x %buildroot/$vmlinux.gz + if test $1 == "--compressed"; then + gzip -n -k -9 %buildroot/$vmlinux + ghost_vmlinux=true + else + ghost_vmlinux=false fi } -%if %build_kdump - add_vmlinux - image=vmlinux -%else - # architecture specifics %ifarch %ix86 x86_64 add_vmlinux --compressed @@ -648,8 +618,9 @@ cp -p arch/arm64/boot/$image %buildroot/boot/$image-%kernelrelease-%build_flavor %endif -# end of build_kdump -%endif +if test -x /usr/lib/rpm/pesign/gen-hmac; then + $_ -r %buildroot /boot/$image-%kernelrelease-%build_flavor +fi # Package the compiled-in certificates as DER files in /etc/uefi/certs # and have mokutil enroll them when the kernel is installed @@ -705,7 +676,7 @@ done done -%if %build_kdump || %build_xen || %build_vanilla || %build_ps3 +%if %build_xen || %build_vanilla # keep this -suffix list in sync with post.sh and postun.sh suffix=-%build_flavor %endif @@ -733,6 +704,8 @@ # space in /boot. dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \ bs=1024 seek=2047 count=1 +# Also reserve some space for the kdump initrd +cp %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump} if [ %CONFIG_MODULES = y ]; then mkdir -p %rpm_install_dir/%cpu_arch_flavor @@ -876,7 +849,7 @@ } # Collect the file lists. -shopt -s nullglob +shopt -s nullglob dotglob
%my_builddir/kernel-devel.files for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do f=${file##%buildroot} @@ -884,22 +857,39 @@ done
{ cd %buildroot - find boot \ - \( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \ - -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \ - -type f -printf '/%%p\n' - - # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that - # the file gets removed when uninstalling the kernel. - echo '%%ghost /boot/initrd-%kernelrelease-%build_flavor-kdump' - touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-%build_flavor-kdump + for f in boot/*; do + if test -L "$f"; then + echo "%%ghost /$f" + continue + elif test ! -f "$f"; then + continue + fi + case "$f" in + boot/initrd-*) + echo "%%ghost /$f" + continue + ;; + boot/vmlinux-*.gz) + ;; + boot/vmlinux-*) + if $ghost_vmlinux; then + echo "%%ghost /$f" + continue + fi + ;; + boot/symtypes*) + continue + ;; + esac + echo "%%attr(0644, root, root) /$f" + done if [ %CONFIG_MODULES = y ]; then find lib/modules/%kernelrelease-%build_flavor \ -type d -o \ \( -path '*/modules.*' ! -path '*/modules.order' \ ! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \ - -o -name '*.ko' -prune -o -printf '/%%p\n' + -o -name '*.ko' -prune -o -type f -printf '/%%p\n' cat %my_builddir/base-modules fi if test %CONFIG_MODULE_SIG = "y"; then @@ -912,10 +902,7 @@ if [ -e .%_docdir/%name ]; then echo "%%doc %_docdir/%name" fi -} | sort -u >%my_builddir/tmp -cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \ - add_dirs_to_filelist >%my_builddir/kernel-base.files -rm %my_builddir/tmp +} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files %if %split_base add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \ @@ -1075,16 +1062,4 @@ %endif %endif -%package devel-debuginfo -# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz -Summary: Debug information for package %name-devel -Group: Development/Debug - -%description devel-debuginfo -Debug information for package %name-devel - - -%source_timestamp -%files devel-debuginfo -f vmlinux.debug.files - %changelog ++++++ kernel-desktop.spec ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:01.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:01.000000000 +0200 @@ -19,8 +19,8 @@ # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild -%define srcversion 3.14 -%define patchversion 3.14.0 +%define srcversion 3.15-rc5 +%define patchversion 3.15.0-rc5 %define variant %{nil} %define vanilla_only 0 @@ -28,10 +28,8 @@ %define build_flavor desktop %define build_default (%build_flavor == "default") -%define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") -%define build_ps3 (%build_flavor == "ps3") %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant @@ -61,9 +59,9 @@ Summary: Kernel optimized for the desktop License: GPL-2.0 Group: System/Kernel -Version: 3.14.0 +Version: 3.15.rc5 %if 0%{?is_kotd} -Release: <RELEASE>.ge0d4304 +Release: <RELEASE>.gcc68f12 %else Release: 0 %endif @@ -71,6 +69,7 @@ BuildRequires: bc BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: hmaccalc BuildRequires: modutils BuildRequires: sparse # Used to sign the kernel in the buildservice @@ -148,7 +147,7 @@ %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/v3.x/testing/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -542,49 +541,20 @@ add_vmlinux() { - local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor - if test $1 == "--compressed"; then - compressed=true - fi cp vmlinux %buildroot/$vmlinux - >%my_builddir/vmlinux.debug.files -%if 0%{?__debug_package:1} - if $compressed; then - local vmlinux_debug=usr/lib/debug/$vmlinux.debug - mkdir -p $(dirname %buildroot/$vmlinux_debug) - /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ - -l vmlinux.sourcefiles %buildroot/$vmlinux - # FIXME: create and package build-id symlinks - objcopy --only-keep-debug \ - %buildroot/$vmlinux \ - %buildroot/$vmlinux_debug || : - objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \ - --strip-debug \ - %buildroot/$vmlinux || : - mkdir -p %buildroot/usr/src/debug - LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \ - | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) - find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 - find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 - echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files - else - # make vmlinux executable so that find-debuginfo.sh picks it up - # (TODO: fix find-debuginfo.sh instead) + # make sure that find-debuginfo.sh picks it up. In the filelist, we + # mark the file 0644 again chmod +x %buildroot/$vmlinux - fi -%endif - if $compressed; then - gzip -n -9 %buildroot/$vmlinux - chmod a-x %buildroot/$vmlinux.gz + if test $1 == "--compressed"; then + gzip -n -k -9 %buildroot/$vmlinux + ghost_vmlinux=true + else + ghost_vmlinux=false fi } -%if %build_kdump - add_vmlinux - image=vmlinux -%else - # architecture specifics %ifarch %ix86 x86_64 add_vmlinux --compressed @@ -650,8 +620,9 @@ cp -p arch/arm64/boot/$image %buildroot/boot/$image-%kernelrelease-%build_flavor %endif -# end of build_kdump -%endif +if test -x /usr/lib/rpm/pesign/gen-hmac; then + $_ -r %buildroot /boot/$image-%kernelrelease-%build_flavor +fi # Package the compiled-in certificates as DER files in /etc/uefi/certs # and have mokutil enroll them when the kernel is installed @@ -707,7 +678,7 @@ done done -%if %build_kdump || %build_xen || %build_vanilla || %build_ps3 +%if %build_xen || %build_vanilla # keep this -suffix list in sync with post.sh and postun.sh suffix=-%build_flavor %endif @@ -735,6 +706,8 @@ # space in /boot. dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \ bs=1024 seek=2047 count=1 +# Also reserve some space for the kdump initrd +cp %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump} if [ %CONFIG_MODULES = y ]; then mkdir -p %rpm_install_dir/%cpu_arch_flavor @@ -878,7 +851,7 @@ } # Collect the file lists. -shopt -s nullglob +shopt -s nullglob dotglob
%my_builddir/kernel-devel.files for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do f=${file##%buildroot} @@ -886,22 +859,39 @@ done
{ cd %buildroot - find boot \ - \( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \ - -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \ - -type f -printf '/%%p\n' - - # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that - # the file gets removed when uninstalling the kernel. - echo '%%ghost /boot/initrd-%kernelrelease-%build_flavor-kdump' - touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-%build_flavor-kdump + for f in boot/*; do + if test -L "$f"; then + echo "%%ghost /$f" + continue + elif test ! -f "$f"; then + continue + fi + case "$f" in + boot/initrd-*) + echo "%%ghost /$f" + continue + ;; + boot/vmlinux-*.gz) + ;; + boot/vmlinux-*) + if $ghost_vmlinux; then + echo "%%ghost /$f" + continue + fi + ;; + boot/symtypes*) + continue + ;; + esac + echo "%%attr(0644, root, root) /$f" + done if [ %CONFIG_MODULES = y ]; then find lib/modules/%kernelrelease-%build_flavor \ -type d -o \ \( -path '*/modules.*' ! -path '*/modules.order' \ ! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \ - -o -name '*.ko' -prune -o -printf '/%%p\n' + -o -name '*.ko' -prune -o -type f -printf '/%%p\n' cat %my_builddir/base-modules fi if test %CONFIG_MODULE_SIG = "y"; then @@ -914,10 +904,7 @@ if [ -e .%_docdir/%name ]; then echo "%%doc %_docdir/%name" fi -} | sort -u >%my_builddir/tmp -cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \ - add_dirs_to_filelist >%my_builddir/kernel-base.files -rm %my_builddir/tmp +} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files %if %split_base add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \ @@ -1103,16 +1090,4 @@ %endif %endif -%package devel-debuginfo -# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz -Summary: Debug information for package %name-devel -Group: Development/Debug - -%description devel-debuginfo -Debug information for package %name-devel - - -%source_timestamp -%files devel-debuginfo -f vmlinux.debug.files - %changelog ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:01.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:01.000000000 +0200 @@ -16,7 +16,7 @@ # -%define patchversion 3.14.0 +%define patchversion 3.15.0-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -25,9 +25,9 @@ Summary: Kernel Documentation License: GPL-2.0 Group: Documentation/Man -Version: 3.14.0 +Version: 3.15.rc5 %if 0%{?is_kotd} -Release: <RELEASE>.ge0d4304 +Release: <RELEASE>.gcc68f12 %else Release: 0 %endif ++++++ kernel-ec2.spec ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:01.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:01.000000000 +0200 @@ -19,8 +19,8 @@ # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild -%define srcversion 3.14 -%define patchversion 3.14.0 +%define srcversion 3.15-rc5 +%define patchversion 3.15.0-rc5 %define variant %{nil} %define vanilla_only 0 @@ -28,10 +28,8 @@ %define build_flavor ec2 %define build_default (%build_flavor == "default") -%define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") -%define build_ps3 (%build_flavor == "ps3") %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant @@ -61,9 +59,9 @@ Summary: The Amazon EC2 Xen Kernel License: GPL-2.0 Group: System/Kernel -Version: 3.14.0 +Version: 3.15.rc5 %if 0%{?is_kotd} -Release: <RELEASE>.ge0d4304 +Release: <RELEASE>.gcc68f12 %else Release: 0 %endif @@ -71,6 +69,7 @@ BuildRequires: bc BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: hmaccalc BuildRequires: modutils BuildRequires: sparse # Used to sign the kernel in the buildservice @@ -148,7 +147,7 @@ %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/v3.x/testing/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -532,49 +531,20 @@ add_vmlinux() { - local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor - if test $1 == "--compressed"; then - compressed=true - fi cp vmlinux %buildroot/$vmlinux - >%my_builddir/vmlinux.debug.files -%if 0%{?__debug_package:1} - if $compressed; then - local vmlinux_debug=usr/lib/debug/$vmlinux.debug - mkdir -p $(dirname %buildroot/$vmlinux_debug) - /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ - -l vmlinux.sourcefiles %buildroot/$vmlinux - # FIXME: create and package build-id symlinks - objcopy --only-keep-debug \ - %buildroot/$vmlinux \ - %buildroot/$vmlinux_debug || : - objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \ - --strip-debug \ - %buildroot/$vmlinux || : - mkdir -p %buildroot/usr/src/debug - LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \ - | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) - find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 - find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 - echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files - else - # make vmlinux executable so that find-debuginfo.sh picks it up - # (TODO: fix find-debuginfo.sh instead) + # make sure that find-debuginfo.sh picks it up. In the filelist, we + # mark the file 0644 again chmod +x %buildroot/$vmlinux - fi -%endif - if $compressed; then - gzip -n -9 %buildroot/$vmlinux - chmod a-x %buildroot/$vmlinux.gz + if test $1 == "--compressed"; then + gzip -n -k -9 %buildroot/$vmlinux + ghost_vmlinux=true + else + ghost_vmlinux=false fi } -%if %build_kdump - add_vmlinux - image=vmlinux -%else - # architecture specifics %ifarch %ix86 x86_64 add_vmlinux --compressed @@ -640,8 +610,9 @@ cp -p arch/arm64/boot/$image %buildroot/boot/$image-%kernelrelease-%build_flavor %endif -# end of build_kdump -%endif +if test -x /usr/lib/rpm/pesign/gen-hmac; then + $_ -r %buildroot /boot/$image-%kernelrelease-%build_flavor +fi # Package the compiled-in certificates as DER files in /etc/uefi/certs # and have mokutil enroll them when the kernel is installed @@ -697,7 +668,7 @@ done done -%if %build_kdump || %build_xen || %build_vanilla || %build_ps3 +%if %build_xen || %build_vanilla # keep this -suffix list in sync with post.sh and postun.sh suffix=-%build_flavor %endif @@ -725,6 +696,8 @@ # space in /boot. dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \ bs=1024 seek=2047 count=1 +# Also reserve some space for the kdump initrd +cp %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump} if [ %CONFIG_MODULES = y ]; then mkdir -p %rpm_install_dir/%cpu_arch_flavor @@ -868,7 +841,7 @@ } # Collect the file lists. -shopt -s nullglob +shopt -s nullglob dotglob
%my_builddir/kernel-devel.files for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do f=${file##%buildroot} @@ -876,22 +849,39 @@ done
{ cd %buildroot - find boot \ - \( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \ - -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \ - -type f -printf '/%%p\n' - - # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that - # the file gets removed when uninstalling the kernel. - echo '%%ghost /boot/initrd-%kernelrelease-%build_flavor-kdump' - touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-%build_flavor-kdump + for f in boot/*; do + if test -L "$f"; then + echo "%%ghost /$f" + continue + elif test ! -f "$f"; then + continue + fi + case "$f" in + boot/initrd-*) + echo "%%ghost /$f" + continue + ;; + boot/vmlinux-*.gz) + ;; + boot/vmlinux-*) + if $ghost_vmlinux; then + echo "%%ghost /$f" + continue + fi + ;; + boot/symtypes*) + continue + ;; + esac + echo "%%attr(0644, root, root) /$f" + done if [ %CONFIG_MODULES = y ]; then find lib/modules/%kernelrelease-%build_flavor \ -type d -o \ \( -path '*/modules.*' ! -path '*/modules.order' \ ! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \ - -o -name '*.ko' -prune -o -printf '/%%p\n' + -o -name '*.ko' -prune -o -type f -printf '/%%p\n' cat %my_builddir/base-modules fi if test %CONFIG_MODULE_SIG = "y"; then @@ -904,10 +894,7 @@ if [ -e .%_docdir/%name ]; then echo "%%doc %_docdir/%name" fi -} | sort -u >%my_builddir/tmp -cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \ - add_dirs_to_filelist >%my_builddir/kernel-base.files -rm %my_builddir/tmp +} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files %if %split_base add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \ @@ -1073,16 +1060,4 @@ %endif %endif -%package devel-debuginfo -# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz -Summary: Debug information for package %name-devel -Group: Development/Debug - -%description devel-debuginfo -Debug information for package %name-devel - - -%source_timestamp -%files devel-debuginfo -f vmlinux.debug.files - %changelog ++++++ kernel-exynos.spec ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:01.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:01.000000000 +0200 @@ -19,8 +19,8 @@ # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild -%define srcversion 3.14 -%define patchversion 3.14.0 +%define srcversion 3.15-rc5 +%define patchversion 3.15.0-rc5 %define variant %{nil} %define vanilla_only 0 @@ -28,10 +28,8 @@ %define build_flavor exynos %define build_default (%build_flavor == "default") -%define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") -%define build_ps3 (%build_flavor == "ps3") %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant @@ -61,9 +59,9 @@ Summary: Kernel for Samsung's Exynos SoC License: GPL-2.0 Group: System/Kernel -Version: 3.14.0 +Version: 3.15.rc5 %if 0%{?is_kotd} -Release: <RELEASE>.ge0d4304 +Release: <RELEASE>.gcc68f12 %else Release: 0 %endif @@ -71,6 +69,7 @@ BuildRequires: bc BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: hmaccalc BuildRequires: modutils BuildRequires: sparse # Used to sign the kernel in the buildservice @@ -148,7 +147,7 @@ %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/v3.x/testing/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -529,49 +528,20 @@ add_vmlinux() { - local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor - if test $1 == "--compressed"; then - compressed=true - fi cp vmlinux %buildroot/$vmlinux - >%my_builddir/vmlinux.debug.files -%if 0%{?__debug_package:1} - if $compressed; then - local vmlinux_debug=usr/lib/debug/$vmlinux.debug - mkdir -p $(dirname %buildroot/$vmlinux_debug) - /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ - -l vmlinux.sourcefiles %buildroot/$vmlinux - # FIXME: create and package build-id symlinks - objcopy --only-keep-debug \ - %buildroot/$vmlinux \ - %buildroot/$vmlinux_debug || : - objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \ - --strip-debug \ - %buildroot/$vmlinux || : - mkdir -p %buildroot/usr/src/debug - LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \ - | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) - find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 - find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 - echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files - else - # make vmlinux executable so that find-debuginfo.sh picks it up - # (TODO: fix find-debuginfo.sh instead) + # make sure that find-debuginfo.sh picks it up. In the filelist, we + # mark the file 0644 again chmod +x %buildroot/$vmlinux - fi -%endif - if $compressed; then - gzip -n -9 %buildroot/$vmlinux - chmod a-x %buildroot/$vmlinux.gz + if test $1 == "--compressed"; then + gzip -n -k -9 %buildroot/$vmlinux + ghost_vmlinux=true + else + ghost_vmlinux=false fi } -%if %build_kdump - add_vmlinux - image=vmlinux -%else - # architecture specifics %ifarch %ix86 x86_64 add_vmlinux --compressed @@ -637,8 +607,9 @@ cp -p arch/arm64/boot/$image %buildroot/boot/$image-%kernelrelease-%build_flavor %endif -# end of build_kdump -%endif +if test -x /usr/lib/rpm/pesign/gen-hmac; then + $_ -r %buildroot /boot/$image-%kernelrelease-%build_flavor +fi # Package the compiled-in certificates as DER files in /etc/uefi/certs # and have mokutil enroll them when the kernel is installed @@ -694,7 +665,7 @@ done done -%if %build_kdump || %build_xen || %build_vanilla || %build_ps3 +%if %build_xen || %build_vanilla # keep this -suffix list in sync with post.sh and postun.sh suffix=-%build_flavor %endif @@ -722,6 +693,8 @@ # space in /boot. dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \ bs=1024 seek=2047 count=1 +# Also reserve some space for the kdump initrd +cp %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump} if [ %CONFIG_MODULES = y ]; then mkdir -p %rpm_install_dir/%cpu_arch_flavor @@ -865,7 +838,7 @@ } # Collect the file lists. -shopt -s nullglob +shopt -s nullglob dotglob
%my_builddir/kernel-devel.files for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do f=${file##%buildroot} @@ -873,22 +846,39 @@ done
{ cd %buildroot - find boot \ - \( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \ - -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \ - -type f -printf '/%%p\n' - - # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that - # the file gets removed when uninstalling the kernel. - echo '%%ghost /boot/initrd-%kernelrelease-%build_flavor-kdump' - touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-%build_flavor-kdump + for f in boot/*; do + if test -L "$f"; then + echo "%%ghost /$f" + continue + elif test ! -f "$f"; then + continue + fi + case "$f" in + boot/initrd-*) + echo "%%ghost /$f" + continue + ;; + boot/vmlinux-*.gz) + ;; + boot/vmlinux-*) + if $ghost_vmlinux; then + echo "%%ghost /$f" + continue + fi + ;; + boot/symtypes*) + continue + ;; + esac + echo "%%attr(0644, root, root) /$f" + done if [ %CONFIG_MODULES = y ]; then find lib/modules/%kernelrelease-%build_flavor \ -type d -o \ \( -path '*/modules.*' ! -path '*/modules.order' \ ! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \ - -o -name '*.ko' -prune -o -printf '/%%p\n' + -o -name '*.ko' -prune -o -type f -printf '/%%p\n' cat %my_builddir/base-modules fi if test %CONFIG_MODULE_SIG = "y"; then @@ -901,10 +891,7 @@ if [ -e .%_docdir/%name ]; then echo "%%doc %_docdir/%name" fi -} | sort -u >%my_builddir/tmp -cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \ - add_dirs_to_filelist >%my_builddir/kernel-base.files -rm %my_builddir/tmp +} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files %if %split_base add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \ @@ -1064,16 +1051,4 @@ %endif %endif -%package devel-debuginfo -# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz -Summary: Debug information for package %name-devel -Group: Development/Debug - -%description devel-debuginfo -Debug information for package %name-devel - - -%source_timestamp -%files devel-debuginfo -f vmlinux.debug.files - %changelog ++++++ kernel-lpae.spec ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:02.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:02.000000000 +0200 @@ -19,8 +19,8 @@ # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild -%define srcversion 3.14 -%define patchversion 3.14.0 +%define srcversion 3.15-rc5 +%define patchversion 3.15.0-rc5 %define variant %{nil} %define vanilla_only 0 @@ -28,10 +28,8 @@ %define build_flavor lpae %define build_default (%build_flavor == "default") -%define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") -%define build_ps3 (%build_flavor == "ps3") %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant @@ -61,9 +59,9 @@ Summary: Kernel for LPAE enabled systems License: GPL-2.0 Group: System/Kernel -Version: 3.14.0 +Version: 3.15.rc5 %if 0%{?is_kotd} -Release: <RELEASE>.ge0d4304 +Release: <RELEASE>.gcc68f12 %else Release: 0 %endif @@ -71,6 +69,7 @@ BuildRequires: bc BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: hmaccalc BuildRequires: modutils BuildRequires: sparse # Used to sign the kernel in the buildservice @@ -148,7 +147,7 @@ %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/v3.x/testing/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -530,49 +529,20 @@ add_vmlinux() { - local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor - if test $1 == "--compressed"; then - compressed=true - fi cp vmlinux %buildroot/$vmlinux - >%my_builddir/vmlinux.debug.files -%if 0%{?__debug_package:1} - if $compressed; then - local vmlinux_debug=usr/lib/debug/$vmlinux.debug - mkdir -p $(dirname %buildroot/$vmlinux_debug) - /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ - -l vmlinux.sourcefiles %buildroot/$vmlinux - # FIXME: create and package build-id symlinks - objcopy --only-keep-debug \ - %buildroot/$vmlinux \ - %buildroot/$vmlinux_debug || : - objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \ - --strip-debug \ - %buildroot/$vmlinux || : - mkdir -p %buildroot/usr/src/debug - LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \ - | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) - find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 - find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 - echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files - else - # make vmlinux executable so that find-debuginfo.sh picks it up - # (TODO: fix find-debuginfo.sh instead) + # make sure that find-debuginfo.sh picks it up. In the filelist, we + # mark the file 0644 again chmod +x %buildroot/$vmlinux - fi -%endif - if $compressed; then - gzip -n -9 %buildroot/$vmlinux - chmod a-x %buildroot/$vmlinux.gz + if test $1 == "--compressed"; then + gzip -n -k -9 %buildroot/$vmlinux + ghost_vmlinux=true + else + ghost_vmlinux=false fi } -%if %build_kdump - add_vmlinux - image=vmlinux -%else - # architecture specifics %ifarch %ix86 x86_64 add_vmlinux --compressed @@ -638,8 +608,9 @@ cp -p arch/arm64/boot/$image %buildroot/boot/$image-%kernelrelease-%build_flavor %endif -# end of build_kdump -%endif +if test -x /usr/lib/rpm/pesign/gen-hmac; then + $_ -r %buildroot /boot/$image-%kernelrelease-%build_flavor +fi # Package the compiled-in certificates as DER files in /etc/uefi/certs # and have mokutil enroll them when the kernel is installed @@ -695,7 +666,7 @@ done done -%if %build_kdump || %build_xen || %build_vanilla || %build_ps3 +%if %build_xen || %build_vanilla # keep this -suffix list in sync with post.sh and postun.sh suffix=-%build_flavor %endif @@ -723,6 +694,8 @@ # space in /boot. dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \ bs=1024 seek=2047 count=1 +# Also reserve some space for the kdump initrd +cp %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump} if [ %CONFIG_MODULES = y ]; then mkdir -p %rpm_install_dir/%cpu_arch_flavor @@ -866,7 +839,7 @@ } # Collect the file lists. -shopt -s nullglob +shopt -s nullglob dotglob
%my_builddir/kernel-devel.files for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do f=${file##%buildroot} @@ -874,22 +847,39 @@ done
{ cd %buildroot - find boot \ - \( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \ - -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \ - -type f -printf '/%%p\n' - - # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that - # the file gets removed when uninstalling the kernel. - echo '%%ghost /boot/initrd-%kernelrelease-%build_flavor-kdump' - touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-%build_flavor-kdump + for f in boot/*; do + if test -L "$f"; then + echo "%%ghost /$f" + continue + elif test ! -f "$f"; then + continue + fi + case "$f" in + boot/initrd-*) + echo "%%ghost /$f" + continue + ;; + boot/vmlinux-*.gz) + ;; + boot/vmlinux-*) + if $ghost_vmlinux; then + echo "%%ghost /$f" + continue + fi + ;; + boot/symtypes*) + continue + ;; + esac + echo "%%attr(0644, root, root) /$f" + done if [ %CONFIG_MODULES = y ]; then find lib/modules/%kernelrelease-%build_flavor \ -type d -o \ \( -path '*/modules.*' ! -path '*/modules.order' \ ! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \ - -o -name '*.ko' -prune -o -printf '/%%p\n' + -o -name '*.ko' -prune -o -type f -printf '/%%p\n' cat %my_builddir/base-modules fi if test %CONFIG_MODULE_SIG = "y"; then @@ -902,10 +892,7 @@ if [ -e .%_docdir/%name ]; then echo "%%doc %_docdir/%name" fi -} | sort -u >%my_builddir/tmp -cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \ - add_dirs_to_filelist >%my_builddir/kernel-base.files -rm %my_builddir/tmp +} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files %if %split_base add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \ @@ -1067,16 +1054,4 @@ %endif %endif -%package devel-debuginfo -# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz -Summary: Debug information for package %name-devel -Group: Development/Debug - -%description devel-debuginfo -Debug information for package %name-devel - - -%source_timestamp -%files devel-debuginfo -f vmlinux.debug.files - %changelog ++++++ kernel-obs-build.spec ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:02.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:02.000000000 +0200 @@ -19,7 +19,7 @@ #!BuildIgnore: post-build-checks -%define patchversion 3.14.0 +%define patchversion 3.15.0-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -33,11 +33,11 @@ %ifarch %ix86 x86_64 BuildRequires: kernel-xen %endif -ExclusiveArch: %ix86 aarch64 armv6hl armv7hl ppc ppc64 ppc64le s390x x86_64 +ExclusiveArch: aarch64 armv6hl armv7hl %ix86 ppc ppc64 ppc64le s390x x86_64 %if 0%{?suse_version} < 1320 # For SLE 11 -BuildRequires: yast2-bootloader BuildRequires: mkinitrd +BuildRequires: perl-Bootloader BuildRoot: %{_tmppath}/%{name}-%{version}-build %else BuildRequires: dracut @@ -45,9 +45,9 @@ Summary: package kernel and initrd for OBS VM builds License: GPL-2.0 Group: SLES -Version: 3.14.0 +Version: 3.15.rc5 %if 0%{?is_kotd} -Release: <RELEASE>.ge0d4304 +Release: <RELEASE>.gcc68f12 %else Release: 0 %endif @@ -115,7 +115,7 @@ %else dracut --host-only --drivers="$KERNEL_MODULES" --force /tmp/initrd.kvm `echo /boot/%{kernel_name}-*-default | sed -n -e 's,[^-]*-\(.*-default\),\1,p'` %ifarch %ix86 x86_64 -dracut --host-only --drivers="$KERNEL_MODULES" --force /tmp/initrd.xen `echo /boot/%{kernel_name}-*-xen | sed -n -e 's,[^-]*-\(.*-xen\),\1,p'` +dracut --host-only --drivers="$KERNEL_MODULES xenblk" --force /tmp/initrd.xen `echo /boot/%{kernel_name}-*-xen | sed -n -e 's,[^-]*-\(.*-xen\),\1,p'` %endif %endif ++++++ kernel-obs-qa-xen.spec ++++++ # # spec file for package kernel-obs-qa # # Copyright (c) 2014 SUSE LINUX Products 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/ # # needsrootforbuild %define patchversion 3.15.0-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros Name: kernel-obs-qa-xen BuildRequires: kernel-xen # kernel-obs-build must be also configured as VMinstall, but is required # here as well to avoid that qa and build package build parallel BuildRequires: kernel-obs-build BuildRequires: modutils ExclusiveArch: %ix86 x86_64 %if 0%{?suse_version} < 1200 # for SLE 11 BuildRoot: %{_tmppath}/%{name}-%{version}-build %endif Summary: Basic QA tests for the kernel License: GPL-2.0 Group: SLES Version: 3.15.rc5 %if 0%{?is_kotd} Release: <RELEASE>.gcc68f12 %else Release: 0 %endif %description This package is using the kernel compiled within Open Build Service(OBS) projects and runs basic tests. %prep %build %check # More tests are comming, currently the main test is the existens of # this spec file. It does trigger a build within OBS VM which is using # the kernel of the same project. # 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 fi %install mkdir -p %{buildroot}/usr/share/%name touch %{buildroot}/usr/share/%name/logfile %files %defattr(-,root,root) /usr/share/%name %changelog ++++++ kernel-obs-qa.spec ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:02.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:02.000000000 +0200 @@ -17,18 +17,18 @@ # needsrootforbuild -%define patchversion 3.14.0 +%define patchversion 3.15.0-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros Name: kernel-obs-qa BuildRequires: kernel-default +# kernel-obs-build must be also configured as VMinstall, but is required +# here as well to avoid that qa and build package build parallel +BuildRequires: kernel-obs-build BuildRequires: modutils -%ifarch %ix86 x86_64 -BuildRequires: kernel-xen -%endif -ExclusiveArch: %ix86 aarch64 armv6hl armv7hl ppc ppc64 ppc64le s390x x86_64 +ExclusiveArch: aarch64 armv6hl armv7hl %ix86 ppc 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.14.0 +Version: 3.15.rc5 %if 0%{?is_kotd} -Release: <RELEASE>.ge0d4304 +Release: <RELEASE>.gcc68f12 %else Release: 0 %endif @@ -59,14 +59,22 @@ # test suites should be packaged in other packages, but build required # and called here. -/sbin/modprobe loop || exit 1 +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 +fi + %install -mkdir -p %{buildroot}/usr/share/kernel-qa/ -touch %{buildroot}/usr/share/kernel-qa/logfile +mkdir -p %{buildroot}/usr/share/%name +touch %{buildroot}/usr/share/%name/logfile %files %defattr(-,root,root) -/usr/share/kernel-qa +/usr/share/%name %changelog ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:02.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:02.000000000 +0200 @@ -19,8 +19,8 @@ # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild -%define srcversion 3.14 -%define patchversion 3.14.0 +%define srcversion 3.15-rc5 +%define patchversion 3.15.0-rc5 %define variant %{nil} %define vanilla_only 0 @@ -28,10 +28,8 @@ %define build_flavor pae %define build_default (%build_flavor == "default") -%define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") -%define build_ps3 (%build_flavor == "ps3") %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant @@ -61,9 +59,9 @@ Summary: Kernel with PAE Support License: GPL-2.0 Group: System/Kernel -Version: 3.14.0 +Version: 3.15.rc5 %if 0%{?is_kotd} -Release: <RELEASE>.ge0d4304 +Release: <RELEASE>.gcc68f12 %else Release: 0 %endif @@ -71,6 +69,7 @@ BuildRequires: bc BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: hmaccalc BuildRequires: modutils BuildRequires: sparse # Used to sign the kernel in the buildservice @@ -153,7 +152,7 @@ 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 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -541,49 +540,20 @@ add_vmlinux() { - local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor - if test $1 == "--compressed"; then - compressed=true - fi cp vmlinux %buildroot/$vmlinux - >%my_builddir/vmlinux.debug.files -%if 0%{?__debug_package:1} - if $compressed; then - local vmlinux_debug=usr/lib/debug/$vmlinux.debug - mkdir -p $(dirname %buildroot/$vmlinux_debug) - /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ - -l vmlinux.sourcefiles %buildroot/$vmlinux - # FIXME: create and package build-id symlinks - objcopy --only-keep-debug \ - %buildroot/$vmlinux \ - %buildroot/$vmlinux_debug || : - objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \ - --strip-debug \ - %buildroot/$vmlinux || : - mkdir -p %buildroot/usr/src/debug - LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \ - | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) - find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 - find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 - echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files - else - # make vmlinux executable so that find-debuginfo.sh picks it up - # (TODO: fix find-debuginfo.sh instead) + # make sure that find-debuginfo.sh picks it up. In the filelist, we + # mark the file 0644 again chmod +x %buildroot/$vmlinux - fi -%endif - if $compressed; then - gzip -n -9 %buildroot/$vmlinux - chmod a-x %buildroot/$vmlinux.gz + if test $1 == "--compressed"; then + gzip -n -k -9 %buildroot/$vmlinux + ghost_vmlinux=true + else + ghost_vmlinux=false fi } -%if %build_kdump - add_vmlinux - image=vmlinux -%else - # architecture specifics %ifarch %ix86 x86_64 add_vmlinux --compressed @@ -649,8 +619,9 @@ cp -p arch/arm64/boot/$image %buildroot/boot/$image-%kernelrelease-%build_flavor %endif -# end of build_kdump -%endif +if test -x /usr/lib/rpm/pesign/gen-hmac; then + $_ -r %buildroot /boot/$image-%kernelrelease-%build_flavor +fi # Package the compiled-in certificates as DER files in /etc/uefi/certs # and have mokutil enroll them when the kernel is installed @@ -706,7 +677,7 @@ done done -%if %build_kdump || %build_xen || %build_vanilla || %build_ps3 +%if %build_xen || %build_vanilla # keep this -suffix list in sync with post.sh and postun.sh suffix=-%build_flavor %endif @@ -734,6 +705,8 @@ # space in /boot. dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \ bs=1024 seek=2047 count=1 +# Also reserve some space for the kdump initrd +cp %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump} if [ %CONFIG_MODULES = y ]; then mkdir -p %rpm_install_dir/%cpu_arch_flavor @@ -877,7 +850,7 @@ } # Collect the file lists. -shopt -s nullglob +shopt -s nullglob dotglob
%my_builddir/kernel-devel.files for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do f=${file##%buildroot} @@ -885,22 +858,39 @@ done
{ cd %buildroot - find boot \ - \( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \ - -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \ - -type f -printf '/%%p\n' - - # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that - # the file gets removed when uninstalling the kernel. - echo '%%ghost /boot/initrd-%kernelrelease-%build_flavor-kdump' - touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-%build_flavor-kdump + for f in boot/*; do + if test -L "$f"; then + echo "%%ghost /$f" + continue + elif test ! -f "$f"; then + continue + fi + case "$f" in + boot/initrd-*) + echo "%%ghost /$f" + continue + ;; + boot/vmlinux-*.gz) + ;; + boot/vmlinux-*) + if $ghost_vmlinux; then + echo "%%ghost /$f" + continue + fi + ;; + boot/symtypes*) + continue + ;; + esac + echo "%%attr(0644, root, root) /$f" + done if [ %CONFIG_MODULES = y ]; then find lib/modules/%kernelrelease-%build_flavor \ -type d -o \ \( -path '*/modules.*' ! -path '*/modules.order' \ ! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \ - -o -name '*.ko' -prune -o -printf '/%%p\n' + -o -name '*.ko' -prune -o -type f -printf '/%%p\n' cat %my_builddir/base-modules fi if test %CONFIG_MODULE_SIG = "y"; then @@ -913,10 +903,7 @@ if [ -e .%_docdir/%name ]; then echo "%%doc %_docdir/%name" fi -} | sort -u >%my_builddir/tmp -cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \ - add_dirs_to_filelist >%my_builddir/kernel-base.files -rm %my_builddir/tmp +} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files %if %split_base add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \ @@ -1093,16 +1080,4 @@ %endif %endif -%package devel-debuginfo -# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz -Summary: Debug information for package %name-devel -Group: Development/Debug - -%description devel-debuginfo -Debug information for package %name-devel - - -%source_timestamp -%files devel-debuginfo -f vmlinux.debug.files - %changelog ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:02.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:02.000000000 +0200 @@ -17,8 +17,8 @@ # icecream 0 -%define srcversion 3.14 -%define patchversion 3.14.0 +%define srcversion 3.15-rc5 +%define patchversion 3.15.0-rc5 %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.14.0 +Version: 3.15.rc5 %if 0%{?is_kotd} -Release: <RELEASE>.ge0d4304 +Release: <RELEASE>.gcc68f12 %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/v3.x/testing/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:02.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:02.000000000 +0200 @@ -24,10 +24,10 @@ Summary: Kernel Symbol Versions (modversions) License: GPL-2.0 Group: Development/Sources -Version: 3.14.0 +Version: 3.15.rc5 %if %using_buildservice %if 0%{?is_kotd} -Release: <RELEASE>.ge0d4304 +Release: <RELEASE>.gcc68f12 %else Release: 0 %endif ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:02.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:02.000000000 +0200 @@ -19,8 +19,8 @@ # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild -%define srcversion 3.14 -%define patchversion 3.14.0 +%define srcversion 3.15-rc5 +%define patchversion 3.15.0-rc5 %define variant %{nil} %define vanilla_only 0 @@ -28,10 +28,8 @@ %define build_flavor vanilla %define build_default (%build_flavor == "default") -%define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") -%define build_ps3 (%build_flavor == "ps3") %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant @@ -61,9 +59,9 @@ Summary: The Standard Kernel - without any SUSE patches License: GPL-2.0 Group: System/Kernel -Version: 3.14.0 +Version: 3.15.rc5 %if 0%{?is_kotd} -Release: <RELEASE>.ge0d4304 +Release: <RELEASE>.gcc68f12 %else Release: 0 %endif @@ -71,6 +69,7 @@ BuildRequires: bc BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: hmaccalc BuildRequires: modutils BuildRequires: sparse # Used to sign the kernel in the buildservice @@ -148,7 +147,7 @@ %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/v3.x/testing/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -529,49 +528,20 @@ add_vmlinux() { - local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor - if test $1 == "--compressed"; then - compressed=true - fi cp vmlinux %buildroot/$vmlinux - >%my_builddir/vmlinux.debug.files -%if 0%{?__debug_package:1} - if $compressed; then - local vmlinux_debug=usr/lib/debug/$vmlinux.debug - mkdir -p $(dirname %buildroot/$vmlinux_debug) - /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ - -l vmlinux.sourcefiles %buildroot/$vmlinux - # FIXME: create and package build-id symlinks - objcopy --only-keep-debug \ - %buildroot/$vmlinux \ - %buildroot/$vmlinux_debug || : - objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \ - --strip-debug \ - %buildroot/$vmlinux || : - mkdir -p %buildroot/usr/src/debug - LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \ - | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) - find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 - find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 - echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files - else - # make vmlinux executable so that find-debuginfo.sh picks it up - # (TODO: fix find-debuginfo.sh instead) + # make sure that find-debuginfo.sh picks it up. In the filelist, we + # mark the file 0644 again chmod +x %buildroot/$vmlinux - fi -%endif - if $compressed; then - gzip -n -9 %buildroot/$vmlinux - chmod a-x %buildroot/$vmlinux.gz + if test $1 == "--compressed"; then + gzip -n -k -9 %buildroot/$vmlinux + ghost_vmlinux=true + else + ghost_vmlinux=false fi } -%if %build_kdump - add_vmlinux - image=vmlinux -%else - # architecture specifics %ifarch %ix86 x86_64 add_vmlinux --compressed @@ -637,8 +607,9 @@ cp -p arch/arm64/boot/$image %buildroot/boot/$image-%kernelrelease-%build_flavor %endif -# end of build_kdump -%endif +if test -x /usr/lib/rpm/pesign/gen-hmac; then + $_ -r %buildroot /boot/$image-%kernelrelease-%build_flavor +fi # Package the compiled-in certificates as DER files in /etc/uefi/certs # and have mokutil enroll them when the kernel is installed @@ -694,7 +665,7 @@ done done -%if %build_kdump || %build_xen || %build_vanilla || %build_ps3 +%if %build_xen || %build_vanilla # keep this -suffix list in sync with post.sh and postun.sh suffix=-%build_flavor %endif @@ -722,6 +693,8 @@ # space in /boot. dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \ bs=1024 seek=2047 count=1 +# Also reserve some space for the kdump initrd +cp %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump} if [ %CONFIG_MODULES = y ]; then mkdir -p %rpm_install_dir/%cpu_arch_flavor @@ -865,7 +838,7 @@ } # Collect the file lists. -shopt -s nullglob +shopt -s nullglob dotglob
%my_builddir/kernel-devel.files for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do f=${file##%buildroot} @@ -873,22 +846,39 @@ done
{ cd %buildroot - find boot \ - \( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \ - -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \ - -type f -printf '/%%p\n' - - # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that - # the file gets removed when uninstalling the kernel. - echo '%%ghost /boot/initrd-%kernelrelease-%build_flavor-kdump' - touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-%build_flavor-kdump + for f in boot/*; do + if test -L "$f"; then + echo "%%ghost /$f" + continue + elif test ! -f "$f"; then + continue + fi + case "$f" in + boot/initrd-*) + echo "%%ghost /$f" + continue + ;; + boot/vmlinux-*.gz) + ;; + boot/vmlinux-*) + if $ghost_vmlinux; then + echo "%%ghost /$f" + continue + fi + ;; + boot/symtypes*) + continue + ;; + esac + echo "%%attr(0644, root, root) /$f" + done if [ %CONFIG_MODULES = y ]; then find lib/modules/%kernelrelease-%build_flavor \ -type d -o \ \( -path '*/modules.*' ! -path '*/modules.order' \ ! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \ - -o -name '*.ko' -prune -o -printf '/%%p\n' + -o -name '*.ko' -prune -o -type f -printf '/%%p\n' cat %my_builddir/base-modules fi if test %CONFIG_MODULE_SIG = "y"; then @@ -901,10 +891,7 @@ if [ -e .%_docdir/%name ]; then echo "%%doc %_docdir/%name" fi -} | sort -u >%my_builddir/tmp -cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \ - add_dirs_to_filelist >%my_builddir/kernel-base.files -rm %my_builddir/tmp +} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files %if %split_base add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \ @@ -1064,16 +1051,4 @@ %endif %endif -%package devel-debuginfo -# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz -Summary: Debug information for package %name-devel -Group: Development/Debug - -%description devel-debuginfo -Debug information for package %name-devel - - -%source_timestamp -%files devel-debuginfo -f vmlinux.debug.files - %changelog ++++++ kernel-xen.spec ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:02.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:02.000000000 +0200 @@ -19,8 +19,8 @@ # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild -%define srcversion 3.14 -%define patchversion 3.14.0 +%define srcversion 3.15-rc5 +%define patchversion 3.15.0-rc5 %define variant %{nil} %define vanilla_only 0 @@ -28,10 +28,8 @@ %define build_flavor xen %define build_default (%build_flavor == "default") -%define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") -%define build_ps3 (%build_flavor == "ps3") %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant @@ -61,9 +59,9 @@ Summary: The Xen Kernel License: GPL-2.0 Group: System/Kernel -Version: 3.14.0 +Version: 3.15.rc5 %if 0%{?is_kotd} -Release: <RELEASE>.ge0d4304 +Release: <RELEASE>.gcc68f12 %else Release: 0 %endif @@ -71,6 +69,7 @@ BuildRequires: bc BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: hmaccalc BuildRequires: modutils BuildRequires: sparse # Used to sign the kernel in the buildservice @@ -151,7 +150,7 @@ 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/v3.x/testing/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -535,49 +534,20 @@ add_vmlinux() { - local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor - if test $1 == "--compressed"; then - compressed=true - fi cp vmlinux %buildroot/$vmlinux - >%my_builddir/vmlinux.debug.files -%if 0%{?__debug_package:1} - if $compressed; then - local vmlinux_debug=usr/lib/debug/$vmlinux.debug - mkdir -p $(dirname %buildroot/$vmlinux_debug) - /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ - -l vmlinux.sourcefiles %buildroot/$vmlinux - # FIXME: create and package build-id symlinks - objcopy --only-keep-debug \ - %buildroot/$vmlinux \ - %buildroot/$vmlinux_debug || : - objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \ - --strip-debug \ - %buildroot/$vmlinux || : - mkdir -p %buildroot/usr/src/debug - LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \ - | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) - find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 - find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 - echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files - else - # make vmlinux executable so that find-debuginfo.sh picks it up - # (TODO: fix find-debuginfo.sh instead) + # make sure that find-debuginfo.sh picks it up. In the filelist, we + # mark the file 0644 again chmod +x %buildroot/$vmlinux - fi -%endif - if $compressed; then - gzip -n -9 %buildroot/$vmlinux - chmod a-x %buildroot/$vmlinux.gz + if test $1 == "--compressed"; then + gzip -n -k -9 %buildroot/$vmlinux + ghost_vmlinux=true + else + ghost_vmlinux=false fi } -%if %build_kdump - add_vmlinux - image=vmlinux -%else - # architecture specifics %ifarch %ix86 x86_64 add_vmlinux --compressed @@ -643,8 +613,9 @@ cp -p arch/arm64/boot/$image %buildroot/boot/$image-%kernelrelease-%build_flavor %endif -# end of build_kdump -%endif +if test -x /usr/lib/rpm/pesign/gen-hmac; then + $_ -r %buildroot /boot/$image-%kernelrelease-%build_flavor +fi # Package the compiled-in certificates as DER files in /etc/uefi/certs # and have mokutil enroll them when the kernel is installed @@ -700,7 +671,7 @@ done done -%if %build_kdump || %build_xen || %build_vanilla || %build_ps3 +%if %build_xen || %build_vanilla # keep this -suffix list in sync with post.sh and postun.sh suffix=-%build_flavor %endif @@ -728,6 +699,8 @@ # space in /boot. dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \ bs=1024 seek=2047 count=1 +# Also reserve some space for the kdump initrd +cp %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump} if [ %CONFIG_MODULES = y ]; then mkdir -p %rpm_install_dir/%cpu_arch_flavor @@ -871,7 +844,7 @@ } # Collect the file lists. -shopt -s nullglob +shopt -s nullglob dotglob
%my_builddir/kernel-devel.files for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do f=${file##%buildroot} @@ -879,22 +852,39 @@ done
{ cd %buildroot - find boot \ - \( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \ - -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \ - -type f -printf '/%%p\n' - - # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that - # the file gets removed when uninstalling the kernel. - echo '%%ghost /boot/initrd-%kernelrelease-%build_flavor-kdump' - touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-%build_flavor-kdump + for f in boot/*; do + if test -L "$f"; then + echo "%%ghost /$f" + continue + elif test ! -f "$f"; then + continue + fi + case "$f" in + boot/initrd-*) + echo "%%ghost /$f" + continue + ;; + boot/vmlinux-*.gz) + ;; + boot/vmlinux-*) + if $ghost_vmlinux; then + echo "%%ghost /$f" + continue + fi + ;; + boot/symtypes*) + continue + ;; + esac + echo "%%attr(0644, root, root) /$f" + done if [ %CONFIG_MODULES = y ]; then find lib/modules/%kernelrelease-%build_flavor \ -type d -o \ \( -path '*/modules.*' ! -path '*/modules.order' \ ! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \ - -o -name '*.ko' -prune -o -printf '/%%p\n' + -o -name '*.ko' -prune -o -type f -printf '/%%p\n' cat %my_builddir/base-modules fi if test %CONFIG_MODULE_SIG = "y"; then @@ -907,10 +897,7 @@ if [ -e .%_docdir/%name ]; then echo "%%doc %_docdir/%name" fi -} | sort -u >%my_builddir/tmp -cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \ - add_dirs_to_filelist >%my_builddir/kernel-base.files -rm %my_builddir/tmp +} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files %if %split_base add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \ @@ -1076,16 +1063,4 @@ %endif %endif -%package devel-debuginfo -# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz -Summary: Debug information for package %name-devel -Group: Development/Debug - -%description devel-debuginfo -Debug information for package %name-devel - - -%source_timestamp -%files devel-debuginfo -f vmlinux.debug.files - %changelog ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:02.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:02.000000000 +0200 @@ -16,7 +16,6 @@ <package>kernel-exynos</package> <package>kernel-lpae</package> <package>kernel-pae</package> -<package>kernel-trace</package> <package>kernel-vanilla</package> <package>kernel-xen</package> </conditions> ++++++ config.conf ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:02.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:02.000000000 +0200 @@ -15,7 +15,6 @@ +i386 i386/xen +i386 -syms i386/ec2 +i386 i386/vanilla -+i386 -syms i386/trace +x86_64 x86_64/default +x86_64 x86_64/desktop @@ -23,17 +22,14 @@ +x86_64 -syms x86_64/ec2 +x86_64 -syms x86_64/debug +x86_64 x86_64/vanilla -+x86_64 -syms x86_64/trace +ppc ppc/default +ppc ppc/vanilla +ppc64 ppc64/default -+ppc64 -syms ppc64/trace +ppc64 -syms ppc64/debug +ppc64 ppc64/vanilla +ppc64le ppc64le/default -+ppc64le -syms ppc64le/trace +ppc64le -syms ppc64le/debug +ppc64le ppc64le/vanilla @@ -45,5 +41,4 @@ +arm64 arm64/default +s390x s390x/default -+s390x -syms s390x/trace +s390x s390x/vanilla ++++++ config.sh ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:02.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:02.000000000 +0200 @@ -1,5 +1,5 @@ # The version of the main tarball to use -SRCVERSION=3.14 +SRCVERSION=3.15-rc5 # variant of the kernel-source package, either empty or "-rt" VARIANT= # buildservice projects to build the kernel against ++++++ config.tar.bz2 ++++++ ++++ 55297 lines of diff (skipped) ++++++ kernel-binary.spec.in ++++++ --- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:03.000000000 +0200 +++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:03.000000000 +0200 @@ -28,10 +28,8 @@ %define build_flavor @FLAVOR@ %define build_default (%build_flavor == "default") -%define build_kdump (%build_flavor == "kdump") %define build_xen (%build_flavor == "xen" || %build_flavor == "ec2") %define build_vanilla (%build_flavor == "vanilla") -%define build_ps3 (%build_flavor == "ps3") %define build_src_dir %my_builddir/linux-%srcversion %define src_install_dir /usr/src/linux-%kernelrelease%variant @@ -71,6 +69,7 @@ BuildRequires: bc BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: hmaccalc BuildRequires: modutils BuildRequires: sparse # Used to sign the kernel in the buildservice @@ -407,49 +406,20 @@ add_vmlinux() { - local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor - if test $1 == "--compressed"; then - compressed=true - fi cp vmlinux %buildroot/$vmlinux - >%my_builddir/vmlinux.debug.files -%if 0%{?__debug_package:1} - if $compressed; then - local vmlinux_debug=usr/lib/debug/$vmlinux.debug - mkdir -p $(dirname %buildroot/$vmlinux_debug) - /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ - -l vmlinux.sourcefiles %buildroot/$vmlinux - # FIXME: create and package build-id symlinks - objcopy --only-keep-debug \ - %buildroot/$vmlinux \ - %buildroot/$vmlinux_debug || : - objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \ - --strip-debug \ - %buildroot/$vmlinux || : - mkdir -p %buildroot/usr/src/debug - LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \ - | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) - find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 - find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 - echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files + # make sure that find-debuginfo.sh picks it up. In the filelist, we + # mark the file 0644 again + chmod +x %buildroot/$vmlinux + if test $1 == "--compressed"; then + gzip -n -k -9 %buildroot/$vmlinux + ghost_vmlinux=true else - # make vmlinux executable so that find-debuginfo.sh picks it up - # (TODO: fix find-debuginfo.sh instead) - chmod +x %buildroot/$vmlinux - fi -%endif - if $compressed; then - gzip -n -9 %buildroot/$vmlinux - chmod a-x %buildroot/$vmlinux.gz + ghost_vmlinux=false fi } -%if %build_kdump - add_vmlinux - image=vmlinux -%else - # architecture specifics %ifarch %ix86 x86_64 add_vmlinux --compressed @@ -515,8 +485,9 @@ cp -p arch/arm64/boot/$image %buildroot/boot/$image-%kernelrelease-%build_flavor %endif -# end of build_kdump -%endif +if test -x /usr/lib/rpm/pesign/gen-hmac; then + $_ -r %buildroot /boot/$image-%kernelrelease-%build_flavor +fi # Package the compiled-in certificates as DER files in /etc/uefi/certs # and have mokutil enroll them when the kernel is installed @@ -572,7 +543,7 @@ done done -%if %build_kdump || %build_xen || %build_vanilla || %build_ps3 +%if %build_xen || %build_vanilla # keep this -suffix list in sync with post.sh and postun.sh suffix=-%build_flavor %endif @@ -600,6 +571,8 @@ # space in /boot. dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \ bs=1024 seek=2047 count=1 +# Also reserve some space for the kdump initrd +cp %buildroot/boot/initrd-%kernelrelease-%build_flavor{,-kdump} if [ %CONFIG_MODULES = y ]; then mkdir -p %rpm_install_dir/%cpu_arch_flavor @@ -743,7 +716,7 @@ } # Collect the file lists. -shopt -s nullglob +shopt -s nullglob dotglob
%my_builddir/kernel-devel.files for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do f=${file##%buildroot} @@ -751,22 +724,39 @@ done
{ cd %buildroot
- find boot \
- \( -type l -o -name 'initrd-*' \) -printf '%%%%ghost /%%p\n' -o \
- -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \
- -type f -printf '/%%p\n'
-
- # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that
- # the file gets removed when uninstalling the kernel.
- echo '%%ghost /boot/initrd-%kernelrelease-%build_flavor-kdump'
- touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-%build_flavor-kdump
+ for f in boot/*; do
+ if test -L "$f"; then
+ echo "%%ghost /$f"
+ continue
+ elif test ! -f "$f"; then
+ continue
+ fi
+ case "$f" in
+ boot/initrd-*)
+ echo "%%ghost /$f"
+ continue
+ ;;
+ boot/vmlinux-*.gz)
+ ;;
+ boot/vmlinux-*)
+ if $ghost_vmlinux; then
+ echo "%%ghost /$f"
+ continue
+ fi
+ ;;
+ boot/symtypes*)
+ continue
+ ;;
+ esac
+ echo "%%attr(0644, root, root) /$f"
+ done
if [ %CONFIG_MODULES = y ]; then
find lib/modules/%kernelrelease-%build_flavor \
-type d -o \
\( -path '*/modules.*' ! -path '*/modules.order' \
! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \
- -o -name '*.ko' -prune -o -printf '/%%p\n'
+ -o -name '*.ko' -prune -o -type f -printf '/%%p\n'
cat %my_builddir/base-modules
fi
if test %CONFIG_MODULE_SIG = "y"; then
@@ -779,10 +769,7 @@
if [ -e .%_docdir/%name ]; then
echo "%%doc %_docdir/%name"
fi
-} | sort -u >%my_builddir/tmp
-cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \
- add_dirs_to_filelist >%my_builddir/kernel-base.files
-rm %my_builddir/tmp
+} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files
%if %split_base
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
@@ -942,16 +929,4 @@
%endif
%endif
-%package devel-debuginfo
-# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
-Summary: Debug information for package %name-devel
-Group: Development/Debug
-
-%description devel-debuginfo
-Debug information for package %name-devel
-
-
-%source_timestamp
-%files devel-debuginfo -f vmlinux.debug.files
-
%changelog
++++++ kernel-obs-build.spec.in ++++++
--- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:03.000000000 +0200
+++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:03.000000000 +0200
@@ -36,8 +36,8 @@
ExclusiveArch: @ARCHS@
%if 0%{?suse_version} < 1320
# For SLE 11
-BuildRequires: yast2-bootloader
BuildRequires: mkinitrd
+BuildRequires: perl-Bootloader
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%else
BuildRequires: dracut
@@ -115,7 +115,7 @@
%else
dracut --host-only --drivers="$KERNEL_MODULES" --force /tmp/initrd.kvm `echo /boot/%{kernel_name}-*-default | sed -n -e 's,[^-]*-\(.*-default\),\1,p'`
%ifarch %ix86 x86_64
-dracut --host-only --drivers="$KERNEL_MODULES" --force /tmp/initrd.xen `echo /boot/%{kernel_name}-*-xen | sed -n -e 's,[^-]*-\(.*-xen\),\1,p'`
+dracut --host-only --drivers="$KERNEL_MODULES xenblk" --force /tmp/initrd.xen `echo /boot/%{kernel_name}-*-xen | sed -n -e 's,[^-]*-\(.*-xen\),\1,p'`
%endif
%endif
++++++ kernel-obs-qa.spec.in ++++++
--- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:03.000000000 +0200
+++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:03.000000000 +0200
@@ -22,12 +22,12 @@
%include %_sourcedir/kernel-spec-macros
-Name: kernel-obs-qa
-BuildRequires: kernel-default
+Name: @NAME@
+BuildRequires: kernel-@FLAVOR@
+# kernel-obs-build must be also configured as VMinstall, but is required
+# here as well to avoid that qa and build package build parallel
+BuildRequires: kernel-obs-build
BuildRequires: modutils
-%ifarch %ix86 x86_64
-BuildRequires: kernel-xen
-%endif
ExclusiveArch: @ARCHS@
%if 0%{?suse_version} < 1200
# for SLE 11
@@ -59,14 +59,22 @@
# test suites should be packaged in other packages, but build required
# and called here.
-/sbin/modprobe loop || exit 1
+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
+fi
+
%install
-mkdir -p %{buildroot}/usr/share/kernel-qa/
-touch %{buildroot}/usr/share/kernel-qa/logfile
+mkdir -p %{buildroot}/usr/share/%name
+touch %{buildroot}/usr/share/%name/logfile
%files
%defattr(-,root,root)
-/usr/share/kernel-qa
+/usr/share/%name
%changelog
++++++ mkspec ++++++
--- /var/tmp/diff_new_pack.W43ngK/_old 2014-05-23 10:56:03.000000000 +0200
+++ /var/tmp/diff_new_pack.W43ngK/_new 2014-05-23 10:56:03.000000000 +0200
@@ -136,12 +136,25 @@
REQUIRES => $requires,
ARCHS => $all_archs);
}
- # kernel-obs-*.spec
+}
+
+# kernel-obs-*.spec
+{
+ my $default_archs = join(" ", arch2rpm(@{$flavor_archs{default}}));
+ my $xen_archs = join(" ", arch2rpm(@{$flavor_archs{xen} || []}));
if (!$variant) {
do_spec('obs-build', "kernel-obs-build.spec", %macros,
- ARCHS => $all_archs);
+ ARCHS => $default_archs);
do_spec('obs-qa', "kernel-obs-qa.spec", %macros,
- ARCHS => $all_archs);
+ ARCHS => $default_archs,
+ NAME => "kernel-obs-qa",
+ FLAVOR => "default");
+ }
+ if ($xen_archs) {
+ do_spec('obs-qa', "kernel-obs-qa-xen.spec", %macros,
+ ARCHS => $xen_archs,
+ NAME => "kernel-obs-qa-xen",
+ FLAVOR => "xen");
}
}
++++++ patches.arch.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/acpi_thermal_passive_blacklist.patch new/patches.arch/acpi_thermal_passive_blacklist.patch
--- old/patches.arch/acpi_thermal_passive_blacklist.patch 2014-02-17 09:32:04.000000000 +0100
+++ new/patches.arch/acpi_thermal_passive_blacklist.patch 2014-04-27 20:22:13.000000000 +0200
@@ -16,9 +16,9 @@
+#include