projects / fglrx-packaging.git / commitdiff
Build Results
 
Summary

Description: The git repository for the ATI/AMD fglrx packaging scripts.
Last Change: Thu 2/4/10 2:40

Recent Commits
Time
Signed-Off By
Description
Commit Diff
Thu 2/4/10 2:39
Mario Limonciello  
Convert to alternatives... 
Thu 2/4/10 1:55
Mario Limonciello  
Drop old kdelnk file... 
Thu 2/4/10 0:49
Mario Limonciello  
Drop arch stuff for fglrx... 
Wed 2/3/10 1:56
Mario Limonciello  
Migrate over to dh7. No... 
Wed 2/3/10 1:22
Mario Limonciello  
Bump standard version for... 
Sat 1/30/10 16:05
Anssi Hannula  
Mandriva: adapt for... 
 
> --git a/Fedora/ATI-fglrx.spec-tmpl b/Fedora/ATI-fglrx.spec-tmpl
index 57c4641
..8d093e6 100755
--- a/Fedora/ATI-fglrx.spec-tmpl
+++ b/Fedora/ATI-fglrx.spec-tmpl
@@ -275,+275,@@ fi
 
%{_sbindir}/atieventsd
 
%{_sbindir}/amdnotifyui
 
%{_sbindir}/atigetsysteminfo
+%{_bindir}/amdxdg-su
 
%{_bindir}/aticonfig
 
%{_bindir}/atiodcli
 
%{_bindir}/atiode
@@ -288,+289,@@ fi
 
@X11_MODULE_DIR@/glesx.so
 
@X11_MODULE_DIR@/amdxmm.so
 
%{_libdir}/fglrx/*.so*
+%{_libdir}/fglrx/*.cap
 %{_mandir}/man[1-9]/atieventsd.*
 # Workaround
 @ICD_PATH_BUG@
@@ -322,6 +324,9 @@ fi


 %changelog
+* Fri Sep 19 2008 Michael Larabel <Michael AT phoronix DOT com> 8.53.2-1
+- Update packaging scripts so they build properly with latest driver. Patch contributed by stevew.
+
 * Wed Jul 30 2008 Michael Larabel <Michael AT phoronix DOT com> 8.51.0-1
 - Update packaging scripts to handle atiode, atidxmm, atiodcli, etc.. Patch contributed by stevew.

diff --git a/Fedora/ati-packager.sh b/Fedora/ati-packager.sh
index e5935e2..53b25d3 100755
--- a/Fedora/ati-packager.sh
+++ b/Fedora/ati-packager.sh
@@ -109,6 +109,8 @@ build_package()

   # Move files as required for X11R7-based distribution releases
   if echo "${X11_RELEASE}"|grep "x7.0" &> /dev/null ; then
+    # get rid of libdri.so so we don't conflict with system package!
+    rm -rf ${TMP_RPM_BUILD_DIR}/usr/X11R6/${ARCH_LIB}/modules/extensions
     mv ${TMP_RPM_BUILD_DIR}/usr/X11R6/include/X11 \
        ${TMP_RPM_BUILD_DIR}/usr/include
     mkdir -p ${TMP_RPM_BUILD_DIR}/usr/${ARCH_LIB}/dri
@@ -137,8 +139,7 @@ build_package()

   # Create the directory for the OpenGL libraries on all releases
   mkdir -p ${TMP_RPM_BUILD_DIR}/usr/${ARCH_LIB}/fglrx
-  mv ${TMP_RPM_BUILD_DIR}/usr/X11R6/${ARCH_LIB}/lib*.so* \
-     ${TMP_RPM_BUILD_DIR}/usr/X11R6/${ARCH_LIB}/lib*.a \
+  mv ${TMP_RPM_BUILD_DIR}/usr/X11R6/${ARCH_LIB}/lib* \
      ${TMP_RPM_BUILD_DIR}/usr/${ARCH_LIB}/fglrx

   # Create some symlinks so the package owns and will remove them on 
 
Phoronix.com
Linux Driver Forums
Copyright © 2010 by Phoronix Media