Commits

Anonymous committed 38ab25a

3.6.6-1

Comments (0)

Files changed (1)

 _basekernel=${_major}.${_minor}
 _srcname=linux-${_major}.${_minor}
 pkgbase=linux-pf
-_pfrel=5
+_pfrel=6
 _kernelname=-pf
 _pfpatchhome="http://pf.natalenko.name/sources/${_basekernel}/"
 _pfpatchname="patch-${_basekernel}.${_pfrel}${_kernelname}"
 pkgname=('linux-pf')
 true && pkgname=('linux-pf' 'linux-pf-headers')
 pkgver=${_basekernel}.${_pfrel}
-pkgrel=2
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://pf.natalenko.name/"
 license=('GPL2')
 options=('!strip')
 makedepends=('git' 'xmlto' 'docbook-xsl' 'xz')
 source=("ftp://www.kernel.org/pub/linux/kernel/v${_major}.x/linux-${_basekernel}.tar.xz"
-        'config' 'config.x86_64'                # the main kernel config files
-        'linux-pf.preset'                       # standard config files for mkinitcpio ramdisk
-        'logo_linux_clut224.ppm.bz2'            #
-        'logo_linux_mono.pbm.bz2'               # the Arch Linux boot logos
-        'logo_linux_vga16.ppm.bz2'              #
-        "interactive-governor.tar.gz::https://gist.github.com/gists/1172524/download"
-        'change-default-console-loglevel.patch'
-        'dcache.patch'
-        "${_pfpatchhome}${_pfpatchname}.bz2"    # the -pf patchset
-        "http://www.linuxforge.net/linux/kernel/kernel-33-gcc47-0.patch"
-)
+	'config' 'config.x86_64'		# the main kernel config files
+	'linux-pf.preset'			# standard config files for mkinitcpio ramdisk
+	'logo_linux_clut224.ppm.bz2'		#
+	'logo_linux_mono.pbm.bz2'		# the Arch Linux boot logos
+	'logo_linux_vga16.ppm.bz2'		#
+	"interactive-governor.tar.gz::https://gist.github.com/gists/1172524/download"
+	'change-default-console-loglevel.patch'
+	'dcache.patch'
+	"${_pfpatchhome}${_pfpatchname}.bz2")	# the -pf patchset
 
 _aufs3git="git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-standalone.git"
 _aufs3name=aufs3
      cd ${_aufs3name}
      git checkout origin/aufs${_basekernel} || _aufs3checkout=KRAKRA
      if [[ ${_aufs3checkout} = "KRAKRA" ]]; then
-        echo
+	echo
         msg "AUFS3 not yet ported to version ${_basekernel}!"
         msg "Skipping related patches."
-        echo
-        cd ..
+	echo
+	cd ..
      else
 #        mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include"
 #        mv include/linux/Kbuild "${pkgdir}/usr/src/linux-${_kernver}/include/"
-        rm include/linux/Kbuild
-        cd ..
-        cp -a ${_aufs3name}/{Documentation,fs,include} ${srcdir}/linux-${_basekernel}/
-        msg "Patching aufs3"
-        for _patch in ${_aufs3name}/*.patch; do
-            patch -Np1 < ${_patch} || _aufs3fail=KRAKRA
+	rm include/linux/Kbuild
+	cd ..
+	cp -a ${_aufs3name}/{Documentation,fs,include} ${srcdir}/linux-${_basekernel}/
+	msg "Patching aufs3"
+	for _patch in ${_aufs3name}/*.patch; do
+	    patch -Np1 < ${_patch} || _aufs3fail=KRAKRA
         done
         if [[ ${_aufs3fail} = "KRAKRA" ]]; then
-            echo
-            msg "Not all aufs3 patches applied correctly. Ignore this if you won't use AUFS."
-            msg "Otherwise, press CTRL-C now and fix manually"
-            echo
+	    echo
+    	    msg "Not all aufs3 patches applied correctly. Ignore this if you won't use AUFS."
+    	    msg "Otherwise, press CTRL-C now and fix manually"
+    	    echo
         fi
     fi
 
   msg "Patching dcache.c"
   patch -Np1 -i "${srcdir}/dcache.patch"
 
-  # added 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
+	cat "${startdir}/config.x86_64" >| .config
    else
-        cat "${startdir}/config" >| .config
+	cat "${startdir}/config" >| .config
    fi
 fi
 
 #----------------------------------------
-if [[ "$_BATCH" != "y" ]]; then         # for batch building
+if [[ "$_BATCH" != "y" ]]; then		# for batch building
   echo
   echo "======================================================="
   msg "You might be prompted below for some config options"
   shopt -s nocasematch
   if [[ "$answer" = "y" ]]; then
      if [[ -s /proc/config.gz ]]; then
-        msg "Extracting config from /proc/config.gz..."
-        zcat /proc/config.gz >| ./.config
+	msg "Extracting config from /proc/config.gz..."
+	zcat /proc/config.gz >| ./.config
      else
-        msg "running 'sudo modprobe configs'"
-        sudo modprobe configs
+	msg "running 'sudo modprobe configs'"
+	sudo modprobe configs
         if [[ -s /proc/config.gz ]]; then
-            msg "Extracting config from /proc/config.gz..."
-            zcat /proc/config.gz >| ./.config
-        else
-            msg "You kernel was not compiled with IKCONFIG_PROC."
-            msg "Attempting to run /usr/bin/modprobed_db recall from modprobe_db..."
-            if [ -e /usr/bin/modprobed_db ]; then
-                sudo /usr/bin/modprobed_db recall
--           else
--               msg "modprobed_db not installed, running make localmodconfig instead..."
--               make localmodconfig
-            fi
+	    msg "Extracting config from /proc/config.gz..."
+	    zcat /proc/config.gz >| ./.config
+	else
+	    msg "You kernel was not compiled with IKCONFIG_PROC."
+	    msg "Attempting to run /usr/bin/modprobed_db recall from modprobe_db..."
+	    if [ -e /usr/bin/modprobed_db ]; then
+		sudo /usr/bin/modprobed_db recall
+	    else
+		msg "modprobed_db not installed, running make localmodconfig instead..."
+		make localmodconfig
+	    fi
         fi
      fi
   elif [[ "$answer" = "l" ]]; then
      # Copied from kernel26-ck's PKGBUILD
      msg "Attempting to run /usr/bin/reload_database with sudo from modprobe_db..."
      if [ -e /usr/bin/modprobed_db ]; then
-        sudo /usr/bin/modprobed_db recall
+	sudo /usr/bin/modprobed_db recall
      fi
      msg "Running 'make localmodconfig'..."
      make localmodconfig
       ;;
   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|MBARCELONA=y|MBOBCAT=y|MBULLDOZER=y|MPILEDRIVER=y|MCOREI7=y|MCOREI7AVX=y|MCOREAVXI=y|MCOREAVX2=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" ./.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`
        export _PKGOPT=y
     fi
   fi
-fi      # batch check ends here
+fi	# batch check ends here
 export CPU
 #----------------------------------------
 
  backup=(etc/mkinitcpio.d/${pkgbase}.preset)
  depends=('coreutils' 'linux-firmware' 'kmod>=9-2' 'mkinitcpio>=0.7')
  optdepends=('linux-docs: Kernel hackers manual - HTML documentation that comes with the Linux kernel.'
-            'crda: to set the correct wireless channels of your country'
-            'pm-utils: utilities and scripts for suspend and hibernate power management'
-            'tuxonice-userui: TuxOnIce userspace user interface'
-            'hibernate-script: set of scripts for managing TuxOnIce, hibernation and suspend to RAM'
-            'nvidia-pf: NVIDIA drivers for linux-pf'
-            'nvidia-beta-all: NVIDIA drivers for all installed kernels'
-            'modprobed_db: Keeps track of EVERY kernel module that has ever been probed. Useful for make localmodconfig.')
- #provides=(${pkgbase}=${_basekernel} 'aufs3')  # for $pkgname-optimized
+	    'crda: to set the correct wireless channels of your country'
+	    'pm-utils: utilities and scripts for suspend and hibernate power management'
+	    'tuxonice-userui: TuxOnIce userspace user interface'
+	    'hibernate-script: set of scripts for managing TuxOnIce, hibernation and suspend to RAM'
+	    'nvidia-pf: NVIDIA drivers for linux-pf'
+	    'nvidia-beta-all: NVIDIA drivers for all installed kernels'
+	    'modprobed_db: Keeps track of EVERY kernel module that has ever been probed. Useful for make localmodconfig.')
+ #provides=(${pkgbase}=${_basekernel} 'aufs3')	# for $pkgname-optimized
  provides=(${pkgbase}=${_basekernel} 'aufs3')
  # below 'provides' is for when you have no other kernel (which is a bad idea anyway)
  # provides=(${pkgbase}=${_basekernel} 'linux=${pkgver}' 'aufs3')
  # If generic build, then conflict with all optimized ones
  conflicts=('linux-pf-core2' 'linux-pf-k8' 'linux-pf-psc' 'linux-pf-atom'
-            'linux-pf-k7' 'linux-pf-p3' 'linux-pf-pm' 'linux-pf-p4'
-            'linux-pf-headers-core2' 'linux-pf-headers-k8' 'linux-pf-headers-psc'
-            'linux-pf-headers-atom' 'linux-pf-headers-k7' 'linux-pf-headers-p3'
-            'linux-pf-headers-pm' 'linux-pf-headers-p4'
-            'kernel26-pf-core2' 'kernel26-pf-k8' 'kernel26-pf-psc' 'kernel26-pf-atom'
-            'kernel26-pf-k7' 'kernel26-pf-p3' 'kernel26-pf-pm' 'kernel26-pf-p4')
+	    'linux-pf-k7' 'linux-pf-p3' 'linux-pf-pm' 'linux-pf-p4'
+	    'linux-pf-headers-core2' 'linux-pf-headers-k8' 'linux-pf-headers-psc'
+	    'linux-pf-headers-atom' 'linux-pf-headers-k7' 'linux-pf-headers-p3'
+	    'linux-pf-headers-pm' 'linux-pf-headers-p4'
+	    'kernel26-pf-core2' 'kernel26-pf-k8' 'kernel26-pf-psc' 'kernel26-pf-atom'
+	    'kernel26-pf-k7' 'kernel26-pf-p3' 'kernel26-pf-pm' 'kernel26-pf-p4')
  replaces=('kernel26-pf' 'aufs3')
  install='linux-pf.install'
 
   # Useful for repo maintainers.
 
   headers="headers"
-  pkgnameopt="${pkgbase}"               # this MUST be outside the following 'if'
-  if [[ "$_PKGOPT" = "y" ]]; then       # package naming according to optimization
+  pkgnameopt="${pkgbase}"		# this MUST be outside the following 'if'
+  if [[ "$_PKGOPT" = "y" ]]; then	# package naming according to optimization
     case $CPU in
      CORE2)
          pkgname="${pkgbase}-core2"
          pkgname="${pkgbase}-k8"
          pkgdesc="${_pkgdesc} AMD K8 optimized."
          ;;
-     BARCELONA)
-         pkgname="${pkgbase}-barcelona"
-         pkgdesc="${_pkgdesc} AMD Barcelona optimized."
-         ;;
-     BOBCAT)
-         pkgname="${pkgbase}-bobcat"
-         pkgdesc="${_pkgdesc} AMD Bobcat optimized"
-         ;;
-     BULLDOZER)
-         pkgname"${pkgbase}-bulldozer"
-         pkgdesc="${_pkgdesc} AMD Bulldozer optimized"
-         ;;
-     PILEDRIVER)
-         pkgname"${pkgbase}-piledriver"
-         pkgdesc="${_pkgdesc} AMD Piledriver optimized"
-         ;;
      PSC)
          pkgname="${pkgbase}-psc"
          pkgdesc="${_pkgdesc} Intel Pentium4/D/Xeon optimized."
          pkgname="${pkgbase}-p4"
          pkgdesc="${_pkgdesc} Intel Pentium4 optimized."
          ;;
-     COREI7)
-         pkgname="${pkgbase}-corei7"
-         pkgdesc="${_pkgdesc} Intel Core Nehalem optimized."
-         ;;
-     COREI7AVX)
-         pkgname="${pkgbase}-corei7avx"
-         pkgdesc="${_pkgdesc} Intel 2nd Gen Core processors including Sandy Bridge."
-         ;;
-     COREAVXI)
-         pkgname="${pkgbase}-coreavxi"
-         pkgdesc="${_pkgdesc} Intel 3rd Gen Core processors including Ivy Bridge."
-         ;;
-     COREAVX2)
-         pkgname="${pkgbase}-coreavx2"
-         pkgdesc="${_pkgdesc} Intel AVX-2 processors including Haswell."
-         ;;
      default)
   # Note to me: DO NOT EVER REMOVE THIS. It's for the AUR PKGBUILD parser.
          pkgname="${pkgbase}"
   # If optimized build, conflict with generic and other optimized ones
 
   if [[ "$pkgname" != "$pkgbase" ]]; then
-        pkgnameopt="${pkgname}"         # this MUST be inside this if-fi
-        pkgname="${pkgbase}"
-        echo pkgname $pkgname
-        cpuopt=`sed -e "s/linux-pf-//" <<<$pkgnameopt`          # get suffix
-        cpuoptdesc=`sed -e "s/${_pkgdesc}//" <<<$pkgdesc`       # get description
-        conflicts=(${conflicts[@]/linux-pf-${cpuopt}/})         # remove current
-        conflicts=(${conflicts[@]/linux-pf-headers-${cpuopt}/}) # remove current's headers
-        export cpuopt cpuoptdesc
+	pkgnameopt="${pkgname}"		# this MUST be inside this if-fi
+	pkgname="${pkgbase}"
+	echo pkgname $pkgname
+	cpuopt=`sed -e "s/linux-pf-//" <<<$pkgnameopt`		# get suffix
+	cpuoptdesc=`sed -e "s/${_pkgdesc}//" <<<$pkgdesc`	# get description
+	conflicts=(${conflicts[@]/linux-pf-${cpuopt}/})		# remove current
+	conflicts=(${conflicts[@]/linux-pf-headers-${cpuopt}/})	# remove current's headers
+	export cpuopt cpuoptdesc
   fi
 
   # second batch check ends here
 
  # Pass conflicts array to linux-pf-headers() BEFORE adding generic linux-pf or headers will conflict
  export _conflicts=${conflicts[@]}
- conflicts=('linux-pf' 'kernel26-pf' ${conflicts[@]})   # add generic packages
+ conflicts=('linux-pf' 'kernel26-pf' ${conflicts[@]})	# add generic packages
 
   echo
   echo "    ======================================="
             'd537a358c9f8b9cbcad34ba99f88af070f54d99c66d3e5d3d4734576ed2fb6e1'
             'b9d79ca33b0b51ff4f6976b7cd6dbb0b624ebf4fbf440222217f8ffc50445de4'
             'c49eca2478b7d911ee95a61c3f9080082b982ba4de34b9acff9b1ff2d5224957'
-            'f9cf30022dcb86a70891c5c1f64713fa4da108beec72e5e264942c674268a6b6'
-            '8f2dad5b89dac8c76c3dd3ad902928d6032ec2c6ada41d873d752bad5586b154')
+            '00e3297461fa03524eb1f2a0721d0132d762fa6897709624bef88050ecb339db')