rpms/kernel
9
2
Fork 4
Code Issues Pull Requests Releases Activity

Linux v3.6-rc1-355-gddf343f

Browse Source
This commit is contained in:
Josh Boyer 2012-08-14 07:58:29 -04:00
parent 83eda0f218
commit 2b2f139262
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kernel.spec
View File

@ -62,7 +62,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and # For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
# #
%global baserelease 2 %global baserelease 1
%global fedora_build %{baserelease} %global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching # base_sublevel is the kernel version we're starting with and patching
@ -95,7 +95,7 @@ Summary: The Linux kernel
# The rc snapshot level # The rc snapshot level
%define rcrev 1 %define rcrev 1
# The git snapshot level # The git snapshot level
%define gitrev 5 %define gitrev 6
# Set rpm version accordingly # Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0 %define rpmversion 3.%{upstream_sublevel}.0
%endif %endif
@ -677,7 +677,7 @@ Patch700: linux-2.6-e1000-ich9-montevina.patch
Patch800: linux-2.6-crash-driver.patch Patch800: linux-2.6-crash-driver.patch
# crypto/ # crypto/
Patch900: modsign-20120802.patch Patch900: modsign-20120814.patch
# secure boot # secure boot
Patch1000: secure-boot-20120809.patch Patch1000: secure-boot-20120809.patch
@ -1381,7 +1381,7 @@ ApplyPatch linux-2.6-crash-driver.patch
ApplyPatch linux-2.6-e1000-ich9-montevina.patch ApplyPatch linux-2.6-e1000-ich9-montevina.patch
# crypto/ # crypto/
ApplyPatch modsign-20120802.patch ApplyPatch modsign-20120814.patch
# secure boot # secure boot
ApplyPatch secure-boot-20120809.patch ApplyPatch secure-boot-20120809.patch
@ -2299,6 +2299,9 @@ fi
# ||----w | # ||----w |
# || || # || ||
%changelog %changelog
* Tue Aug 14 2012 Josh Boyer <jwboyer@redhat.com> - 3.6.0-0.rc1.git6.1
- Linux v3.6-rc1-355-gddf343f
* Mon Aug 13 2012 Josh Boyer <jwboyer@redhat.com> - 3.6.0-0.rc1.git5.2 * Mon Aug 13 2012 Josh Boyer <jwboyer@redhat.com> - 3.6.0-0.rc1.git5.2
- Fix VFS file creation bugs (rhbz 844485) - Fix VFS file creation bugs (rhbz 844485)

6
modsign-20120802.patch → modsign-20120814.patch
View File

@ -5040,13 +5040,13 @@ index 0192a4e..c1df590 100644
asm(".section .plt,\"ax\",@nobits; .align 3; .previous"); asm(".section .plt,\"ax\",@nobits; .align 3; .previous");
asm(".section .init.plt,\"ax\",@nobits; .align 3; .previous"); asm(".section .init.plt,\"ax\",@nobits; .align 3; .previous");
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 76de6b6..53a8e01 100644 index 107610e..c76a052 100644
--- a/arch/s390/Kconfig --- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig +++ b/arch/s390/Kconfig
@@ -124,6 +124,8 @@ config S390 @@ -125,6 +125,8 @@ config S390
select GENERIC_TIME_VSYSCALL
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
select KTIME_SCALAR if 32BIT select KTIME_SCALAR if 32BIT
select HAVE_ARCH_SECCOMP_FILTER
+ select HAVE_MOD_ARCH_SPECIFIC + select HAVE_MOD_ARCH_SPECIFIC
+ select MODULES_USE_ELF_RELA + select MODULES_USE_ELF_RELA

2
sources
View File

@ -1,3 +1,3 @@
24153eaaa81dedc9481ada8cd9c3b83d linux-3.5.tar.xz 24153eaaa81dedc9481ada8cd9c3b83d linux-3.5.tar.xz
af201f38b03587c3b33415fdbaf446ef patch-3.6-rc1.xz af201f38b03587c3b33415fdbaf446ef patch-3.6-rc1.xz
4def4d2cf75dbdba9a0976a5514c796f patch-3.6-rc1-git5.xz 69af00455bd184779d3a01afb18e4d97 patch-3.6-rc1-git6.xz