Summary
Description: The git repository for the ATI/AMD fglrx packaging scripts.
Last Change: Mon 8/30/10 10:11
Recent Commits
>
--git a/Ubuntu/dists/intrepid/xorg-driver-fglrx.links b/Ubuntu/dists/intrepid/xorg-driver-fglrx.links
index 077d13e..ed3578e 100644
--- a/Ubuntu/dists/intrepid/xorg-driver-fglrx.links
+++ b/Ubuntu/dists/intrepid/xorg-driver-fglrx.links
@@ -1,4 +1,3 @@
-usr/lib/libGL.so.1.2 usr/lib/libGL.so.1
usr/lib/libfglrx_gamma.so.1.0 usr/lib/libfglrx_gamma.so.1
usr/lib/libfglrx_pp.so.1.0 usr/lib/libfglrx_pp.so.1
usr/lib/libfglrx_dm.so.1.0 usr/lib/libfglrx_dm.so.1
diff --git a/Ubuntu/dists/intrepid/xorg-driver-fglrx.postrm b/Ubuntu/dists/intrepid/xorg-driver-fglrx.postrm
index b5cf24b..7f6d9ed 100644
--- a/Ubuntu/dists/intrepid/xorg-driver-fglrx.postrm
+++ b/Ubuntu/dists/intrepid/xorg-driver-fglrx.postrm
@@ -21,30 +21,7 @@ PKGNAME=xorg-driver-fglrx
case "$1" in
remove|purge)
dpkg-divert --remove --rename --package $PKGNAME --divert /usr/lib/fglrx/libGL.so.1.2.xlibmesa /usr/lib/libGL.so.1.2 > /dev/null
-
- dpkg-divert --remove --rename --package $PKGNAME --divert /usr/X11R6/lib32/fglrx/libGL.so.1.2.xlibmesa /usr/X11R6/lib32/libGL.so.1.2 > /dev/null
-
- dpkg-divert --remove --rename --package $PKGNAME --divert /usr/X11R6/lib32/fglrx/libGL.so.1.xlibmesa /usr/X11R6/lib32/libGL.so.1 > /dev/null
-
dpkg-divert --remove --rename --package $PKGNAME --divert /usr/lib32/fglrx/libGL.so.1.2.xlibmesa /usr/lib32/libGL.so.1.2 > /dev/null
-
- dpkg-divert --remove --rename --package $PKGNAME --divert /usr/lib32/fglrx/libGL.so.1.xlibmesa /usr/lib32/libGL.so.1 > /dev/null
-
- dpkg-divert --remove --rename --package $PKGNAME --divert /usr/X11R6/lib/fglrx/libGL.so.1.2.xlibmesa /usr/X11R6/lib/libGL.so.1.2 > /dev/null
-
- if [ -d /usr/lib/fglrx ]; then
- rmdir /usr/lib/fglrx || true;
- fi
- if [ -d /usr/X11R6/lib/fglrx ]; then
- rmdir /usr/X11R6/lib/fglrx || true;
- fi
- if [ -d /usr/X11R6/lib32/fglrx ]; then
- rmdir /usr/X11R6/lib32/fglrx || true;
- fi
- if [ -d /usr/lib32/fglrx ]; then
- rmdir /usr/lib32/fglrx || true;
- fi
- ldconfig
;;
upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
diff --git a/Ubuntu/dists/intrepid/xorg-driver-fglrx.preinst b/Ubuntu/dists/intrepid/xorg-driver-fglrx.preinst
index 6bfd769..e61cca4 100644
--- a/Ubuntu/dists/intrepid/xorg-driver-fglrx.preinst
+++ b/Ubuntu/dists/intrepid/xorg-driver-fglrx.preinst
@@ -19,10 +19,9 @@ if [ `dpkg --print-installation-architecture` = "amd64" ]; then
HAS_LIB32="yes"
fi
-
fix_diversions()
{
- # remove old-style diversions
+ # Remove very old style diversions
if [ -d /usr/share/fglrx/diversions ]; then
if [ -n "$HAS_LIB32" ]; then
dpkg-divert --remove --package $PKGNAME \
@@ -36,6 +35,25 @@ fix_diversions()
rmdir /usr/share/fglrx/diversions || true
fi
+
+ #remove old and unnecessary libGL.so.1 symlinks
+ if [ -L /usr/lib/fglrx/libGL.so.1.xlibmesa ]; then
+ rm /usr/lib/fglrx/libGL.so.1.xlibmesa
+ fi
+
+ if [ -L /usr/lib32/fglrx/libGL.so.1.xlibmesa ]; then
+ rm /usr/lib32/fglrx/libGL.so.1.xlibmesa
+ fi
+ #remove unnecessary X11R6 symlinks that may not have
+ #been cleaned up in earlier releases
+ for i in /usr/lib/libGL.so.1 \
+ /usr/lib32/libGL.so.1 \
+ /usr/X11R6/lib/libGL.so.1 \
+ /usr/X11R6/lib/libGL.so.1.2 \
+ /usr/X11R6/lib32/libGL.so.1 \
+ /usr/X11R6/lib32/libGL.so.1.2 ; do \
+ dpkg-divert --remove --package $PKGNAME $i > /dev/null; \
+ done
}
case "$1" in
@@ -44,32 +62,16 @@ case "$1" in
# remove old fglrx diversions
fix_diversions
- # create new diversion directories
+ # make new diversions
if [ ! -d /usr/lib/fglrx ]; then
- mkdir -p /usr/lib/fglrx || true
+ mkdir -p /usr/lib/fglrx
fi
- if [ -d /usr/X11R6 ] && [ ! -d /usr/X11R6/lib/fglrx ]; then
- mkdir -p /usr/X11R6/lib/fglrx || true
- fi
- if [ -n "$HAS_LIB32" ] && [ ! -d /usr/lib32/fglrx ]; then
- mkdir -p /usr/lib32/fglrx || true
- fi
- if [ -n "$HAS_LIB32" ] && [ -d /usr/X11R6 ] && [ ! -d /usr/X11R6/lib32/fglrx ]; then
- mkdir -p /usr/X11R6/lib32/fglrx || true
- fi
-
- # make new diversions
- dpkg-divert --add --rename --package $PKGNAME --divert /usr/lib/fglrx/libGL.so.1.xlibmesa /usr/lib/libGL.so.1 > /dev/null
dpkg-divert --add --rename --package $PKGNAME --divert /usr/lib/fglrx/libGL.so.1.2.xlibmesa /usr/lib/libGL.so.1.2 > /dev/null
- dpkg-divert --add --rename --package $PKGNAME --divert /usr/X11R6/lib/fglrx/libGL.so.1.xlibmesa /usr/X11R6/lib/libGL.so.1 > /dev/null
- dpkg-divert --add --rename --package $PKGNAME --divert /usr/X11R6/lib/fglrx/libGL.so.1.2.xlibmesa /usr/X11R6/lib/libGL.so.1.2 > /dev/null
-
if [ -n "$HAS_LIB32" ]; then
- dpkg-divert --add --rename --package $PKGNAME --divert /usr/X11R6/lib32/fglrx/libGL.so.1.xlibmesa /usr/X11R6/lib32/libGL.so.1 > /dev/null
- dpkg-divert --add --rename --package $PKGNAME --divert /usr/X11R6/lib32/fglrx/libGL.so.1.2.xlibmesa /usr/X11R6/lib32/libGL.so.1.2 > /dev/null
-
- dpkg-divert --add --rename --package $PKGNAME --divert /usr/lib32/fglrx/libGL.so.1.xlibmesa /usr/lib32/libGL.so.1 > /dev/null
+ if [ ! -d /usr/lib32/fglrx ]; then
+ mkdir -p /usr/lib32/fglrx
+ fi
dpkg-divert --add --rename --package $PKGNAME --divert /usr/lib32/fglrx/libGL.so.1.2.xlibmesa /usr/lib32/libGL.so.1.2 > /dev/null
fi
;;
<
Copyright © 2010 by Phoronix Media