commit a23d074c33cfc35365ad674d49adc656a5f968b0
Author: Jan Rękorajski <[email protected]>
Date: Thu Oct 24 12:49:20 2013 +0200
- 3.4.67
- kgcc is __cc for a very long time now, it's definition has been dropped
kernel-vserver-2.3.patch | 2 +-
kernel.spec | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 557a9f0..9f1a388 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -91,7 +91,7 @@
%define rel 1
%define basever 3.4
-%define postver .65
+%define postver .67
# __alt_kernel is list of features, empty string if none set
# _alt kernel is defined as: %{nil}%{?alt_kernel:-%{?alt_kernel}} (defined in
rpm.macros)
@@ -138,7 +138,7 @@ Source0:
http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
# Source0-md5: 967f72983655e2479f951195953e8480
%if "%{postver}" != ".0"
Patch0:
http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz
-# Patch0-md5: 5cc0b3e19712173f8f2612c17af16a64
+# Patch0-md5: 1ccc0e8290b5496467a08f101fc555a5
%endif
Source1: kernel.sysconfig
@@ -373,7 +373,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define topdir %{_builddir}/%{name}-%{version}
%define srcdir %{topdir}/linux-%{basever}
%define objdir %{topdir}/%{targetobj}
-%define targetobj %{_target_base_arch}-gcc-%(%{kgcc}
-dumpversion)
+%define targetobj %{_target_base_arch}-gcc-%(%{__cc}
-dumpversion)
%define _kernelsrcdir /usr/src/linux%{_alt_kernel}-%{version}
diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index 496ffa8..36b54a3 100644
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -13975,9 +13975,9 @@ diff -NurpP --minimal linux-3.4.57/init/main.c
linux-3.4.57-vs2.3.3.9/init/main.
--- linux-3.4.57/init/main.c 2013-08-13 14:13:36.000000000 +0000
+++ linux-3.4.57-vs2.3.3.9/init/main.c 2013-02-19 14:42:56.000000000 +0000
@@ -68,6 +68,7 @@
- #include <linux/shmem_fs.h>
#include <linux/slab.h>
#include <linux/perf_event.h>
+ #include <linux/random.h>
+#include <linux/vserver/percpu.h>
#include <asm/io.h>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/a23d074c33cfc35365ad674d49adc656a5f968b0
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
