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

[Andreas Beckmann]

Author: anbe-guest
Date: 2012-02-18 10:20:59 +0000 (Sat, 18 Feb 2012)
New Revision: 855

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/fglrx-driver.install.in
   fglrx-driver/trunk/debian/fglrx-driver.links.in
   fglrx-driver/trunk/debian/rules
Log:
work around lstat() and ship switchlibglx as a file

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2012-02-17 10:02:17 UTC (rev 854)
+++ fglrx-driver/trunk/debian/changelog	2012-02-18 10:20:59 UTC (rev 855)
@@ -3,6 +3,8 @@
   [ Andreas Beckmann ]
   * Edit binaries fglrx_drv.so, aticonfig, atieventsd, and amdcccle to replace
     a hardcoded path to /usr/lib64/fglrx/switchlib* on amd64.
+  * Install /usr/lib/fglrx/switchlibglx as a file instead of a symbolic link
+    to avoid "world writable file" warning because of checking with lstat().
     (Closes: #657604)
   * amd-opencl-icd: Add libSlotMaximizer{Ag,Be}.so libraries.
   * Bump debhelper dependency to 9.

Modified: fglrx-driver/trunk/debian/fglrx-driver.install.in
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.install.in	2012-02-17 10:02:17 UTC (rev 854)
+++ fglrx-driver/trunk/debian/fglrx-driver.install.in	2012-02-18 10:20:59 UTC (rev 855)
@@ -13,3 +13,4 @@
 _XPIC_/usr/X11R6/_LIB_/modules/linux/*.so			usr/lib/xorg/modules/linux/
 fglrx.ids							usr/share/fglrx/
 debian/switchlibGL						usr/lib/fglrx/
+debian/switchlibglx						usr/lib/fglrx/

Modified: fglrx-driver/trunk/debian/fglrx-driver.links.in
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.links.in	2012-02-17 10:02:17 UTC (rev 854)
+++ fglrx-driver/trunk/debian/fglrx-driver.links.in	2012-02-18 10:20:59 UTC (rev 855)
@@ -1,2 +1 @@
 _LIBDIR_/dri/fglrx_dri.so usr/lib/dri/fglrx_dri.so
-usr/lib/fglrx/switchlibGL usr/lib/fglrx/switchlibglx

Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules	2012-02-17 10:02:17 UTC (rev 854)
+++ fglrx-driver/trunk/debian/rules	2012-02-18 10:20:59 UTC (rev 855)
@@ -21,6 +21,7 @@
 
 generated=$(shell ls debian/*.in | sed s/\.in$$//g)
 generated	+= fglrx.ids
+generated	+= debian/switchlibglx
 
 %: %.in
 	sed -r -e 's%_VERSION_%$(upstream_version)%g' \
@@ -54,6 +55,9 @@
 	cat $< | sed -n -r -e '/FGL_ASIC_ID/ s/.*\(0x(.{4})\).*/1002\1/p' \
 		| tr a-z A-Z | sort -u > $@
 
+debian/switchlibglx: debian/switchlibGL
+	ln $< $@
+
 override_dh_auto_configure: $(generated) compare-copyright-license
 	cd debian/man && ./autogen.sh --copy
 	cd debian/man && ./configure --prefix=/usr --mandir=/usr/share/man \