catalyst: fix dkms build for linux>=3.7; fix libglx.so symlink.

This commit is contained in:
Juan RP 2013-02-07 19:25:19 +01:00
parent 39873bedf7
commit 7e634744a0
4 changed files with 24 additions and 2 deletions

View file

@ -11,6 +11,6 @@ post)
# libglx # libglx
cd ../../usr/lib/xorg/modules/extensions cd ../../usr/lib/xorg/modules/extensions
ln -sf ../fglrx/fglrx-libglx.so libglx.so ln -sfr ./fglrx/fglrx-libglx.so libglx.so
;; ;;
esac esac

View file

@ -13,6 +13,7 @@ do_install() {
vmkdir usr/src/${_fglrx} vmkdir usr/src/${_fglrx}
cd ${wrksrc}/fglrx cd ${wrksrc}/fglrx
patch -Np0 -i ${FILESDIR}/uapi_linux_version_make.patch
cp -r common/lib/modules/fglrx/build_mod/* ${DESTDIR}/usr/src/${_fglrx} cp -r common/lib/modules/fglrx/build_mod/* ${DESTDIR}/usr/src/${_fglrx}
vinstall arch/${_ARCHDIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a \ vinstall arch/${_ARCHDIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a \

View file

@ -0,0 +1,21 @@
Use uapi/linux/version.h if linux/version.h not found.
--- common/lib/modules/fglrx/build_mod/make.sh.orig 2013-02-07 19:17:27.405645903 +0100
+++ common/lib/modules/fglrx/build_mod/make.sh 2013-02-07 19:19:05.549150417 +0100
@@ -203,11 +203,16 @@ cd $current_wd
# sample: #define UTS_RELEASE "2.4.0-test7"
src_file=$linuxincludes/linux/version.h
+src_file_new=$linuxincludes/generated/uapi/linux/version.h
if [ ! -e $src_file ]; then
+ if [ ! -e $src_file_new ]; then
echo "kernel includes at $linuxincludes not found or incomplete" | tee -a $logfile
echo "file: $src_file" | tee -a $logfile
exit 1
+ else
+ src_file=$src_file_new
+ fi
fi
OsRelease=${uname_r}

View file

@ -1,7 +1,7 @@
# Template file for 'catalyst' # Template file for 'catalyst'
pkgname=catalyst pkgname=catalyst
version=13.1 version=13.1
revision=2 revision=3
short_desc="AMD catalyst driver for Linux -- libraries and utilities" short_desc="AMD catalyst driver for Linux -- libraries and utilities"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
license="Propietary AMD license" license="Propietary AMD license"