commit ff1dcd9c1bed643596079e41c3178bc69827c601

OBS-URL: https://build.opensuse.org/package/show/Kernel:stable/kernel-source?expand=0&rev=448
This commit is contained in:
Michal Marek 2015-11-21 07:05:11 +00:00 committed by Git OBS Bridge
parent 469f159ebd
commit 1004571006
31 changed files with 173 additions and 271 deletions

View File

@ -11,12 +11,9 @@
<arch>x86_64</arch>
<package>kernel-debug</package>
<package>kernel-default</package>
<package>kernel-ec2</package>
<package>kernel-lpae</package>
<package>kernel-pae</package>
<package>kernel-pv</package>
<package>kernel-vanilla</package>
<package>kernel-xen</package>
</conditions>
<hardware>
<processors>8</processors>
@ -33,12 +30,9 @@
<arch>ppc64le</arch>
<package>kernel-debug</package>
<package>kernel-default</package>
<package>kernel-ec2</package>
<package>kernel-lpae</package>
<package>kernel-pae</package>
<package>kernel-pv</package>
<package>kernel-vanilla</package>
<package>kernel-xen</package>
</conditions>
<hardware>
<processors>4</processors>

View File

@ -10,16 +10,10 @@
+i386 i386/default
+i386 i386/pae
+i386 i386/xen
+i386 -syms i386/ec2
+i386 i386/pv
+i386 -syms i386/debug
+i386 i386/vanilla
+x86_64 x86_64/default
+x86_64 x86_64/xen
+x86_64 -syms x86_64/ec2
+x86_64 x86_64/pv
+x86_64 -syms x86_64/debug
+x86_64 x86_64/vanilla

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fceab8afadf199559938bcc88df7d76d1dbfb20f5ae70ec7ee907b06a30af4dc
size 375562
oid sha256:c8c1ea2269971c0d80e15d7703ee279f67742671051b66ec474238ae9798a896
size 322618

View File

@ -28,7 +28,6 @@
%define build_flavor @FLAVOR@
%define build_default ("%build_flavor" == "default")
%define build_xen ("%build_flavor" == "xen" || "%build_flavor" == "ec2")
%define build_vanilla ("%build_flavor" == "vanilla")
%define src_install_dir /usr/src/linux-%kernelrelease%variant
@ -122,9 +121,6 @@ BuildRequires: dwarfextract
%ifarch %arm
BuildRequires: u-boot-tools
%endif
%if %build_xen
#!BuildIgnore: xen
%endif
Obsoletes: microcode_ctl
@ -452,9 +448,6 @@ add_vmlinux()
%ifarch %ix86 x86_64
add_vmlinux --compressed
image=bzImage
%if %build_xen
test -f arch/x86/boot/$image || image=vmlinuz
%endif
cp -p arch/x86/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
image=vmlinuz
%endif
@ -545,7 +538,7 @@ for sub in '-base' '' '-extra'; do
done
done
%if %build_xen || %build_vanilla
%if %build_vanilla
# keep this -suffix list in sync with post.sh and postun.sh
suffix=-%build_flavor
%endif

View File

@ -4,6 +4,16 @@ Thu Nov 19 07:41:19 CET 2015 - tiwai@suse.de
- ethernet/atheros/alx: add Killer E2400 device ID (boo#955363).
- commit 66773be
-------------------------------------------------------------------
Wed Nov 18 22:40:44 CET 2015 - mmarek@suse.cz
- XEN: Use the PVOPS kernel (fate#315712)
Merge the -pv configs into -default (-pae on i386) and -debug and drop
the -xen flavor and the associated patches.xen series. For a
transitional period, the -xen flavor will be maintained in a separate
branch as a reference.
- commit ff1dcd9
-------------------------------------------------------------------
Tue Nov 17 10:14:21 CET 2015 - jlee@suse.com

View File

@ -28,7 +28,6 @@
%define build_flavor debug
%define build_default ("%build_flavor" == "default")
%define build_xen ("%build_flavor" == "xen" || "%build_flavor" == "ec2")
%define build_vanilla ("%build_flavor" == "vanilla")
%define src_install_dir /usr/src/linux-%kernelrelease%variant
@ -60,7 +59,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 4.3.0
%if 0%{?is_kotd}
Release: <RELEASE>.g66773be
Release: <RELEASE>.gff1dcd9
%else
Release: 0
%endif
@ -122,9 +121,6 @@ BuildRequires: dwarfextract
%ifarch %arm
BuildRequires: u-boot-tools
%endif
%if %build_xen
#!BuildIgnore: xen
%endif
Obsoletes: microcode_ctl
@ -583,9 +579,6 @@ add_vmlinux()
%ifarch %ix86 x86_64
add_vmlinux --compressed
image=bzImage
%if %build_xen
test -f arch/x86/boot/$image || image=vmlinuz
%endif
cp -p arch/x86/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
image=vmlinuz
%endif
@ -676,7 +669,7 @@ for sub in '-base' '' '-extra'; do
done
done
%if %build_xen || %build_vanilla
%if %build_vanilla
# keep this -suffix list in sync with post.sh and postun.sh
suffix=-%build_flavor
%endif

View File

@ -4,6 +4,16 @@ Thu Nov 19 07:41:19 CET 2015 - tiwai@suse.de
- ethernet/atheros/alx: add Killer E2400 device ID (boo#955363).
- commit 66773be
-------------------------------------------------------------------
Wed Nov 18 22:40:44 CET 2015 - mmarek@suse.cz
- XEN: Use the PVOPS kernel (fate#315712)
Merge the -pv configs into -default (-pae on i386) and -debug and drop
the -xen flavor and the associated patches.xen series. For a
transitional period, the -xen flavor will be maintained in a separate
branch as a reference.
- commit ff1dcd9
-------------------------------------------------------------------
Tue Nov 17 10:14:21 CET 2015 - jlee@suse.com

View File

@ -28,7 +28,6 @@
%define build_flavor default
%define build_default ("%build_flavor" == "default")
%define build_xen ("%build_flavor" == "xen" || "%build_flavor" == "ec2")
%define build_vanilla ("%build_flavor" == "vanilla")
%define src_install_dir /usr/src/linux-%kernelrelease%variant
@ -60,7 +59,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 4.3.0
%if 0%{?is_kotd}
Release: <RELEASE>.g66773be
Release: <RELEASE>.gff1dcd9
%else
Release: 0
%endif
@ -122,9 +121,6 @@ BuildRequires: dwarfextract
%ifarch %arm
BuildRequires: u-boot-tools
%endif
%if %build_xen
#!BuildIgnore: xen
%endif
Obsoletes: microcode_ctl
@ -168,6 +164,10 @@ Provides: kernel-bigsmp = 3.1
Obsoletes: kernel-bigsmp <= 3.1
Provides: kernel-desktop = 4.3
Obsoletes: kernel-desktop <= 4.3
Provides: kernel-xen = 4.3
Obsoletes: kernel-xen <= 4.3
Provides: kernel-ec2 = 4.3
Obsoletes: kernel-ec2 <= 4.3
%endif
%ifarch %ix86
Provides: kernel-trace-base = 3.13
@ -188,6 +188,10 @@ Provides: kernel-bigsmp-base = 3.1
Obsoletes: kernel-bigsmp-base <= 3.1
Provides: kernel-desktop-base = 4.3
Obsoletes: kernel-desktop-base <= 4.3
Provides: kernel-xen-base = 4.3
Obsoletes: kernel-xen-base <= 4.3
Provides: kernel-ec2-base = 4.3
Obsoletes: kernel-ec2-base <= 4.3
%endif
%obsolete_rebuilds %name
Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz
@ -618,9 +622,6 @@ add_vmlinux()
%ifarch %ix86 x86_64
add_vmlinux --compressed
image=bzImage
%if %build_xen
test -f arch/x86/boot/$image || image=vmlinuz
%endif
cp -p arch/x86/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
image=vmlinuz
%endif
@ -711,7 +712,7 @@ for sub in '-base' '' '-extra'; do
done
done
%if %build_xen || %build_vanilla
%if %build_vanilla
# keep this -suffix list in sync with post.sh and postun.sh
suffix=-%build_flavor
%endif
@ -1002,6 +1003,10 @@ Provides: kernel-bigsmp-base = 3.1
Obsoletes: kernel-bigsmp-base <= 3.1
Provides: kernel-desktop-base = 4.3
Obsoletes: kernel-desktop-base <= 4.3
Provides: kernel-xen-base = 4.3
Obsoletes: kernel-xen-base <= 4.3
Provides: kernel-ec2-base = 4.3
Obsoletes: kernel-ec2-base <= 4.3
%endif
%obsolete_rebuilds %name-base
%ifarch %ix86
@ -1060,6 +1065,10 @@ Provides: kernel-bigsmp-extra = 3.1
Obsoletes: kernel-bigsmp-extra <= 3.1
Provides: kernel-desktop-extra = 4.3
Obsoletes: kernel-desktop-extra <= 4.3
Provides: kernel-xen-extra = 4.3
Obsoletes: kernel-xen-extra <= 4.3
Provides: kernel-ec2-extra = 4.3
Obsoletes: kernel-ec2-extra <= 4.3
%endif
%obsolete_rebuilds %name-extra
Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu)
@ -1131,6 +1140,10 @@ Provides: kernel-bigsmp-devel = 3.1
Obsoletes: kernel-bigsmp-devel <= 3.1
Provides: kernel-desktop-devel = 4.3
Obsoletes: kernel-desktop-devel <= 4.3
Provides: kernel-xen-devel = 4.3
Obsoletes: kernel-xen-devel <= 4.3
Provides: kernel-ec2-devel = 4.3
Obsoletes: kernel-ec2-devel <= 4.3
%endif
%obsolete_rebuilds %name-devel
PreReq: coreutils

View File

@ -4,6 +4,16 @@ Thu Nov 19 07:41:19 CET 2015 - tiwai@suse.de
- ethernet/atheros/alx: add Killer E2400 device ID (boo#955363).
- commit 66773be
-------------------------------------------------------------------
Wed Nov 18 22:40:44 CET 2015 - mmarek@suse.cz
- XEN: Use the PVOPS kernel (fate#315712)
Merge the -pv configs into -default (-pae on i386) and -debug and drop
the -xen flavor and the associated patches.xen series. For a
transitional period, the -xen flavor will be maintained in a separate
branch as a reference.
- commit ff1dcd9
-------------------------------------------------------------------
Tue Nov 17 10:14:21 CET 2015 - jlee@suse.com

View File

@ -29,7 +29,7 @@ License: GPL-2.0
Group: Documentation/Man
Version: 4.3.0
%if 0%{?is_kotd}
Release: <RELEASE>.g66773be
Release: <RELEASE>.gff1dcd9
%else
Release: 0
%endif

View File

@ -4,6 +4,16 @@ Thu Nov 19 07:41:19 CET 2015 - tiwai@suse.de
- ethernet/atheros/alx: add Killer E2400 device ID (boo#955363).
- commit 66773be
-------------------------------------------------------------------
Wed Nov 18 22:40:44 CET 2015 - mmarek@suse.cz
- XEN: Use the PVOPS kernel (fate#315712)
Merge the -pv configs into -default (-pae on i386) and -debug and drop
the -xen flavor and the associated patches.xen series. For a
transitional period, the -xen flavor will be maintained in a separate
branch as a reference.
- commit ff1dcd9
-------------------------------------------------------------------
Tue Nov 17 10:14:21 CET 2015 - jlee@suse.com

View File

@ -28,7 +28,6 @@
%define build_flavor lpae
%define build_default ("%build_flavor" == "default")
%define build_xen ("%build_flavor" == "xen" || "%build_flavor" == "ec2")
%define build_vanilla ("%build_flavor" == "vanilla")
%define src_install_dir /usr/src/linux-%kernelrelease%variant
@ -60,7 +59,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 4.3.0
%if 0%{?is_kotd}
Release: <RELEASE>.g66773be
Release: <RELEASE>.gff1dcd9
%else
Release: 0
%endif
@ -122,9 +121,6 @@ BuildRequires: dwarfextract
%ifarch %arm
BuildRequires: u-boot-tools
%endif
%if %build_xen
#!BuildIgnore: xen
%endif
Obsoletes: microcode_ctl
@ -577,9 +573,6 @@ add_vmlinux()
%ifarch %ix86 x86_64
add_vmlinux --compressed
image=bzImage
%if %build_xen
test -f arch/x86/boot/$image || image=vmlinuz
%endif
cp -p arch/x86/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
image=vmlinuz
%endif
@ -670,7 +663,7 @@ for sub in '-base' '' '-extra'; do
done
done
%if %build_xen || %build_vanilla
%if %build_vanilla
# keep this -suffix list in sync with post.sh and postun.sh
suffix=-%build_flavor
%endif

View File

@ -34,6 +34,9 @@ Obsoletes: %{-n*}-vmi
%ifarch x86_64
Obsoletes: %{-n*}-desktop
%endif
%ifarch %ix86 x86_64
Obsoletes: %{-n*}-xen
%endif
%endif
%if %1 == "pae"
Obsoletes: %{-n*}-desktop

View File

@ -4,6 +4,16 @@ Thu Nov 19 07:41:19 CET 2015 - tiwai@suse.de
- ethernet/atheros/alx: add Killer E2400 device ID (boo#955363).
- commit 66773be
-------------------------------------------------------------------
Wed Nov 18 22:40:44 CET 2015 - mmarek@suse.cz
- XEN: Use the PVOPS kernel (fate#315712)
Merge the -pv configs into -default (-pae on i386) and -debug and drop
the -xen flavor and the associated patches.xen series. For a
transitional period, the -xen flavor will be maintained in a separate
branch as a reference.
- commit ff1dcd9
-------------------------------------------------------------------
Tue Nov 17 10:14:21 CET 2015 - jlee@suse.com

View File

@ -30,9 +30,6 @@ BuildRequires: device-mapper
BuildRequires: util-linux
BuildRequires: kernel-default
%ifarch %ix86 x86_64
BuildRequires: kernel-xen
%endif
ExclusiveArch: aarch64 armv6hl armv7hl %ix86 ppc64 ppc64le s390x x86_64
%if 0%{?suse_version} < 1315
# For SLE 11
@ -47,7 +44,7 @@ License: GPL-2.0
Group: SLES
Version: 4.3.0
%if 0%{?is_kotd}
Release: <RELEASE>.g66773be
Release: <RELEASE>.gff1dcd9
%else
Release: 0
%endif
@ -122,16 +119,8 @@ ROOT=""
/sbin/mkinitrd $ROOT \
-m "$KERNEL_MODULES" \
-k /boot/%{kernel_name}-*-default -M /boot/System.map-*-default -i /tmp/initrd.kvm -B
%ifarch %ix86 x86_64
/sbin/mkinitrd $ROOT \
-m "$KERNEL_MODULES" \
-k /boot/vmlinuz-xen -M /boot/System.map-*-xen -i /tmp/initrd.xen
%endif
%else
dracut --host-only --drivers="$KERNEL_MODULES" --force /tmp/initrd.kvm `echo /boot/%{kernel_name}-*-default | sed -n -e 's,[^-]*-\(.*-default\),\1,p'`
%ifarch %ix86 x86_64
dracut --host-only --drivers="$KERNEL_MODULES xenblk" --force /tmp/initrd.xen `echo /boot/%{kernel_name}-*-xen | sed -n -e 's,[^-]*-\(.*-xen\),\1,p'`
%endif
%endif
@ -142,10 +131,6 @@ rm -rf /usr/lib/dracut/modules.d/80obs
install -d -m 0755 $RPM_BUILD_ROOT
cp -v /boot/%{kernel_name}-*-default $RPM_BUILD_ROOT/.build.kernel.kvm
cp -v /tmp/initrd.kvm $RPM_BUILD_ROOT/.build.initrd.kvm
%ifarch %ix86 x86_64
cp -v /boot/%{kernel_name}-*-xen $RPM_BUILD_ROOT/.build.kernel.xen
cp -v /tmp/initrd.xen $RPM_BUILD_ROOT/.build.initrd.xen
%endif
#inform worker about arch
#see obs-build commit e47399d738e51

View File

@ -30,9 +30,6 @@ BuildRequires: device-mapper
BuildRequires: util-linux
BuildRequires: kernel-default
%ifarch %ix86 x86_64
BuildRequires: kernel-xen
%endif
ExclusiveArch: @ARCHS@
%if 0%{?suse_version} < 1315
# For SLE 11
@ -122,16 +119,8 @@ ROOT=""
/sbin/mkinitrd $ROOT \
-m "$KERNEL_MODULES" \
-k /boot/%{kernel_name}-*-default -M /boot/System.map-*-default -i /tmp/initrd.kvm -B
%ifarch %ix86 x86_64
/sbin/mkinitrd $ROOT \
-m "$KERNEL_MODULES" \
-k /boot/vmlinuz-xen -M /boot/System.map-*-xen -i /tmp/initrd.xen
%endif
%else
dracut --host-only --drivers="$KERNEL_MODULES" --force /tmp/initrd.kvm `echo /boot/%{kernel_name}-*-default | sed -n -e 's,[^-]*-\(.*-default\),\1,p'`
%ifarch %ix86 x86_64
dracut --host-only --drivers="$KERNEL_MODULES xenblk" --force /tmp/initrd.xen `echo /boot/%{kernel_name}-*-xen | sed -n -e 's,[^-]*-\(.*-xen\),\1,p'`
%endif
%endif
@ -142,10 +131,6 @@ rm -rf /usr/lib/dracut/modules.d/80obs
install -d -m 0755 $RPM_BUILD_ROOT
cp -v /boot/%{kernel_name}-*-default $RPM_BUILD_ROOT/.build.kernel.kvm
cp -v /tmp/initrd.kvm $RPM_BUILD_ROOT/.build.initrd.kvm
%ifarch %ix86 x86_64
cp -v /boot/%{kernel_name}-*-xen $RPM_BUILD_ROOT/.build.kernel.xen
cp -v /tmp/initrd.xen $RPM_BUILD_ROOT/.build.initrd.xen
%endif
#inform worker about arch
#see obs-build commit e47399d738e51

View File

@ -4,6 +4,16 @@ Thu Nov 19 07:41:19 CET 2015 - tiwai@suse.de
- ethernet/atheros/alx: add Killer E2400 device ID (boo#955363).
- commit 66773be
-------------------------------------------------------------------
Wed Nov 18 22:40:44 CET 2015 - mmarek@suse.cz
- XEN: Use the PVOPS kernel (fate#315712)
Merge the -pv configs into -default (-pae on i386) and -debug and drop
the -xen flavor and the associated patches.xen series. For a
transitional period, the -xen flavor will be maintained in a separate
branch as a reference.
- commit ff1dcd9
-------------------------------------------------------------------
Tue Nov 17 10:14:21 CET 2015 - jlee@suse.com

View File

@ -38,7 +38,7 @@ License: GPL-2.0
Group: SLES
Version: 4.3.0
%if 0%{?is_kotd}
Release: <RELEASE>.g66773be
Release: <RELEASE>.gff1dcd9
%else
Release: 0
%endif

View File

@ -4,6 +4,16 @@ Thu Nov 19 07:41:19 CET 2015 - tiwai@suse.de
- ethernet/atheros/alx: add Killer E2400 device ID (boo#955363).
- commit 66773be
-------------------------------------------------------------------
Wed Nov 18 22:40:44 CET 2015 - mmarek@suse.cz
- XEN: Use the PVOPS kernel (fate#315712)
Merge the -pv configs into -default (-pae on i386) and -debug and drop
the -xen flavor and the associated patches.xen series. For a
transitional period, the -xen flavor will be maintained in a separate
branch as a reference.
- commit ff1dcd9
-------------------------------------------------------------------
Tue Nov 17 10:14:21 CET 2015 - jlee@suse.com

View File

@ -28,7 +28,6 @@
%define build_flavor pae
%define build_default ("%build_flavor" == "default")
%define build_xen ("%build_flavor" == "xen" || "%build_flavor" == "ec2")
%define build_vanilla ("%build_flavor" == "vanilla")
%define src_install_dir /usr/src/linux-%kernelrelease%variant
@ -60,7 +59,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 4.3.0
%if 0%{?is_kotd}
Release: <RELEASE>.g66773be
Release: <RELEASE>.gff1dcd9
%else
Release: 0
%endif
@ -122,9 +121,6 @@ BuildRequires: dwarfextract
%ifarch %arm
BuildRequires: u-boot-tools
%endif
%if %build_xen
#!BuildIgnore: xen
%endif
Obsoletes: microcode_ctl
@ -152,12 +148,20 @@ Provides: kernel-vmi = 2.6.38
Obsoletes: kernel-vmi <= 2.6.38
Provides: kernel-desktop = 4.3
Obsoletes: kernel-desktop <= 4.3
Provides: kernel-xen = 4.3
Obsoletes: kernel-xen <= 4.3
Provides: kernel-ec2 = 4.3
Obsoletes: kernel-ec2 <= 4.3
%endif
%ifarch %ix86
Provides: kernel-vmi-base = 2.6.38
Obsoletes: kernel-vmi-base <= 2.6.38
Provides: kernel-desktop-base = 4.3
Obsoletes: kernel-desktop-base <= 4.3
Provides: kernel-xen-base = 4.3
Obsoletes: kernel-xen-base <= 4.3
Provides: kernel-ec2-base = 4.3
Obsoletes: kernel-ec2-base <= 4.3
%endif
%obsolete_rebuilds %name
Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz
@ -595,9 +599,6 @@ add_vmlinux()
%ifarch %ix86 x86_64
add_vmlinux --compressed
image=bzImage
%if %build_xen
test -f arch/x86/boot/$image || image=vmlinuz
%endif
cp -p arch/x86/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
image=vmlinuz
%endif
@ -688,7 +689,7 @@ for sub in '-base' '' '-extra'; do
done
done
%if %build_xen || %build_vanilla
%if %build_vanilla
# keep this -suffix list in sync with post.sh and postun.sh
suffix=-%build_flavor
%endif
@ -965,6 +966,10 @@ Provides: kernel-vmi-base = 2.6.38
Obsoletes: kernel-vmi-base <= 2.6.38
Provides: kernel-desktop-base = 4.3
Obsoletes: kernel-desktop-base <= 4.3
Provides: kernel-xen-base = 4.3
Obsoletes: kernel-xen-base <= 4.3
Provides: kernel-ec2-base = 4.3
Obsoletes: kernel-ec2-base <= 4.3
%endif
%obsolete_rebuilds %name-base
%ifarch %ix86
@ -1016,6 +1021,10 @@ Provides: kernel-vmi-extra = 2.6.38
Obsoletes: kernel-vmi-extra <= 2.6.38
Provides: kernel-desktop-extra = 4.3
Obsoletes: kernel-desktop-extra <= 4.3
Provides: kernel-xen-extra = 4.3
Obsoletes: kernel-xen-extra <= 4.3
Provides: kernel-ec2-extra = 4.3
Obsoletes: kernel-ec2-extra <= 4.3
%endif
%obsolete_rebuilds %name-extra
Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu)
@ -1080,6 +1089,10 @@ Provides: kernel-vmi-devel = 2.6.38
Obsoletes: kernel-vmi-devel <= 2.6.38
Provides: kernel-desktop-devel = 4.3
Obsoletes: kernel-desktop-devel <= 4.3
Provides: kernel-xen-devel = 4.3
Obsoletes: kernel-xen-devel <= 4.3
Provides: kernel-ec2-devel = 4.3
Obsoletes: kernel-ec2-devel <= 4.3
%endif
%obsolete_rebuilds %name-devel
PreReq: coreutils

View File

@ -4,6 +4,16 @@ Thu Nov 19 07:41:19 CET 2015 - tiwai@suse.de
- ethernet/atheros/alx: add Killer E2400 device ID (boo#955363).
- commit 66773be
-------------------------------------------------------------------
Wed Nov 18 22:40:44 CET 2015 - mmarek@suse.cz
- XEN: Use the PVOPS kernel (fate#315712)
Merge the -pv configs into -default (-pae on i386) and -debug and drop
the -xen flavor and the associated patches.xen series. For a
transitional period, the -xen flavor will be maintained in a separate
branch as a reference.
- commit ff1dcd9
-------------------------------------------------------------------
Tue Nov 17 10:14:21 CET 2015 - jlee@suse.com

View File

@ -32,7 +32,7 @@ License: GPL-2.0
Group: Development/Sources
Version: 4.3.0
%if 0%{?is_kotd}
Release: <RELEASE>.g66773be
Release: <RELEASE>.gff1dcd9
%else
Release: 0
%endif

View File

@ -4,6 +4,16 @@ Thu Nov 19 07:41:19 CET 2015 - tiwai@suse.de
- ethernet/atheros/alx: add Killer E2400 device ID (boo#955363).
- commit 66773be
-------------------------------------------------------------------
Wed Nov 18 22:40:44 CET 2015 - mmarek@suse.cz
- XEN: Use the PVOPS kernel (fate#315712)
Merge the -pv configs into -default (-pae on i386) and -debug and drop
the -xen flavor and the associated patches.xen series. For a
transitional period, the -xen flavor will be maintained in a separate
branch as a reference.
- commit ff1dcd9
-------------------------------------------------------------------
Tue Nov 17 10:14:21 CET 2015 - jlee@suse.com

View File

@ -27,7 +27,7 @@ Group: Development/Sources
Version: 4.3.0
%if %using_buildservice
%if 0%{?is_kotd}
Release: <RELEASE>.g66773be
Release: <RELEASE>.gff1dcd9
%else
Release: 0
%endif
@ -47,12 +47,6 @@ Requires: kernel-lpae-devel = %version-%source_rel
%ifarch %ix86
Requires: kernel-pae-devel = %version-%source_rel
%endif
%ifarch %ix86 x86_64
Requires: kernel-pv-devel = %version-%source_rel
%endif
%ifarch %ix86 x86_64
Requires: kernel-xen-devel = %version-%source_rel
%endif
Requires: pesign-obs-integration
Provides: %name = %version-%source_rel
Provides: multiversion(kernel)

View File

@ -4,6 +4,16 @@ Thu Nov 19 07:41:19 CET 2015 - tiwai@suse.de
- ethernet/atheros/alx: add Killer E2400 device ID (boo#955363).
- commit 66773be
-------------------------------------------------------------------
Wed Nov 18 22:40:44 CET 2015 - mmarek@suse.cz
- XEN: Use the PVOPS kernel (fate#315712)
Merge the -pv configs into -default (-pae on i386) and -debug and drop
the -xen flavor and the associated patches.xen series. For a
transitional period, the -xen flavor will be maintained in a separate
branch as a reference.
- commit ff1dcd9
-------------------------------------------------------------------
Tue Nov 17 10:14:21 CET 2015 - jlee@suse.com

View File

@ -28,7 +28,6 @@
%define build_flavor vanilla
%define build_default ("%build_flavor" == "default")
%define build_xen ("%build_flavor" == "xen" || "%build_flavor" == "ec2")
%define build_vanilla ("%build_flavor" == "vanilla")
%define src_install_dir /usr/src/linux-%kernelrelease%variant
@ -60,7 +59,7 @@ License: GPL-2.0
Group: System/Kernel
Version: 4.3.0
%if 0%{?is_kotd}
Release: <RELEASE>.g66773be
Release: <RELEASE>.gff1dcd9
%else
Release: 0
%endif
@ -122,9 +121,6 @@ BuildRequires: dwarfextract
%ifarch %arm
BuildRequires: u-boot-tools
%endif
%if %build_xen
#!BuildIgnore: xen
%endif
Obsoletes: microcode_ctl
@ -576,9 +572,6 @@ add_vmlinux()
%ifarch %ix86 x86_64
add_vmlinux --compressed
image=bzImage
%if %build_xen
test -f arch/x86/boot/$image || image=vmlinuz
%endif
cp -p arch/x86/boot/$image %buildroot/boot/vmlinuz-%kernelrelease-%build_flavor
image=vmlinuz
%endif
@ -669,7 +662,7 @@ for sub in '-base' '' '-extra'; do
done
done
%if %build_xen || %build_vanilla
%if %build_vanilla
# keep this -suffix list in sync with post.sh and postun.sh
suffix=-%build_flavor
%endif

View File

@ -38,3 +38,8 @@ s390x/default trace 3.13
# openSUSE 13.2 / Tumbleweed until 2015-10-01
i386/pae desktop 4.3
x86_64/default desktop 4.3
i386/pae xen 4.3
i386/pae ec2 4.3
x86_64/default xen 4.3
x86_64/default ec2 4.3

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cbb6d007c05b318c2ee1f4bd40e3b497c7fd786e1e62e18ea6a52fded49da96e
size 2282320
oid sha256:6dfe8549f6e38f0b10c457737af3d0abb9e8001f0716350e97012671ec1657b6
size 130

View File

@ -2,11 +2,9 @@
touch /boot/do_purge_kernels
suffix=
case @FLAVOR@ in
xen*|ec2|vanilla)
suffix=-@FLAVOR@
;;
esac
if test "@FLAVOR@" = "vanilla"; then
suffix=-@FLAVOR@
fi
for x in /boot/@IMAGE@ /boot/initrd; do
rm -f $x$suffix
ln -s ${x##*/}-@KERNELRELEASE@-@FLAVOR@ $x$suffix

View File

@ -507,157 +507,3 @@
# You'd better have a good reason for adding a patch
# below here.
########################################################
########################################################
# XEN architecture, version 3
########################################################
# xen patches, from xenbits mercurial repository.
# http://xenbits.xensource.com/ext/linux-2.6-merge.hg
#
# everything named "xen3-auto-*" is auto-generated.
# PLEASE DON'T EDIT THESE PATCHES. Create fixup patches
# on top of them instead. This reduces workload when
# re-basing to a newer xen tree.
#
# split out patches
patches.xen/kexec-move-segment-code-i386.patch
patches.xen/kexec-move-segment-code-x86_64.patch
patches.xen/ipv6-no-autoconf
patches.xen/pci-guestdev
patches.xen/pci-reserve
# bulk stuff, new files for xen
patches.xen/xen3-auto-xen-arch.diff
patches.xen/xen3-auto-xen-drivers.diff
patches.xen/xen3-auto-include-xen-interface.diff
patches.xen/xen3-auto-blktap2-pvops.diff
# kconfig bits for xen
patches.xen/xen3-auto-xen-kconfig.diff
# common code changes
patches.xen/xen3-auto-common.diff
patches.xen/xen3-auto-arch-x86.diff
patches.xen/xen3-auto-arch-i386.diff
patches.xen/xen3-auto-arch-x86_64.diff
# fixups due to upstream Xen parts
patches.xen/xen3-fixup-xen
# newer changeset backports
# changes outside arch/{i386,x86_64}/xen
patches.xen/xen3-fixup-kconfig
patches.xen/xen3-fixup-common
patches.xen/xen3-fixup-arch-x86
patches.xen/xen3-fixup-blktap2-pvops
# ports of upstream patches
patches.xen/xen3-patch-2.6.18
patches.xen/xen3-patch-2.6.19
patches.xen/xen3-patch-2.6.20
patches.xen/xen3-patch-2.6.21
patches.xen/xen3-patch-2.6.22
patches.xen/xen3-patch-2.6.23
patches.xen/xen3-patch-2.6.24
patches.xen/xen3-patch-2.6.25
patches.xen/xen3-patch-2.6.26
patches.xen/xen3-patch-2.6.27
patches.xen/xen3-patch-2.6.28
patches.xen/xen3-patch-2.6.29
patches.xen/xen3-patch-2.6.30
patches.xen/xen3-patch-2.6.31
patches.xen/xen3-patch-2.6.32
patches.xen/xen3-patch-2.6.33
patches.xen/xen3-patch-2.6.34
patches.xen/xen3-patch-2.6.35
patches.xen/xen3-patch-2.6.36
patches.xen/xen3-patch-2.6.37
patches.xen/xen3-patch-2.6.38
patches.xen/xen3-patch-2.6.39
patches.xen/xen3-patch-3.0
patches.xen/xen3-patch-3.1
patches.xen/xen3-patch-3.2
patches.xen/xen3-patch-3.3
patches.xen/xen3-patch-3.4
patches.xen/xen3-patch-3.5
patches.xen/xen3-patch-3.6
patches.xen/xen3-patch-3.7
patches.xen/xen3-patch-3.8
patches.xen/xen3-patch-3.9
patches.xen/xen3-patch-3.10
patches.xen/xen3-patch-3.11
patches.xen/xen3-patch-3.12
patches.xen/xen3-patch-3.13
patches.xen/xen3-patch-3.14
patches.xen/xen3-patch-3.15
patches.xen/xen3-patch-3.16
patches.xen/xen3-patch-3.17
patches.xen/xen3-patch-3.18
patches.xen/xen3-patch-3.19
patches.xen/xen3-patch-4.0
patches.xen/xen3-patch-4.1
patches.xen/xen3-patch-4.2
patches.xen/xen3-patch-4.3
# ports of other patches
patches.xen/xen3-stack-unwind
# bugfixes and enhancements
patches.xen/xen-sys-suspend
patches.xen/xen-ipi-per-cpu-irq
patches.xen/xen-virq-per-cpu-irq
patches.xen/xen-clockevents
patches.xen/xen-spinlock-poll-early
patches.xen/xen-pcpu
patches.xen/xen-pcpu-hotplug-kexec
patches.xen/xen-mem-hotplug
patches.xen/xen-configurable-guest-devices
patches.xen/xen-setup-gsi
patches.xen/xen-privcmd-hcall-preemption
patches.xen/xen-privcmd-truly-batch
patches.xen/xen-unpriv-build
patches.xen/xen-cpufreq-report
patches.xen/xen-multi-page-ring
patches.xen/xen-balloon-max-target
patches.xen/xen-blkback-multi-page-ring
patches.xen/xen-blkback-indirect
patches.xen/xen-blkback-cdrom
patches.xen/xen-blkif-protocol-fallback-hack
patches.xen/xen-blkfront-multi-page-ring
patches.xen/xen-blkfront-indirect
patches.xen/xen-blkif-op-packet
patches.xen/xen-blkfront-cdrom
patches.xen/xen-blkfront-hvm-no-cdrom
patches.xen/xen-blktap-modular
patches.xen/xen-blktap-write-barriers
patches.xen/xen-blktap2-configurable-nr-devs
patches.xen/xen-netback-defer-netdev-destruction
patches.xen/xen-netback-notify-multi
patches.xen/xen-netback-generalize
patches.xen/xen-netback-multiple-tasklets
patches.xen/xen-netback-kernel-threads
patches.xen/xen-netback-tx-queue-len
patches.xen/xen-netback-coalesce
patches.xen/xen-vscsi-large-requests
patches.xen/xen-cxgb3
patches.xen/xen-dcdbas
patches.xen/xen-pv-on-hvm-skip-initialization-of-emulated-devices
patches.xen/xen-x86-panic-no-reboot
patches.xen/xen-x86-dcr-fallback
patches.xen/xen-x86-no-lapic
patches.xen/xen-x86-pmd-handling
patches.xen/xen-x86-bigmem
patches.xen/xen-x86-exit-mmap
patches.xen/xen-x86-per-cpu-vcpu-info
patches.xen/xen-x86-pcpu
patches.xen/xen-x86-EFI
patches.xen/xen-x86-bzImage
patches.xen/xen-x86_64-pgd-pin
patches.xen/xen-x86_64-pgd-alloc-order
patches.xen/xen-x86_64-dump-user-pgt
patches.xen/xen-x86_64-note-init-p2m
patches.xen/xen-x86_64-unmapped-initrd
patches.xen/xen-x86_64-vread-pvclock
patches.xen/xen-x86_64-m2p-strict

View File

@ -1,3 +1,3 @@
2015-11-19 07:42:54 +0100
GIT Revision: 66773be951dd2fdab2434d666b1ca0145571838e
2015-11-20 10:02:09 +0100
GIT Revision: ff1dcd9c1bed643596079e41c3178bc69827c601
GIT Branch: stable