Accepting request 241011 from devel:openSUSE:Factory:kernel

- Update to 3.16-rc5.

OBS-URL: https://build.opensuse.org/request/show/241011
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kernel-source?expand=0&rev=240
This commit is contained in:
Stephan Kulow 2014-07-18 12:03:22 +00:00 committed by Git OBS Bridge
parent 44d3c947e2
commit 31e7f49bd7
55 changed files with 3730 additions and 107977 deletions

View File

@ -13,8 +13,6 @@
<package>kernel-default</package>
<package>kernel-desktop</package>
<package>kernel-ec2</package>
<package>kernel-exynos</package>
<package>kernel-lpae</package>
<package>kernel-pae</package>
<package>kernel-vanilla</package>
<package>kernel-xen</package>

10
compress-vmlinux.sh Normal file
View File

@ -0,0 +1,10 @@
#!/bin/bash
set -x
vmlinux=$1
if test -e "$vmlinux" -a -e "$vmlinux.gz"; then
# Deliberately not using gzip -n; the vmlinux image has a predictable
# timestamp (bnc#880848#c20)
gzip -k -9 -f "$vmlinux"
fi

View File

@ -34,11 +34,11 @@
+ppc64le ppc64le/vanilla
# ARM architectures
+armv6hl armv6hl/default
+armv7hl armv7hl/default
+armv7hl armv7hl/lpae
+armv7hl armv7hl/exynos
+arm64 arm64/default
#+armv6hl armv6hl/default
#+armv7hl armv7hl/default
#+armv7hl armv7hl/lpae
#+armv7hl armv7hl/exynos
#+arm64 arm64/default
+s390x s390x/default
+s390x s390x/vanilla

View File

@ -1,9 +1,10 @@
# The version of the main tarball to use
SRCVERSION=3.15
SRCVERSION=3.16-rc5
# variant of the kernel-source package, either empty or "-rt"
VARIANT=
# buildservice projects to build the kernel against
OBS_PROJECT=openSUSE:13.1:Update
OBS_PROJECT_ARM=openSUSE:12.2:ARM
IBS_PROJECT=
IBS_PROJECT_ARM=Devel:ARM:12.3
OBS_PROJECT=openSUSE:Factory
OBS_PROJECT_ARM=openSUSE:Factory:ARM
OBS_PROJECT_PPC=openSUSE:Factory:PowerPC
IBS_PROJECT=SUSE:Factory:Head
IBS_PROJECT_ARM=Devel:ARM:Factory

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cfa77770f310ed09fe89a3e325e2c0c2c79ee028b87cbba28fa93a46823cad58
size 264936
oid sha256:0921ed985369908ac28411d84e0fabbe276ded1f19eb1f1fc332150f35429f16
size 231692

View File

@ -35,7 +35,7 @@
%define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
%define kernel_build_dir %build_src_dir/linux-obj
%(chmod +x %_sourcedir/{@SCRIPTS@})
@ -113,10 +113,6 @@ Requires(post): distribution-release
# but are not needed to build the kernel
#!BuildIgnore: autoconf automake gettext-runtime libtool cvs gettext-tools m4 udev insserv
%ifarch ia64
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
%ifarch s390 s390x
%if %build_vanilla && 0%{?suse_version} < 1130
BuildRequires: dwarfextract
@ -295,12 +291,12 @@ if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
if test -e ../config.addon/%cpu_arch_flavor; then
if test -e %my_builddir/config.addon/%cpu_arch_flavor; then
# FIXME: config.addon doesn't affect the %CONFIG_ macros defined at
# the top of the specfile
%_sourcedir/configtool.pl ../config{,.addon}/%cpu_arch_flavor >.config
%_sourcedir/configtool.pl %my_builddir/config{,.addon}/%cpu_arch_flavor >.config
else
cp ../config/%cpu_arch_flavor .config
cp %my_builddir/config/%cpu_arch_flavor .config
fi
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%source_rel-%build_flavor \
@ -357,7 +353,7 @@ fi
# You can also set this permanently in ~/.rpmmacros:
# %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat)
%if %CONFIG_KMSG_IDS == "y"
chmod +x ../linux-%srcversion/scripts/kmsg-doc
chmod +x ../scripts/kmsg-doc
MAKE_ARGS="$MAKE_ARGS D=2"
%endif
@ -415,25 +411,17 @@ add_vmlinux()
# mark the file 0644 again
chmod +x %buildroot/$vmlinux
if test $1 == "--compressed"; then
# avoid using the gzip -n option to make kdump happy (bnc#880848#c20)
ts="$(head -n1 %_sourcedir/source-timestamp)"
touch -d "$ts" %buildroot/$vmlinux
touch %buildroot/$vmlinux.gz
%if 0%{?__debug_package:1}
# split the debug information just to keep the compressed file
# reasonably small
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp %buildroot/$vmlinux{,.save}
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
--strip-debug \
%buildroot/$vmlinux || :
# let find-debuginfo.sh do the real job
rm -f %buildroot/$vmlinux_debug
# compress the vmlinux image after find-debuginfo.sh has processed it
%global __debug_install_post %__debug_install_post \
%_sourcedir/compress-vmlinux.sh %buildroot/boot/vmlinux-%kernelrelease-%build_flavor
%else
%_sourcedir/compress-vmlinux.sh %buildroot/$vmlinux
%endif
gzip -n -k -9 %buildroot/$vmlinux
if test -e %buildroot/$vmlinux.save; then
mv -f %buildroot/$vmlinux{.save,}
fi
ghost_vmlinux=true
else
ghost_vmlinux=false
@ -450,21 +438,10 @@ add_vmlinux()
cp -p arch/x86/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
image=vmlinuz
%endif
%ifarch alpha
add_vmlinux --compressed
cp -p arch/alpha/boot/vmlinux.gz %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
image=vmlinuz
%endif
%ifarch ppc ppc64 ppc64le
add_vmlinux
image=vmlinux
%endif
%ifarch ia64
add_vmlinux --compressed
mv %buildroot/boot/vmlinux-%kernelrelease-%build_flavor.gz \
%buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
image=vmlinuz
%endif
%ifarch s390 s390x
add_vmlinux --compressed
cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor
@ -479,12 +456,6 @@ add_vmlinux()
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
%endif
%endif
%ifarch sparc64
add_vmlinux --compressed
image=zImage
cp -p arch/sparc/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
image=vmlinux
%endif
%ifarch %arm
add_vmlinux --compressed
case "%build_flavor" in
@ -584,6 +555,7 @@ fi
%if %install_vdso
# Install the unstripped vdso's that are linked in the kernel image
make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
rm -rf %buildroot/lib/modules/%kernelrelease-%build_flavor/vdso/.build-id
%endif
# Create a dummy initrd with roughly the size the real one will have.
@ -713,9 +685,10 @@ if [ %CONFIG_MODULES = y ]; then
strip "$f"
esac
done
# Replace the absolute with a relative path
sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \
%rpm_install_dir/%cpu_arch_flavor/Makefile
# Recreate the generated Makefile with correct path
sh ../scripts/mkmakefile ../../../linux-%kernelrelease%variant \
%rpm_install_dir/%cpu_arch_flavor \
$(echo %srcversion | sed -r 's/^([0-9]+)\.([0-9]+)[\.-].*/\1 \2/')
fi
add_dirs_to_filelist() {

File diff suppressed because it is too large Load Diff

View File

@ -19,8 +19,8 @@
# This makes the OBS store the project cert as %_sourcedir/_projectcert.crt
# needssslcertforbuild
%define srcversion 3.15
%define patchversion 3.15.5
%define srcversion 3.16-rc5
%define patchversion 3.16.0-rc5
%define variant %{nil}
%define vanilla_only 0
@ -35,9 +35,9 @@
%define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
%define kernel_build_dir %build_src_dir/linux-obj
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver})
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver,compress-vmlinux.sh})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
@ -59,11 +59,11 @@ Name: kernel-debug
Summary: A Debug Version of the Kernel
License: GPL-2.0
Group: System/Kernel
Version: 3.15.5
Version: 3.16.rc5
%if 0%{?is_kotd}
Release: <RELEASE>.g01d2774
Release: <RELEASE>.ge709184
%else
Release: <RELEASE>.g01d2774
Release: 0
%endif
Url: http://www.kernel.org/
BuildRequires: bc
@ -113,10 +113,6 @@ Requires(post): distribution-release
# but are not needed to build the kernel
#!BuildIgnore: autoconf automake gettext-runtime libtool cvs gettext-tools m4 udev insserv
%ifarch ia64
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
%ifarch s390 s390x
%if %build_vanilla && 0%{?suse_version} < 1130
BuildRequires: dwarfextract
@ -152,7 +148,7 @@ Provides: kernel = %version-%source_rel
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
@ -198,6 +194,7 @@ Source68: host-memcpy-hack.h
Source69: try-disable-staging-driver
Source70: kernel-obs-build.spec.in
Source71: kernel-obs-qa.spec.in
Source72: compress-vmlinux.sh
Source100: config.tar.bz2
Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2
@ -275,6 +272,7 @@ NoSource: 68
NoSource: 69
NoSource: 70
NoSource: 71
NoSource: 72
NoSource: 100
NoSource: 101
NoSource: 102
@ -421,12 +419,12 @@ if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
if test -e ../config.addon/%cpu_arch_flavor; then
if test -e %my_builddir/config.addon/%cpu_arch_flavor; then
# FIXME: config.addon doesn't affect the %CONFIG_ macros defined at
# the top of the specfile
%_sourcedir/configtool.pl ../config{,.addon}/%cpu_arch_flavor >.config
%_sourcedir/configtool.pl %my_builddir/config{,.addon}/%cpu_arch_flavor >.config
else
cp ../config/%cpu_arch_flavor .config
cp %my_builddir/config/%cpu_arch_flavor .config
fi
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%source_rel-%build_flavor \
@ -483,7 +481,7 @@ fi
# You can also set this permanently in ~/.rpmmacros:
# %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat)
%if %CONFIG_KMSG_IDS == "y"
chmod +x ../linux-%srcversion/scripts/kmsg-doc
chmod +x ../scripts/kmsg-doc
MAKE_ARGS="$MAKE_ARGS D=2"
%endif
@ -541,25 +539,17 @@ add_vmlinux()
# mark the file 0644 again
chmod +x %buildroot/$vmlinux
if test $1 == "--compressed"; then
# avoid using the gzip -n option to make kdump happy (bnc#880848#c20)
ts="$(head -n1 %_sourcedir/source-timestamp)"
touch -d "$ts" %buildroot/$vmlinux
touch %buildroot/$vmlinux.gz
%if 0%{?__debug_package:1}
# split the debug information just to keep the compressed file
# reasonably small
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp %buildroot/$vmlinux{,.save}
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
--strip-debug \
%buildroot/$vmlinux || :
# let find-debuginfo.sh do the real job
rm -f %buildroot/$vmlinux_debug
# compress the vmlinux image after find-debuginfo.sh has processed it
%global __debug_install_post %__debug_install_post \
%_sourcedir/compress-vmlinux.sh %buildroot/boot/vmlinux-%kernelrelease-%build_flavor
%else
%_sourcedir/compress-vmlinux.sh %buildroot/$vmlinux
%endif
gzip -n -k -9 %buildroot/$vmlinux
if test -e %buildroot/$vmlinux.save; then
mv -f %buildroot/$vmlinux{.save,}
fi
ghost_vmlinux=true
else
ghost_vmlinux=false
@ -576,21 +566,10 @@ add_vmlinux()
cp -p arch/x86/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
image=vmlinuz
%endif
%ifarch alpha
add_vmlinux --compressed
cp -p arch/alpha/boot/vmlinux.gz %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
image=vmlinuz
%endif
%ifarch ppc ppc64 ppc64le
add_vmlinux
image=vmlinux
%endif
%ifarch ia64
add_vmlinux --compressed
mv %buildroot/boot/vmlinux-%kernelrelease-%build_flavor.gz \
%buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
image=vmlinuz
%endif
%ifarch s390 s390x
add_vmlinux --compressed
cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor
@ -605,12 +584,6 @@ add_vmlinux()
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
%endif
%endif
%ifarch sparc64
add_vmlinux --compressed
image=zImage
cp -p arch/sparc/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
image=vmlinux
%endif
%ifarch %arm
add_vmlinux --compressed
case "%build_flavor" in
@ -710,6 +683,7 @@ fi
%if %install_vdso
# Install the unstripped vdso's that are linked in the kernel image
make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
rm -rf %buildroot/lib/modules/%kernelrelease-%build_flavor/vdso/.build-id
%endif
# Create a dummy initrd with roughly the size the real one will have.
@ -839,9 +813,10 @@ if [ %CONFIG_MODULES = y ]; then
strip "$f"
esac
done
# Replace the absolute with a relative path
sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \
%rpm_install_dir/%cpu_arch_flavor/Makefile
# Recreate the generated Makefile with correct path
sh ../scripts/mkmakefile ../../../linux-%kernelrelease%variant \
%rpm_install_dir/%cpu_arch_flavor \
$(echo %srcversion | sed -r 's/^([0-9]+)\.([0-9]+)[\.-].*/\1 \2/')
fi
add_dirs_to_filelist() {

File diff suppressed because it is too large Load Diff

View File

@ -19,8 +19,8 @@
# This makes the OBS store the project cert as %_sourcedir/_projectcert.crt
# needssslcertforbuild
%define srcversion 3.15
%define patchversion 3.15.5
%define srcversion 3.16-rc5
%define patchversion 3.16.0-rc5
%define variant %{nil}
%define vanilla_only 0
@ -35,9 +35,9 @@
%define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
%define kernel_build_dir %build_src_dir/linux-obj
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver})
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver,compress-vmlinux.sh})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
@ -59,11 +59,11 @@ Name: kernel-default
Summary: The Standard Kernel
License: GPL-2.0
Group: System/Kernel
Version: 3.15.5
Version: 3.16.rc5
%if 0%{?is_kotd}
Release: <RELEASE>.g01d2774
Release: <RELEASE>.ge709184
%else
Release: <RELEASE>.g01d2774
Release: 0
%endif
Url: http://www.kernel.org/
BuildRequires: bc
@ -113,10 +113,6 @@ Requires(post): distribution-release
# but are not needed to build the kernel
#!BuildIgnore: autoconf automake gettext-runtime libtool cvs gettext-tools m4 udev insserv
%ifarch ia64
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
%ifarch s390 s390x
%if %build_vanilla && 0%{?suse_version} < 1130
BuildRequires: dwarfextract
@ -153,6 +149,8 @@ Provides: kernel-smp = 2.6.17
Obsoletes: kernel-smp <= 2.6.17
Provides: kernel-trace = 3.13
Obsoletes: kernel-trace <= 3.13
Provides: kernel-trace-base = 3.13
Obsoletes: kernel-trace-base <= 3.13
%endif
%ifarch ppc64
Provides: kernel-kdump = 2.6.28
@ -161,14 +159,18 @@ Obsoletes: kernel-kdump <= 2.6.28
%ifarch s390x
Provides: kernel-trace = 3.13
Obsoletes: kernel-trace <= 3.13
Provides: kernel-trace-base = 3.13
Obsoletes: kernel-trace-base <= 3.13
%endif
%ifarch x86_64
Provides: kernel-smp = 2.6.17
Obsoletes: kernel-smp <= 2.6.17
Provides: kernel-trace = 3.13
Obsoletes: kernel-trace <= 3.13
Provides: kernel-trace-base = 3.13
Obsoletes: kernel-trace-base <= 3.13
%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
@ -214,6 +216,7 @@ Source68: host-memcpy-hack.h
Source69: try-disable-staging-driver
Source70: kernel-obs-build.spec.in
Source71: kernel-obs-qa.spec.in
Source72: compress-vmlinux.sh
Source100: config.tar.bz2
Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2
@ -231,7 +234,7 @@ Source113: patches.kabi.tar.bz2
Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: aarch64 armv6hl armv7hl %ix86 ppc ppc64 ppc64le s390x x86_64
ExclusiveArch: %ix86 ppc ppc64 ppc64le s390x x86_64
%define kmp_target_cpu %_target_cpu
%ifarch %ix86
# Only i386/default supports i586, mark other flavors' packages as i686
@ -291,6 +294,7 @@ NoSource: 68
NoSource: 69
NoSource: 70
NoSource: 71
NoSource: 72
NoSource: 100
NoSource: 101
NoSource: 102
@ -436,12 +440,12 @@ if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
if test -e ../config.addon/%cpu_arch_flavor; then
if test -e %my_builddir/config.addon/%cpu_arch_flavor; then
# FIXME: config.addon doesn't affect the %CONFIG_ macros defined at
# the top of the specfile
%_sourcedir/configtool.pl ../config{,.addon}/%cpu_arch_flavor >.config
%_sourcedir/configtool.pl %my_builddir/config{,.addon}/%cpu_arch_flavor >.config
else
cp ../config/%cpu_arch_flavor .config
cp %my_builddir/config/%cpu_arch_flavor .config
fi
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%source_rel-%build_flavor \
@ -498,7 +502,7 @@ fi
# You can also set this permanently in ~/.rpmmacros:
# %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat)
%if %CONFIG_KMSG_IDS == "y"
chmod +x ../linux-%srcversion/scripts/kmsg-doc
chmod +x ../scripts/kmsg-doc
MAKE_ARGS="$MAKE_ARGS D=2"
%endif
@ -556,25 +560,17 @@ add_vmlinux()
# mark the file 0644 again
chmod +x %buildroot/$vmlinux
if test $1 == "--compressed"; then
# avoid using the gzip -n option to make kdump happy (bnc#880848#c20)
ts="$(head -n1 %_sourcedir/source-timestamp)"
touch -d "$ts" %buildroot/$vmlinux
touch %buildroot/$vmlinux.gz
%if 0%{?__debug_package:1}
# split the debug information just to keep the compressed file
# reasonably small
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp %buildroot/$vmlinux{,.save}
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
--strip-debug \
%buildroot/$vmlinux || :
# let find-debuginfo.sh do the real job
rm -f %buildroot/$vmlinux_debug
# compress the vmlinux image after find-debuginfo.sh has processed it
%global __debug_install_post %__debug_install_post \
%_sourcedir/compress-vmlinux.sh %buildroot/boot/vmlinux-%kernelrelease-%build_flavor
%else
%_sourcedir/compress-vmlinux.sh %buildroot/$vmlinux
%endif
gzip -n -k -9 %buildroot/$vmlinux
if test -e %buildroot/$vmlinux.save; then
mv -f %buildroot/$vmlinux{.save,}
fi
ghost_vmlinux=true
else
ghost_vmlinux=false
@ -591,21 +587,10 @@ add_vmlinux()
cp -p arch/x86/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
image=vmlinuz
%endif
%ifarch alpha
add_vmlinux --compressed
cp -p arch/alpha/boot/vmlinux.gz %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
image=vmlinuz
%endif
%ifarch ppc ppc64 ppc64le
add_vmlinux
image=vmlinux
%endif
%ifarch ia64
add_vmlinux --compressed
mv %buildroot/boot/vmlinux-%kernelrelease-%build_flavor.gz \
%buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
image=vmlinuz
%endif
%ifarch s390 s390x
add_vmlinux --compressed
cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor
@ -620,12 +605,6 @@ add_vmlinux()
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
%endif
%endif
%ifarch sparc64
add_vmlinux --compressed
image=zImage
cp -p arch/sparc/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
image=vmlinux
%endif
%ifarch %arm
add_vmlinux --compressed
case "%build_flavor" in
@ -725,6 +704,7 @@ fi
%if %install_vdso
# Install the unstripped vdso's that are linked in the kernel image
make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
rm -rf %buildroot/lib/modules/%kernelrelease-%build_flavor/vdso/.build-id
%endif
# Create a dummy initrd with roughly the size the real one will have.
@ -854,9 +834,10 @@ if [ %CONFIG_MODULES = y ]; then
strip "$f"
esac
done
# Replace the absolute with a relative path
sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \
%rpm_install_dir/%cpu_arch_flavor/Makefile
# Recreate the generated Makefile with correct path
sh ../scripts/mkmakefile ../../../linux-%kernelrelease%variant \
%rpm_install_dir/%cpu_arch_flavor \
$(echo %srcversion | sed -r 's/^([0-9]+)\.([0-9]+)[\.-].*/\1 \2/')
fi
add_dirs_to_filelist() {
@ -974,18 +955,7 @@ Requires(pre): coreutils awk
Requires(post): modutils
Requires(post): perl-Bootloader
Requires(post): mkinitrd
%ifarch %ix86
Provides: kernel-trace-base = 3.13
Obsoletes: kernel-trace-base <= 3.13
%endif
%ifarch s390x
Provides: kernel-trace-base = 3.13
Obsoletes: kernel-trace-base <= 3.13
%endif
%ifarch x86_64
Provides: kernel-trace-base = 3.13
Obsoletes: kernel-trace-base <= 3.13
%endif
%ifarch %ix86
Conflicts: libc.so.6()(64bit)
%endif

File diff suppressed because it is too large Load Diff

View File

@ -19,8 +19,8 @@
# This makes the OBS store the project cert as %_sourcedir/_projectcert.crt
# needssslcertforbuild
%define srcversion 3.15
%define patchversion 3.15.5
%define srcversion 3.16-rc5
%define patchversion 3.16.0-rc5
%define variant %{nil}
%define vanilla_only 0
@ -35,9 +35,9 @@
%define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
%define kernel_build_dir %build_src_dir/linux-obj
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver})
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver,compress-vmlinux.sh})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
@ -59,11 +59,11 @@ Name: kernel-desktop
Summary: Kernel optimized for the desktop
License: GPL-2.0
Group: System/Kernel
Version: 3.15.5
Version: 3.16.rc5
%if 0%{?is_kotd}
Release: <RELEASE>.g01d2774
Release: <RELEASE>.ge709184
%else
Release: <RELEASE>.g01d2774
Release: 0
%endif
Url: http://www.kernel.org/
BuildRequires: bc
@ -113,10 +113,6 @@ Requires(post): distribution-release
# but are not needed to build the kernel
#!BuildIgnore: autoconf automake gettext-runtime libtool cvs gettext-tools m4 udev insserv
%ifarch ia64
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
%ifarch s390 s390x
%if %build_vanilla && 0%{?suse_version} < 1130
BuildRequires: dwarfextract
@ -149,7 +145,7 @@ Conflicts: libc.so.6()(64bit)
%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
@ -195,6 +191,7 @@ Source68: host-memcpy-hack.h
Source69: try-disable-staging-driver
Source70: kernel-obs-build.spec.in
Source71: kernel-obs-qa.spec.in
Source72: compress-vmlinux.sh
Source100: config.tar.bz2
Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2
@ -272,6 +269,7 @@ NoSource: 68
NoSource: 69
NoSource: 70
NoSource: 71
NoSource: 72
NoSource: 100
NoSource: 101
NoSource: 102
@ -430,12 +428,12 @@ if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
if test -e ../config.addon/%cpu_arch_flavor; then
if test -e %my_builddir/config.addon/%cpu_arch_flavor; then
# FIXME: config.addon doesn't affect the %CONFIG_ macros defined at
# the top of the specfile
%_sourcedir/configtool.pl ../config{,.addon}/%cpu_arch_flavor >.config
%_sourcedir/configtool.pl %my_builddir/config{,.addon}/%cpu_arch_flavor >.config
else
cp ../config/%cpu_arch_flavor .config
cp %my_builddir/config/%cpu_arch_flavor .config
fi
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%source_rel-%build_flavor \
@ -492,7 +490,7 @@ fi
# You can also set this permanently in ~/.rpmmacros:
# %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat)
%if %CONFIG_KMSG_IDS == "y"
chmod +x ../linux-%srcversion/scripts/kmsg-doc
chmod +x ../scripts/kmsg-doc
MAKE_ARGS="$MAKE_ARGS D=2"
%endif
@ -550,25 +548,17 @@ add_vmlinux()
# mark the file 0644 again
chmod +x %buildroot/$vmlinux
if test $1 == "--compressed"; then
# avoid using the gzip -n option to make kdump happy (bnc#880848#c20)
ts="$(head -n1 %_sourcedir/source-timestamp)"
touch -d "$ts" %buildroot/$vmlinux
touch %buildroot/$vmlinux.gz
%if 0%{?__debug_package:1}
# split the debug information just to keep the compressed file
# reasonably small
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp %buildroot/$vmlinux{,.save}
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
--strip-debug \
%buildroot/$vmlinux || :
# let find-debuginfo.sh do the real job
rm -f %buildroot/$vmlinux_debug
# compress the vmlinux image after find-debuginfo.sh has processed it
%global __debug_install_post %__debug_install_post \
%_sourcedir/compress-vmlinux.sh %buildroot/boot/vmlinux-%kernelrelease-%build_flavor
%else
%_sourcedir/compress-vmlinux.sh %buildroot/$vmlinux
%endif
gzip -n -k -9 %buildroot/$vmlinux
if test -e %buildroot/$vmlinux.save; then
mv -f %buildroot/$vmlinux{.save,}
fi
ghost_vmlinux=true
else
ghost_vmlinux=false
@ -585,21 +575,10 @@ add_vmlinux()
cp -p arch/x86/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
image=vmlinuz
%endif
%ifarch alpha
add_vmlinux --compressed
cp -p arch/alpha/boot/vmlinux.gz %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
image=vmlinuz
%endif
%ifarch ppc ppc64 ppc64le
add_vmlinux
image=vmlinux
%endif
%ifarch ia64
add_vmlinux --compressed
mv %buildroot/boot/vmlinux-%kernelrelease-%build_flavor.gz \
%buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
image=vmlinuz
%endif
%ifarch s390 s390x
add_vmlinux --compressed
cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor
@ -614,12 +593,6 @@ add_vmlinux()
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
%endif
%endif
%ifarch sparc64
add_vmlinux --compressed
image=zImage
cp -p arch/sparc/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
image=vmlinux
%endif
%ifarch %arm
add_vmlinux --compressed
case "%build_flavor" in
@ -719,6 +692,7 @@ fi
%if %install_vdso
# Install the unstripped vdso's that are linked in the kernel image
make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
rm -rf %buildroot/lib/modules/%kernelrelease-%build_flavor/vdso/.build-id
%endif
# Create a dummy initrd with roughly the size the real one will have.
@ -848,9 +822,10 @@ if [ %CONFIG_MODULES = y ]; then
strip "$f"
esac
done
# Replace the absolute with a relative path
sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \
%rpm_install_dir/%cpu_arch_flavor/Makefile
# Recreate the generated Makefile with correct path
sh ../scripts/mkmakefile ../../../linux-%kernelrelease%variant \
%rpm_install_dir/%cpu_arch_flavor \
$(echo %srcversion | sed -r 's/^([0-9]+)\.([0-9]+)[\.-].*/\1 \2/')
fi
add_dirs_to_filelist() {

File diff suppressed because it is too large Load Diff

View File

@ -16,7 +16,7 @@
#
%define patchversion 3.15.5
%define patchversion 3.16.0-rc5
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@ -25,11 +25,11 @@ Name: kernel-docs
Summary: Kernel Documentation
License: GPL-2.0
Group: Documentation/Man
Version: 3.15.5
Version: 3.16.rc5
%if 0%{?is_kotd}
Release: <RELEASE>.g01d2774
Release: <RELEASE>.ge709184
%else
Release: <RELEASE>.g01d2774
Release: 0
%endif
BuildRequires: docbook-toys
BuildRequires: docbook-utils

File diff suppressed because it is too large Load Diff

View File

@ -19,8 +19,8 @@
# This makes the OBS store the project cert as %_sourcedir/_projectcert.crt
# needssslcertforbuild
%define srcversion 3.15
%define patchversion 3.15.5
%define srcversion 3.16-rc5
%define patchversion 3.16.0-rc5
%define variant %{nil}
%define vanilla_only 0
@ -35,9 +35,9 @@
%define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
%define kernel_build_dir %build_src_dir/linux-obj
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver})
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver,compress-vmlinux.sh})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
@ -59,11 +59,11 @@ Name: kernel-ec2
Summary: The Amazon EC2 Xen Kernel
License: GPL-2.0
Group: System/Kernel
Version: 3.15.5
Version: 3.16.rc5
%if 0%{?is_kotd}
Release: <RELEASE>.g01d2774
Release: <RELEASE>.ge709184
%else
Release: <RELEASE>.g01d2774
Release: 0
%endif
Url: http://www.kernel.org/
BuildRequires: bc
@ -113,10 +113,6 @@ Requires(post): distribution-release
# but are not needed to build the kernel
#!BuildIgnore: autoconf automake gettext-runtime libtool cvs gettext-tools m4 udev insserv
%ifarch ia64
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
%ifarch s390 s390x
%if %build_vanilla && 0%{?suse_version} < 1130
BuildRequires: dwarfextract
@ -149,7 +145,7 @@ Conflicts: libc.so.6()(64bit)
%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
@ -195,6 +191,7 @@ Source68: host-memcpy-hack.h
Source69: try-disable-staging-driver
Source70: kernel-obs-build.spec.in
Source71: kernel-obs-qa.spec.in
Source72: compress-vmlinux.sh
Source100: config.tar.bz2
Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2
@ -272,6 +269,7 @@ NoSource: 68
NoSource: 69
NoSource: 70
NoSource: 71
NoSource: 72
NoSource: 100
NoSource: 101
NoSource: 102
@ -420,12 +418,12 @@ if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
if test -e ../config.addon/%cpu_arch_flavor; then
if test -e %my_builddir/config.addon/%cpu_arch_flavor; then
# FIXME: config.addon doesn't affect the %CONFIG_ macros defined at
# the top of the specfile
%_sourcedir/configtool.pl ../config{,.addon}/%cpu_arch_flavor >.config
%_sourcedir/configtool.pl %my_builddir/config{,.addon}/%cpu_arch_flavor >.config
else
cp ../config/%cpu_arch_flavor .config
cp %my_builddir/config/%cpu_arch_flavor .config
fi
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%source_rel-%build_flavor \
@ -482,7 +480,7 @@ fi
# You can also set this permanently in ~/.rpmmacros:
# %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat)
%if %CONFIG_KMSG_IDS == "y"
chmod +x ../linux-%srcversion/scripts/kmsg-doc
chmod +x ../scripts/kmsg-doc
MAKE_ARGS="$MAKE_ARGS D=2"
%endif
@ -540,25 +538,17 @@ add_vmlinux()
# mark the file 0644 again
chmod +x %buildroot/$vmlinux
if test $1 == "--compressed"; then
# avoid using the gzip -n option to make kdump happy (bnc#880848#c20)
ts="$(head -n1 %_sourcedir/source-timestamp)"
touch -d "$ts" %buildroot/$vmlinux
touch %buildroot/$vmlinux.gz
%if 0%{?__debug_package:1}
# split the debug information just to keep the compressed file
# reasonably small
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp %buildroot/$vmlinux{,.save}
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
--strip-debug \
%buildroot/$vmlinux || :
# let find-debuginfo.sh do the real job
rm -f %buildroot/$vmlinux_debug
# compress the vmlinux image after find-debuginfo.sh has processed it
%global __debug_install_post %__debug_install_post \
%_sourcedir/compress-vmlinux.sh %buildroot/boot/vmlinux-%kernelrelease-%build_flavor
%else
%_sourcedir/compress-vmlinux.sh %buildroot/$vmlinux
%endif
gzip -n -k -9 %buildroot/$vmlinux
if test -e %buildroot/$vmlinux.save; then
mv -f %buildroot/$vmlinux{.save,}
fi
ghost_vmlinux=true
else
ghost_vmlinux=false
@ -575,21 +565,10 @@ add_vmlinux()
cp -p arch/x86/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
image=vmlinuz
%endif
%ifarch alpha
add_vmlinux --compressed
cp -p arch/alpha/boot/vmlinux.gz %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
image=vmlinuz
%endif
%ifarch ppc ppc64 ppc64le
add_vmlinux
image=vmlinux
%endif
%ifarch ia64
add_vmlinux --compressed
mv %buildroot/boot/vmlinux-%kernelrelease-%build_flavor.gz \
%buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
image=vmlinuz
%endif
%ifarch s390 s390x
add_vmlinux --compressed
cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor
@ -604,12 +583,6 @@ add_vmlinux()
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
%endif
%endif
%ifarch sparc64
add_vmlinux --compressed
image=zImage
cp -p arch/sparc/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
image=vmlinux
%endif
%ifarch %arm
add_vmlinux --compressed
case "%build_flavor" in
@ -709,6 +682,7 @@ fi
%if %install_vdso
# Install the unstripped vdso's that are linked in the kernel image
make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
rm -rf %buildroot/lib/modules/%kernelrelease-%build_flavor/vdso/.build-id
%endif
# Create a dummy initrd with roughly the size the real one will have.
@ -838,9 +812,10 @@ if [ %CONFIG_MODULES = y ]; then
strip "$f"
esac
done
# Replace the absolute with a relative path
sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \
%rpm_install_dir/%cpu_arch_flavor/Makefile
# Recreate the generated Makefile with correct path
sh ../scripts/mkmakefile ../../../linux-%kernelrelease%variant \
%rpm_install_dir/%cpu_arch_flavor \
$(echo %srcversion | sed -r 's/^([0-9]+)\.([0-9]+)[\.-].*/\1 \2/')
fi
add_dirs_to_filelist() {

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -19,7 +19,7 @@
#!BuildIgnore: post-build-checks
%define patchversion 3.15.5
%define patchversion 3.16.0-rc5
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@ -33,7 +33,7 @@ BuildRequires: kernel-default
%ifarch %ix86 x86_64
BuildRequires: kernel-xen
%endif
ExclusiveArch: aarch64 armv6hl armv7hl %ix86 ppc ppc64 ppc64le s390x x86_64
ExclusiveArch: %ix86 ppc ppc64 ppc64le s390x x86_64
%if 0%{?suse_version} < 1320
# For SLE 11
BuildRequires: mkinitrd
@ -45,11 +45,11 @@ BuildRequires: dracut
Summary: package kernel and initrd for OBS VM builds
License: GPL-2.0
Group: SLES
Version: 3.15.5
Version: 3.16.rc5
%if 0%{?is_kotd}
Release: <RELEASE>.g01d2774
Release: <RELEASE>.ge709184
%else
Release: <RELEASE>.g01d2774
Release: 0
%endif
%description
@ -93,7 +93,7 @@ chmod a+rx /usr/lib/dracut/modules.d/80obs/setup_obs.sh
# a longer list to have them also available for qemu cross builds where x86_64 kernel runs in eg. arm env.
# this list of modules where available on build workers of build.opensuse.org, so we stay compatible.
export KERNEL_MODULES="loop dm-mod dm-snapshot binfmt-misc fuse kqemu squashfs ext2 ext3 ext4 reiserfs nf_conntrack_ipv6 binfmt_misc virtio_pci virtio_blk fat vfat nls_cp437 nls_iso8859-1 ibmvscsi ibmvscsic"
export KERNEL_MODULES="loop dm-mod dm-snapshot binfmt-misc fuse kqemu squashfs ext2 ext3 ext4 reiserfs nf_conntrack_ipv6 binfmt_misc virtio_pci virtio_mmio virtio_blk fat vfat nls_cp437 nls_iso8859-1 ibmvscsi ibmvscsic"
ROOT=""
[ -e "/dev/vda" ] && ROOT="-d /dev/vda"
[ -e /dev/hda1 ] && ROOT="-d /dev/hda1" # for xen builds
@ -101,6 +101,9 @@ ROOT=""
%ifarch s390 s390x
%define kernel_name image
%endif
%ifarch aarch64
%define kernel_name Image
%endif
%if 0%{?suse_version} < 1320
# For SLE 11

View File

@ -93,7 +93,7 @@ chmod a+rx /usr/lib/dracut/modules.d/80obs/setup_obs.sh
# a longer list to have them also available for qemu cross builds where x86_64 kernel runs in eg. arm env.
# this list of modules where available on build workers of build.opensuse.org, so we stay compatible.
export KERNEL_MODULES="loop dm-mod dm-snapshot binfmt-misc fuse kqemu squashfs ext2 ext3 ext4 reiserfs nf_conntrack_ipv6 binfmt_misc virtio_pci virtio_blk fat vfat nls_cp437 nls_iso8859-1 ibmvscsi ibmvscsic"
export KERNEL_MODULES="loop dm-mod dm-snapshot binfmt-misc fuse kqemu squashfs ext2 ext3 ext4 reiserfs nf_conntrack_ipv6 binfmt_misc virtio_pci virtio_mmio virtio_blk fat vfat nls_cp437 nls_iso8859-1 ibmvscsi ibmvscsic"
ROOT=""
[ -e "/dev/vda" ] && ROOT="-d /dev/vda"
[ -e /dev/hda1 ] && ROOT="-d /dev/hda1" # for xen builds
@ -101,6 +101,9 @@ ROOT=""
%ifarch s390 s390x
%define kernel_name image
%endif
%ifarch aarch64
%define kernel_name Image
%endif
%if 0%{?suse_version} < 1320
# For SLE 11

File diff suppressed because it is too large Load Diff

View File

@ -17,7 +17,7 @@
# needsrootforbuild
%define patchversion 3.15.5
%define patchversion 3.16.0-rc5
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@ -36,11 +36,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Basic QA tests for the kernel
License: GPL-2.0
Group: SLES
Version: 3.15.5
Version: 3.16.rc5
%if 0%{?is_kotd}
Release: <RELEASE>.g01d2774
Release: <RELEASE>.ge709184
%else
Release: <RELEASE>.g01d2774
Release: 0
%endif
%description

File diff suppressed because it is too large Load Diff

View File

@ -17,7 +17,7 @@
# needsrootforbuild
%define patchversion 3.15.5
%define patchversion 3.16.0-rc5
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@ -28,7 +28,7 @@ BuildRequires: kernel-default
# here as well to avoid that qa and build package build parallel
BuildRequires: kernel-obs-build
BuildRequires: modutils
ExclusiveArch: aarch64 armv6hl armv7hl %ix86 ppc ppc64 ppc64le s390x x86_64
ExclusiveArch: %ix86 ppc ppc64 ppc64le s390x x86_64
%if 0%{?suse_version} < 1200
# for SLE 11
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -36,11 +36,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Basic QA tests for the kernel
License: GPL-2.0
Group: SLES
Version: 3.15.5
Version: 3.16.rc5
%if 0%{?is_kotd}
Release: <RELEASE>.g01d2774
Release: <RELEASE>.ge709184
%else
Release: <RELEASE>.g01d2774
Release: 0
%endif
%description

File diff suppressed because it is too large Load Diff

View File

@ -19,8 +19,8 @@
# This makes the OBS store the project cert as %_sourcedir/_projectcert.crt
# needssslcertforbuild
%define srcversion 3.15
%define patchversion 3.15.5
%define srcversion 3.16-rc5
%define patchversion 3.16.0-rc5
%define variant %{nil}
%define vanilla_only 0
@ -35,9 +35,9 @@
%define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
%define kernel_build_dir %build_src_dir/linux-obj
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver})
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver,compress-vmlinux.sh})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
@ -59,11 +59,11 @@ Name: kernel-pae
Summary: Kernel with PAE Support
License: GPL-2.0
Group: System/Kernel
Version: 3.15.5
Version: 3.16.rc5
%if 0%{?is_kotd}
Release: <RELEASE>.g01d2774
Release: <RELEASE>.ge709184
%else
Release: <RELEASE>.g01d2774
Release: 0
%endif
Url: http://www.kernel.org/
BuildRequires: bc
@ -113,10 +113,6 @@ Requires(post): distribution-release
# but are not needed to build the kernel
#!BuildIgnore: autoconf automake gettext-runtime libtool cvs gettext-tools m4 udev insserv
%ifarch ia64
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
%ifarch s390 s390x
%if %build_vanilla && 0%{?suse_version} < 1130
BuildRequires: dwarfextract
@ -154,7 +150,7 @@ Obsoletes: kernel-bigsmp <= 2.6.17
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
@ -200,6 +196,7 @@ Source68: host-memcpy-hack.h
Source69: try-disable-staging-driver
Source70: kernel-obs-build.spec.in
Source71: kernel-obs-qa.spec.in
Source72: compress-vmlinux.sh
Source100: config.tar.bz2
Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2
@ -277,6 +274,7 @@ NoSource: 68
NoSource: 69
NoSource: 70
NoSource: 71
NoSource: 72
NoSource: 100
NoSource: 101
NoSource: 102
@ -429,12 +427,12 @@ if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
if test -e ../config.addon/%cpu_arch_flavor; then
if test -e %my_builddir/config.addon/%cpu_arch_flavor; then
# FIXME: config.addon doesn't affect the %CONFIG_ macros defined at
# the top of the specfile
%_sourcedir/configtool.pl ../config{,.addon}/%cpu_arch_flavor >.config
%_sourcedir/configtool.pl %my_builddir/config{,.addon}/%cpu_arch_flavor >.config
else
cp ../config/%cpu_arch_flavor .config
cp %my_builddir/config/%cpu_arch_flavor .config
fi
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%source_rel-%build_flavor \
@ -491,7 +489,7 @@ fi
# You can also set this permanently in ~/.rpmmacros:
# %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat)
%if %CONFIG_KMSG_IDS == "y"
chmod +x ../linux-%srcversion/scripts/kmsg-doc
chmod +x ../scripts/kmsg-doc
MAKE_ARGS="$MAKE_ARGS D=2"
%endif
@ -549,25 +547,17 @@ add_vmlinux()
# mark the file 0644 again
chmod +x %buildroot/$vmlinux
if test $1 == "--compressed"; then
# avoid using the gzip -n option to make kdump happy (bnc#880848#c20)
ts="$(head -n1 %_sourcedir/source-timestamp)"
touch -d "$ts" %buildroot/$vmlinux
touch %buildroot/$vmlinux.gz
%if 0%{?__debug_package:1}
# split the debug information just to keep the compressed file
# reasonably small
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp %buildroot/$vmlinux{,.save}
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
--strip-debug \
%buildroot/$vmlinux || :
# let find-debuginfo.sh do the real job
rm -f %buildroot/$vmlinux_debug
# compress the vmlinux image after find-debuginfo.sh has processed it
%global __debug_install_post %__debug_install_post \
%_sourcedir/compress-vmlinux.sh %buildroot/boot/vmlinux-%kernelrelease-%build_flavor
%else
%_sourcedir/compress-vmlinux.sh %buildroot/$vmlinux
%endif
gzip -n -k -9 %buildroot/$vmlinux
if test -e %buildroot/$vmlinux.save; then
mv -f %buildroot/$vmlinux{.save,}
fi
ghost_vmlinux=true
else
ghost_vmlinux=false
@ -584,21 +574,10 @@ add_vmlinux()
cp -p arch/x86/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
image=vmlinuz
%endif
%ifarch alpha
add_vmlinux --compressed
cp -p arch/alpha/boot/vmlinux.gz %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
image=vmlinuz
%endif
%ifarch ppc ppc64 ppc64le
add_vmlinux
image=vmlinux
%endif
%ifarch ia64
add_vmlinux --compressed
mv %buildroot/boot/vmlinux-%kernelrelease-%build_flavor.gz \
%buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
image=vmlinuz
%endif
%ifarch s390 s390x
add_vmlinux --compressed
cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor
@ -613,12 +592,6 @@ add_vmlinux()
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
%endif
%endif
%ifarch sparc64
add_vmlinux --compressed
image=zImage
cp -p arch/sparc/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
image=vmlinux
%endif
%ifarch %arm
add_vmlinux --compressed
case "%build_flavor" in
@ -718,6 +691,7 @@ fi
%if %install_vdso
# Install the unstripped vdso's that are linked in the kernel image
make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
rm -rf %buildroot/lib/modules/%kernelrelease-%build_flavor/vdso/.build-id
%endif
# Create a dummy initrd with roughly the size the real one will have.
@ -847,9 +821,10 @@ if [ %CONFIG_MODULES = y ]; then
strip "$f"
esac
done
# Replace the absolute with a relative path
sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \
%rpm_install_dir/%cpu_arch_flavor/Makefile
# Recreate the generated Makefile with correct path
sh ../scripts/mkmakefile ../../../linux-%kernelrelease%variant \
%rpm_install_dir/%cpu_arch_flavor \
$(echo %srcversion | sed -r 's/^([0-9]+)\.([0-9]+)[\.-].*/\1 \2/')
fi
add_dirs_to_filelist() {
@ -1015,10 +990,7 @@ Requires(pre): coreutils awk
Requires(post): modutils
Requires(post): perl-Bootloader
Requires(post): mkinitrd
%ifarch %ix86
Provides: kernel-vmi-extra = 2.6.38
Obsoletes: kernel-vmi-extra <= 2.6.38
%endif
Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu)
%ifarch %ix86
Conflicts: libc.so.6()(64bit)
@ -1076,10 +1048,7 @@ Provides: %name-devel = %version-%source_rel
Provides: multiversion(kernel)
Requires: kernel-devel%variant = %version-%source_rel
Supplements: packageand(%name:kernel-devel%variant)
%ifarch %ix86
Provides: kernel-vmi-devel = 2.6.38
Obsoletes: kernel-vmi-devel <= 2.6.38
%endif
PreReq: coreutils
%description devel

File diff suppressed because it is too large Load Diff

View File

@ -17,8 +17,8 @@
# icecream 0
%define srcversion 3.15
%define patchversion 3.15.5
%define srcversion 3.16-rc5
%define patchversion 3.16.0-rc5
%define variant %{nil}
%define vanilla_only 0
@ -30,11 +30,11 @@ Name: kernel-source
Summary: The Linux Kernel Sources
License: GPL-2.0
Group: Development/Sources
Version: 3.15.5
Version: 3.16.rc5
%if 0%{?is_kotd}
Release: <RELEASE>.g01d2774
Release: <RELEASE>.ge709184
%else
Release: <RELEASE>.g01d2774
Release: 0
%endif
Url: http://www.kernel.org/
AutoReqProv: off
@ -45,7 +45,7 @@ Requires(post): coreutils sed
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
@ -91,6 +91,7 @@ Source68: host-memcpy-hack.h
Source69: try-disable-staging-driver
Source70: kernel-obs-build.spec.in
Source71: kernel-obs-qa.spec.in
Source72: compress-vmlinux.sh
Source100: config.tar.bz2
Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2
@ -113,7 +114,7 @@ Prefix: /usr/src
# Source is only complete with devel files.
Requires: kernel-devel%variant = %version-%release
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver})
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver,compress-vmlinux.sh})
%define symbols %(set -- $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
%define variant_symbols %(case %name in (*-rt) echo "RT" ;; esac)

View File

@ -91,6 +91,7 @@ Source68: host-memcpy-hack.h
Source69: try-disable-staging-driver
Source70: kernel-obs-build.spec.in
Source71: kernel-obs-qa.spec.in
Source72: compress-vmlinux.sh
Source100: config.tar.bz2
Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2

File diff suppressed because it is too large Load Diff

View File

@ -24,12 +24,12 @@ Name: kernel-syms
Summary: Kernel Symbol Versions (modversions)
License: GPL-2.0
Group: Development/Sources
Version: 3.15.5
Version: 3.16.rc5
%if %using_buildservice
%if 0%{?is_kotd}
Release: <RELEASE>.g01d2774
Release: <RELEASE>.ge709184
%else
Release: <RELEASE>.g01d2774
Release: 0
%endif
%else
%define kernel_source_release %(LC_ALL=C rpm -q kernel-devel%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0)
@ -38,18 +38,12 @@ Release: %kernel_source_release
Url: http://www.kernel.org/
AutoReqProv: off
BuildRequires: coreutils
%ifarch aarch64 armv6hl armv7hl %ix86 ppc ppc64 ppc64le s390x x86_64
%ifarch %ix86 ppc ppc64 ppc64le s390x x86_64
Requires: kernel-default-devel = %version-%source_rel
%endif
%ifarch %ix86 x86_64
Requires: kernel-desktop-devel = %version-%source_rel
%endif
%ifarch armv7hl
Requires: kernel-exynos-devel = %version-%source_rel
%endif
%ifarch armv7hl
Requires: kernel-lpae-devel = %version-%source_rel
%endif
%ifarch %ix86
Requires: kernel-pae-devel = %version-%source_rel
%endif
@ -62,7 +56,7 @@ Provides: multiversion(kernel)
Source: README.KSYMS
Requires: kernel-devel%variant = %version-%source_rel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 aarch64 armv6hl armv7hl ppc ppc64 ppc64le s390x x86_64
ExclusiveArch: %ix86 ppc ppc64 ppc64le s390x x86_64
Prefix: /usr/src
%description

File diff suppressed because it is too large Load Diff

View File

@ -19,8 +19,8 @@
# This makes the OBS store the project cert as %_sourcedir/_projectcert.crt
# needssslcertforbuild
%define srcversion 3.15
%define patchversion 3.15.5
%define srcversion 3.16-rc5
%define patchversion 3.16.0-rc5
%define variant %{nil}
%define vanilla_only 0
@ -35,9 +35,9 @@
%define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
%define kernel_build_dir %build_src_dir/linux-obj
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver})
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver,compress-vmlinux.sh})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
@ -59,11 +59,11 @@ Name: kernel-vanilla
Summary: The Standard Kernel - without any SUSE patches
License: GPL-2.0
Group: System/Kernel
Version: 3.15.5
Version: 3.16.rc5
%if 0%{?is_kotd}
Release: <RELEASE>.g01d2774
Release: <RELEASE>.ge709184
%else
Release: <RELEASE>.g01d2774
Release: 0
%endif
Url: http://www.kernel.org/
BuildRequires: bc
@ -113,10 +113,6 @@ Requires(post): distribution-release
# but are not needed to build the kernel
#!BuildIgnore: autoconf automake gettext-runtime libtool cvs gettext-tools m4 udev insserv
%ifarch ia64
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
%ifarch s390 s390x
%if %build_vanilla && 0%{?suse_version} < 1130
BuildRequires: dwarfextract
@ -149,7 +145,7 @@ Conflicts: libc.so.6()(64bit)
%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
@ -195,6 +191,7 @@ Source68: host-memcpy-hack.h
Source69: try-disable-staging-driver
Source70: kernel-obs-build.spec.in
Source71: kernel-obs-qa.spec.in
Source72: compress-vmlinux.sh
Source100: config.tar.bz2
Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2
@ -272,6 +269,7 @@ NoSource: 68
NoSource: 69
NoSource: 70
NoSource: 71
NoSource: 72
NoSource: 100
NoSource: 101
NoSource: 102
@ -417,12 +415,12 @@ if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
if test -e ../config.addon/%cpu_arch_flavor; then
if test -e %my_builddir/config.addon/%cpu_arch_flavor; then
# FIXME: config.addon doesn't affect the %CONFIG_ macros defined at
# the top of the specfile
%_sourcedir/configtool.pl ../config{,.addon}/%cpu_arch_flavor >.config
%_sourcedir/configtool.pl %my_builddir/config{,.addon}/%cpu_arch_flavor >.config
else
cp ../config/%cpu_arch_flavor .config
cp %my_builddir/config/%cpu_arch_flavor .config
fi
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%source_rel-%build_flavor \
@ -479,7 +477,7 @@ fi
# You can also set this permanently in ~/.rpmmacros:
# %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat)
%if %CONFIG_KMSG_IDS == "y"
chmod +x ../linux-%srcversion/scripts/kmsg-doc
chmod +x ../scripts/kmsg-doc
MAKE_ARGS="$MAKE_ARGS D=2"
%endif
@ -537,25 +535,17 @@ add_vmlinux()
# mark the file 0644 again
chmod +x %buildroot/$vmlinux
if test $1 == "--compressed"; then
# avoid using the gzip -n option to make kdump happy (bnc#880848#c20)
ts="$(head -n1 %_sourcedir/source-timestamp)"
touch -d "$ts" %buildroot/$vmlinux
touch %buildroot/$vmlinux.gz
%if 0%{?__debug_package:1}
# split the debug information just to keep the compressed file
# reasonably small
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp %buildroot/$vmlinux{,.save}
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
--strip-debug \
%buildroot/$vmlinux || :
# let find-debuginfo.sh do the real job
rm -f %buildroot/$vmlinux_debug
# compress the vmlinux image after find-debuginfo.sh has processed it
%global __debug_install_post %__debug_install_post \
%_sourcedir/compress-vmlinux.sh %buildroot/boot/vmlinux-%kernelrelease-%build_flavor
%else
%_sourcedir/compress-vmlinux.sh %buildroot/$vmlinux
%endif
gzip -n -k -9 %buildroot/$vmlinux
if test -e %buildroot/$vmlinux.save; then
mv -f %buildroot/$vmlinux{.save,}
fi
ghost_vmlinux=true
else
ghost_vmlinux=false
@ -572,21 +562,10 @@ add_vmlinux()
cp -p arch/x86/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
image=vmlinuz
%endif
%ifarch alpha
add_vmlinux --compressed
cp -p arch/alpha/boot/vmlinux.gz %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
image=vmlinuz
%endif
%ifarch ppc ppc64 ppc64le
add_vmlinux
image=vmlinux
%endif
%ifarch ia64
add_vmlinux --compressed
mv %buildroot/boot/vmlinux-%kernelrelease-%build_flavor.gz \
%buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
image=vmlinuz
%endif
%ifarch s390 s390x
add_vmlinux --compressed
cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor
@ -601,12 +580,6 @@ add_vmlinux()
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
%endif
%endif
%ifarch sparc64
add_vmlinux --compressed
image=zImage
cp -p arch/sparc/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
image=vmlinux
%endif
%ifarch %arm
add_vmlinux --compressed
case "%build_flavor" in
@ -706,6 +679,7 @@ fi
%if %install_vdso
# Install the unstripped vdso's that are linked in the kernel image
make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
rm -rf %buildroot/lib/modules/%kernelrelease-%build_flavor/vdso/.build-id
%endif
# Create a dummy initrd with roughly the size the real one will have.
@ -835,9 +809,10 @@ if [ %CONFIG_MODULES = y ]; then
strip "$f"
esac
done
# Replace the absolute with a relative path
sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \
%rpm_install_dir/%cpu_arch_flavor/Makefile
# Recreate the generated Makefile with correct path
sh ../scripts/mkmakefile ../../../linux-%kernelrelease%variant \
%rpm_install_dir/%cpu_arch_flavor \
$(echo %srcversion | sed -r 's/^([0-9]+)\.([0-9]+)[\.-].*/\1 \2/')
fi
add_dirs_to_filelist() {

File diff suppressed because it is too large Load Diff

View File

@ -19,8 +19,8 @@
# This makes the OBS store the project cert as %_sourcedir/_projectcert.crt
# needssslcertforbuild
%define srcversion 3.15
%define patchversion 3.15.5
%define srcversion 3.16-rc5
%define patchversion 3.16.0-rc5
%define variant %{nil}
%define vanilla_only 0
@ -35,9 +35,9 @@
%define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
%define kernel_build_dir %build_src_dir/linux-obj
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver})
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh,try-disable-staging-driver,compress-vmlinux.sh})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
@ -59,11 +59,11 @@ Name: kernel-xen
Summary: The Xen Kernel
License: GPL-2.0
Group: System/Kernel
Version: 3.15.5
Version: 3.16.rc5
%if 0%{?is_kotd}
Release: <RELEASE>.g01d2774
Release: <RELEASE>.ge709184
%else
Release: <RELEASE>.g01d2774
Release: 0
%endif
Url: http://www.kernel.org/
BuildRequires: bc
@ -113,10 +113,6 @@ Requires(post): distribution-release
# but are not needed to build the kernel
#!BuildIgnore: autoconf automake gettext-runtime libtool cvs gettext-tools m4 udev insserv
%ifarch ia64
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
%ifarch s390 s390x
%if %build_vanilla && 0%{?suse_version} < 1130
BuildRequires: dwarfextract
@ -152,7 +148,7 @@ Provides: kernel = %version-%source_rel
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
@ -198,6 +194,7 @@ Source68: host-memcpy-hack.h
Source69: try-disable-staging-driver
Source70: kernel-obs-build.spec.in
Source71: kernel-obs-qa.spec.in
Source72: compress-vmlinux.sh
Source100: config.tar.bz2
Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2
@ -275,6 +272,7 @@ NoSource: 68
NoSource: 69
NoSource: 70
NoSource: 71
NoSource: 72
NoSource: 100
NoSource: 101
NoSource: 102
@ -423,12 +421,12 @@ if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
if test -e ../config.addon/%cpu_arch_flavor; then
if test -e %my_builddir/config.addon/%cpu_arch_flavor; then
# FIXME: config.addon doesn't affect the %CONFIG_ macros defined at
# the top of the specfile
%_sourcedir/configtool.pl ../config{,.addon}/%cpu_arch_flavor >.config
%_sourcedir/configtool.pl %my_builddir/config{,.addon}/%cpu_arch_flavor >.config
else
cp ../config/%cpu_arch_flavor .config
cp %my_builddir/config/%cpu_arch_flavor .config
fi
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION -%source_rel-%build_flavor \
@ -485,7 +483,7 @@ fi
# You can also set this permanently in ~/.rpmmacros:
# %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat)
%if %CONFIG_KMSG_IDS == "y"
chmod +x ../linux-%srcversion/scripts/kmsg-doc
chmod +x ../scripts/kmsg-doc
MAKE_ARGS="$MAKE_ARGS D=2"
%endif
@ -543,25 +541,17 @@ add_vmlinux()
# mark the file 0644 again
chmod +x %buildroot/$vmlinux
if test $1 == "--compressed"; then
# avoid using the gzip -n option to make kdump happy (bnc#880848#c20)
ts="$(head -n1 %_sourcedir/source-timestamp)"
touch -d "$ts" %buildroot/$vmlinux
touch %buildroot/$vmlinux.gz
%if 0%{?__debug_package:1}
# split the debug information just to keep the compressed file
# reasonably small
local vmlinux_debug=usr/lib/debug/$vmlinux.debug
mkdir -p $(dirname %buildroot/$vmlinux_debug)
cp %buildroot/$vmlinux{,.save}
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \
--strip-debug \
%buildroot/$vmlinux || :
# let find-debuginfo.sh do the real job
rm -f %buildroot/$vmlinux_debug
# compress the vmlinux image after find-debuginfo.sh has processed it
%global __debug_install_post %__debug_install_post \
%_sourcedir/compress-vmlinux.sh %buildroot/boot/vmlinux-%kernelrelease-%build_flavor
%else
%_sourcedir/compress-vmlinux.sh %buildroot/$vmlinux
%endif
gzip -n -k -9 %buildroot/$vmlinux
if test -e %buildroot/$vmlinux.save; then
mv -f %buildroot/$vmlinux{.save,}
fi
ghost_vmlinux=true
else
ghost_vmlinux=false
@ -578,21 +568,10 @@ add_vmlinux()
cp -p arch/x86/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
image=vmlinuz
%endif
%ifarch alpha
add_vmlinux --compressed
cp -p arch/alpha/boot/vmlinux.gz %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
image=vmlinuz
%endif
%ifarch ppc ppc64 ppc64le
add_vmlinux
image=vmlinux
%endif
%ifarch ia64
add_vmlinux --compressed
mv %buildroot/boot/vmlinux-%kernelrelease-%build_flavor.gz \
%buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
image=vmlinuz
%endif
%ifarch s390 s390x
add_vmlinux --compressed
cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor
@ -607,12 +586,6 @@ add_vmlinux()
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
%endif
%endif
%ifarch sparc64
add_vmlinux --compressed
image=zImage
cp -p arch/sparc/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
image=vmlinux
%endif
%ifarch %arm
add_vmlinux --compressed
case "%build_flavor" in
@ -712,6 +685,7 @@ fi
%if %install_vdso
# Install the unstripped vdso's that are linked in the kernel image
make vdso_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
rm -rf %buildroot/lib/modules/%kernelrelease-%build_flavor/vdso/.build-id
%endif
# Create a dummy initrd with roughly the size the real one will have.
@ -841,9 +815,10 @@ if [ %CONFIG_MODULES = y ]; then
strip "$f"
esac
done
# Replace the absolute with a relative path
sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \
%rpm_install_dir/%cpu_arch_flavor/Makefile
# Recreate the generated Makefile with correct path
sh ../scripts/mkmakefile ../../../linux-%kernelrelease%variant \
%rpm_install_dir/%cpu_arch_flavor \
$(echo %srcversion | sed -r 's/^([0-9]+)\.([0-9]+)[\.-].*/\1 \2/')
fi
add_dirs_to_filelist() {

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c3927e87be4040fa8aca1b58663dc0776aaf00485604ff88a623be2f3fb07794
size 79676484

3
linux-3.16-rc5.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:94c0def2d3fbeb3e06977f3204b920005179470e98e4eedbe62c258ad79ea8d9
size 80486256

8
mkspec
View File

@ -330,13 +330,8 @@ sub _arch2rpm {
sub provides_obsoletes {
my $flavor = shift;
my @archs = @_;
my $subpkg;
my $res = "";
# flavor-base implies flavor-{devel,extra} to keep the config short
if ($flavor =~ s/-(extra|devel)/-base/) {
$subpkg = $1;
}
for my $arch (@archs) {
my @packs = @{$obsolete_packages{$arch}{$flavor} || []};
next if (!@packs);
@ -345,9 +340,6 @@ sub provides_obsoletes {
$res .= "\%ifarch $rpmarch\n";
for my $pack (@packs) {
my $name = $pack->[0];
if ($subpkg) {
$name =~ s/-base/-\Q$subpkg\E/;
}
my $version = $pack->[1];
$res .= "Provides: $name = $version\n";
$res .= "Obsoletes: $name <= $version\n";

View File

@ -30,10 +30,16 @@ i386/pae-base vmi-base 2.6.38
# SLES 11 SP3 / openSUSE 13.1
i386/default trace 3.13
i386/default-base trace-base 3.13
i386/default trace-base 3.13
i386/default-extra trace-extra 3.13
i386/default-devel trace-devel 3.13
x86_64/default trace 3.13
x86_64/default-base trace-base 3.13
x86_64/default trace-base 3.13
x86_64/default-extra trace-extra 3.13
x86_64/default-devel trace-devel 3.13
s390x/default trace 3.13
s390x/default-base trace-base 3.13
s390x/default trace-base 3.13
s390x/default-extra trace-extra 3.13
s390x/default-devel trace-devel 3.13

View File

@ -38,21 +38,6 @@ non-executable. Therefore, the PAE kernel should be used on any systems
that support it, regardless of the amount of main memory.
%endif
=== kernel-kdump ===
kernel for kdump
This kernel is intended for kdump. It can not be booted with a normal
bootloader, the kexec tool has to be used to load it. Once the system
crashes, the loaded kernel will be started to grab debug info from the
crashed kernel.
=== kernel-net ===
Minimal kernel with disk and net support
This kernel carries only networking and disk drivers to fit into the
standard Sun OpenBoot download buffer, and is intended for the
initial install and rescue mode only.
=== kernel-pae ===
Kernel with PAE Support
@ -65,31 +50,6 @@ PAE is not only more physical address space but also important for the
non-executable. Therefore, the PAE kernel should be used on any systems
that support it, regardless of the amount of main memory.
=== kernel-ppc64 ===
Kernel for ppc64 Systems
This package contains the kernel for:
IBM pSeries 64bit machines IBM iSeries 64bit machines Apple G5 machines
Sony Playstation 3
The boot file is /boot/vmlinux.
The home page of the ppc64 project is http://www.penguinppc.org/
=== kernel-ps3 ===
kernel for ps3 bootloader
This package contains the kernel for the PS3 bootloader. PS3 systems
only have 4MB of flash memory for the bootloader, so this kernel needs
to be as small as possible and is _not_ meant to be installed in the
final system.
=== kernel-s390 ===
The Standard Kernel
The standard kernel.
=== kernel-vanilla ===
The Standard Kernel - without any SUSE patches

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8e4786dc2c5be8fc852f391fcde72025b4d8b0cdfff35228cd5246e956486488
size 155281
oid sha256:105ea50dc12e23a49ffbccb481e842bfce040db0d0653e91387f84a854ecf220
size 154876

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fcb9b18dad7315fa64ef5d5decce766cbf62c3ab2badbf62956d624f9856b416
size 4148
oid sha256:64f02618264275483687b983d58a98e69eff25ce8a416a9420d12116f0ce552d
size 3132

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2a229ceb85ee2907019fbdbe494b5976502b629fb7020e24a238dccd44b5a722
size 16556
oid sha256:30444113a07f559e0848151cd6f7ba9f5f587b640d409636fac5c7ef2699a6d7
size 10945

BIN
patches.kernel.org.tar.bz2 (Stored with Git LFS)

Binary file not shown.

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cbb5aae6e6bbed918acfd2784fd2844dd333de653eae66b2ee87fe555bca4429
size 3386
oid sha256:31d4bbcbd210082864c9c4c836a0eeb6116cfa40c5362d346868ac30b1949823
size 4580

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:92e16b77fb40c6e18ff13b1dc2f83a768ccaf5e0aa574f80dbb773976ec9b050
size 83053
oid sha256:2ccaccbe2cf89045d3340508be4010bb723ae9e0e2b2423ceadab7fe9bd62940
size 83028

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a3146148523c0dc67ee0d024981f8aa6d45f7e5ad06579a48c0faada389701be
size 2093821
oid sha256:97d44263103aff46269c351a79003a317eecc2800d6f584d73325624e10f3c78
size 2108467

36
post.sh
View File

@ -1,35 +1,9 @@
# Flag to trigger /etc/init.d/purge-kernels on next reboot (fate#312018)
touch /boot/do_purge_kernels
# It must be possible to install different kernel.rpm packages in parallel.
# But in this post install script, the /boot/vmlinux symlink is replaced.
# On powerpc, the different kernels are for different board/firmware types
# They are not compatible.
wrong_boardtype() {
echo "This kernel-@FLAVOR@.@RPM_TARGET_CPU@.rpm is for $1, it will not boot on this system."
echo "The /boot/vmlinux symlink will not be created or updated."
exit 0
}
if [ -f /proc/cpuinfo ]; then
case "@FLAVOR@-@RPM_TARGET_CPU@" in
vanilla-ppc64|default-ppc64|ps3-ppc64|ppc64-ppc64|kdump-ppc64|ps3-ppc|ppc64-ppc|kdump-ppc)
if [ -d /proc/iSeries -o ! -d /proc/ppc64 ]; then
wrong_boardtype "OpenFirmware based 64bit machines"
fi
;;
vanilla-ppc|default-ppc)
if [ -d /proc/ppc64 -o -d /proc/iSeries ]; then
wrong_boardtype "32bit systems"
fi
;;
*)
;;
esac
fi
suffix=
case @FLAVOR@ in
kdump|ps3|xen*|ec2|vanilla)
xen*|ec2|vanilla)
suffix=-@FLAVOR@
;;
esac
@ -62,7 +36,8 @@ run_bootloader () {
[ -f /boot/grub/menu.lst -o \
-f /etc/lilo.conf -o \
-f /etc/elilo.conf -o \
-f /etc/zipl.conf ]
-f /etc/zipl.conf -o \
-f /etc/default/grub ]
then
return 0
else
@ -70,11 +45,6 @@ run_bootloader () {
fi
}
# exit out early for Moblin as we don't want to touch the bootloader menu
if [ -f /etc/SuSE-moblin-release ] ; then
exit 0
fi
if [ -f /etc/fstab -a ! -e /.buildenv ] ; then
# only run the bootloader if the usual bootloader configuration
# files are there -- this is different on every architecture

View File

@ -26,11 +26,6 @@ if [ -x $wm2 ]; then
/bin/bash -${-/e/} $wm2 --remove-kernel @KERNELRELEASE@-@FLAVOR@
fi
# exit out early for Moblin as we don't want to touch the bootloader menu
if [ -f /etc/SuSE-moblin-release ] ; then
exit 0
fi
# remove fstab check once perl-Bootloader can cope with it
if [ -f /etc/fstab ]; then
if [ -x /usr/lib/bootloader/bootloader_entry ]; then

View File

@ -27,11 +27,6 @@
# DO NOT MODIFY THEM!
# Send separate patches upstream if you find a problem...
########################################################
patches.kernel.org/patch-3.15.1
patches.kernel.org/patch-3.15.1-2
patches.kernel.org/patch-3.15.2-3
patches.kernel.org/patch-3.15.3-4
patches.kernel.org/patch-3.15.4-5
########################################################
# Build fixes that apply to the vanilla kernel too.
@ -40,7 +35,7 @@
########################################################
patches.rpmify/chipidea-clean-up-dependencies
patches.rpmify/lustre-lloop-dont-change-logical-size
patches.rpmify/s390-add-slab-h-for-kzalloc-kfree
patches.rpmify/of_mdio-fix-cyclic-dependency.patch
########################################################
# kABI consistency patches
@ -56,7 +51,6 @@
# will be included in the vanilla package.
########################################################
patches.rpmify/firmware-path
patches.rpmify/rpm-kernel-config
patches.rpmify/split-package
patches.rpmify/cloneconfig.diff
@ -162,7 +156,6 @@
patches.arch/cubox-configuration.patch
patches.arch/arm-OMAP-Fix-missing-cm3xxx.h-include.patch
patches.arch/arm-OMAP-Fix-missing-usb.h-include.patch
patches.arch/arm-omapfb-fix.patch
# Compile fix for Xen on ARM with our Xen patches applied
patches.arch/arm-xen-fixup.patch
@ -242,8 +235,6 @@
########################################################
# cifs patches
########################################################
patches.fixes/cifs-Set-client-guid-on-per-connection-basis.patch
patches.fixes/cifs-Do-not-send-ClientGUID-on-SMB2.02-dialect.patch
########################################################
# ext2/ext3
@ -368,7 +359,6 @@
########################################################
patches.drivers/drm-cirrus-Use-16bpp-as-default
patches.fixes/nouveau-fix-race-with-fence-signaling
patches.fixes/drm-msm-replace-type-of-paddr-to-uint32_t.patch
########################################################
# video4linux
@ -404,8 +394,6 @@
########################################################
# USB
########################################################
patches.fixes/usb-musb-tusb6010-Add-tusb_revision-to-struct-musb-t
patches.fixes/usb-musb-tusb6010-Use-musb-tusb_revision-instead-of-
########################################################
# I2C
@ -421,7 +409,6 @@
##########################################################
# Sound
##########################################################
patches.drivers/ALSA-hda-Add-dock-pin-setups-for-Thinkpad-T440
########################################################
# Char / serial
@ -434,9 +421,6 @@
# Needs updating WRT d27769ec (block: add GENHD_FL_NO_PART_SCAN)
+hare patches.suse/no-partition-scan
patches.fixes/pvpanic-Set-high-notifier-priority
patches.fixes/asus-wmi-Set-WAPF-to-4-for-Asus-X550CA.patch
########################################################
# Other drivers we have added to the tree
########################################################
@ -517,7 +501,6 @@
########################################################
# KVM patches
########################################################
patches.fixes/kvm-macos.patch
########################################################
# Staging tree patches
@ -613,6 +596,7 @@
patches.xen/xen3-patch-3.13
patches.xen/xen3-patch-3.14
patches.xen/xen3-patch-3.15
patches.xen/xen3-patch-3.16-rc3
# ports of other patches
patches.xen/xen3-stack-unwind
@ -628,7 +612,6 @@
patches.xen/xen-pcpu
patches.xen/xen-pcpu-hotplug-kexec
patches.xen/xen-mem-hotplug
patches.xen/xen-swiotlb-unmap-single-phys-check
patches.xen/xen-configurable-guest-devices
patches.xen/xen-setup-gsi
patches.xen/xen-privcmd-hcall-preemption

View File

@ -1,3 +1,3 @@
2014-07-10 10:16:25 +0200
GIT Revision: 01d27743c4d4797b97d13844472e11fe53383a2f
GIT Branch: stable
2014-07-14 16:29:51 +0200
GIT Revision: e709184000b4616aaa4043a8d7bc3c05ab55a495
GIT Branch: master

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:58cdd21029911f634c1e9139437c939b7f2f5e187b2a21bd004e83fba0ca21a3
size 874
oid sha256:4f52f53a399072b4b65065e3e6a7d8644e7b6d7cec0d95ce99c25498d5211210
size 870