1
0
forked from pool/kernel-source

GIT Revision: f223ee652010d2179a7287193aa4d7e6db362131

OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-source?expand=0&rev=7169
This commit is contained in:
Michal Marek 2011-11-29 06:01:39 +00:00 committed by Git OBS Bridge
parent 6a33246c1b
commit ff41f18d7e
39 changed files with 52404 additions and 203 deletions

View File

@ -12,8 +12,8 @@
+i386 i386/desktop +i386 i386/desktop
+i386 i386/pae +i386 i386/pae
+i386 -syms i386/debug +i386 -syms i386/debug
#+i386 i386/xen +i386 i386/xen
#+i386 -syms i386/ec2 +i386 -syms i386/ec2
+i386 i386/vanilla +i386 i386/vanilla
+i386 -syms i386/trace +i386 -syms i386/trace
@ -24,8 +24,8 @@
+x86_64 x86_64/default +x86_64 x86_64/default
+x86_64 x86_64/desktop +x86_64 x86_64/desktop
#+x86_64 x86_64/xen +x86_64 x86_64/xen
#+x86_64 -syms x86_64/ec2 +x86_64 -syms x86_64/ec2
+x86_64 -syms x86_64/debug +x86_64 -syms x86_64/debug
+x86_64 x86_64/vanilla +x86_64 x86_64/vanilla
+x86_64 -syms x86_64/trace +x86_64 -syms x86_64/trace

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:642a7ecadcff9fca6e776466d2bf8da3f3f920c2abc5e42df0c50de803a02ca5 oid sha256:8024270bb25086b35db8628dd9512abac6c238c7050283128b433953cfbdaa3e
size 240279 size 273763

View File

@ -20,6 +20,7 @@
%define srcversion @SRCVERSION@ %define srcversion @SRCVERSION@
%define patchversion @PATCHVERSION@ %define patchversion @PATCHVERSION@
%define variant @VARIANT@%{nil} %define variant @VARIANT@%{nil}
%define vanilla_only @VANILLA_ONLY@
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
@ -297,11 +298,25 @@ fi
# %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat) # %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat)
%if %CONFIG_KMSG_IDS == "y" %if %CONFIG_KMSG_IDS == "y"
chmod +x ../linux-%srcversion/scripts/kmsg-doc chmod +x ../linux-%srcversion/scripts/kmsg-doc
make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 MAKE_ARGS="$MAKE_ARGS D=2"
%else
make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y
%endif %endif
while true; do
make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y 2>&1 \
| tee buildlog
if test "${PIPESTATUS[0]}" -eq 0; then
break
fi
# In the linux-next and vanilla branches, we try harder to build a
# package.
if test 0%vanilla_only -gt 0 &&
%_sourcedir/try-disable-staging-driver buildlog; then
echo "Retrying make"
else
exit 1
fi
done
%install %install
# get rid of /usr/lib/rpm/brp-strip-debug # get rid of /usr/lib/rpm/brp-strip-debug

View File

@ -1,3 +1,35 @@
-------------------------------------------------------------------
Mon Nov 28 17:07:17 CET 2011 - jeffm@suse.com
- Fix kernel-source spec to give ownership of the /usr/src/linux link
to kernel-devel. kernel-source depends on kernel-devel, so this is correct.
- Fix kernel-source spec to give ownership of the /usr/src/linux link
to kernel-devel. kernel-source depends on kernel-devel, so this is correct.
- commit 7160a9c
-------------------------------------------------------------------
Mon Nov 28 16:51:10 CET 2011 - jbeulich@novell.com
- Refresh patches.xen/xen-pcpu-hotplug.
- Refresh patches.xen/xen3-patch-3.2-rc3.
- commit 7956240
-------------------------------------------------------------------
Mon Nov 28 16:12:16 CET 2011 - jbeulich@novell.com
- Update Xen patches to 3,2-rc3 and c/s 1127.
- Update frontswap patches to v10.
- config.conf: Re-enable Xen.
- Update config files.
- commit b08ea4f
-------------------------------------------------------------------
Mon Nov 28 15:32:21 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Ignore staging failures only in vanilla only
branches.
- commit eeaaaf1
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Nov 25 19:28:57 CET 2011 - agraf@suse.de Fri Nov 25 19:28:57 CET 2011 - agraf@suse.de
@ -72,6 +104,20 @@ Thu Nov 24 18:45:54 CET 2011 - ohering@suse.de
- ata_piix: ignore disks in a hyper-v guest. - ata_piix: ignore disks in a hyper-v guest.
- commit d0bebdb - commit d0bebdb
-------------------------------------------------------------------
Thu Nov 24 13:01:09 CET 2011 - mmarek@suse.cz
- rpm/try-disable-staging-driver: Script to disable failing staging
driver and restart make.
- commit 819d1fa
-------------------------------------------------------------------
Thu Nov 24 12:41:48 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Do not have a separate make invocation for
s390 and the rest.
- commit d72f6c1
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 24 00:27:55 CET 2011 - agraf@suse.de Thu Nov 24 00:27:55 CET 2011 - agraf@suse.de
@ -88,7 +134,8 @@ Wed Nov 23 22:35:11 CET 2011 - agraf@suse.de
Wed Nov 23 22:33:58 CET 2011 - agraf@suse.de Wed Nov 23 22:33:58 CET 2011 - agraf@suse.de
- ARM: create uImage, not zImage, so we can boot with u-boot - ARM: create uImage, not zImage, so we can boot with u-boot
- commit 36caa28 - ARM: create uImage, not zImage, so we can boot with u-boot
- commit 63a7b2c
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 23 02:33:12 CET 2011 - agraf@suse.de Wed Nov 23 02:33:12 CET 2011 - agraf@suse.de
@ -126,7 +173,10 @@ Tue Nov 22 14:12:10 CET 2011 - agraf@suse.de
- ARM: Use zImage, not vmlinux - ARM: Use zImage, not vmlinux
On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems. On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems.
Put that into the rpm as vmlinuz instead of the vmlinux ELF binary. Put that into the rpm as vmlinuz instead of the vmlinux ELF binary.
- commit 6676e8d - ARM: Use zImage, not vmlinux
On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems.
Put that into the rpm as vmlinuz instead of the vmlinux ELF binary.
- commit 4c08eb0
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 22 14:05:11 CET 2011 - agraf@suse.de Tue Nov 22 14:05:11 CET 2011 - agraf@suse.de

View File

@ -20,6 +20,7 @@
%define srcversion 3.2-rc3 %define srcversion 3.2-rc3
%define patchversion 3.2.0-rc3 %define patchversion 3.2.0-rc3
%define variant %{nil} %define variant %{nil}
%define vanilla_only 0
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
@ -35,7 +36,7 @@
%define rpm_install_dir %buildroot%obj_install_dir %define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj %define kernel_build_dir %my_builddir/linux-obj
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh}) %(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,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})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor %define cpu_arch_flavor %cpu_arch/%build_flavor
@ -176,6 +177,7 @@ Source65: kernel-spec-macros
Source66: configtool.pl Source66: configtool.pl
Source67: log.sh Source67: log.sh
Source68: host-memcpy-hack.h Source68: host-memcpy-hack.h
Source69: try-disable-staging-driver
Source100: config.tar.bz2 Source100: config.tar.bz2
Source101: config.addon.tar.bz2 Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2 Source102: patches.arch.tar.bz2
@ -375,11 +377,25 @@ fi
# %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat) # %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat)
%if %CONFIG_KMSG_IDS == "y" %if %CONFIG_KMSG_IDS == "y"
chmod +x ../linux-%srcversion/scripts/kmsg-doc chmod +x ../linux-%srcversion/scripts/kmsg-doc
make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 MAKE_ARGS="$MAKE_ARGS D=2"
%else
make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y
%endif %endif
while true; do
make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y 2>&1 \
| tee buildlog
if test "${PIPESTATUS[0]}" -eq 0; then
break
fi
# In the linux-next and vanilla branches, we try harder to build a
# package.
if test 0%vanilla_only -gt 0 &&
%_sourcedir/try-disable-staging-driver buildlog; then
echo "Retrying make"
else
exit 1
fi
done
%install %install
# get rid of /usr/lib/rpm/brp-strip-debug # get rid of /usr/lib/rpm/brp-strip-debug

View File

@ -1,3 +1,35 @@
-------------------------------------------------------------------
Mon Nov 28 17:07:17 CET 2011 - jeffm@suse.com
- Fix kernel-source spec to give ownership of the /usr/src/linux link
to kernel-devel. kernel-source depends on kernel-devel, so this is correct.
- Fix kernel-source spec to give ownership of the /usr/src/linux link
to kernel-devel. kernel-source depends on kernel-devel, so this is correct.
- commit 7160a9c
-------------------------------------------------------------------
Mon Nov 28 16:51:10 CET 2011 - jbeulich@novell.com
- Refresh patches.xen/xen-pcpu-hotplug.
- Refresh patches.xen/xen3-patch-3.2-rc3.
- commit 7956240
-------------------------------------------------------------------
Mon Nov 28 16:12:16 CET 2011 - jbeulich@novell.com
- Update Xen patches to 3,2-rc3 and c/s 1127.
- Update frontswap patches to v10.
- config.conf: Re-enable Xen.
- Update config files.
- commit b08ea4f
-------------------------------------------------------------------
Mon Nov 28 15:32:21 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Ignore staging failures only in vanilla only
branches.
- commit eeaaaf1
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Nov 25 19:28:57 CET 2011 - agraf@suse.de Fri Nov 25 19:28:57 CET 2011 - agraf@suse.de
@ -72,6 +104,20 @@ Thu Nov 24 18:45:54 CET 2011 - ohering@suse.de
- ata_piix: ignore disks in a hyper-v guest. - ata_piix: ignore disks in a hyper-v guest.
- commit d0bebdb - commit d0bebdb
-------------------------------------------------------------------
Thu Nov 24 13:01:09 CET 2011 - mmarek@suse.cz
- rpm/try-disable-staging-driver: Script to disable failing staging
driver and restart make.
- commit 819d1fa
-------------------------------------------------------------------
Thu Nov 24 12:41:48 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Do not have a separate make invocation for
s390 and the rest.
- commit d72f6c1
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 24 00:27:55 CET 2011 - agraf@suse.de Thu Nov 24 00:27:55 CET 2011 - agraf@suse.de
@ -88,7 +134,8 @@ Wed Nov 23 22:35:11 CET 2011 - agraf@suse.de
Wed Nov 23 22:33:58 CET 2011 - agraf@suse.de Wed Nov 23 22:33:58 CET 2011 - agraf@suse.de
- ARM: create uImage, not zImage, so we can boot with u-boot - ARM: create uImage, not zImage, so we can boot with u-boot
- commit 36caa28 - ARM: create uImage, not zImage, so we can boot with u-boot
- commit 63a7b2c
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 23 02:33:12 CET 2011 - agraf@suse.de Wed Nov 23 02:33:12 CET 2011 - agraf@suse.de
@ -126,7 +173,10 @@ Tue Nov 22 14:12:10 CET 2011 - agraf@suse.de
- ARM: Use zImage, not vmlinux - ARM: Use zImage, not vmlinux
On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems. On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems.
Put that into the rpm as vmlinuz instead of the vmlinux ELF binary. Put that into the rpm as vmlinuz instead of the vmlinux ELF binary.
- commit 6676e8d - ARM: Use zImage, not vmlinux
On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems.
Put that into the rpm as vmlinuz instead of the vmlinux ELF binary.
- commit 4c08eb0
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 22 14:05:11 CET 2011 - agraf@suse.de Tue Nov 22 14:05:11 CET 2011 - agraf@suse.de

View File

@ -20,6 +20,7 @@
%define srcversion 3.2-rc3 %define srcversion 3.2-rc3
%define patchversion 3.2.0-rc3 %define patchversion 3.2.0-rc3
%define variant %{nil} %define variant %{nil}
%define vanilla_only 0
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
@ -35,7 +36,7 @@
%define rpm_install_dir %buildroot%obj_install_dir %define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj %define kernel_build_dir %my_builddir/linux-obj
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh}) %(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,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})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor %define cpu_arch_flavor %cpu_arch/%build_flavor
@ -192,6 +193,7 @@ Source65: kernel-spec-macros
Source66: configtool.pl Source66: configtool.pl
Source67: log.sh Source67: log.sh
Source68: host-memcpy-hack.h Source68: host-memcpy-hack.h
Source69: try-disable-staging-driver
Source100: config.tar.bz2 Source100: config.tar.bz2
Source101: config.addon.tar.bz2 Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2 Source102: patches.arch.tar.bz2
@ -390,11 +392,25 @@ fi
# %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat) # %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat)
%if %CONFIG_KMSG_IDS == "y" %if %CONFIG_KMSG_IDS == "y"
chmod +x ../linux-%srcversion/scripts/kmsg-doc chmod +x ../linux-%srcversion/scripts/kmsg-doc
make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 MAKE_ARGS="$MAKE_ARGS D=2"
%else
make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y
%endif %endif
while true; do
make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y 2>&1 \
| tee buildlog
if test "${PIPESTATUS[0]}" -eq 0; then
break
fi
# In the linux-next and vanilla branches, we try harder to build a
# package.
if test 0%vanilla_only -gt 0 &&
%_sourcedir/try-disable-staging-driver buildlog; then
echo "Retrying make"
else
exit 1
fi
done
%install %install
# get rid of /usr/lib/rpm/brp-strip-debug # get rid of /usr/lib/rpm/brp-strip-debug

View File

@ -1,3 +1,35 @@
-------------------------------------------------------------------
Mon Nov 28 17:07:17 CET 2011 - jeffm@suse.com
- Fix kernel-source spec to give ownership of the /usr/src/linux link
to kernel-devel. kernel-source depends on kernel-devel, so this is correct.
- Fix kernel-source spec to give ownership of the /usr/src/linux link
to kernel-devel. kernel-source depends on kernel-devel, so this is correct.
- commit 7160a9c
-------------------------------------------------------------------
Mon Nov 28 16:51:10 CET 2011 - jbeulich@novell.com
- Refresh patches.xen/xen-pcpu-hotplug.
- Refresh patches.xen/xen3-patch-3.2-rc3.
- commit 7956240
-------------------------------------------------------------------
Mon Nov 28 16:12:16 CET 2011 - jbeulich@novell.com
- Update Xen patches to 3,2-rc3 and c/s 1127.
- Update frontswap patches to v10.
- config.conf: Re-enable Xen.
- Update config files.
- commit b08ea4f
-------------------------------------------------------------------
Mon Nov 28 15:32:21 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Ignore staging failures only in vanilla only
branches.
- commit eeaaaf1
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Nov 25 19:28:57 CET 2011 - agraf@suse.de Fri Nov 25 19:28:57 CET 2011 - agraf@suse.de
@ -72,6 +104,20 @@ Thu Nov 24 18:45:54 CET 2011 - ohering@suse.de
- ata_piix: ignore disks in a hyper-v guest. - ata_piix: ignore disks in a hyper-v guest.
- commit d0bebdb - commit d0bebdb
-------------------------------------------------------------------
Thu Nov 24 13:01:09 CET 2011 - mmarek@suse.cz
- rpm/try-disable-staging-driver: Script to disable failing staging
driver and restart make.
- commit 819d1fa
-------------------------------------------------------------------
Thu Nov 24 12:41:48 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Do not have a separate make invocation for
s390 and the rest.
- commit d72f6c1
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 24 00:27:55 CET 2011 - agraf@suse.de Thu Nov 24 00:27:55 CET 2011 - agraf@suse.de
@ -88,7 +134,8 @@ Wed Nov 23 22:35:11 CET 2011 - agraf@suse.de
Wed Nov 23 22:33:58 CET 2011 - agraf@suse.de Wed Nov 23 22:33:58 CET 2011 - agraf@suse.de
- ARM: create uImage, not zImage, so we can boot with u-boot - ARM: create uImage, not zImage, so we can boot with u-boot
- commit 36caa28 - ARM: create uImage, not zImage, so we can boot with u-boot
- commit 63a7b2c
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 23 02:33:12 CET 2011 - agraf@suse.de Wed Nov 23 02:33:12 CET 2011 - agraf@suse.de
@ -126,7 +173,10 @@ Tue Nov 22 14:12:10 CET 2011 - agraf@suse.de
- ARM: Use zImage, not vmlinux - ARM: Use zImage, not vmlinux
On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems. On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems.
Put that into the rpm as vmlinuz instead of the vmlinux ELF binary. Put that into the rpm as vmlinuz instead of the vmlinux ELF binary.
- commit 6676e8d - ARM: Use zImage, not vmlinux
On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems.
Put that into the rpm as vmlinuz instead of the vmlinux ELF binary.
- commit 4c08eb0
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 22 14:05:11 CET 2011 - agraf@suse.de Tue Nov 22 14:05:11 CET 2011 - agraf@suse.de

View File

@ -20,6 +20,7 @@
%define srcversion 3.2-rc3 %define srcversion 3.2-rc3
%define patchversion 3.2.0-rc3 %define patchversion 3.2.0-rc3
%define variant %{nil} %define variant %{nil}
%define vanilla_only 0
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
@ -35,7 +36,7 @@
%define rpm_install_dir %buildroot%obj_install_dir %define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj %define kernel_build_dir %my_builddir/linux-obj
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh}) %(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,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})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor %define cpu_arch_flavor %cpu_arch/%build_flavor
@ -173,6 +174,7 @@ Source65: kernel-spec-macros
Source66: configtool.pl Source66: configtool.pl
Source67: log.sh Source67: log.sh
Source68: host-memcpy-hack.h Source68: host-memcpy-hack.h
Source69: try-disable-staging-driver
Source100: config.tar.bz2 Source100: config.tar.bz2
Source101: config.addon.tar.bz2 Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2 Source102: patches.arch.tar.bz2
@ -384,11 +386,25 @@ fi
# %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat) # %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat)
%if %CONFIG_KMSG_IDS == "y" %if %CONFIG_KMSG_IDS == "y"
chmod +x ../linux-%srcversion/scripts/kmsg-doc chmod +x ../linux-%srcversion/scripts/kmsg-doc
make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 MAKE_ARGS="$MAKE_ARGS D=2"
%else
make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y
%endif %endif
while true; do
make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y 2>&1 \
| tee buildlog
if test "${PIPESTATUS[0]}" -eq 0; then
break
fi
# In the linux-next and vanilla branches, we try harder to build a
# package.
if test 0%vanilla_only -gt 0 &&
%_sourcedir/try-disable-staging-driver buildlog; then
echo "Retrying make"
else
exit 1
fi
done
%install %install
# get rid of /usr/lib/rpm/brp-strip-debug # get rid of /usr/lib/rpm/brp-strip-debug

View File

@ -1,3 +1,35 @@
-------------------------------------------------------------------
Mon Nov 28 17:07:17 CET 2011 - jeffm@suse.com
- Fix kernel-source spec to give ownership of the /usr/src/linux link
to kernel-devel. kernel-source depends on kernel-devel, so this is correct.
- Fix kernel-source spec to give ownership of the /usr/src/linux link
to kernel-devel. kernel-source depends on kernel-devel, so this is correct.
- commit 7160a9c
-------------------------------------------------------------------
Mon Nov 28 16:51:10 CET 2011 - jbeulich@novell.com
- Refresh patches.xen/xen-pcpu-hotplug.
- Refresh patches.xen/xen3-patch-3.2-rc3.
- commit 7956240
-------------------------------------------------------------------
Mon Nov 28 16:12:16 CET 2011 - jbeulich@novell.com
- Update Xen patches to 3,2-rc3 and c/s 1127.
- Update frontswap patches to v10.
- config.conf: Re-enable Xen.
- Update config files.
- commit b08ea4f
-------------------------------------------------------------------
Mon Nov 28 15:32:21 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Ignore staging failures only in vanilla only
branches.
- commit eeaaaf1
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Nov 25 19:28:57 CET 2011 - agraf@suse.de Fri Nov 25 19:28:57 CET 2011 - agraf@suse.de
@ -72,6 +104,20 @@ Thu Nov 24 18:45:54 CET 2011 - ohering@suse.de
- ata_piix: ignore disks in a hyper-v guest. - ata_piix: ignore disks in a hyper-v guest.
- commit d0bebdb - commit d0bebdb
-------------------------------------------------------------------
Thu Nov 24 13:01:09 CET 2011 - mmarek@suse.cz
- rpm/try-disable-staging-driver: Script to disable failing staging
driver and restart make.
- commit 819d1fa
-------------------------------------------------------------------
Thu Nov 24 12:41:48 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Do not have a separate make invocation for
s390 and the rest.
- commit d72f6c1
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 24 00:27:55 CET 2011 - agraf@suse.de Thu Nov 24 00:27:55 CET 2011 - agraf@suse.de
@ -88,7 +134,8 @@ Wed Nov 23 22:35:11 CET 2011 - agraf@suse.de
Wed Nov 23 22:33:58 CET 2011 - agraf@suse.de Wed Nov 23 22:33:58 CET 2011 - agraf@suse.de
- ARM: create uImage, not zImage, so we can boot with u-boot - ARM: create uImage, not zImage, so we can boot with u-boot
- commit 36caa28 - ARM: create uImage, not zImage, so we can boot with u-boot
- commit 63a7b2c
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 23 02:33:12 CET 2011 - agraf@suse.de Wed Nov 23 02:33:12 CET 2011 - agraf@suse.de
@ -126,7 +173,10 @@ Tue Nov 22 14:12:10 CET 2011 - agraf@suse.de
- ARM: Use zImage, not vmlinux - ARM: Use zImage, not vmlinux
On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems. On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems.
Put that into the rpm as vmlinuz instead of the vmlinux ELF binary. Put that into the rpm as vmlinuz instead of the vmlinux ELF binary.
- commit 6676e8d - ARM: Use zImage, not vmlinux
On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems.
Put that into the rpm as vmlinuz instead of the vmlinux ELF binary.
- commit 4c08eb0
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 22 14:05:11 CET 2011 - agraf@suse.de Tue Nov 22 14:05:11 CET 2011 - agraf@suse.de

24698
kernel-ec2.changes Normal file

File diff suppressed because it is too large Load Diff

915
kernel-ec2.spec Normal file
View File

@ -0,0 +1,915 @@
#
# spec file for package kernel-ec2
#
# Copyright (c) 2011 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/
#
# norootforbuild
%define srcversion 3.2-rc3
%define patchversion 3.2.0-rc3
%define variant %{nil}
%define vanilla_only 0
%include %_sourcedir/kernel-spec-macros
%define build_flavor ec2
%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
%define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,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})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
%ifarch %ix86 x86_64
%define install_vdso 1
%else
%define install_vdso 0
%endif
Name: kernel-ec2
Summary: The Amazon EC2 Xen Kernel
Version: 3.2.rc3
Release: 0
License: GPL v2 only
Group: System/Kernel
Url: http://www.kernel.org/
BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes
Provides: multiversion(kernel)
Provides: %{name}_%_target_cpu = %version-%release
Provides: %name = %version-%source_rel
%if %split_base
Provides: kernel-base = %version-%source_rel
# Obsolete the -base subpackage from 11.1 and 11.2 development phase
Obsoletes: %name-base <= 2.6.31
%endif
Requires(pre): coreutils awk
# Need a module-init-tools with /usr/lib/module-init-tools/weak-modules2
Requires(post): module-init-tools >= 3.4
# This Requires is wrong, because the post/postun scripts have a
# test -x update-bootloader, having perl-Bootloader is not a hard requirement.
# But, there is no way to tell rpm or yast to schedule the installation
# of perl-Bootloader before kernel-binary.rpm if both are in the list of
# packages to install/update. Likewise, this is true for mkinitrd.
# Need a perl-Bootloader with /usr/lib/bootloader/bootloader_entry
Requires(post): perl-Bootloader >= 0.4.15
Requires(post): mkinitrd
# Do not install p-b and mkinitrd for the install check, the %post script is
# able to handle this
#!BuildIgnore: perl-Bootloader mkinitrd
# Remove some packages that are installed automatically by the build system,
# but are not needed to build the kernel
#!BuildIgnore: autoconf automake gettext-runtime libtool cvs gettext-tools m4 udev fillup insserv
%ifarch ia64
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
%ifarch s390 s390x
%if %build_vanilla && 0%{?suse_version} < 1130
BuildRequires: dwarfextract
%endif
%endif
%ifarch %arm
BuildRequires: u-boot-tools
%endif
%if %build_xen
%ifarch %ix86
%if %build_flavor != "ec2"
Provides: kernel-xenpae = %version
Obsoletes: kernel-xenpae <= %version
%endif
%endif
#!BuildIgnore: xen
%endif
Provides: %name-nongpl
Obsoletes: %name-nongpl
%if %build_vanilla
# force bzip2 instead of lzma compression to allow install on older dist versions
%define _binary_payload w9.bzdio
%endif
# dead network if installed on SLES10, otherwise it will work (mostly)
Conflicts: sysfsutils < 2.0
%if ! %build_vanilla
Conflicts: apparmor-profiles <= 2.1
Conflicts: apparmor-parser < 2.3
# root-lvm only works with newer udevs
Conflicts: udev < 118
Conflicts: lvm2 < 2.02.33
%endif
%ifarch %ix86
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh
Source9: devel-post.sh
Source10: preun.sh
Source11: postun.sh
Source12: pre.sh
Source13: post.sh
Source14: series.conf
Source16: guards
Source17: apply-patches
Source21: config.conf
Source23: supported.conf
Source33: check-for-config-changes
Source34: check-supported-list
Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
Source39: config-options.changes.txt
Source40: source-timestamp
Source44: find-provides
Source45: split-modules
Source46: modversions
Source48: macros.kernel-source
Source49: kernel-module-subpackage
Source50: kabi.pl
Source51: mkspec
Source52: kernel-source%variant.changes
Source53: kernel-source.spec.in
Source54: kernel-binary.spec.in
Source55: kernel-syms.spec.in
Source56: kernel-docs.spec.in
Source60: config.sh
Source61: compute-PATCHVERSION.sh
Source62: old-packages.conf
Source63: arch-symbols
Source64: package-descriptions
Source65: kernel-spec-macros
Source66: configtool.pl
Source67: log.sh
Source68: host-memcpy-hack.h
Source69: try-disable-staging-driver
Source100: config.tar.bz2
Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2
Source103: patches.drivers.tar.bz2
Source104: patches.fixes.tar.bz2
Source105: patches.rpmify.tar.bz2
Source106: patches.suse.tar.bz2
Source107: patches.xen.tar.bz2
Source108: patches.addon.tar.bz2
Source109: patches.kernel.org.tar.bz2
Source110: patches.apparmor.tar.bz2
Source111: patches.rt.tar.bz2
Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2
Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64
# These files are found in the kernel-source package:
NoSource: 0
NoSource: 100
NoSource: 101
NoSource: 102
NoSource: 103
NoSource: 104
NoSource: 105
NoSource: 106
NoSource: 107
NoSource: 108
NoSource: 109
NoSource: 110
NoSource: 111
NoSource: 112
NoSource: 113
NoSource: 120
NoSource: 121
# The following KMPs have been integrated into the kernel package,
# grouped by the last product that contained them.
# sles10 / 10.3
Obsoletes: iwlwifi-kmp-%build_flavor
Obsoletes: ipw3945-kmp-%build_flavor
# sles10 / 11.0
Obsoletes: uvcvideo-kmp-%build_flavor
# 11.0
Obsoletes: atl2-kmp-%build_flavor
Obsoletes: wlan-ng-kmp-%build_flavor
Obsoletes: et131x-kmp-%build_flavor
Obsoletes: ivtv-kmp-%build_flavor
Obsoletes: at76_usb-kmp-%build_flavor
Obsoletes: pcc-acpi-kmp-%build_flavor
Obsoletes: btusb-kmp-%build_flavor
# sle11-ga
Obsoletes: enic-kmp-%build_flavor
Obsoletes: fnic-kmp-%build_flavor
Obsoletes: brocade-bfa-kmp-%build_flavor
Obsoletes: kvm-kmp-%build_flavor
Obsoletes: perfmon-kmp-%build_flavor
Obsoletes: iwlagn-2-6-27-kmp-%build_flavor
Obsoletes: msi-wmi-kmp-%build_flavor
# sle11
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
Obsoletes: quickcam-kmp-%build_flavor < 0.6.7
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
%description
The Linux kernel for Xen paravirtualization.
This kernel can only be used both as an unprivileged ("xenU")
kernel (for Amazon EC2).
%source_timestamp
%prep
if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then
echo "The %name-%version.nosrc.rpm package does not contain the" \
"complete sources. Please install kernel-source-%version.src.rpm."
exit 1
fi
SYMBOLS=
if test -e %_sourcedir/extra-symbols; then
SYMBOLS=$(cat %_sourcedir/extra-symbols)
echo "extra symbol(s):" $SYMBOLS
fi
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 -a 121
mkdir -p %kernel_build_dir
supported_conf() {
%_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u
}
# Generate the list of modules to be marked as supported
{ supported_conf base
supported_conf --default=0 external | sed 's/$/ external/'
} > %kernel_build_dir/Module.supported
supported_conf --default=0 base >%kernel_build_dir/Module.base
cd linux-%srcversion
%_sourcedir/apply-patches \
%if %{build_vanilla}
--vanilla \
%endif
%_sourcedir/series.conf .. $SYMBOLS
cd %kernel_build_dir
# Override the timestamp 'uname -v' reports with the source timestamp and
# the commit hash.
date=$(head -n 1 %_sourcedir/source-timestamp)
commit=$(sed -n 's/GIT Revision: //p' %_sourcedir/source-timestamp)
cat > .kernel-binary.spec.buildenv <<EOF
export KBUILD_BUILD_TIMESTAMP="$(LANG=C date -d "$date") (${commit:0:7})"
export KBUILD_VERBOSE=0
export KBUILD_SYMTYPES=1
export KBUILD_OVERRIDE=1
export KBUILD_BUILD_USER=geeko
export KBUILD_BUILD_HOST=buildhost
export HOST_EXTRACFLAGS="-include %_sourcedir/host-memcpy-hack.h"
EOF
source .kernel-binary.spec.buildenv
if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
if test -e ../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
else
cp ../config/%cpu_arch_flavor .config
fi
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION %release_num-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
--enable CONFIG_DEBUG_INFO \
--disable CONFIG_DEBUG_INFO_REDUCED
%else
--disable CONFIG_DEBUG_INFO
%endif
MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS
else
cp .config .config.orig
make silentoldconfig $MAKE_ARGS < /dev/null
%_sourcedir/check-for-config-changes .config.orig .config
rm .config.orig
fi
make prepare $MAKE_ARGS
make scripts $MAKE_ARGS
krel=$(make -s kernelrelease $MAKE_ARGS)
if [ "$krel" != "%kernelrelease-%build_flavor" ]; then
echo "Kernel release mismatch: $krel != %kernelrelease-%build_flavor" >&2
exit 1
fi
make clean $MAKE_ARGS
rm -f source
find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
%build
cd %kernel_build_dir
source .kernel-binary.spec.buildenv
# create *.symref files in the tree
if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
%_sourcedir/modversions --unpack . < $_
fi
# The %{_smp_mflags} macro is defined to a number, make will spawn that many jobs.
# There are several ways how to define it:
# If you are using the build script:
# build --jobs=N kernel-$flavor.spec
# With plain rpmbuild:
# rpmbuild -ba --define 'jobs N' kernel-$flavor.spec
# To spawn as many jobs as there are cpu cores:
# rpmbuild -ba --define "%_smp_mflags -j 0$(grep -Ec 'cpu[0-9]' /proc/stat)" \
# kernel-$flavor.spec
# 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
MAKE_ARGS="$MAKE_ARGS D=2"
%endif
while true; do
make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y 2>&1 \
| tee buildlog
if test "${PIPESTATUS[0]}" -eq 0; then
break
fi
# In the linux-next and vanilla branches, we try harder to build a
# package.
if test 0%vanilla_only -gt 0 &&
%_sourcedir/try-disable-staging-driver buildlog; then
echo "Retrying make"
else
exit 1
fi
done
%install
# get rid of /usr/lib/rpm/brp-strip-debug
# strip removes too much from the vmlinux ELF binary
export NO_BRP_STRIP_DEBUG=true
export STRIP_KEEP_SYMTAB='*/vmlinux-*'
# /lib/modules/%kernelrelease-%build_flavor/build will be a stale symlink until the
# kernel-devel package is installed. Don't check for stale symlinks
# in the brp-symlink check:
export NO_BRP_STALE_LINK_ERROR=yes
cd %kernel_build_dir
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false
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)
chmod +x %buildroot/$vmlinux
fi
%endif
if $compressed; then
gzip -n -9 %buildroot/$vmlinux
chmod a-x %buildroot/$vmlinux.gz
fi
}
%if %build_kdump
add_vmlinux
image=vmlinux
%else
# architecture specifics
%ifarch %ix86 x86_64
add_vmlinux --compressed
%if %build_xen
image=vmlinuz
%else
image=bzImage
%endif
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
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
image=image
if test -e arch/s390/boot/kerntypes.o; then
cp -p arch/s390/boot/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor
elif test -x "$(which dwarfextract 2>/dev/null)"; then
dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)"
fi
%if %CONFIG_KMSG_IDS == "y"
mkdir -p %buildroot/usr/share/man/man9
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
# quickly compile uImage so we have something to boot from
make %{?_smp_mflags} uImage $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y
image=uImage
cp -p arch/arm/boot/$image %buildroot/boot/uImage-%kernelrelease-%build_flavor
%endif
# end of build_kdump
%endif
for sub in '-base' '' '-extra'; do
case "$sub" in
'-base' | '') base_package=1 ;;
*) base_package=0 ;;
esac
for script in preun postun pre post devel-pre devel-post; do
sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
-e "s:@IMAGE@:$image:g" \
-e "s:@FLAVOR""@:%build_flavor:g" \
-e "s:@SUBPACKAGE@:%name$sub:g" \
-e "s:@BASE_PACKAGE@:$base_package:g" \
-e "s:@RPM_VERSION_RELEASE@:%version-%release:g" \
-e "s:@RPM_TARGET_CPU@:%_target_cpu:g" \
-e "s:@CPU_ARCH_FLAVOR@:%cpu_arch_flavor:g" \
-e "s:@SRCVARIANT@:%variant:g" \
%_sourcedir/$script.sh > %my_builddir/$script$sub.sh
done
done
%if %build_kdump || %build_xen || %build_vanilla || %build_ps3
# keep this -suffix list in sync with post.sh and postun.sh
suffix=-%build_flavor
%endif
ln -s $image$suffix %buildroot/boot/$image$suffix
ln -s initrd$suffix %buildroot/boot/initrd$suffix
cp -p .config %buildroot/boot/config-%kernelrelease-%build_flavor
sysctl_file=%buildroot/boot/sysctl.conf-%kernelrelease-%build_flavor
for file in %my_builddir/sysctl/{defaults,%cpu_arch/arch-defaults,%cpu_arch_flavor}; do
if [ -f "$file" ]; then
cat "$file"
fi
done | sed '1i # Generated file - do not edit.' >$sysctl_file
if [ ! -s $sysctl_file ]; then
rm $sysctl_file
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
%endif
# Create a dummy initrd with roughly the size the real one will have.
# That way, YaST will know that this package requires some additional
# space in /boot.
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
bs=1024 seek=2047 count=1
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch
ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor
gzip -n -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz
make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
if ! %_sourcedir/check-supported-list \
%_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then
%if %supported_modules_check
exit 1
%endif
echo "Consistency check error: please update supported.conf."
fi
%ifarch s390 s390x
if test -e arch/s390/boot/kerntypes.o; then
:
elif test -x "$(which dwarfextract 2>/dev/null)" -a \
-f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor; then
find %buildroot -name "*.ko" > kofiles.list
dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)"
fi
%endif
# Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor
# so that kernel-devel + kernel-%build_flavor is sufficient for building
# modules that have modversions as well.
mkdir -p %rpm_install_dir/%cpu_arch/%build_flavor
cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor
# Table of types used in exported symbols (for modversion debugging).
%_sourcedir/modversions --pack . > %buildroot/boot/symtypes-%kernelrelease-%build_flavor
if [ -s %buildroot/boot/symtypes-%kernelrelease-%build_flavor ]; then
gzip -n -9 %buildroot/boot/symtypes-%kernelrelease-%build_flavor
else
rm -f %buildroot/boot/symtypes-%kernelrelease-%build_flavor
fi
# Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory.
if [ ! -e %rpm_install_dir/%_target_cpu ]; then
ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
fi
# We were building in %my_builddir/linux-%srcversion, but the sources will
# later be installed in /usr/src/linux-%srcversion-%source_rel. Fix up the
# build symlink.
rm -f %buildroot/lib/modules/%kernelrelease-%build_flavor/{source,build}
ln -s %src_install_dir \
%buildroot/lib/modules/%kernelrelease-%build_flavor/source
ln -s %obj_install_dir/%cpu_arch/%build_flavor \
%buildroot/lib/modules/%kernelrelease-%build_flavor/build
# Abort if there are any undefined symbols
msg="$(/sbin/depmod -F %buildroot/boot/System.map-%kernelrelease-%build_flavor \
-b %buildroot -ae %kernelrelease-%build_flavor 2>&1)"
if [ $? -ne 0 ] || echo "$msg" | grep 'needs unknown symbol'; then
exit 1
fi
%if %split_base
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
-b %kernel_build_dir/Module.base \
%if ! %supported_modules_check
-i \
%endif
-s %kernel_build_dir/Module.supported
%if ! %split_extra
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif
%else
( cd %buildroot
find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules
%endif
res=0
if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then
# check for kabi changes
%_sourcedir/kabi.pl --rules %my_builddir/kabi/severities \
%my_builddir/kabi/%cpu_arch/symvers-%build_flavor \
Module.symvers || res=$?
fi
if [ $res -ne 0 ]; then
if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then
echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \
"directory to build this kernel even though its badness is" \
"higher than allowed for an official kernel."
exit 1
fi
fi
tar -cf - -T %my_builddir/obj-files | \
tar -xf - -C %rpm_install_dir/%cpu_arch_flavor
# bnc#507084
find %rpm_install_dir/%cpu_arch_flavor/scripts -type f -perm -111 | \
while read f; do
case "$(file -b "$f")" in
ELF\ *\ executable*)
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
fi
add_dirs_to_filelist() {
sed -rn '
# print file name
p
# remove filelist macros
s:%%[a-z]+(\([^)]+\))? ?::g
# add %%dir prefix
s:^:%%dir :
# print all parents
:a
# skip directories owned by other packages
s:^%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
s:/[^/]+$::p
ta
' "$@" | sort -u
}
# Collect the file lists.
shopt -s nullglob
> %my_builddir/kernel-devel.files
for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
%buildroot/lib/modules/*/{build,source}; do
f=${file##%buildroot}
echo "$f" >> %my_builddir/kernel-devel.files
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-kdump'
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump
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'
cat %my_builddir/base-modules
fi
test -d lib/firmware/%kernelrelease-%build_flavor && \
find lib/firmware/%kernelrelease-%build_flavor \
-type d -o \
-printf '/%%p\n'
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
%if %split_base
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
> %my_builddir/kernel-main.files
%endif
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
%endif
# Hardlink duplicate files automatically (from package fdupes): It doesn't save
# much, but it keeps rpmlint from breaking the package build. Note that we skip
# /usr/src/linux-obj intentionally, to not accidentally break timestamps there
%fdupes $RPM_BUILD_ROOT/lib
%preun -f preun.sh
%postun -f postun.sh
%pre -f pre.sh
%post -f post.sh
%if %split_base
%files -f kernel-main.files
%else
%files -f kernel-base.files
%endif
%defattr(-, root, root)
%package base
Summary: The Amazon EC2 Xen Kernel - base modules
License: GPL v2 only
Group: System/Kernel
Url: http://www.kernel.org/
Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel
Requires(pre): coreutils awk
Requires(post): module-init-tools
Requires(post): perl-Bootloader
Requires(post): mkinitrd
%ifarch %ix86
Conflicts: libc.so.6()(64bit)
%endif
%description base
The Linux kernel for Xen paravirtualization.
This kernel can only be used both as an unprivileged ("xenU")
kernel (for Amazon EC2).
This package contains only the base modules, required in all installs.
%source_timestamp
%preun base -f preun-base.sh
%postun base -f postun-base.sh
%pre base -f pre-base.sh
%post base -f post-base.sh
%if %split_base
%files base -f kernel-base.files
%defattr(-, root, root)
%endif
%package extra
Summary: The Amazon EC2 Xen Kernel - Unsupported kernel modules
License: GPL v2 only
Group: System/Kernel
Url: http://www.kernel.org/
Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel
Requires: %{name}_%_target_cpu = %version-%release
Requires(pre): coreutils awk
Requires(post): module-init-tools
Requires(post): perl-Bootloader
Requires(post): mkinitrd
Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu)
%ifarch %ix86
Conflicts: libc.so.6()(64bit)
%endif
%description extra
The Linux kernel for Xen paravirtualization.
This kernel can only be used both as an unprivileged ("xenU")
kernel (for Amazon EC2).
This package contains additional modules not supported by Novell.
%source_timestamp
%preun extra -f preun-extra.sh
%postun extra -f postun-extra.sh
%pre extra -f pre-extra.sh
%post extra -f post-extra.sh
%if %split_extra
%files extra -f kernel-extra.files
%defattr(-, root, root)
%endif
%if %CONFIG_KMSG_IDS == "y"
%package man
Summary: The collection of man pages generated by the kmsg script.
License: GPL v2 only
Group: System/Kernel
%description man
This package includes the man pages that have been generated from the
kmsg message documentation comments.
%source_timestamp
%files man
%defattr(-,root,root)
/usr/share/man/man9/*
%endif
%package devel
Summary: Development files necessary for building kernel modules
License: GPL v2 only
Group: Development/Sources
Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
Requires: kernel-devel%variant = %version-%source_rel
Supplements: packageand(%name:kernel-devel%variant)
%description devel
This package contains files necessary for building kernel modules (and
kernel module packages) against the %build_flavor flavor of the kernel.
%source_timestamp
%if %CONFIG_MODULES == "y"
%pre devel -f devel-pre.sh
%post devel -f devel-post.sh
%files devel -f kernel-devel.files
%defattr(-,root,root)
%dir %obj_install_dir
%dir %obj_install_dir/%cpu_arch
%dir /usr/src/linux-obj
%dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor
%obj_install_dir/%cpu_arch_flavor
%if %_target_cpu != %cpu_arch
%obj_install_dir/%_target_cpu
/usr/src/linux-obj/%_target_cpu
%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
License: GPL v2 only
Group: Development/Debug
%description devel-debuginfo
Debug information for package %name-devel
%source_timestamp
%files devel-debuginfo -f vmlinux.debug.files
%changelog

View File

@ -1,3 +1,35 @@
-------------------------------------------------------------------
Mon Nov 28 17:07:17 CET 2011 - jeffm@suse.com
- Fix kernel-source spec to give ownership of the /usr/src/linux link
to kernel-devel. kernel-source depends on kernel-devel, so this is correct.
- Fix kernel-source spec to give ownership of the /usr/src/linux link
to kernel-devel. kernel-source depends on kernel-devel, so this is correct.
- commit 7160a9c
-------------------------------------------------------------------
Mon Nov 28 16:51:10 CET 2011 - jbeulich@novell.com
- Refresh patches.xen/xen-pcpu-hotplug.
- Refresh patches.xen/xen3-patch-3.2-rc3.
- commit 7956240
-------------------------------------------------------------------
Mon Nov 28 16:12:16 CET 2011 - jbeulich@novell.com
- Update Xen patches to 3,2-rc3 and c/s 1127.
- Update frontswap patches to v10.
- config.conf: Re-enable Xen.
- Update config files.
- commit b08ea4f
-------------------------------------------------------------------
Mon Nov 28 15:32:21 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Ignore staging failures only in vanilla only
branches.
- commit eeaaaf1
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Nov 25 19:28:57 CET 2011 - agraf@suse.de Fri Nov 25 19:28:57 CET 2011 - agraf@suse.de
@ -72,6 +104,20 @@ Thu Nov 24 18:45:54 CET 2011 - ohering@suse.de
- ata_piix: ignore disks in a hyper-v guest. - ata_piix: ignore disks in a hyper-v guest.
- commit d0bebdb - commit d0bebdb
-------------------------------------------------------------------
Thu Nov 24 13:01:09 CET 2011 - mmarek@suse.cz
- rpm/try-disable-staging-driver: Script to disable failing staging
driver and restart make.
- commit 819d1fa
-------------------------------------------------------------------
Thu Nov 24 12:41:48 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Do not have a separate make invocation for
s390 and the rest.
- commit d72f6c1
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 24 00:27:55 CET 2011 - agraf@suse.de Thu Nov 24 00:27:55 CET 2011 - agraf@suse.de
@ -88,7 +134,8 @@ Wed Nov 23 22:35:11 CET 2011 - agraf@suse.de
Wed Nov 23 22:33:58 CET 2011 - agraf@suse.de Wed Nov 23 22:33:58 CET 2011 - agraf@suse.de
- ARM: create uImage, not zImage, so we can boot with u-boot - ARM: create uImage, not zImage, so we can boot with u-boot
- commit 36caa28 - ARM: create uImage, not zImage, so we can boot with u-boot
- commit 63a7b2c
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 23 02:33:12 CET 2011 - agraf@suse.de Wed Nov 23 02:33:12 CET 2011 - agraf@suse.de
@ -126,7 +173,10 @@ Tue Nov 22 14:12:10 CET 2011 - agraf@suse.de
- ARM: Use zImage, not vmlinux - ARM: Use zImage, not vmlinux
On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems. On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems.
Put that into the rpm as vmlinuz instead of the vmlinux ELF binary. Put that into the rpm as vmlinuz instead of the vmlinux ELF binary.
- commit 6676e8d - ARM: Use zImage, not vmlinux
On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems.
Put that into the rpm as vmlinuz instead of the vmlinux ELF binary.
- commit 4c08eb0
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 22 14:05:11 CET 2011 - agraf@suse.de Tue Nov 22 14:05:11 CET 2011 - agraf@suse.de

View File

@ -20,6 +20,7 @@
%define srcversion 3.2-rc3 %define srcversion 3.2-rc3
%define patchversion 3.2.0-rc3 %define patchversion 3.2.0-rc3
%define variant %{nil} %define variant %{nil}
%define vanilla_only 0
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
@ -35,7 +36,7 @@
%define rpm_install_dir %buildroot%obj_install_dir %define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj %define kernel_build_dir %my_builddir/linux-obj
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh}) %(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,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})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor %define cpu_arch_flavor %cpu_arch/%build_flavor
@ -173,6 +174,7 @@ Source65: kernel-spec-macros
Source66: configtool.pl Source66: configtool.pl
Source67: log.sh Source67: log.sh
Source68: host-memcpy-hack.h Source68: host-memcpy-hack.h
Source69: try-disable-staging-driver
Source100: config.tar.bz2 Source100: config.tar.bz2
Source101: config.addon.tar.bz2 Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2 Source102: patches.arch.tar.bz2
@ -372,11 +374,25 @@ fi
# %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat) # %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat)
%if %CONFIG_KMSG_IDS == "y" %if %CONFIG_KMSG_IDS == "y"
chmod +x ../linux-%srcversion/scripts/kmsg-doc chmod +x ../linux-%srcversion/scripts/kmsg-doc
make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 MAKE_ARGS="$MAKE_ARGS D=2"
%else
make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y
%endif %endif
while true; do
make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y 2>&1 \
| tee buildlog
if test "${PIPESTATUS[0]}" -eq 0; then
break
fi
# In the linux-next and vanilla branches, we try harder to build a
# package.
if test 0%vanilla_only -gt 0 &&
%_sourcedir/try-disable-staging-driver buildlog; then
echo "Retrying make"
else
exit 1
fi
done
%install %install
# get rid of /usr/lib/rpm/brp-strip-debug # get rid of /usr/lib/rpm/brp-strip-debug

View File

@ -1,3 +1,35 @@
-------------------------------------------------------------------
Mon Nov 28 17:07:17 CET 2011 - jeffm@suse.com
- Fix kernel-source spec to give ownership of the /usr/src/linux link
to kernel-devel. kernel-source depends on kernel-devel, so this is correct.
- Fix kernel-source spec to give ownership of the /usr/src/linux link
to kernel-devel. kernel-source depends on kernel-devel, so this is correct.
- commit 7160a9c
-------------------------------------------------------------------
Mon Nov 28 16:51:10 CET 2011 - jbeulich@novell.com
- Refresh patches.xen/xen-pcpu-hotplug.
- Refresh patches.xen/xen3-patch-3.2-rc3.
- commit 7956240
-------------------------------------------------------------------
Mon Nov 28 16:12:16 CET 2011 - jbeulich@novell.com
- Update Xen patches to 3,2-rc3 and c/s 1127.
- Update frontswap patches to v10.
- config.conf: Re-enable Xen.
- Update config files.
- commit b08ea4f
-------------------------------------------------------------------
Mon Nov 28 15:32:21 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Ignore staging failures only in vanilla only
branches.
- commit eeaaaf1
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Nov 25 19:28:57 CET 2011 - agraf@suse.de Fri Nov 25 19:28:57 CET 2011 - agraf@suse.de
@ -72,6 +104,20 @@ Thu Nov 24 18:45:54 CET 2011 - ohering@suse.de
- ata_piix: ignore disks in a hyper-v guest. - ata_piix: ignore disks in a hyper-v guest.
- commit d0bebdb - commit d0bebdb
-------------------------------------------------------------------
Thu Nov 24 13:01:09 CET 2011 - mmarek@suse.cz
- rpm/try-disable-staging-driver: Script to disable failing staging
driver and restart make.
- commit 819d1fa
-------------------------------------------------------------------
Thu Nov 24 12:41:48 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Do not have a separate make invocation for
s390 and the rest.
- commit d72f6c1
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 24 00:27:55 CET 2011 - agraf@suse.de Thu Nov 24 00:27:55 CET 2011 - agraf@suse.de
@ -88,7 +134,8 @@ Wed Nov 23 22:35:11 CET 2011 - agraf@suse.de
Wed Nov 23 22:33:58 CET 2011 - agraf@suse.de Wed Nov 23 22:33:58 CET 2011 - agraf@suse.de
- ARM: create uImage, not zImage, so we can boot with u-boot - ARM: create uImage, not zImage, so we can boot with u-boot
- commit 36caa28 - ARM: create uImage, not zImage, so we can boot with u-boot
- commit 63a7b2c
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 23 02:33:12 CET 2011 - agraf@suse.de Wed Nov 23 02:33:12 CET 2011 - agraf@suse.de
@ -126,7 +173,10 @@ Tue Nov 22 14:12:10 CET 2011 - agraf@suse.de
- ARM: Use zImage, not vmlinux - ARM: Use zImage, not vmlinux
On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems. On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems.
Put that into the rpm as vmlinuz instead of the vmlinux ELF binary. Put that into the rpm as vmlinuz instead of the vmlinux ELF binary.
- commit 6676e8d - ARM: Use zImage, not vmlinux
On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems.
Put that into the rpm as vmlinuz instead of the vmlinux ELF binary.
- commit 4c08eb0
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 22 14:05:11 CET 2011 - agraf@suse.de Tue Nov 22 14:05:11 CET 2011 - agraf@suse.de

View File

@ -20,6 +20,7 @@
%define srcversion 3.2-rc3 %define srcversion 3.2-rc3
%define patchversion 3.2.0-rc3 %define patchversion 3.2.0-rc3
%define variant %{nil} %define variant %{nil}
%define vanilla_only 0
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
@ -35,7 +36,7 @@
%define rpm_install_dir %buildroot%obj_install_dir %define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj %define kernel_build_dir %my_builddir/linux-obj
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh}) %(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,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})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor %define cpu_arch_flavor %cpu_arch/%build_flavor
@ -173,6 +174,7 @@ Source65: kernel-spec-macros
Source66: configtool.pl Source66: configtool.pl
Source67: log.sh Source67: log.sh
Source68: host-memcpy-hack.h Source68: host-memcpy-hack.h
Source69: try-disable-staging-driver
Source100: config.tar.bz2 Source100: config.tar.bz2
Source101: config.addon.tar.bz2 Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2 Source102: patches.arch.tar.bz2
@ -372,11 +374,25 @@ fi
# %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat) # %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat)
%if %CONFIG_KMSG_IDS == "y" %if %CONFIG_KMSG_IDS == "y"
chmod +x ../linux-%srcversion/scripts/kmsg-doc chmod +x ../linux-%srcversion/scripts/kmsg-doc
make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 MAKE_ARGS="$MAKE_ARGS D=2"
%else
make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y
%endif %endif
while true; do
make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y 2>&1 \
| tee buildlog
if test "${PIPESTATUS[0]}" -eq 0; then
break
fi
# In the linux-next and vanilla branches, we try harder to build a
# package.
if test 0%vanilla_only -gt 0 &&
%_sourcedir/try-disable-staging-driver buildlog; then
echo "Retrying make"
else
exit 1
fi
done
%install %install
# get rid of /usr/lib/rpm/brp-strip-debug # get rid of /usr/lib/rpm/brp-strip-debug

View File

@ -1,3 +1,35 @@
-------------------------------------------------------------------
Mon Nov 28 17:07:17 CET 2011 - jeffm@suse.com
- Fix kernel-source spec to give ownership of the /usr/src/linux link
to kernel-devel. kernel-source depends on kernel-devel, so this is correct.
- Fix kernel-source spec to give ownership of the /usr/src/linux link
to kernel-devel. kernel-source depends on kernel-devel, so this is correct.
- commit 7160a9c
-------------------------------------------------------------------
Mon Nov 28 16:51:10 CET 2011 - jbeulich@novell.com
- Refresh patches.xen/xen-pcpu-hotplug.
- Refresh patches.xen/xen3-patch-3.2-rc3.
- commit 7956240
-------------------------------------------------------------------
Mon Nov 28 16:12:16 CET 2011 - jbeulich@novell.com
- Update Xen patches to 3,2-rc3 and c/s 1127.
- Update frontswap patches to v10.
- config.conf: Re-enable Xen.
- Update config files.
- commit b08ea4f
-------------------------------------------------------------------
Mon Nov 28 15:32:21 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Ignore staging failures only in vanilla only
branches.
- commit eeaaaf1
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Nov 25 19:28:57 CET 2011 - agraf@suse.de Fri Nov 25 19:28:57 CET 2011 - agraf@suse.de
@ -72,6 +104,20 @@ Thu Nov 24 18:45:54 CET 2011 - ohering@suse.de
- ata_piix: ignore disks in a hyper-v guest. - ata_piix: ignore disks in a hyper-v guest.
- commit d0bebdb - commit d0bebdb
-------------------------------------------------------------------
Thu Nov 24 13:01:09 CET 2011 - mmarek@suse.cz
- rpm/try-disable-staging-driver: Script to disable failing staging
driver and restart make.
- commit 819d1fa
-------------------------------------------------------------------
Thu Nov 24 12:41:48 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Do not have a separate make invocation for
s390 and the rest.
- commit d72f6c1
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 24 00:27:55 CET 2011 - agraf@suse.de Thu Nov 24 00:27:55 CET 2011 - agraf@suse.de
@ -88,7 +134,8 @@ Wed Nov 23 22:35:11 CET 2011 - agraf@suse.de
Wed Nov 23 22:33:58 CET 2011 - agraf@suse.de Wed Nov 23 22:33:58 CET 2011 - agraf@suse.de
- ARM: create uImage, not zImage, so we can boot with u-boot - ARM: create uImage, not zImage, so we can boot with u-boot
- commit 36caa28 - ARM: create uImage, not zImage, so we can boot with u-boot
- commit 63a7b2c
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 23 02:33:12 CET 2011 - agraf@suse.de Wed Nov 23 02:33:12 CET 2011 - agraf@suse.de
@ -126,7 +173,10 @@ Tue Nov 22 14:12:10 CET 2011 - agraf@suse.de
- ARM: Use zImage, not vmlinux - ARM: Use zImage, not vmlinux
On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems. On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems.
Put that into the rpm as vmlinuz instead of the vmlinux ELF binary. Put that into the rpm as vmlinuz instead of the vmlinux ELF binary.
- commit 6676e8d - ARM: Use zImage, not vmlinux
On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems.
Put that into the rpm as vmlinuz instead of the vmlinux ELF binary.
- commit 4c08eb0
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 22 14:05:11 CET 2011 - agraf@suse.de Tue Nov 22 14:05:11 CET 2011 - agraf@suse.de

View File

@ -20,6 +20,7 @@
%define srcversion 3.2-rc3 %define srcversion 3.2-rc3
%define patchversion 3.2.0-rc3 %define patchversion 3.2.0-rc3
%define variant %{nil} %define variant %{nil}
%define vanilla_only 0
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
@ -35,7 +36,7 @@
%define rpm_install_dir %buildroot%obj_install_dir %define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj %define kernel_build_dir %my_builddir/linux-obj
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh}) %(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,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})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor %define cpu_arch_flavor %cpu_arch/%build_flavor
@ -176,6 +177,7 @@ Source65: kernel-spec-macros
Source66: configtool.pl Source66: configtool.pl
Source67: log.sh Source67: log.sh
Source68: host-memcpy-hack.h Source68: host-memcpy-hack.h
Source69: try-disable-staging-driver
Source100: config.tar.bz2 Source100: config.tar.bz2
Source101: config.addon.tar.bz2 Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2 Source102: patches.arch.tar.bz2
@ -381,11 +383,25 @@ fi
# %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat) # %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat)
%if %CONFIG_KMSG_IDS == "y" %if %CONFIG_KMSG_IDS == "y"
chmod +x ../linux-%srcversion/scripts/kmsg-doc chmod +x ../linux-%srcversion/scripts/kmsg-doc
make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 MAKE_ARGS="$MAKE_ARGS D=2"
%else
make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y
%endif %endif
while true; do
make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y 2>&1 \
| tee buildlog
if test "${PIPESTATUS[0]}" -eq 0; then
break
fi
# In the linux-next and vanilla branches, we try harder to build a
# package.
if test 0%vanilla_only -gt 0 &&
%_sourcedir/try-disable-staging-driver buildlog; then
echo "Retrying make"
else
exit 1
fi
done
%install %install
# get rid of /usr/lib/rpm/brp-strip-debug # get rid of /usr/lib/rpm/brp-strip-debug

View File

@ -1,3 +1,35 @@
-------------------------------------------------------------------
Mon Nov 28 17:07:17 CET 2011 - jeffm@suse.com
- Fix kernel-source spec to give ownership of the /usr/src/linux link
to kernel-devel. kernel-source depends on kernel-devel, so this is correct.
- Fix kernel-source spec to give ownership of the /usr/src/linux link
to kernel-devel. kernel-source depends on kernel-devel, so this is correct.
- commit 7160a9c
-------------------------------------------------------------------
Mon Nov 28 16:51:10 CET 2011 - jbeulich@novell.com
- Refresh patches.xen/xen-pcpu-hotplug.
- Refresh patches.xen/xen3-patch-3.2-rc3.
- commit 7956240
-------------------------------------------------------------------
Mon Nov 28 16:12:16 CET 2011 - jbeulich@novell.com
- Update Xen patches to 3,2-rc3 and c/s 1127.
- Update frontswap patches to v10.
- config.conf: Re-enable Xen.
- Update config files.
- commit b08ea4f
-------------------------------------------------------------------
Mon Nov 28 15:32:21 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Ignore staging failures only in vanilla only
branches.
- commit eeaaaf1
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Nov 25 19:28:57 CET 2011 - agraf@suse.de Fri Nov 25 19:28:57 CET 2011 - agraf@suse.de
@ -72,6 +104,20 @@ Thu Nov 24 18:45:54 CET 2011 - ohering@suse.de
- ata_piix: ignore disks in a hyper-v guest. - ata_piix: ignore disks in a hyper-v guest.
- commit d0bebdb - commit d0bebdb
-------------------------------------------------------------------
Thu Nov 24 13:01:09 CET 2011 - mmarek@suse.cz
- rpm/try-disable-staging-driver: Script to disable failing staging
driver and restart make.
- commit 819d1fa
-------------------------------------------------------------------
Thu Nov 24 12:41:48 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Do not have a separate make invocation for
s390 and the rest.
- commit d72f6c1
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 24 00:27:55 CET 2011 - agraf@suse.de Thu Nov 24 00:27:55 CET 2011 - agraf@suse.de
@ -88,7 +134,8 @@ Wed Nov 23 22:35:11 CET 2011 - agraf@suse.de
Wed Nov 23 22:33:58 CET 2011 - agraf@suse.de Wed Nov 23 22:33:58 CET 2011 - agraf@suse.de
- ARM: create uImage, not zImage, so we can boot with u-boot - ARM: create uImage, not zImage, so we can boot with u-boot
- commit 36caa28 - ARM: create uImage, not zImage, so we can boot with u-boot
- commit 63a7b2c
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 23 02:33:12 CET 2011 - agraf@suse.de Wed Nov 23 02:33:12 CET 2011 - agraf@suse.de
@ -126,7 +173,10 @@ Tue Nov 22 14:12:10 CET 2011 - agraf@suse.de
- ARM: Use zImage, not vmlinux - ARM: Use zImage, not vmlinux
On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems. On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems.
Put that into the rpm as vmlinuz instead of the vmlinux ELF binary. Put that into the rpm as vmlinuz instead of the vmlinux ELF binary.
- commit 6676e8d - ARM: Use zImage, not vmlinux
On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems.
Put that into the rpm as vmlinuz instead of the vmlinux ELF binary.
- commit 4c08eb0
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 22 14:05:11 CET 2011 - agraf@suse.de Tue Nov 22 14:05:11 CET 2011 - agraf@suse.de

View File

@ -20,6 +20,7 @@
%define srcversion 3.2-rc3 %define srcversion 3.2-rc3
%define patchversion 3.2.0-rc3 %define patchversion 3.2.0-rc3
%define variant %{nil} %define variant %{nil}
%define vanilla_only 0
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
@ -35,7 +36,7 @@
%define rpm_install_dir %buildroot%obj_install_dir %define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj %define kernel_build_dir %my_builddir/linux-obj
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh}) %(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,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})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor %define cpu_arch_flavor %cpu_arch/%build_flavor
@ -180,6 +181,7 @@ Source65: kernel-spec-macros
Source66: configtool.pl Source66: configtool.pl
Source67: log.sh Source67: log.sh
Source68: host-memcpy-hack.h Source68: host-memcpy-hack.h
Source69: try-disable-staging-driver
Source100: config.tar.bz2 Source100: config.tar.bz2
Source101: config.addon.tar.bz2 Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2 Source102: patches.arch.tar.bz2
@ -385,11 +387,25 @@ fi
# %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat) # %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat)
%if %CONFIG_KMSG_IDS == "y" %if %CONFIG_KMSG_IDS == "y"
chmod +x ../linux-%srcversion/scripts/kmsg-doc chmod +x ../linux-%srcversion/scripts/kmsg-doc
make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 MAKE_ARGS="$MAKE_ARGS D=2"
%else
make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y
%endif %endif
while true; do
make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y 2>&1 \
| tee buildlog
if test "${PIPESTATUS[0]}" -eq 0; then
break
fi
# In the linux-next and vanilla branches, we try harder to build a
# package.
if test 0%vanilla_only -gt 0 &&
%_sourcedir/try-disable-staging-driver buildlog; then
echo "Retrying make"
else
exit 1
fi
done
%install %install
# get rid of /usr/lib/rpm/brp-strip-debug # get rid of /usr/lib/rpm/brp-strip-debug

View File

@ -1,3 +1,35 @@
-------------------------------------------------------------------
Mon Nov 28 17:07:17 CET 2011 - jeffm@suse.com
- Fix kernel-source spec to give ownership of the /usr/src/linux link
to kernel-devel. kernel-source depends on kernel-devel, so this is correct.
- Fix kernel-source spec to give ownership of the /usr/src/linux link
to kernel-devel. kernel-source depends on kernel-devel, so this is correct.
- commit 7160a9c
-------------------------------------------------------------------
Mon Nov 28 16:51:10 CET 2011 - jbeulich@novell.com
- Refresh patches.xen/xen-pcpu-hotplug.
- Refresh patches.xen/xen3-patch-3.2-rc3.
- commit 7956240
-------------------------------------------------------------------
Mon Nov 28 16:12:16 CET 2011 - jbeulich@novell.com
- Update Xen patches to 3,2-rc3 and c/s 1127.
- Update frontswap patches to v10.
- config.conf: Re-enable Xen.
- Update config files.
- commit b08ea4f
-------------------------------------------------------------------
Mon Nov 28 15:32:21 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Ignore staging failures only in vanilla only
branches.
- commit eeaaaf1
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Nov 25 19:28:57 CET 2011 - agraf@suse.de Fri Nov 25 19:28:57 CET 2011 - agraf@suse.de
@ -72,6 +104,20 @@ Thu Nov 24 18:45:54 CET 2011 - ohering@suse.de
- ata_piix: ignore disks in a hyper-v guest. - ata_piix: ignore disks in a hyper-v guest.
- commit d0bebdb - commit d0bebdb
-------------------------------------------------------------------
Thu Nov 24 13:01:09 CET 2011 - mmarek@suse.cz
- rpm/try-disable-staging-driver: Script to disable failing staging
driver and restart make.
- commit 819d1fa
-------------------------------------------------------------------
Thu Nov 24 12:41:48 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Do not have a separate make invocation for
s390 and the rest.
- commit d72f6c1
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 24 00:27:55 CET 2011 - agraf@suse.de Thu Nov 24 00:27:55 CET 2011 - agraf@suse.de
@ -88,7 +134,8 @@ Wed Nov 23 22:35:11 CET 2011 - agraf@suse.de
Wed Nov 23 22:33:58 CET 2011 - agraf@suse.de Wed Nov 23 22:33:58 CET 2011 - agraf@suse.de
- ARM: create uImage, not zImage, so we can boot with u-boot - ARM: create uImage, not zImage, so we can boot with u-boot
- commit 36caa28 - ARM: create uImage, not zImage, so we can boot with u-boot
- commit 63a7b2c
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 23 02:33:12 CET 2011 - agraf@suse.de Wed Nov 23 02:33:12 CET 2011 - agraf@suse.de
@ -126,7 +173,10 @@ Tue Nov 22 14:12:10 CET 2011 - agraf@suse.de
- ARM: Use zImage, not vmlinux - ARM: Use zImage, not vmlinux
On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems. On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems.
Put that into the rpm as vmlinuz instead of the vmlinux ELF binary. Put that into the rpm as vmlinuz instead of the vmlinux ELF binary.
- commit 6676e8d - ARM: Use zImage, not vmlinux
On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems.
Put that into the rpm as vmlinuz instead of the vmlinux ELF binary.
- commit 4c08eb0
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 22 14:05:11 CET 2011 - agraf@suse.de Tue Nov 22 14:05:11 CET 2011 - agraf@suse.de

View File

@ -20,6 +20,7 @@
%define srcversion 3.2-rc3 %define srcversion 3.2-rc3
%define patchversion 3.2.0-rc3 %define patchversion 3.2.0-rc3
%define variant %{nil} %define variant %{nil}
%define vanilla_only 0
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
@ -35,7 +36,7 @@
%define rpm_install_dir %buildroot%obj_install_dir %define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj %define kernel_build_dir %my_builddir/linux-obj
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh}) %(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,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})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor %define cpu_arch_flavor %cpu_arch/%build_flavor
@ -176,6 +177,7 @@ Source65: kernel-spec-macros
Source66: configtool.pl Source66: configtool.pl
Source67: log.sh Source67: log.sh
Source68: host-memcpy-hack.h Source68: host-memcpy-hack.h
Source69: try-disable-staging-driver
Source100: config.tar.bz2 Source100: config.tar.bz2
Source101: config.addon.tar.bz2 Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2 Source102: patches.arch.tar.bz2
@ -374,11 +376,25 @@ fi
# %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat) # %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat)
%if %CONFIG_KMSG_IDS == "y" %if %CONFIG_KMSG_IDS == "y"
chmod +x ../linux-%srcversion/scripts/kmsg-doc chmod +x ../linux-%srcversion/scripts/kmsg-doc
make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 MAKE_ARGS="$MAKE_ARGS D=2"
%else
make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y
%endif %endif
while true; do
make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y 2>&1 \
| tee buildlog
if test "${PIPESTATUS[0]}" -eq 0; then
break
fi
# In the linux-next and vanilla branches, we try harder to build a
# package.
if test 0%vanilla_only -gt 0 &&
%_sourcedir/try-disable-staging-driver buildlog; then
echo "Retrying make"
else
exit 1
fi
done
%install %install
# get rid of /usr/lib/rpm/brp-strip-debug # get rid of /usr/lib/rpm/brp-strip-debug

View File

@ -1,3 +1,35 @@
-------------------------------------------------------------------
Mon Nov 28 17:07:17 CET 2011 - jeffm@suse.com
- Fix kernel-source spec to give ownership of the /usr/src/linux link
to kernel-devel. kernel-source depends on kernel-devel, so this is correct.
- Fix kernel-source spec to give ownership of the /usr/src/linux link
to kernel-devel. kernel-source depends on kernel-devel, so this is correct.
- commit 7160a9c
-------------------------------------------------------------------
Mon Nov 28 16:51:10 CET 2011 - jbeulich@novell.com
- Refresh patches.xen/xen-pcpu-hotplug.
- Refresh patches.xen/xen3-patch-3.2-rc3.
- commit 7956240
-------------------------------------------------------------------
Mon Nov 28 16:12:16 CET 2011 - jbeulich@novell.com
- Update Xen patches to 3,2-rc3 and c/s 1127.
- Update frontswap patches to v10.
- config.conf: Re-enable Xen.
- Update config files.
- commit b08ea4f
-------------------------------------------------------------------
Mon Nov 28 15:32:21 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Ignore staging failures only in vanilla only
branches.
- commit eeaaaf1
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Nov 25 19:28:57 CET 2011 - agraf@suse.de Fri Nov 25 19:28:57 CET 2011 - agraf@suse.de
@ -72,6 +104,20 @@ Thu Nov 24 18:45:54 CET 2011 - ohering@suse.de
- ata_piix: ignore disks in a hyper-v guest. - ata_piix: ignore disks in a hyper-v guest.
- commit d0bebdb - commit d0bebdb
-------------------------------------------------------------------
Thu Nov 24 13:01:09 CET 2011 - mmarek@suse.cz
- rpm/try-disable-staging-driver: Script to disable failing staging
driver and restart make.
- commit 819d1fa
-------------------------------------------------------------------
Thu Nov 24 12:41:48 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Do not have a separate make invocation for
s390 and the rest.
- commit d72f6c1
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 24 00:27:55 CET 2011 - agraf@suse.de Thu Nov 24 00:27:55 CET 2011 - agraf@suse.de
@ -88,7 +134,8 @@ Wed Nov 23 22:35:11 CET 2011 - agraf@suse.de
Wed Nov 23 22:33:58 CET 2011 - agraf@suse.de Wed Nov 23 22:33:58 CET 2011 - agraf@suse.de
- ARM: create uImage, not zImage, so we can boot with u-boot - ARM: create uImage, not zImage, so we can boot with u-boot
- commit 36caa28 - ARM: create uImage, not zImage, so we can boot with u-boot
- commit 63a7b2c
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 23 02:33:12 CET 2011 - agraf@suse.de Wed Nov 23 02:33:12 CET 2011 - agraf@suse.de
@ -126,7 +173,10 @@ Tue Nov 22 14:12:10 CET 2011 - agraf@suse.de
- ARM: Use zImage, not vmlinux - ARM: Use zImage, not vmlinux
On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems. On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems.
Put that into the rpm as vmlinuz instead of the vmlinux ELF binary. Put that into the rpm as vmlinuz instead of the vmlinux ELF binary.
- commit 6676e8d - ARM: Use zImage, not vmlinux
On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems.
Put that into the rpm as vmlinuz instead of the vmlinux ELF binary.
- commit 4c08eb0
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 22 14:05:11 CET 2011 - agraf@suse.de Tue Nov 22 14:05:11 CET 2011 - agraf@suse.de

View File

@ -83,6 +83,7 @@ Source65: kernel-spec-macros
Source66: configtool.pl Source66: configtool.pl
Source67: log.sh Source67: log.sh
Source68: host-memcpy-hack.h Source68: host-memcpy-hack.h
Source69: try-disable-staging-driver
Source100: config.tar.bz2 Source100: config.tar.bz2
Source101: config.addon.tar.bz2 Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2 Source102: patches.arch.tar.bz2
@ -105,7 +106,7 @@ Prefix: /usr/src
# Source is only complete with devel files. # Source is only complete with devel files.
Requires: kernel-devel = %version-%release Requires: kernel-devel = %version-%release
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh}) %(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,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})
%define symbols %(set -- $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define symbols %(set -- $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
%define variant_symbols %(case %name in (*-rt) echo "RT" ;; esac) %define variant_symbols %(case %name in (*-rt) echo "RT" ;; esac)
@ -233,7 +234,6 @@ find %buildroot/usr/src/linux* ! -type l | xargs touch -d "$ts"
%files -f nondevel.files %files -f nondevel.files
%defattr(-, root, root) %defattr(-, root, root)
%ghost /usr/src/linux%variant
/usr/src/linux%variant-%kernelrelease/README.SUSE /usr/src/linux%variant-%kernelrelease/README.SUSE
%files -n kernel-devel%variant -f devel.files %files -n kernel-devel%variant -f devel.files

View File

@ -83,6 +83,7 @@ Source65: kernel-spec-macros
Source66: configtool.pl Source66: configtool.pl
Source67: log.sh Source67: log.sh
Source68: host-memcpy-hack.h Source68: host-memcpy-hack.h
Source69: try-disable-staging-driver
Source100: config.tar.bz2 Source100: config.tar.bz2
Source101: config.addon.tar.bz2 Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2 Source102: patches.arch.tar.bz2
@ -233,7 +234,6 @@ find %buildroot/usr/src/linux* ! -type l | xargs touch -d "$ts"
%files -f nondevel.files %files -f nondevel.files
%defattr(-, root, root) %defattr(-, root, root)
%ghost /usr/src/linux%variant
/usr/src/linux%variant-%kernelrelease/README.SUSE /usr/src/linux%variant-%kernelrelease/README.SUSE
%files -n kernel-devel%variant -f devel.files %files -n kernel-devel%variant -f devel.files

View File

@ -1,3 +1,35 @@
-------------------------------------------------------------------
Mon Nov 28 17:07:17 CET 2011 - jeffm@suse.com
- Fix kernel-source spec to give ownership of the /usr/src/linux link
to kernel-devel. kernel-source depends on kernel-devel, so this is correct.
- Fix kernel-source spec to give ownership of the /usr/src/linux link
to kernel-devel. kernel-source depends on kernel-devel, so this is correct.
- commit 7160a9c
-------------------------------------------------------------------
Mon Nov 28 16:51:10 CET 2011 - jbeulich@novell.com
- Refresh patches.xen/xen-pcpu-hotplug.
- Refresh patches.xen/xen3-patch-3.2-rc3.
- commit 7956240
-------------------------------------------------------------------
Mon Nov 28 16:12:16 CET 2011 - jbeulich@novell.com
- Update Xen patches to 3,2-rc3 and c/s 1127.
- Update frontswap patches to v10.
- config.conf: Re-enable Xen.
- Update config files.
- commit b08ea4f
-------------------------------------------------------------------
Mon Nov 28 15:32:21 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Ignore staging failures only in vanilla only
branches.
- commit eeaaaf1
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Nov 25 19:28:57 CET 2011 - agraf@suse.de Fri Nov 25 19:28:57 CET 2011 - agraf@suse.de
@ -72,6 +104,20 @@ Thu Nov 24 18:45:54 CET 2011 - ohering@suse.de
- ata_piix: ignore disks in a hyper-v guest. - ata_piix: ignore disks in a hyper-v guest.
- commit d0bebdb - commit d0bebdb
-------------------------------------------------------------------
Thu Nov 24 13:01:09 CET 2011 - mmarek@suse.cz
- rpm/try-disable-staging-driver: Script to disable failing staging
driver and restart make.
- commit 819d1fa
-------------------------------------------------------------------
Thu Nov 24 12:41:48 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Do not have a separate make invocation for
s390 and the rest.
- commit d72f6c1
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 24 00:27:55 CET 2011 - agraf@suse.de Thu Nov 24 00:27:55 CET 2011 - agraf@suse.de
@ -88,7 +134,8 @@ Wed Nov 23 22:35:11 CET 2011 - agraf@suse.de
Wed Nov 23 22:33:58 CET 2011 - agraf@suse.de Wed Nov 23 22:33:58 CET 2011 - agraf@suse.de
- ARM: create uImage, not zImage, so we can boot with u-boot - ARM: create uImage, not zImage, so we can boot with u-boot
- commit 36caa28 - ARM: create uImage, not zImage, so we can boot with u-boot
- commit 63a7b2c
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 23 02:33:12 CET 2011 - agraf@suse.de Wed Nov 23 02:33:12 CET 2011 - agraf@suse.de
@ -126,7 +173,10 @@ Tue Nov 22 14:12:10 CET 2011 - agraf@suse.de
- ARM: Use zImage, not vmlinux - ARM: Use zImage, not vmlinux
On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems. On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems.
Put that into the rpm as vmlinuz instead of the vmlinux ELF binary. Put that into the rpm as vmlinuz instead of the vmlinux ELF binary.
- commit 6676e8d - ARM: Use zImage, not vmlinux
On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems.
Put that into the rpm as vmlinuz instead of the vmlinux ELF binary.
- commit 4c08eb0
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 22 14:05:11 CET 2011 - agraf@suse.de Tue Nov 22 14:05:11 CET 2011 - agraf@suse.de

View File

@ -59,6 +59,9 @@ Requires: kernel-s390-devel = %version-%source_rel
%ifarch armv7l %ifarch armv7l
Requires: kernel-tegra-devel = %version-%source_rel Requires: kernel-tegra-devel = %version-%source_rel
%endif %endif
%ifarch %ix86 x86_64
Requires: kernel-xen-devel = %version-%source_rel
%endif
Provides: multiversion(kernel) Provides: multiversion(kernel)
Provides: %name = %version-%source_rel Provides: %name = %version-%source_rel
Source: README.KSYMS Source: README.KSYMS

View File

@ -1,3 +1,35 @@
-------------------------------------------------------------------
Mon Nov 28 17:07:17 CET 2011 - jeffm@suse.com
- Fix kernel-source spec to give ownership of the /usr/src/linux link
to kernel-devel. kernel-source depends on kernel-devel, so this is correct.
- Fix kernel-source spec to give ownership of the /usr/src/linux link
to kernel-devel. kernel-source depends on kernel-devel, so this is correct.
- commit 7160a9c
-------------------------------------------------------------------
Mon Nov 28 16:51:10 CET 2011 - jbeulich@novell.com
- Refresh patches.xen/xen-pcpu-hotplug.
- Refresh patches.xen/xen3-patch-3.2-rc3.
- commit 7956240
-------------------------------------------------------------------
Mon Nov 28 16:12:16 CET 2011 - jbeulich@novell.com
- Update Xen patches to 3,2-rc3 and c/s 1127.
- Update frontswap patches to v10.
- config.conf: Re-enable Xen.
- Update config files.
- commit b08ea4f
-------------------------------------------------------------------
Mon Nov 28 15:32:21 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Ignore staging failures only in vanilla only
branches.
- commit eeaaaf1
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Nov 25 19:28:57 CET 2011 - agraf@suse.de Fri Nov 25 19:28:57 CET 2011 - agraf@suse.de
@ -72,6 +104,20 @@ Thu Nov 24 18:45:54 CET 2011 - ohering@suse.de
- ata_piix: ignore disks in a hyper-v guest. - ata_piix: ignore disks in a hyper-v guest.
- commit d0bebdb - commit d0bebdb
-------------------------------------------------------------------
Thu Nov 24 13:01:09 CET 2011 - mmarek@suse.cz
- rpm/try-disable-staging-driver: Script to disable failing staging
driver and restart make.
- commit 819d1fa
-------------------------------------------------------------------
Thu Nov 24 12:41:48 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Do not have a separate make invocation for
s390 and the rest.
- commit d72f6c1
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 24 00:27:55 CET 2011 - agraf@suse.de Thu Nov 24 00:27:55 CET 2011 - agraf@suse.de
@ -88,7 +134,8 @@ Wed Nov 23 22:35:11 CET 2011 - agraf@suse.de
Wed Nov 23 22:33:58 CET 2011 - agraf@suse.de Wed Nov 23 22:33:58 CET 2011 - agraf@suse.de
- ARM: create uImage, not zImage, so we can boot with u-boot - ARM: create uImage, not zImage, so we can boot with u-boot
- commit 36caa28 - ARM: create uImage, not zImage, so we can boot with u-boot
- commit 63a7b2c
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 23 02:33:12 CET 2011 - agraf@suse.de Wed Nov 23 02:33:12 CET 2011 - agraf@suse.de
@ -126,7 +173,10 @@ Tue Nov 22 14:12:10 CET 2011 - agraf@suse.de
- ARM: Use zImage, not vmlinux - ARM: Use zImage, not vmlinux
On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems. On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems.
Put that into the rpm as vmlinuz instead of the vmlinux ELF binary. Put that into the rpm as vmlinuz instead of the vmlinux ELF binary.
- commit 6676e8d - ARM: Use zImage, not vmlinux
On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems.
Put that into the rpm as vmlinuz instead of the vmlinux ELF binary.
- commit 4c08eb0
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 22 14:05:11 CET 2011 - agraf@suse.de Tue Nov 22 14:05:11 CET 2011 - agraf@suse.de

View File

@ -20,6 +20,7 @@
%define srcversion 3.2-rc3 %define srcversion 3.2-rc3
%define patchversion 3.2.0-rc3 %define patchversion 3.2.0-rc3
%define variant %{nil} %define variant %{nil}
%define vanilla_only 0
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
@ -35,7 +36,7 @@
%define rpm_install_dir %buildroot%obj_install_dir %define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj %define kernel_build_dir %my_builddir/linux-obj
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh}) %(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,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})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor %define cpu_arch_flavor %cpu_arch/%build_flavor
@ -173,6 +174,7 @@ Source65: kernel-spec-macros
Source66: configtool.pl Source66: configtool.pl
Source67: log.sh Source67: log.sh
Source68: host-memcpy-hack.h Source68: host-memcpy-hack.h
Source69: try-disable-staging-driver
Source100: config.tar.bz2 Source100: config.tar.bz2
Source101: config.addon.tar.bz2 Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2 Source102: patches.arch.tar.bz2
@ -372,11 +374,25 @@ fi
# %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat) # %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat)
%if %CONFIG_KMSG_IDS == "y" %if %CONFIG_KMSG_IDS == "y"
chmod +x ../linux-%srcversion/scripts/kmsg-doc chmod +x ../linux-%srcversion/scripts/kmsg-doc
make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 MAKE_ARGS="$MAKE_ARGS D=2"
%else
make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y
%endif %endif
while true; do
make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y 2>&1 \
| tee buildlog
if test "${PIPESTATUS[0]}" -eq 0; then
break
fi
# In the linux-next and vanilla branches, we try harder to build a
# package.
if test 0%vanilla_only -gt 0 &&
%_sourcedir/try-disable-staging-driver buildlog; then
echo "Retrying make"
else
exit 1
fi
done
%install %install
# get rid of /usr/lib/rpm/brp-strip-debug # get rid of /usr/lib/rpm/brp-strip-debug

View File

@ -1,3 +1,35 @@
-------------------------------------------------------------------
Mon Nov 28 17:07:17 CET 2011 - jeffm@suse.com
- Fix kernel-source spec to give ownership of the /usr/src/linux link
to kernel-devel. kernel-source depends on kernel-devel, so this is correct.
- Fix kernel-source spec to give ownership of the /usr/src/linux link
to kernel-devel. kernel-source depends on kernel-devel, so this is correct.
- commit 7160a9c
-------------------------------------------------------------------
Mon Nov 28 16:51:10 CET 2011 - jbeulich@novell.com
- Refresh patches.xen/xen-pcpu-hotplug.
- Refresh patches.xen/xen3-patch-3.2-rc3.
- commit 7956240
-------------------------------------------------------------------
Mon Nov 28 16:12:16 CET 2011 - jbeulich@novell.com
- Update Xen patches to 3,2-rc3 and c/s 1127.
- Update frontswap patches to v10.
- config.conf: Re-enable Xen.
- Update config files.
- commit b08ea4f
-------------------------------------------------------------------
Mon Nov 28 15:32:21 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Ignore staging failures only in vanilla only
branches.
- commit eeaaaf1
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Nov 25 19:28:57 CET 2011 - agraf@suse.de Fri Nov 25 19:28:57 CET 2011 - agraf@suse.de
@ -72,6 +104,20 @@ Thu Nov 24 18:45:54 CET 2011 - ohering@suse.de
- ata_piix: ignore disks in a hyper-v guest. - ata_piix: ignore disks in a hyper-v guest.
- commit d0bebdb - commit d0bebdb
-------------------------------------------------------------------
Thu Nov 24 13:01:09 CET 2011 - mmarek@suse.cz
- rpm/try-disable-staging-driver: Script to disable failing staging
driver and restart make.
- commit 819d1fa
-------------------------------------------------------------------
Thu Nov 24 12:41:48 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Do not have a separate make invocation for
s390 and the rest.
- commit d72f6c1
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 24 00:27:55 CET 2011 - agraf@suse.de Thu Nov 24 00:27:55 CET 2011 - agraf@suse.de
@ -88,7 +134,8 @@ Wed Nov 23 22:35:11 CET 2011 - agraf@suse.de
Wed Nov 23 22:33:58 CET 2011 - agraf@suse.de Wed Nov 23 22:33:58 CET 2011 - agraf@suse.de
- ARM: create uImage, not zImage, so we can boot with u-boot - ARM: create uImage, not zImage, so we can boot with u-boot
- commit 36caa28 - ARM: create uImage, not zImage, so we can boot with u-boot
- commit 63a7b2c
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 23 02:33:12 CET 2011 - agraf@suse.de Wed Nov 23 02:33:12 CET 2011 - agraf@suse.de
@ -126,7 +173,10 @@ Tue Nov 22 14:12:10 CET 2011 - agraf@suse.de
- ARM: Use zImage, not vmlinux - ARM: Use zImage, not vmlinux
On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems. On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems.
Put that into the rpm as vmlinuz instead of the vmlinux ELF binary. Put that into the rpm as vmlinuz instead of the vmlinux ELF binary.
- commit 6676e8d - ARM: Use zImage, not vmlinux
On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems.
Put that into the rpm as vmlinuz instead of the vmlinux ELF binary.
- commit 4c08eb0
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 22 14:05:11 CET 2011 - agraf@suse.de Tue Nov 22 14:05:11 CET 2011 - agraf@suse.de

View File

@ -20,6 +20,7 @@
%define srcversion 3.2-rc3 %define srcversion 3.2-rc3
%define patchversion 3.2.0-rc3 %define patchversion 3.2.0-rc3
%define variant %{nil} %define variant %{nil}
%define vanilla_only 0
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
@ -35,7 +36,7 @@
%define rpm_install_dir %buildroot%obj_install_dir %define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj %define kernel_build_dir %my_builddir/linux-obj
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh}) %(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,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})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor %define cpu_arch_flavor %cpu_arch/%build_flavor
@ -184,6 +185,7 @@ Source65: kernel-spec-macros
Source66: configtool.pl Source66: configtool.pl
Source67: log.sh Source67: log.sh
Source68: host-memcpy-hack.h Source68: host-memcpy-hack.h
Source69: try-disable-staging-driver
Source100: config.tar.bz2 Source100: config.tar.bz2
Source101: config.addon.tar.bz2 Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2 Source102: patches.arch.tar.bz2
@ -382,11 +384,25 @@ fi
# %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat) # %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat)
%if %CONFIG_KMSG_IDS == "y" %if %CONFIG_KMSG_IDS == "y"
chmod +x ../linux-%srcversion/scripts/kmsg-doc chmod +x ../linux-%srcversion/scripts/kmsg-doc
make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 MAKE_ARGS="$MAKE_ARGS D=2"
%else
make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y
%endif %endif
while true; do
make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y 2>&1 \
| tee buildlog
if test "${PIPESTATUS[0]}" -eq 0; then
break
fi
# In the linux-next and vanilla branches, we try harder to build a
# package.
if test 0%vanilla_only -gt 0 &&
%_sourcedir/try-disable-staging-driver buildlog; then
echo "Retrying make"
else
exit 1
fi
done
%install %install
# get rid of /usr/lib/rpm/brp-strip-debug # get rid of /usr/lib/rpm/brp-strip-debug

View File

@ -1,3 +1,35 @@
-------------------------------------------------------------------
Mon Nov 28 17:07:17 CET 2011 - jeffm@suse.com
- Fix kernel-source spec to give ownership of the /usr/src/linux link
to kernel-devel. kernel-source depends on kernel-devel, so this is correct.
- Fix kernel-source spec to give ownership of the /usr/src/linux link
to kernel-devel. kernel-source depends on kernel-devel, so this is correct.
- commit 7160a9c
-------------------------------------------------------------------
Mon Nov 28 16:51:10 CET 2011 - jbeulich@novell.com
- Refresh patches.xen/xen-pcpu-hotplug.
- Refresh patches.xen/xen3-patch-3.2-rc3.
- commit 7956240
-------------------------------------------------------------------
Mon Nov 28 16:12:16 CET 2011 - jbeulich@novell.com
- Update Xen patches to 3,2-rc3 and c/s 1127.
- Update frontswap patches to v10.
- config.conf: Re-enable Xen.
- Update config files.
- commit b08ea4f
-------------------------------------------------------------------
Mon Nov 28 15:32:21 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Ignore staging failures only in vanilla only
branches.
- commit eeaaaf1
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Nov 25 19:28:57 CET 2011 - agraf@suse.de Fri Nov 25 19:28:57 CET 2011 - agraf@suse.de
@ -72,6 +104,20 @@ Thu Nov 24 18:45:54 CET 2011 - ohering@suse.de
- ata_piix: ignore disks in a hyper-v guest. - ata_piix: ignore disks in a hyper-v guest.
- commit d0bebdb - commit d0bebdb
-------------------------------------------------------------------
Thu Nov 24 13:01:09 CET 2011 - mmarek@suse.cz
- rpm/try-disable-staging-driver: Script to disable failing staging
driver and restart make.
- commit 819d1fa
-------------------------------------------------------------------
Thu Nov 24 12:41:48 CET 2011 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: Do not have a separate make invocation for
s390 and the rest.
- commit d72f6c1
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 24 00:27:55 CET 2011 - agraf@suse.de Thu Nov 24 00:27:55 CET 2011 - agraf@suse.de
@ -88,7 +134,8 @@ Wed Nov 23 22:35:11 CET 2011 - agraf@suse.de
Wed Nov 23 22:33:58 CET 2011 - agraf@suse.de Wed Nov 23 22:33:58 CET 2011 - agraf@suse.de
- ARM: create uImage, not zImage, so we can boot with u-boot - ARM: create uImage, not zImage, so we can boot with u-boot
- commit 36caa28 - ARM: create uImage, not zImage, so we can boot with u-boot
- commit 63a7b2c
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 23 02:33:12 CET 2011 - agraf@suse.de Wed Nov 23 02:33:12 CET 2011 - agraf@suse.de
@ -126,7 +173,10 @@ Tue Nov 22 14:12:10 CET 2011 - agraf@suse.de
- ARM: Use zImage, not vmlinux - ARM: Use zImage, not vmlinux
On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems. On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems.
Put that into the rpm as vmlinuz instead of the vmlinux ELF binary. Put that into the rpm as vmlinuz instead of the vmlinux ELF binary.
- commit 6676e8d - ARM: Use zImage, not vmlinux
On ARM we use the arch/arm/boot/zImage file similar to x86 to boot systems.
Put that into the rpm as vmlinuz instead of the vmlinux ELF binary.
- commit 4c08eb0
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 22 14:05:11 CET 2011 - agraf@suse.de Tue Nov 22 14:05:11 CET 2011 - agraf@suse.de

View File

@ -20,6 +20,7 @@
%define srcversion 3.2-rc3 %define srcversion 3.2-rc3
%define patchversion 3.2.0-rc3 %define patchversion 3.2.0-rc3
%define variant %{nil} %define variant %{nil}
%define vanilla_only 0
%include %_sourcedir/kernel-spec-macros %include %_sourcedir/kernel-spec-macros
@ -35,7 +36,7 @@
%define rpm_install_dir %buildroot%obj_install_dir %define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj %define kernel_build_dir %my_builddir/linux-obj
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,group-source-files.pl,find-provides,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,configtool.pl,log.sh}) %(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,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})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor %define cpu_arch_flavor %cpu_arch/%build_flavor
@ -180,6 +181,7 @@ Source65: kernel-spec-macros
Source66: configtool.pl Source66: configtool.pl
Source67: log.sh Source67: log.sh
Source68: host-memcpy-hack.h Source68: host-memcpy-hack.h
Source69: try-disable-staging-driver
Source100: config.tar.bz2 Source100: config.tar.bz2
Source101: config.addon.tar.bz2 Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2 Source102: patches.arch.tar.bz2
@ -378,11 +380,25 @@ fi
# %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat) # %_smp_mflags -j 0%(grep -Ec 'cpu[0-9]' /proc/stat)
%if %CONFIG_KMSG_IDS == "y" %if %CONFIG_KMSG_IDS == "y"
chmod +x ../linux-%srcversion/scripts/kmsg-doc chmod +x ../linux-%srcversion/scripts/kmsg-doc
make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y D=2 MAKE_ARGS="$MAKE_ARGS D=2"
%else
make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y
%endif %endif
while true; do
make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y 2>&1 \
| tee buildlog
if test "${PIPESTATUS[0]}" -eq 0; then
break
fi
# In the linux-next and vanilla branches, we try harder to build a
# package.
if test 0%vanilla_only -gt 0 &&
%_sourcedir/try-disable-staging-driver buildlog; then
echo "Retrying make"
else
exit 1
fi
done
%install %install
# get rid of /usr/lib/rpm/brp-strip-debug # get rid of /usr/lib/rpm/brp-strip-debug

24698
kernel-xen.changes Normal file

File diff suppressed because it is too large Load Diff

915
kernel-xen.spec Normal file
View File

@ -0,0 +1,915 @@
#
# spec file for package kernel-xen
#
# Copyright (c) 2011 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/
#
# norootforbuild
%define srcversion 3.2-rc3
%define patchversion 3.2.0-rc3
%define variant %{nil}
%define vanilla_only 0
%include %_sourcedir/kernel-spec-macros
%define build_flavor xen
%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
%define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,check-supported-list,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})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE CONFIG_ENTERPRISE_SUPPORT
%{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
%define split_base (%CONFIG_SPLIT_PACKAGE == "y")
%define split_extra (%CONFIG_SPLIT_PACKAGE == "y" && %CONFIG_ENTERPRISE_SUPPORT == "y")
%ifarch %ix86 x86_64
%define install_vdso 1
%else
%define install_vdso 0
%endif
Name: kernel-xen
Summary: The Xen Kernel
Version: 3.2.rc3
Release: 0
License: GPL v2 only
Group: System/Kernel
Url: http://www.kernel.org/
BuildRequires: coreutils module-init-tools sparse
BuildRequires: fdupes
Provides: multiversion(kernel)
Provides: %{name}_%_target_cpu = %version-%release
Provides: %name = %version-%source_rel
%if %split_base
Provides: kernel-base = %version-%source_rel
# Obsolete the -base subpackage from 11.1 and 11.2 development phase
Obsoletes: %name-base <= 2.6.31
%endif
Requires(pre): coreutils awk
# Need a module-init-tools with /usr/lib/module-init-tools/weak-modules2
Requires(post): module-init-tools >= 3.4
# This Requires is wrong, because the post/postun scripts have a
# test -x update-bootloader, having perl-Bootloader is not a hard requirement.
# But, there is no way to tell rpm or yast to schedule the installation
# of perl-Bootloader before kernel-binary.rpm if both are in the list of
# packages to install/update. Likewise, this is true for mkinitrd.
# Need a perl-Bootloader with /usr/lib/bootloader/bootloader_entry
Requires(post): perl-Bootloader >= 0.4.15
Requires(post): mkinitrd
# Do not install p-b and mkinitrd for the install check, the %post script is
# able to handle this
#!BuildIgnore: perl-Bootloader mkinitrd
# Remove some packages that are installed automatically by the build system,
# but are not needed to build the kernel
#!BuildIgnore: autoconf automake gettext-runtime libtool cvs gettext-tools m4 udev fillup insserv
%ifarch ia64
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
%ifarch s390 s390x
%if %build_vanilla && 0%{?suse_version} < 1130
BuildRequires: dwarfextract
%endif
%endif
%ifarch %arm
BuildRequires: u-boot-tools
%endif
%if %build_xen
%ifarch %ix86
%if %build_flavor != "ec2"
Provides: kernel-xenpae = %version
Obsoletes: kernel-xenpae <= %version
%endif
%endif
#!BuildIgnore: xen
%endif
Provides: %name-nongpl
Obsoletes: %name-nongpl
%if %build_vanilla
# force bzip2 instead of lzma compression to allow install on older dist versions
%define _binary_payload w9.bzdio
%endif
# dead network if installed on SLES10, otherwise it will work (mostly)
Conflicts: sysfsutils < 2.0
%if ! %build_vanilla
Conflicts: apparmor-profiles <= 2.1
Conflicts: apparmor-parser < 2.3
# root-lvm only works with newer udevs
Conflicts: udev < 118
Conflicts: lvm2 < 2.02.33
%endif
%ifarch %ix86
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2
Source2: source-post.sh
Source3: kernel-source.rpmlintrc
Source8: devel-pre.sh
Source9: devel-post.sh
Source10: preun.sh
Source11: postun.sh
Source12: pre.sh
Source13: post.sh
Source14: series.conf
Source16: guards
Source17: apply-patches
Source21: config.conf
Source23: supported.conf
Source33: check-for-config-changes
Source34: check-supported-list
Source35: group-source-files.pl
Source37: README.SUSE
Source38: README.KSYMS
Source39: config-options.changes.txt
Source40: source-timestamp
Source44: find-provides
Source45: split-modules
Source46: modversions
Source48: macros.kernel-source
Source49: kernel-module-subpackage
Source50: kabi.pl
Source51: mkspec
Source52: kernel-source%variant.changes
Source53: kernel-source.spec.in
Source54: kernel-binary.spec.in
Source55: kernel-syms.spec.in
Source56: kernel-docs.spec.in
Source60: config.sh
Source61: compute-PATCHVERSION.sh
Source62: old-packages.conf
Source63: arch-symbols
Source64: package-descriptions
Source65: kernel-spec-macros
Source66: configtool.pl
Source67: log.sh
Source68: host-memcpy-hack.h
Source69: try-disable-staging-driver
Source100: config.tar.bz2
Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2
Source103: patches.drivers.tar.bz2
Source104: patches.fixes.tar.bz2
Source105: patches.rpmify.tar.bz2
Source106: patches.suse.tar.bz2
Source107: patches.xen.tar.bz2
Source108: patches.addon.tar.bz2
Source109: patches.kernel.org.tar.bz2
Source110: patches.apparmor.tar.bz2
Source111: patches.rt.tar.bz2
Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2
Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64
# These files are found in the kernel-source package:
NoSource: 0
NoSource: 100
NoSource: 101
NoSource: 102
NoSource: 103
NoSource: 104
NoSource: 105
NoSource: 106
NoSource: 107
NoSource: 108
NoSource: 109
NoSource: 110
NoSource: 111
NoSource: 112
NoSource: 113
NoSource: 120
NoSource: 121
# The following KMPs have been integrated into the kernel package,
# grouped by the last product that contained them.
# sles10 / 10.3
Obsoletes: iwlwifi-kmp-%build_flavor
Obsoletes: ipw3945-kmp-%build_flavor
# sles10 / 11.0
Obsoletes: uvcvideo-kmp-%build_flavor
# 11.0
Obsoletes: atl2-kmp-%build_flavor
Obsoletes: wlan-ng-kmp-%build_flavor
Obsoletes: et131x-kmp-%build_flavor
Obsoletes: ivtv-kmp-%build_flavor
Obsoletes: at76_usb-kmp-%build_flavor
Obsoletes: pcc-acpi-kmp-%build_flavor
Obsoletes: btusb-kmp-%build_flavor
# sle11-ga
Obsoletes: enic-kmp-%build_flavor
Obsoletes: fnic-kmp-%build_flavor
Obsoletes: brocade-bfa-kmp-%build_flavor
Obsoletes: kvm-kmp-%build_flavor
Obsoletes: perfmon-kmp-%build_flavor
Obsoletes: iwlagn-2-6-27-kmp-%build_flavor
Obsoletes: msi-wmi-kmp-%build_flavor
# sle11
Obsoletes: ocfs2-kmp-%build_flavor
# 11.1
Obsoletes: quickcam-kmp-%build_flavor < 0.6.7
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
%description
The Linux kernel for Xen paravirtualization.
This kernel can be used both as the domain0 ("xen0") and as an
unprivileged ("xenU") kernel.
%source_timestamp
%prep
if ! [ -e %_sourcedir/linux-%srcversion.tar.bz2 ]; then
echo "The %name-%version.nosrc.rpm package does not contain the" \
"complete sources. Please install kernel-source-%version.src.rpm."
exit 1
fi
SYMBOLS=
if test -e %_sourcedir/extra-symbols; then
SYMBOLS=$(cat %_sourcedir/extra-symbols)
echo "extra symbol(s):" $SYMBOLS
fi
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 -a 121
mkdir -p %kernel_build_dir
supported_conf() {
%_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u
}
# Generate the list of modules to be marked as supported
{ supported_conf base
supported_conf --default=0 external | sed 's/$/ external/'
} > %kernel_build_dir/Module.supported
supported_conf --default=0 base >%kernel_build_dir/Module.base
cd linux-%srcversion
%_sourcedir/apply-patches \
%if %{build_vanilla}
--vanilla \
%endif
%_sourcedir/series.conf .. $SYMBOLS
cd %kernel_build_dir
# Override the timestamp 'uname -v' reports with the source timestamp and
# the commit hash.
date=$(head -n 1 %_sourcedir/source-timestamp)
commit=$(sed -n 's/GIT Revision: //p' %_sourcedir/source-timestamp)
cat > .kernel-binary.spec.buildenv <<EOF
export KBUILD_BUILD_TIMESTAMP="$(LANG=C date -d "$date") (${commit:0:7})"
export KBUILD_VERBOSE=0
export KBUILD_SYMTYPES=1
export KBUILD_OVERRIDE=1
export KBUILD_BUILD_USER=geeko
export KBUILD_BUILD_HOST=buildhost
export HOST_EXTRACFLAGS="-include %_sourcedir/host-memcpy-hack.h"
EOF
source .kernel-binary.spec.buildenv
if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
if test -e ../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
else
cp ../config/%cpu_arch_flavor .config
fi
%build_src_dir/scripts/config \
--set-str CONFIG_LOCALVERSION %release_num-%build_flavor \
--enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
--enable CONFIG_DEBUG_INFO \
--disable CONFIG_DEBUG_INFO_REDUCED
%else
--disable CONFIG_DEBUG_INFO
%endif
MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS
else
cp .config .config.orig
make silentoldconfig $MAKE_ARGS < /dev/null
%_sourcedir/check-for-config-changes .config.orig .config
rm .config.orig
fi
make prepare $MAKE_ARGS
make scripts $MAKE_ARGS
krel=$(make -s kernelrelease $MAKE_ARGS)
if [ "$krel" != "%kernelrelease-%build_flavor" ]; then
echo "Kernel release mismatch: $krel != %kernelrelease-%build_flavor" >&2
exit 1
fi
make clean $MAKE_ARGS
rm -f source
find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
%build
cd %kernel_build_dir
source .kernel-binary.spec.buildenv
# create *.symref files in the tree
if test -e %my_builddir/kabi/%cpu_arch/symtypes-%build_flavor; then
%_sourcedir/modversions --unpack . < $_
fi
# The %{_smp_mflags} macro is defined to a number, make will spawn that many jobs.
# There are several ways how to define it:
# If you are using the build script:
# build --jobs=N kernel-$flavor.spec
# With plain rpmbuild:
# rpmbuild -ba --define 'jobs N' kernel-$flavor.spec
# To spawn as many jobs as there are cpu cores:
# rpmbuild -ba --define "%_smp_mflags -j 0$(grep -Ec 'cpu[0-9]' /proc/stat)" \
# kernel-$flavor.spec
# 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
MAKE_ARGS="$MAKE_ARGS D=2"
%endif
while true; do
make %{?_smp_mflags} all $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y 2>&1 \
| tee buildlog
if test "${PIPESTATUS[0]}" -eq 0; then
break
fi
# In the linux-next and vanilla branches, we try harder to build a
# package.
if test 0%vanilla_only -gt 0 &&
%_sourcedir/try-disable-staging-driver buildlog; then
echo "Retrying make"
else
exit 1
fi
done
%install
# get rid of /usr/lib/rpm/brp-strip-debug
# strip removes too much from the vmlinux ELF binary
export NO_BRP_STRIP_DEBUG=true
export STRIP_KEEP_SYMTAB='*/vmlinux-*'
# /lib/modules/%kernelrelease-%build_flavor/build will be a stale symlink until the
# kernel-devel package is installed. Don't check for stale symlinks
# in the brp-symlink check:
export NO_BRP_STALE_LINK_ERROR=yes
cd %kernel_build_dir
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor
add_vmlinux()
{
local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false
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)
chmod +x %buildroot/$vmlinux
fi
%endif
if $compressed; then
gzip -n -9 %buildroot/$vmlinux
chmod a-x %buildroot/$vmlinux.gz
fi
}
%if %build_kdump
add_vmlinux
image=vmlinux
%else
# architecture specifics
%ifarch %ix86 x86_64
add_vmlinux --compressed
%if %build_xen
image=vmlinuz
%else
image=bzImage
%endif
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
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
image=image
if test -e arch/s390/boot/kerntypes.o; then
cp -p arch/s390/boot/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor
elif test -x "$(which dwarfextract 2>/dev/null)"; then
dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)"
fi
%if %CONFIG_KMSG_IDS == "y"
mkdir -p %buildroot/usr/share/man/man9
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
# quickly compile uImage so we have something to boot from
make %{?_smp_mflags} uImage $MAKE_ARGS CONFIG_DEBUG_SECTION_MISMATCH=y
image=uImage
cp -p arch/arm/boot/$image %buildroot/boot/uImage-%kernelrelease-%build_flavor
%endif
# end of build_kdump
%endif
for sub in '-base' '' '-extra'; do
case "$sub" in
'-base' | '') base_package=1 ;;
*) base_package=0 ;;
esac
for script in preun postun pre post devel-pre devel-post; do
sed -e "s:@KERNELRELEASE@:%kernelrelease:g" \
-e "s:@IMAGE@:$image:g" \
-e "s:@FLAVOR""@:%build_flavor:g" \
-e "s:@SUBPACKAGE@:%name$sub:g" \
-e "s:@BASE_PACKAGE@:$base_package:g" \
-e "s:@RPM_VERSION_RELEASE@:%version-%release:g" \
-e "s:@RPM_TARGET_CPU@:%_target_cpu:g" \
-e "s:@CPU_ARCH_FLAVOR@:%cpu_arch_flavor:g" \
-e "s:@SRCVARIANT@:%variant:g" \
%_sourcedir/$script.sh > %my_builddir/$script$sub.sh
done
done
%if %build_kdump || %build_xen || %build_vanilla || %build_ps3
# keep this -suffix list in sync with post.sh and postun.sh
suffix=-%build_flavor
%endif
ln -s $image$suffix %buildroot/boot/$image$suffix
ln -s initrd$suffix %buildroot/boot/initrd$suffix
cp -p .config %buildroot/boot/config-%kernelrelease-%build_flavor
sysctl_file=%buildroot/boot/sysctl.conf-%kernelrelease-%build_flavor
for file in %my_builddir/sysctl/{defaults,%cpu_arch/arch-defaults,%cpu_arch_flavor}; do
if [ -f "$file" ]; then
cat "$file"
fi
done | sed '1i # Generated file - do not edit.' >$sysctl_file
if [ ! -s $sysctl_file ]; then
rm $sysctl_file
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
%endif
# Create a dummy initrd with roughly the size the real one will have.
# That way, YaST will know that this package requires some additional
# space in /boot.
dd if=/dev/zero of=%buildroot/boot/initrd-%kernelrelease-%build_flavor \
bs=1024 seek=2047 count=1
if [ %CONFIG_MODULES = y ]; then
mkdir -p %rpm_install_dir/%cpu_arch_flavor
mkdir -p %buildroot/usr/src/linux-obj/%cpu_arch
ln -s %build_flavor %buildroot/usr/src/linux-obj/%cpu_arch_flavor
gzip -n -c9 < Module.symvers > %buildroot/boot/symvers-%kernelrelease-%build_flavor.gz
make modules_install $MAKE_ARGS INSTALL_MOD_PATH=%buildroot
if ! %_sourcedir/check-supported-list \
%_sourcedir %buildroot/lib/modules/%kernelrelease-%build_flavor; then
%if %supported_modules_check
exit 1
%endif
echo "Consistency check error: please update supported.conf."
fi
%ifarch s390 s390x
if test -e arch/s390/boot/kerntypes.o; then
:
elif test -x "$(which dwarfextract 2>/dev/null)" -a \
-f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor; then
find %buildroot -name "*.ko" > kofiles.list
dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)"
fi
%endif
# Also put the resulting file in %rpm_install_dir/%cpu_arch/%build_flavor
# so that kernel-devel + kernel-%build_flavor is sufficient for building
# modules that have modversions as well.
mkdir -p %rpm_install_dir/%cpu_arch/%build_flavor
cp Module.symvers %rpm_install_dir/%cpu_arch/%build_flavor
# Table of types used in exported symbols (for modversion debugging).
%_sourcedir/modversions --pack . > %buildroot/boot/symtypes-%kernelrelease-%build_flavor
if [ -s %buildroot/boot/symtypes-%kernelrelease-%build_flavor ]; then
gzip -n -9 %buildroot/boot/symtypes-%kernelrelease-%build_flavor
else
rm -f %buildroot/boot/symtypes-%kernelrelease-%build_flavor
fi
# Some architecture's $(uname -m) output is different from the ARCH
# parameter that needs to be passed to kbuild. Create symlinks from
# $(uname -m) to the ARCH directory.
if [ ! -e %rpm_install_dir/%_target_cpu ]; then
ln -sf %cpu_arch %rpm_install_dir/%_target_cpu
ln -sf %cpu_arch %buildroot/usr/src/linux-obj/%_target_cpu
fi
# We were building in %my_builddir/linux-%srcversion, but the sources will
# later be installed in /usr/src/linux-%srcversion-%source_rel. Fix up the
# build symlink.
rm -f %buildroot/lib/modules/%kernelrelease-%build_flavor/{source,build}
ln -s %src_install_dir \
%buildroot/lib/modules/%kernelrelease-%build_flavor/source
ln -s %obj_install_dir/%cpu_arch/%build_flavor \
%buildroot/lib/modules/%kernelrelease-%build_flavor/build
# Abort if there are any undefined symbols
msg="$(/sbin/depmod -F %buildroot/boot/System.map-%kernelrelease-%build_flavor \
-b %buildroot -ae %kernelrelease-%build_flavor 2>&1)"
if [ $? -ne 0 ] || echo "$msg" | grep 'needs unknown symbol'; then
exit 1
fi
%if %split_base
%_sourcedir/split-modules -d %buildroot \
-o %my_builddir \
-b %kernel_build_dir/Module.base \
%if ! %supported_modules_check
-i \
%endif
-s %kernel_build_dir/Module.supported
%if ! %split_extra
cat %my_builddir/unsupported-modules >>%my_builddir/main-modules
%endif
%else
( cd %buildroot
find lib/modules/%kernelrelease-%build_flavor -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules
%endif
res=0
if test -e %my_builddir/kabi/%cpu_arch/symvers-%build_flavor; then
# check for kabi changes
%_sourcedir/kabi.pl --rules %my_builddir/kabi/severities \
%my_builddir/kabi/%cpu_arch/symvers-%build_flavor \
Module.symvers || res=$?
fi
if [ $res -ne 0 ]; then
if [ ! -e %my_builddir/kabi/%cpu_arch/ignore-%build_flavor -a \
! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then
echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \
"directory to build this kernel even though its badness is" \
"higher than allowed for an official kernel."
exit 1
fi
fi
tar -cf - -T %my_builddir/obj-files | \
tar -xf - -C %rpm_install_dir/%cpu_arch_flavor
# bnc#507084
find %rpm_install_dir/%cpu_arch_flavor/scripts -type f -perm -111 | \
while read f; do
case "$(file -b "$f")" in
ELF\ *\ executable*)
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
fi
add_dirs_to_filelist() {
sed -rn '
# print file name
p
# remove filelist macros
s:%%[a-z]+(\([^)]+\))? ?::g
# add %%dir prefix
s:^:%%dir :
# print all parents
:a
# skip directories owned by other packages
s:^%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
s:/[^/]+$::p
ta
' "$@" | sort -u
}
# Collect the file lists.
shopt -s nullglob
> %my_builddir/kernel-devel.files
for file in %buildroot/boot/vmlinux-*.gz %buildroot/boot/symtypes* \
%buildroot/lib/modules/*/{build,source}; do
f=${file##%buildroot}
echo "$f" >> %my_builddir/kernel-devel.files
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-kdump'
touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump
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'
cat %my_builddir/base-modules
fi
test -d lib/firmware/%kernelrelease-%build_flavor && \
find lib/firmware/%kernelrelease-%build_flavor \
-type d -o \
-printf '/%%p\n'
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
%if %split_base
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules} \
> %my_builddir/kernel-main.files
%endif
%if %split_extra
add_dirs_to_filelist %my_builddir/unsupported-modules > %my_builddir/kernel-extra.files
%endif
# Hardlink duplicate files automatically (from package fdupes): It doesn't save
# much, but it keeps rpmlint from breaking the package build. Note that we skip
# /usr/src/linux-obj intentionally, to not accidentally break timestamps there
%fdupes $RPM_BUILD_ROOT/lib
%preun -f preun.sh
%postun -f postun.sh
%pre -f pre.sh
%post -f post.sh
%if %split_base
%files -f kernel-main.files
%else
%files -f kernel-base.files
%endif
%defattr(-, root, root)
%package base
Summary: The Xen Kernel - base modules
License: GPL v2 only
Group: System/Kernel
Url: http://www.kernel.org/
Provides: multiversion(kernel)
Provides: kernel-base = %version-%source_rel
Requires(pre): coreutils awk
Requires(post): module-init-tools
Requires(post): perl-Bootloader
Requires(post): mkinitrd
%ifarch %ix86
Conflicts: libc.so.6()(64bit)
%endif
%description base
The Linux kernel for Xen paravirtualization.
This kernel can be used both as the domain0 ("xen0") and as an
unprivileged ("xenU") kernel.
This package contains only the base modules, required in all installs.
%source_timestamp
%preun base -f preun-base.sh
%postun base -f postun-base.sh
%pre base -f pre-base.sh
%post base -f post-base.sh
%if %split_base
%files base -f kernel-base.files
%defattr(-, root, root)
%endif
%package extra
Summary: The Xen Kernel - Unsupported kernel modules
License: GPL v2 only
Group: System/Kernel
Url: http://www.kernel.org/
Provides: multiversion(kernel)
Provides: %name-extra_%_target_cpu = %version-%release
Provides: kernel-extra = %version-%source_rel
Requires: %{name}_%_target_cpu = %version-%release
Requires(pre): coreutils awk
Requires(post): module-init-tools
Requires(post): perl-Bootloader
Requires(post): mkinitrd
Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu)
%ifarch %ix86
Conflicts: libc.so.6()(64bit)
%endif
%description extra
The Linux kernel for Xen paravirtualization.
This kernel can be used both as the domain0 ("xen0") and as an
unprivileged ("xenU") kernel.
This package contains additional modules not supported by Novell.
%source_timestamp
%preun extra -f preun-extra.sh
%postun extra -f postun-extra.sh
%pre extra -f pre-extra.sh
%post extra -f post-extra.sh
%if %split_extra
%files extra -f kernel-extra.files
%defattr(-, root, root)
%endif
%if %CONFIG_KMSG_IDS == "y"
%package man
Summary: The collection of man pages generated by the kmsg script.
License: GPL v2 only
Group: System/Kernel
%description man
This package includes the man pages that have been generated from the
kmsg message documentation comments.
%source_timestamp
%files man
%defattr(-,root,root)
/usr/share/man/man9/*
%endif
%package devel
Summary: Development files necessary for building kernel modules
License: GPL v2 only
Group: Development/Sources
Provides: multiversion(kernel)
Provides: %name-devel = %version-%source_rel
Requires: kernel-devel%variant = %version-%source_rel
Supplements: packageand(%name:kernel-devel%variant)
%description devel
This package contains files necessary for building kernel modules (and
kernel module packages) against the %build_flavor flavor of the kernel.
%source_timestamp
%if %CONFIG_MODULES == "y"
%pre devel -f devel-pre.sh
%post devel -f devel-post.sh
%files devel -f kernel-devel.files
%defattr(-,root,root)
%dir %obj_install_dir
%dir %obj_install_dir/%cpu_arch
%dir /usr/src/linux-obj
%dir /usr/src/linux-obj/%cpu_arch
%ghost /usr/src/linux-obj/%cpu_arch_flavor
%obj_install_dir/%cpu_arch_flavor
%if %_target_cpu != %cpu_arch
%obj_install_dir/%_target_cpu
/usr/src/linux-obj/%_target_cpu
%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
License: GPL v2 only
Group: Development/Debug
%description devel-debuginfo
Debug information for package %name-devel
%source_timestamp
%files devel-debuginfo -f vmlinux.debug.files
%changelog

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:f9810f45a353ff2328fb4b90dfec8fcef374440161a1f4e693cebd79cf29a938 oid sha256:631780142d6a98f4ac951a93d69e49acec87899353953cf87034a4f606a5c88d
size 2034859 size 2063415

View File

@ -557,118 +557,120 @@
# re-basing to a newer xen tree. # re-basing to a newer xen tree.
# #
### both uml framebuffer and xen need this one. ### both uml framebuffer and xen need this one.
+xen patches.xen/add-console-use-vt patches.xen/add-console-use-vt
+xen
+xen # split out patches # split out patches
+xen patches.xen/kexec-move-segment-code-i386.patch patches.xen/kexec-move-segment-code-i386.patch
+xen patches.xen/kexec-move-segment-code-x86_64.patch patches.xen/kexec-move-segment-code-x86_64.patch
+xen patches.xen/frontswap-structure-changes patches.xen/frontswap-header
+xen patches.xen/frontswap-core patches.xen/frontswap-hooks
+xen patches.xen/frontswap-hooks patches.xen/frontswap-core
+xen patches.xen/frontswap-config patches.xen/frontswap-config
+xen patches.xen/ipv6-no-autoconf patches.xen/cleancache-update
+xen patches.xen/pci-guestdev patches.xen/frontswap-cleancache-invalidate
+xen patches.xen/pci-reserve patches.xen/ipv6-no-autoconf
+xen patches.xen/pci-guestdev
+xen # bulk stuff, new files for xen patches.xen/pci-reserve
+xen patches.xen/xen3-auto-xen-arch.diff
+xen patches.xen/xen3-auto-xen-drivers.diff # bulk stuff, new files for xen
+xen patches.xen/xen3-auto-include-xen-interface.diff patches.xen/xen3-auto-xen-arch.diff
+xen patches.xen/xen3-auto-blktap2-pvops.diff patches.xen/xen3-auto-xen-drivers.diff
+xen patches.xen/xen3-auto-include-xen-interface.diff
+xen # kconfig bits for xen patches.xen/xen3-auto-blktap2-pvops.diff
+xen patches.xen/xen3-auto-xen-kconfig.diff
+xen # kconfig bits for xen
+xen # common code changes patches.xen/xen3-auto-xen-kconfig.diff
+xen patches.xen/xen3-auto-common.diff
+xen patches.xen/xen3-auto-arch-x86.diff # common code changes
+xen patches.xen/xen3-auto-arch-i386.diff patches.xen/xen3-auto-common.diff
+xen patches.xen/xen3-auto-arch-x86_64.diff patches.xen/xen3-auto-arch-x86.diff
+xen patches.xen/xen3-auto-arch-i386.diff
+xen # fixups due to upstream Xen parts patches.xen/xen3-auto-arch-x86_64.diff
+xen patches.xen/xen3-fixup-xen
+xen # fixups due to upstream Xen parts
+xen # newer changeset backports patches.xen/xen3-fixup-xen
+xen
+xen # changes outside arch/{i386,x86_64}/xen # newer changeset backports
+xen patches.xen/xen3-fixup-kconfig
+xen patches.xen/xen3-fixup-common # changes outside arch/{i386,x86_64}/xen
+xen patches.xen/xen3-fixup-arch-x86 patches.xen/xen3-fixup-kconfig
+xen patches.xen/xen3-fixup-blktap2-pvops patches.xen/xen3-fixup-common
+xen patches.xen/xen3-fixup-arch-x86
+xen # ports of other patches patches.xen/xen3-fixup-blktap2-pvops
+xen patches.xen/xen3-patch-2.6.18
+xen patches.xen/xen3-patch-2.6.19 # ports of other patches
+xen patches.xen/xen3-patch-2.6.20 patches.xen/xen3-patch-2.6.18
+xen patches.xen/xen3-patch-2.6.21 patches.xen/xen3-patch-2.6.19
+xen patches.xen/xen3-patch-2.6.22 patches.xen/xen3-patch-2.6.20
+xen patches.xen/xen3-patch-2.6.23 patches.xen/xen3-patch-2.6.21
+xen patches.xen/xen3-patch-2.6.24 patches.xen/xen3-patch-2.6.22
+xen patches.xen/xen3-patch-2.6.25 patches.xen/xen3-patch-2.6.23
+xen patches.xen/xen3-patch-2.6.26 patches.xen/xen3-patch-2.6.24
+xen patches.xen/xen3-patch-2.6.27 patches.xen/xen3-patch-2.6.25
+xen patches.xen/xen3-patch-2.6.28 patches.xen/xen3-patch-2.6.26
+xen patches.xen/xen3-patch-2.6.29 patches.xen/xen3-patch-2.6.27
+xen patches.xen/xen3-patch-2.6.30 patches.xen/xen3-patch-2.6.28
+xen patches.xen/xen3-patch-2.6.31 patches.xen/xen3-patch-2.6.29
+xen patches.xen/xen3-patch-2.6.32 patches.xen/xen3-patch-2.6.30
+xen patches.xen/xen3-patch-2.6.33 patches.xen/xen3-patch-2.6.31
+xen patches.xen/xen3-patch-2.6.34 patches.xen/xen3-patch-2.6.32
+xen patches.xen/xen3-patch-2.6.35 patches.xen/xen3-patch-2.6.33
+xen patches.xen/xen3-patch-2.6.36 patches.xen/xen3-patch-2.6.34
+xen patches.xen/xen3-patch-2.6.37 patches.xen/xen3-patch-2.6.35
+xen patches.xen/xen3-patch-2.6.38 patches.xen/xen3-patch-2.6.36
+xen patches.xen/xen3-patch-2.6.39 patches.xen/xen3-patch-2.6.37
+xen patches.xen/xen3-patch-3.0 patches.xen/xen3-patch-2.6.38
+xen patches.xen/xen3-patch-3.1 patches.xen/xen3-patch-2.6.39
+xen patches.xen/xen3-apei_allow_drivers_access_nvs_ram.patch patches.xen/xen3-patch-3.0
+xen patches.xen/xen3-acpi_implement_overriding_of_arbitrary_acpi_tables_via_initrd.patch patches.xen/xen3-patch-3.1
+xen patches.xen/xen3-stack-unwind patches.xen/xen3-patch-3.2-rc3
+xen patches.xen/xen3-x86_64-unwind-annotations patches.xen/xen3-apei_allow_drivers_access_nvs_ram.patch
+xen patches.xen/xen3-acpi_implement_overriding_of_arbitrary_acpi_tables_via_initrd.patch
+xen # bugfixes and enhancements patches.xen/xen3-stack-unwind
+xen patches.xen/xen-kconfig-compat patches.xen/xen3-x86_64-unwind-annotations
+xen patches.xen/xen-sys-suspend
+xen patches.xen/xen-ipi-per-cpu-irq # bugfixes and enhancements
+xen patches.xen/xen-virq-per-cpu-irq patches.xen/xen-kconfig-compat
+xen patches.xen/xen-clockevents patches.xen/xen-sys-suspend
+xen patches.xen/xen-spinlock-poll-early patches.xen/xen-ipi-per-cpu-irq
+xen patches.xen/xen-pcpu-hotplug patches.xen/xen-virq-per-cpu-irq
+xen patches.xen/xen-mem-hotplug patches.xen/xen-clockevents
+xen patches.xen/xen-swiotlb-heuristics patches.xen/xen-spinlock-poll-early
+xen patches.xen/xen-configurable-guest-devices patches.xen/xen-pcpu-hotplug
+xen patches.xen/xen-setup-gsi patches.xen/xen-mem-hotplug
+xen patches.xen/xen-sections patches.xen/xen-swiotlb-heuristics
+xen patches.xen/xen-unpriv-build patches.xen/xen-configurable-guest-devices
+xen patches.xen/xen-cpufreq-report patches.xen/xen-setup-gsi
+xen patches.xen/xen-balloon-max-target patches.xen/xen-sections
+xen patches.xen/xen-blkif-protocol-fallback-hack patches.xen/xen-unpriv-build
+xen patches.xen/xen-blkback-cdrom patches.xen/xen-cpufreq-report
+xen patches.xen/xen-blktap-modular patches.xen/xen-balloon-max-target
+xen patches.xen/xen-blktap-write-barriers patches.xen/xen-blkif-protocol-fallback-hack
+xen patches.xen/xen-blktap2-configurable-nr-devs patches.xen/xen-blkback-cdrom
+xen patches.xen/xen-op-packet patches.xen/xen-blktap-modular
+xen patches.xen/xen-blkfront-cdrom patches.xen/xen-blktap-write-barriers
+xen patches.xen/xen-blkfront-hvm-no-cdrom patches.xen/xen-blktap2-configurable-nr-devs
+xen patches.xen/xen-netback-nr-irqs patches.xen/xen-op-packet
+xen patches.xen/xen-netback-notify-multi patches.xen/xen-blkfront-cdrom
+xen patches.xen/xen-netback-generalize patches.xen/xen-blkfront-hvm-no-cdrom
+xen patches.xen/xen-netback-multiple-tasklets patches.xen/xen-netback-nr-irqs
+xen patches.xen/xen-netback-kernel-threads patches.xen/xen-netback-notify-multi
+xen patches.xen/xen-cxgb3 patches.xen/xen-netback-generalize
+xen patches.xen/xen-dcdbas patches.xen/xen-netback-multiple-tasklets
+xen patches.xen/xen-x86-panic-no-reboot patches.xen/xen-netback-kernel-threads
+xen patches.xen/xen-x86-dcr-fallback patches.xen/xen-cxgb3
+xen patches.xen/xen-x86-no-lapic patches.xen/xen-dcdbas
+xen patches.xen/xen-x86-pmd-handling patches.xen/xen-x86-panic-no-reboot
+xen patches.xen/xen-x86-bigmem patches.xen/xen-x86-dcr-fallback
+xen patches.xen/xen-x86-exit-mmap patches.xen/xen-x86-no-lapic
+xen patches.xen/xen-x86-per-cpu-vcpu-info patches.xen/xen-x86-pmd-handling
+xen patches.xen/xen-x86-msr-on-pcpu patches.xen/xen-x86-bigmem
+xen patches.xen/xen-x86-EFI patches.xen/xen-x86-exit-mmap
+xen patches.xen/xen-x86_64-pgd-pin patches.xen/xen-x86-per-cpu-vcpu-info
+xen patches.xen/xen-x86_64-pgd-alloc-order patches.xen/xen-x86-msr-on-pcpu
+xen patches.xen/xen-x86_64-dump-user-pgt patches.xen/xen-x86-EFI
+xen patches.xen/xen-x86_64-note-init-p2m patches.xen/xen-x86_64-pgd-pin
+xen patches.xen/xen-x86_64-unmapped-initrd patches.xen/xen-x86_64-pgd-alloc-order
+xen- patches.xen/xencons-tty_mutex.patch patches.xen/xen-x86_64-dump-user-pgt
patches.xen/xen-x86_64-note-init-p2m
patches.xen/xen-x86_64-unmapped-initrd

View File

@ -1,3 +1,3 @@
2011-11-25 19:28:57 +0100 2011-11-28 22:17:55 +0100
GIT Revision: c1efd3360673630e17d6ecdfb92db25140fef981 GIT Revision: f223ee652010d2179a7287193aa4d7e6db362131
GIT Branch: master GIT Branch: master

View File

@ -0,0 +1,79 @@
#!/bin/bash
#############################################################################
# Copyright (c) 2011 Novell, Inc.
# All Rights Reserved.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of version 2 of the GNU General Public License as
# published by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, contact Novell, Inc.
#
# To contact Novell about this file by physical or electronic mail,
# you may find current contact information at www.novell.com
#############################################################################
# If make fails, check if it happened due to a staging driver and disable it.
# That way, staging does not spoil automatic package building and we also
# do not need to worry about forgetting to reenable manually disabled drivers.
if test -L source; then
source="source"
else
source="."
fi
makefile="$source/drivers/staging/Makefile"
skipped_options=staging-skipped-options
logfile=$1
if test -z "$logfile"; then
echo "Usage: $0 logfile" >&2
exit 1
fi
if ! test -f "$logfile"; then
echo "$logfile not found" >&2
exit 1
fi
# safety precaution
if test "0$(wc -l "$skipped_options" 2>/dev/null)" -gt 20; then
echo "Possible loop detected in $0, exiting after 20 attempts" >&2
exit 1
fi
# find out if the error happened in drivers/staging
dir=$(sed -rn 's@.*/drivers/staging/([^/]*)/.*: error: .*@\1@p; T; q' "$logfile")
if test -z "$dir"; then
exit 1
else
echo "Build failed due to drivers/staging/$dir"
fi
option=$(sed -n 's/obj-\$(\(.*\))[[:space:]]*+=[[:space:]]*'"$dir"'\//\1/p' "$makefile")
if test -z "$option"; then
echo "Cannot determine config option to skip drivers/staging/$dir" >&2
exit 1
fi
# we need to be carefull not to loop endlessly
if grep -qsFx "$option" "$skipped_options"; then
echo "$option has already been disabled, but drivers/staging/$dir is still failing" >&2
exit 1
fi
echo "Trying to disable $option"
"$source/scripts/config" --disable "$option"
if ! make silentoldconfig $MAKE_ARGS || grep "^$option" .config; then
echo "Could not disable $option" >&2
exit 1
fi
echo "$option" >>"$skipped_options"
exit 0