- fixdeps needs 64-bit file API on some filesystems (like carme-i686)

[packages/kernel.git] / kernel.spec

diff --git a/kernel.spec b/kernel.spec
index eb6ffb1e066705593fbf2fb98a3401b9a175cb83..99743ad78a996b1cb10a6a4798542bfab53b3fc0 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -108,8 +108,8 @@ Release:    %{rel}
 Epoch:         3
 License:       GPL v2
 Group:         Base/Kernel
-Source0:       http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}-rc6.tar.xz
-# Source0-md5: 4f25cd5bec5f8d5a7d935b3f2ccb8481
+Source0:       http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
+# Source0-md5: cc6ee608854e0da4b64f6c1ff8b6398c
 %if "%{postver}" != ".0"
 Patch0:                http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz
 # Patch0-md5:  8431ee4e2467fdfde47e31701813a265
@@ -144,6 +144,7 @@ Source58:   kernel-inittmpfs.config
 Patch3:                kernel-fbcondecor.patch
 Patch4:                kernel-fbcon-margins.patch
 Patch5:                linux-wistron-amilo8210.patch
+Patch6:                linux-wistron-nx.patch
 
 # netfilter related stuff mostly based on patch-o-matic-ng
 # snapshot 20070806 with some fixes. Some modules
@@ -238,7 +239,8 @@ Patch2000:  kernel-small_fixes.patch
 Patch2001:     kernel-pwc-uncompress.patch
 Patch2003:     kernel-regressions.patch
 
-# http://git.kernel.org/?p=linux/kernel/git/jj/linux-apparmor.git;a=shortlog;h=refs/heads/v3.5-aa2.8
+# bzr co lp:apparmor
+# ls apparmor/kernel-patches/3.12
 Patch5000:     kernel-apparmor.patch
 
 # for rescuecd
@@ -386,7 +388,8 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
        %endif
        %define DepMod /sbin/depmod
 %endif
-%define MakeOpts %{CrossOpts} HOSTCC="%{__cc}"
+# use 64-bit offsets for fixdeps to work with 64-bit inodes
+%define MakeOpts %{CrossOpts} HOSTCC="%{__cc} -D_FILE_OFFSET_BITS=64"
 
 %define __features \
 %{?with_fbcondecor:Fbsplash/fbcondecor - enabled }\
@@ -621,7 +624,6 @@ Pakiet zawiera dokumentację do jądra Linuksa pochodzącą z katalogu
 %setup -qc
 ln -s %{SOURCE7} kernel-module-build.pl
 ln -s %{SOURCE10} Makefile
-mv linux-%{basever}-rc6 linux-%{basever}
 cd linux-%{basever}
 
 %if "%{postver}" != ".0"
@@ -635,6 +637,7 @@ cd linux-%{basever}
 %endif
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 ## netfilter
 #