rpms/fglrx-kmod/devel fglrx-kmod.spec, 1.1, 1.2 fglrx-makefile.diff, 1.1, 1.2 fglrx-makesh.diff, 1.1, 1.2

[Stewart Adam]

Author: firewing

Update of /cvs/nonfree/rpms/fglrx-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21495/devel

Modified Files:
	fglrx-kmod.spec fglrx-makefile.diff fglrx-makesh.diff 
Log Message:
Update build patches (ATI has modified make.sh and 2.6.x/Makefile)



Index: fglrx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/fglrx-kmod/devel/fglrx-kmod.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fglrx-kmod.spec	16 Oct 2008 18:32:09 -0000	1.1
+++ fglrx-kmod.spec	16 Oct 2008 23:48:18 -0000	1.2
@@ -15,7 +15,7 @@
 
 Name:        fglrx-kmod
 Version:     8.543
-Release:     0.1.%{ativersion}%{?dist}.1
+Release:     0.2.%{ativersion}%{?dist}.1
 # Taken over by kmodtool
 Summary:     AMD display driver kernel module
 Group:       System Environment/Kernel
@@ -108,7 +108,10 @@
 
 
 %changelog
-* Thu Oct 16 2008 Stewart Adam <s.adam at diffingo.com> - 8.542-0.1.8.11beta.1
+* Thu Oct 16 2008 Stewart Adam <s.adam at diffingo.com> - 8.543-0.2.8.11beta.1
+- Update patches
+
+* Thu Oct 16 2008 Stewart Adam <s.adam at diffingo.com> - 8.543-0.1.8.11beta.1
 - Update to 8.53.4 (Catalyst 8.11beta)
 
 * Thu Oct 16 2008 Stewart Adam <s.adam at diffingo.com> - 8.542-1.8.10.1

fglrx-makefile.diff:

Index: fglrx-makefile.diff
===================================================================
RCS file: /cvs/nonfree/rpms/fglrx-kmod/devel/fglrx-makefile.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fglrx-makefile.diff	16 Oct 2008 18:32:09 -0000	1.1
+++ fglrx-makefile.diff	16 Oct 2008 23:48:18 -0000	1.2
@@ -1,14 +1,10 @@
---- 2.6.x/Makefile.old	2005-01-13 19:43:14.938719720 +0100
-+++ 2.6.x/Makefile	2005-01-13 19:40:13.825253152 +0100
-@@ -27,11 +27,7 @@
- KVER            = $(shell uname -r)
- # KVER            = 2.6.0-0.test1.1.26custom
+--- 2.6.x/Makefile.old	2008-10-16 19:35:33.000000000 -0400
++++ 2.6.x/Makefile	2008-10-16 19:36:49.000000000 -0400
+@@ -47,7 +47,7 @@
+ # on first call from remote location we get into this path
+ # whilst on second call all is managed by the embedding kernel makefile
  
--ifeq (1,1)
--KDIR            = /lib/modules/$(KVER)/build
--else
--KDIR            = /usr/src/linux-$(KVER)
--endif
+-KDIR            = /lib/modules/$(shell uname -r)/build
 +KDIR            = $(KERNEL_PATH)
  PWD             = $(shell pwd)
  

fglrx-makesh.diff:

Index: fglrx-makesh.diff
===================================================================
RCS file: /cvs/nonfree/rpms/fglrx-kmod/devel/fglrx-makesh.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fglrx-makesh.diff	16 Oct 2008 18:32:09 -0000	1.1
+++ fglrx-makesh.diff	16 Oct 2008 23:48:18 -0000	1.2
@@ -1,16 +1,25 @@
---- make.sh.old	2005-01-13 19:41:53.485102552 +0100
-+++ make.sh	2005-01-13 19:40:01.866071224 +0100
-@@ -75,10 +75,10 @@
- 
+--- make.sh.old	2008-10-16 19:41:59.000000000 -0400
++++ make.sh	2008-10-16 19:43:47.000000000 -0400
+@@ -62,16 +62,16 @@
  # ==============================================================
  # system/kernel identification
+ 
 -uname_r=`uname -r`
 -uname_v=`uname -v`
 +uname_r="${FEDORA_UNAME_R}"
 +uname_v="$(grep UTS_VERSION ${KERNEL_PATH}/include/linux/compile.h | cut -d'"' -f2)"
- uname_s=`uname -s`
--uname_m=`uname -m`
-+uname_m="${FEDORA_UNAME_M}"
- uname_a=`uname -a`
  
- # if you want to overload the current settings then please enter 1 below
+ # ==============================================================
+ # check if we are running as root with typical login shell paths
+ 
+-if [ `id -u` -ne 0 ]; then
+-  echo "You must be logged in as root to run this script."
+-  exit 1
+-fi
++#if [ `id -u` -ne 0 ]; then
++#  echo "You must be logged in as root to run this script."
++#  exit 1
++#fi
+ 
+ which depmod >/dev/null 2>&1
+