[Pkg-fglrx-devel] r844 - fglrx-driver/trunk/debian

[Andreas Beckmann]

Author: anbe-guest
Date: 2012-01-31 11:48:17 +0000 (Tue, 31 Jan 2012)
New Revision: 844

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/rules
Log:
add rpl magic for hardcoded /usr/lib64/fglrx/switchlibgl*

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2012-01-26 13:13:54 UTC (rev 843)
+++ fglrx-driver/trunk/debian/changelog	2012-01-31 11:48:17 UTC (rev 844)
@@ -1,3 +1,12 @@
+fglrx-driver (1:12-1-2) UNRELEASED; urgency=low
+
+  [ Andreas Beckmann ]
+  * Edit binaries fglrx_drv.so, aticonfig, atieventsd, and amdcccle to replace
+    a hardcoded path to /usr/lib64/fglrx/switchlib* on amd64.
+    (Closes: #657604)
+
+ -- Andreas Beckmann <debian at abeckmann.de>  Tue, 31 Jan 2012 12:41:02 +0100
+
 fglrx-driver (1:12-1-1) unstable; urgency=low
 
   * New upstream release.

Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules	2012-01-26 13:13:54 UTC (rev 843)
+++ fglrx-driver/trunk/debian/rules	2012-01-31 11:48:17 UTC (rev 844)
@@ -62,6 +62,14 @@
 override_dh_auto_build:
 	$(MAKE) -C debian/man
 
+# On amd64, AMD hardcoded some paths to /usr/lib64/fglrx/switchlibgl*, and
+# prevents working around this with symlinks because they check the files
+# with lstat() and thereafter complain about world writability.
+badlib64files	 = ./debian/fglrx-driver/usr/lib/fglrx/fglrx_drv.so
+badlib64files	+= ./debian/fglrx-atieventsd/usr/sbin/atieventsd
+badlib64files	+= ./debian/fglrx-control/usr/bin/amdcccle
+badlib64files	+= ./debian/fglrx-driver/usr/bin/aticonfig
+
 override_dh_install:
 	dh_install
 	chrpath -d -k debian/fglrx-control/usr/bin/amdcccle
@@ -73,6 +81,15 @@
 		rpl -e	'/usr/X11R6/lib/modules/dri\0' \
 			'$${ORIGIN}/dri\0!!!!!!!!!!!!\0' \
 			debian/fglrx-glx-ia32/usr/lib32/fglrx-libGL.so.1.2
+	rpl -e	'/usr/lib64/fglrx/switchlibGL\0' \
+		'/usr/lib/fglrx/switchlibGL\0!\0' \
+		$(badlib64files)
+	rpl -e	'/usr/lib64/fglrx/switchlibglx\0' \
+		'/usr/lib/fglrx/switchlibglx\0!\0' \
+		$(badlib64files)
+	rpl -e	'/usr/lib64/fglrx\0' \
+		'/usr/lib/fglrx\0!\0' \
+		$(badlib64files)
 	chmod a+x debian/fglrx-source/usr/src/modules/fglrx/debian/rules
 	tar cfj debian/fglrx-source/usr/src/fglrx.tar.bz2 \
 		--owner=root --group=src --remove-files \