sorta-fix ~lukeshu/codeanalyst

It still doesn't work, but everything compiles against this kernel, and the
custom version of oprofile builds.

1 files changed, 31 insertions, 7 deletions

diff --git a/~lukeshu/codeanalyst/PKGBUILD b/~lukeshu/codeanalyst/PKGBUILD
index 5cbab45dc..885e06f0e 100755
--- a/~lukeshu/codeanalyst/PKGBUILD
+++ b/~lukeshu/codeanalyst/PKGBUILD
@@ -5,14 +5,13 @@
 # The docs claim that the fork is just for adding support for
 # processors that aren't upstream yet (at the time, they are now that
 # 0.9.7 is out). So, shouldn't we just link against 0.9.7? Well:
-#  * AMD also added a bunch of CodeAnalyst-specific code. Also some of
-#    the external.
+#  * AMD also added a bunch of CodeAnalyst-specific code.
 #  * Several external variables/types have different names; the API is
 #    incompatible.
 #  * [extra]/oprofile-0.9.7-3 only includes about half of the headers.
 
 pkgbase=CodeAnalyst
-pkgname=codeanalyst
+pkgname=(codeanalyst codeanalyst-cakm)
 pkgver=3.3.18.0361
 _pkgver="${pkgver//./_}"
 pkgrel=4.1
@@ -20,20 +19,24 @@ pkgdesc="AMD performance profiler. Includes a fork of oprofile."
 url="http://developer.amd.com/tools/${pkgbase}/"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('gcc' 'sudo' 'qt>=4.1' 'oprofile' 'libdwarf')
+depends=('gcc' 'qt>=4.1' 'libdwarf')
 makedepends=('linux-headers' 'elfutils' 'findutils' 'file')
-provides=('oprofile=0.9.6cvs')
-conflicts=('oprofile')
 options=('!strip')
 install=codeanalyst.install
 source=("http://download2-developer.amd.com/amd/${pkgbase}/${pkgbase}${_pkgver}Public.tar.gz"
 	'gcc47.patch'
 	'skipSetup.patch'
+        'kernel3.4.patch'
         'codeanalyst.sudo'
         'codeanalyst.desktop'
 	'codeanalyst.svg')
 
 build() {
+  build_codeanalyst
+  build_codeanalyst-cakm
+}
+
+build_codeanalyst() {
   cd "${srcdir}/${pkgbase}-${_pkgver}-Public"
   patch -Np1 -i "${srcdir}/gcc47.patch"
   patch -Np1 -i "${srcdir}/skipSetup.patch"
@@ -46,7 +49,18 @@ build() {
   make
 }
 
-package() {
+build_codeanalyst-cakm() {
+  cd "${srcdir}/${pkgbase}-${_pkgver}-Public"/src/cakm
+  cp -r kernel2.6.38 kernel3.4
+  cd kernel3.4
+  patch -Np1 -i "${srcdir}/kernel3.4.patch"
+  make
+}
+
+package_codeanalyst() {
+  provides=('oprofile=0.9.6cvs')
+  conflicts=('oprofile')
+
   cd "${srcdir}/${pkgbase}-${_pkgver}-Public"
   make DESTDIR="${pkgdir}" install
   rm -f "${pkgdir}/usr/sbin/ca_user_manager" # either codeanalyst.install does this, or it is trivial
@@ -59,9 +73,19 @@ package() {
   install -D -m644 codeanalyst.desktop "${pkgdir}/usr/share/applications/codeanalyst.desktop"
 }
 
+package_codeanalyst-cakm() {
+  pkgdesc="CodeAnalyst kernel module, oprofile-ca.ko, a replacement for oprofile.ko"
+  depends=(codeanalyst)
+  provides=()
+
+  cd "${srcdir}/${pkgbase}-${_pkgver}-Public"/src/cakm/kernel3.4
+  install -D -m644 oprofile.ko "${pkgdir}/lib/modules/`uname -r`/kernel/arch/x86/oprofile/oprofile-ca.ko"
+}
+
 md5sums=('f1e29bc7c7da259df228ce59281ee1d7'
          '063d0fc9680641a92ce5e310ffe1c9c0'
          'ce549e59c4a5916fd19e8d085e863627'
+         '3a5d820a43a0360d561bb0c4d67d9735'
          '3cc8f64fe84c5a886d0172ee8d99f690'
          '3a18d3f7fb01f199a8ed5ae2908c18e4'
          '1822a4157b82904b82e72fc1e9bcbd42')