forked from pool/kernel-source
Accepting request 23849 from Kernel:HEAD
Copy from Kernel:HEAD/kernel-source based on submit request 23849 from user coolo OBS-URL: https://build.opensuse.org/request/show/23849 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kernel-source?expand=0&rev=80
This commit is contained in:
committed by
Git OBS Bridge
parent
ab3f35b3fc
commit
e11a3a8f61
@@ -25,7 +25,7 @@
|
||||
|
||||
%define build_flavor @FLAVOR@
|
||||
%define build_kdump (%build_flavor == "kdump")
|
||||
%define build_xen (%build_flavor == "xen")
|
||||
%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
|
||||
%define build_vanilla (%build_flavor == "vanilla")
|
||||
%define build_ps3 (%build_flavor == "ps3")
|
||||
|
||||
@@ -95,9 +95,11 @@ BuildRequires: dwarfextract
|
||||
%endif
|
||||
%if %build_xen
|
||||
%ifarch %ix86
|
||||
%if %build_flavor != "ec2"
|
||||
Provides: kernel-xenpae = %version
|
||||
Obsoletes: kernel-xenpae <= %version
|
||||
%endif
|
||||
%endif
|
||||
#!BuildIgnore: xen
|
||||
%endif
|
||||
|
||||
@@ -173,26 +175,30 @@ NoSource: 120
|
||||
|
||||
# The following KMPs have been integrated into the kernel package.
|
||||
# sles10 / 10.3
|
||||
Obsoletes: iwlwifi-kmp
|
||||
Obsoletes: ipw3945-kmp
|
||||
Obsoletes: iwlwifi-kmp-%build_flavor
|
||||
Obsoletes: ipw3945-kmp-%build_flavor
|
||||
# sles10 / 11.0
|
||||
Obsoletes: uvcvideo-kmp
|
||||
Obsoletes: uvcvideo-kmp-%build_flavor
|
||||
# 10.3
|
||||
Obsoletes: adm8211-kmp
|
||||
Obsoletes: rt2x00-kmp
|
||||
Obsoletes: rfswitch-kmp
|
||||
Obsoletes: adm8211-kmp-%build_flavor
|
||||
Obsoletes: rt2x00-kmp-%build_flavor
|
||||
Obsoletes: rfswitch-kmp-%build_flavor
|
||||
# 11.0
|
||||
Obsoletes: atl2-kmp
|
||||
Obsoletes: wlan-ng-kmp
|
||||
Obsoletes: et131x-kmp
|
||||
Obsoletes: ivtv-kmp
|
||||
Obsoletes: at76_usb-kmp
|
||||
Obsoletes: pcc-acpi-kmp
|
||||
Obsoletes: btusb-kmp
|
||||
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
|
||||
# sle11
|
||||
Obsoletes: ocfs2-kmp
|
||||
Obsoletes: ocfs2-kmp-%build_flavor
|
||||
# 11.1
|
||||
Obsoletes: quickcam-kmp < 0.6.7
|
||||
Obsoletes: quickcam-kmp-%build_flavor < 0.6.7
|
||||
|
||||
# Provide the exported symbols as "ksym(symbol) = hash"
|
||||
%define __find_provides %_sourcedir/find-provides %name
|
||||
@@ -425,7 +431,7 @@ add_vmlinux()
|
||||
cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor
|
||||
image=image
|
||||
if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then
|
||||
dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor
|
||||
dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)"
|
||||
fi
|
||||
%if %CONFIG_KMSG_IDS == "y"
|
||||
mkdir -p %buildroot/usr/share/man/man9
|
||||
@@ -500,7 +506,7 @@ if [ %CONFIG_MODULES = y ]; then
|
||||
if [ -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
|
||||
dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)"
|
||||
fi
|
||||
%endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user