Commits

Christos Nouskas  committed 6f63360

3.2.7-3
Fixed kernel-headers package conflict.

  • Participants
  • Parent commits c818202

Comments (0)

Files changed (1)

 pkgname=('linux-pf')
 true && pkgname=('linux-pf' 'linux-pf-headers')
 pkgver=${_basekernel}.${_pfrel}
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://pf.natalenko.name/"
 license=('GPL2')
 	    '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=(${_pkgname}=${_basekernel} 'aufs3')	# for $pkgname-optimized
- provides=(${_pkgname}=${_basekernel} 'aufs3' 'kernel26-pf')
+ provides=(${_pkgname}=${_basekernel} 'aufs3')
  # below 'provides' is for when you have no other kernel (which is a bad idea anyway)
  # provides=(${_pkgname}=${_basekernel} 'linux=${pkgver}' 'aufs3')
- #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)
- #conflicts=('kernel26-pf')
  # 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'
 	echo pkgname $pkgname
 	cpuopt=`sed -e "s/linux-pf-//" <<<$pkgnameopt`		# get suffix
 	cpuoptdesc=`sed -e "s/${_pkgdesc}//" <<<$pkgdesc`	# get description
-	conflicts=('linux-pf' 'kernel26-pf' ${conflicts[@]})	# add generic packages
 	conflicts=(${conflicts[@]/linux-pf-${cpuopt}/})		# remove current
 	conflicts=(${conflicts[@]/linux-pf-headers-${cpuopt}/})		# remove current's headers
 	export cpuopt cpuoptdesc
-	echo headers: $headers cpuopt: $cpuopt
-	headers="${headers}-${cpuopt}"
-	echo headers: $headers cpuopt: $cpuopt
   fi
 
   # second batch check ends here
  fi
 
- # Pass conflicts array to linux-pf-headers()
+ # 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
 
   echo
   echo "    ======================================="