Commits

Christos Nouskas committed 57f9c36

3.6.7-1
Added newer CPU support patch

Comments (0)

Files changed (2)

 _basekernel=${_major}.${_minor}
 _srcname=linux-${_major}.${_minor}
 pkgbase=linux-pf
-_pfrel=6
+_pfrel=7
 _kernelname=-pf
 _pfpatchhome="http://pf.natalenko.name/sources/${_basekernel}/"
 _pfpatchname="patch-${_basekernel}.${_pfrel}${_kernelname}"
 	'logo_linux_vga16.ppm.bz2'		#
 	"interactive-governor.tar.gz::https://gist.github.com/gists/1172524/download"
 	'change-default-console-loglevel.patch'
-	'dcache.patch'
+	'http://www.linuxforge.net/linux/kernel/kernel-33-gcc47-0.patch'
 	"${_pfpatchhome}${_pfpatchname}.bz2")	# the -pf patchset
 
 _aufs3git="git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-standalone.git"
 
   # end linux-ARCH patches
 
-  # don't call cifs_lookup on hashed, negative dentry
-  msg "Patching dcache.c"
-  patch -Np1 -i "${srcdir}/dcache.patch"
+  # add gcc 4.7 support for Kconfig and menuconfig
+  patch -Np1 -i "${srcdir}/kernel-33-gcc47-0.patch"
 
    if [ "$CARCH" = "x86_64" ]; then
 	cat "${startdir}/config.x86_64" >| .config
       ;;
   esac
   cp -v .config ${startdir}/config.local
-  CPU=`egrep "MK8=y|MCORE2=y|MPSC=y|MATOM=y|MPENTIUMII=y|MPENTIUMIII=y|MPENTIUMM=y|MPENTIUM4=y|MK7=y|CONFIG_GENERIC_CPU=y|M686=y" ./.config`
+  CPU=`egrep "MK8=y|MCORE2=y|MPSC=y|MATOM=y|MPENTIUMII=y|MPENTIUMIII=y|MPENTIUMM=y|\
+  MPENTIUM4=y|MK7=y|CONFIG_GENERIC_CPU=y|M686=y|MBARCELONA=y|MBOBCAT=y|MBULLDOZER=y|\
+  MPILEDRIVER=y|MCOREI7=y|MCOREI7AVX=y|MCOREAVXI=y|MCOREAVX2=y" ./.config`
   CPU=`sed -e "s/CONFIG_M\(.*\)=y/\1/" <<<$CPU`
   CPU=`sed -e "s/CONFIG_GENERIC_CPU=y/GENERIC/" <<<$CPU`
   CPU=`sed -e "s/^686$/GENERIC/" <<<$CPU`
+  CPU=`sed -e "s/BARCELONA/K8/;s/BOBCAT/K8/;s/BULLDOZER/K8/;s/PILEDRIVER/K8/" <<<$CPU`
+  CPU=`sed -e "s/COREAVX2/CORE2/;s/COREAVXI/CORE2/;s/COREI7AVX/CORE2/;s/COREI7/CORE2/" <<<$CPU`
   cp -v .config ${startdir}/config.$CPU-$CARCH
 
   # Give option to rename package according to CPU
   echo
   if [[ "$CPU" != "GENERIC" ]]; then
+    lcpu=`tr '[:upper:]' '[:lower:]' <<< $CPU`
     echo "=============================================================="
     msg "An non-generic CPU was selected for this kernel."
     echo
     msg "Hit <G>     :  to create a generic package named linux-pf"
     msg "Hit <ENTER> :  to create a package named after the selected CPU"
-    echo "                   (e.g. linux-pf-core2 - recommended)"
+    echo "                   (linux-pf-$lcpu - recommended)"
     echo
     msg "This option affects ONLY the package name. Whether or not the"
     msg "kernel is optimized was determined at the previous config step."
             '9e1e81d80afac6f316e53947e1b081017090081cd30e6c4c473420b77af4b52b'
             'd537a358c9f8b9cbcad34ba99f88af070f54d99c66d3e5d3d4734576ed2fb6e1'
             'b9d79ca33b0b51ff4f6976b7cd6dbb0b624ebf4fbf440222217f8ffc50445de4'
-            'c49eca2478b7d911ee95a61c3f9080082b982ba4de34b9acff9b1ff2d5224957'
-            '00e3297461fa03524eb1f2a0721d0132d762fa6897709624bef88050ecb339db')
+            '8f2dad5b89dac8c76c3dd3ad902928d6032ec2c6ada41d873d752bad5586b154'
+            '4d4dfb704c1fb9406fa2261c35ba1e95334b89b8030b402af5d4e280c0dc2d46')

dcache.patch

-@@ -, +, @@ 
- negative dentry
-    BUG_ON(!d_unhashed(entry));
- fs/cifs/dir.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
---- a/fs/cifs/dir.c	
-+++ a/fs/cifs/dir.c	
-@@ -398,7 +398,12 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry,
- 	 * in network traffic in the other paths.
- 	 */
- 	if (!(oflags & O_CREAT)) {
--		struct dentry *res = cifs_lookup(inode, direntry, 0);
-+		struct dentry *res;
-+
-+		if (!direntry->d_inode)
-+			return -ENOENT;
-+
-+		res = cifs_lookup(inode, direntry, 0);
- 		if (IS_ERR(res))
- 			return PTR_ERR(res);
-