Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] PERFORCE change 77775 by Juuso Alasuutari for review

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Perforce Review Daemon <p4review AT smee.org>
  • To: "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "David Kowis" <dkowis+smgl-p4 AT shlrm.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Eric Sandall" <eric AT sandall.us>, "George J. Sherwood" <george AT beernabeer.com>, "Jason Flatt" <jflatt AT sourcemage.org>, "Ladislav Hagara" <ladislav.hagara AT unob.cz>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Pol Vinogradov" <vin.public AT gmail.com>, "Robin Cook" <rcook AT wyrms.net>, "Seth Woolley" <seth AT swoolley.homeip.net>, "vladimir_marek" <vlmarek AT volny.cz>
  • Subject: [SM-Commit] PERFORCE change 77775 by Juuso Alasuutari for review
  • Date: Fri, 14 Apr 2006 14:40:01 +0100 (BST)

Change 77775 by juuso_alasuutari@juuso_alasuutari-kamayuq on 2006/04/14
14:39:21

Version updated to 1.0-8756, spell strongly modified. Now uses
nvidia's own installer which works well, except that it won't run in X. But
don't blame me, blame Nvidia.

Affected files ...

... //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/BUILD#10 edit
... //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/CONFIGURE#2 edit
... //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/DETAILS#17 edit
... //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/HISTORY#24 edit
... //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/INSTALL#8 edit
... //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/LICENSE#1 add
...
//sgl/grimoires/z-rejected/z-kernels/nvidia_driver/NVIDIA_kernel-1.0-8178-U012206.diff#2
delete
... //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/PREPARE#1 add
... //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/PRE_BUILD#4 edit

Differences ...

==== //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/BUILD#10 (xtext) ====

@@ -1,18 +1,1 @@
-invoke_uname_change &&
-export UNAME_CHANGE_RELEASE=$(get_kernel_version) &&
-cd usr/src/nv &&
-
-### please no-one remove this
-cd $SOURCE_DIRECTORY &&
-
-if [[ $VIA4X == "y" ]]; then sedit "s/NVreg_EnableVia4x
=0;/NVreg_EnableVia4x = 1;/" usr/src/nv/os-registry.c; fi &&
-
-if [[ $ALiAGP == "y" ]]; then sedit "s/NVreg_EnableALiAGP =
0;/NVreg_EnableALiAGP = 1;/" usr/src/nv/os-registry.c; fi &&
-
-if [[ $AGPSBA == "y" ]]; then sedit "s/NVreg_EnableAGPSBA =
0;/NVreg_EnableAGPSBA = 1;/" usr/src/nv/os-registry.c; fi &&
-
-if [[ $AGPFW == "y" ]]; then sedit "s/NVreg_EnableAGPFW =
0;/NVreg_EnableAGPFW = 1;/" usr/src/nv/os-registry.c; fi &&
-
-cd usr/src/nv &&
-make KERNEL_MODLIB=/lib/modules/$(get_kernel_version) module &&
-cd $SOURCE_DIRECTORY
+true

==== //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/CONFIGURE#2 (xtext)
====

@@ -2,3 +2,5 @@
config_query ALiAGP "Enable AGP on ALi chipsets, which might cause
instability?" n
config_query AGPSBA "Enable AGP SBA(Side Band Addressing) on all supported
chipsets, which might cause instability?" n
config_query AGPFW "Enable AGP Fast Writes on all supported chipsets,
which might cause instability?" n
+config_query EXPERT "Expert installation mode?" n
+config_query XCONF "Automatically configure xorg.conf after install?" n

==== //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/DETAILS#17 (xtext)
====

@@ -2,16 +2,18 @@
SPELL=nvidia_driver
case "${SMGL_COMPAT_ARCHS[0]}" in
x86-64|64)
- VERSION=1.0-8178-pkg1
+ VERSION=1.0-8756-pkg2
SOURCE=NVIDIA-Linux-x86_64-${VERSION}.run

SOURCE_URL=http://download.nvidia.com/XFree86/Linux-x86_64/${VERSION/-pkg*}/$SOURCE
-
SOURCE_HASH=sha512:ce2a90bda301e78a21c47f895be0df2776522da2d3d42f3a6451c888888a447bf1667347fd148b836da8e979be5e0b21f4ed6ac8d4de9bfd7c2e9c918431f9e7
+
SOURCE_HASH=sha512:567e48a7e5fb44fca0c5ec03d482fcefcd186b5848c577e18bc93136a9ef9d87ba37cb3021cdd8d7552f1331385b35cafc991e402859ca58c2df33cbd281c9a8
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/NVIDIA-Linux-x86_64-$VERSION
;;
ia32|32)
- VERSION=1.0-8178-pkg1
+ VERSION=1.0-8756-pkg1
SOURCE=NVIDIA-Linux-x86-$VERSION.run

SOURCE_URL=http://download.nvidia.com/XFree86/Linux-x86/${VERSION/-pkg*}/$SOURCE
-
SOURCE_HASH=sha512:e5f2abfe7fe1787dcd8ed767cdfa36e43a735601f79edf93673bd5e87a3934d77aa7ad0b3fd7b5ec42d32a9ef323eb6dcf8dfdbb8509f2eb7f598e67e1461be1
+
SOURCE_HASH=sha512:fd16338ba4e7b5ca67d2aa1565354f39604d02030639c2a171722a6a9f824f95dc366e918796d0fbb217c6b88420575297a253261d67bc7a316a2f9061b0e96f
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/NVIDIA-Linux-x86-$VERSION
;;
############################################################
# missing ia64 support we don't have an arch spec for it???
@@ -22,12 +24,12 @@
SOURCE_URL=
;;
esac
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/NVIDIA-Linux-x86-$VERSION
- WEB_SITE=http://www.nvidia.com
+ WEB_SITE=http://www.nvidia.com/object/unix.html
ENTERED=20030401
UPDATED=20050730
ARCHIVE=off
- LICENSE[0]=http://www.nvidia.com/view.asp?IO=nv_swlicense
+ REJECT="Non-GPL compatible software license"
+ LICENSE[0]=http://www.nvidia.com/object/nv_swlicense.html
BUILD_API=2
SHORT="Driver provided by NVIDIA for NVIDIA GPUs"
cat << EOF

==== //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/HISTORY#24 (text) ====

@@ -1,3 +1,15 @@
+2006-04-14 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: Version 1.0-8756
+ * PRE_BUILD, BUILD, INSTALL: Use nvidia's own installer
+ executable
+ * PREPARE: Added, checks if X is running, installer won't
+ run if it is. Made to display and prompt license
+ agreement.
+ * LICENSE: Added, Nvidia's license agreement.
+ * CONFIGURE: Added options to use expert install mode and
+ configure xorg automatically
+ * NVIDIA_kernel-1.0-8178-U012206.diff: Deleted
+
2006-03-25 Juuso Alasuutari <iuso AT sourcemage.org>
* PRE_BUILD: Apply patch to fix compile against 2.6.16
kernels, bug #10748. Thanks to Arnaud Fortier!

==== //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/INSTALL#8 (xtext) ====

@@ -1,13 +1,9 @@
-sedit 's/ lsmod / true /' usr/src/nv/conftest.sh &&
-mkdir -p ${INSTALL_ROOT}/usr/X11R6/lib/modules/drivers &&
-mkdir -p ${INSTALL_ROOT}/usr/X11R6/lib/modules/extensions &&
-export IGNORE_CC_MISMATCH=1 &&
-cd usr/src/nv &&
-make KERNEL_MODLIB=/lib/modules/$(get_kernel_version)
KERNEL_UNAME=$(get_kernel_version) module-install &&
-cd $SOURCE_DIRECTORY &&
-sedit 's/install: kernel_module_install/install: /g' Makefile &&
-make install &&
+local e X &&
+if [[ $EXPERT == y ]]; then e='-e'; fi &&
+if [[ $XCONF == y ]]; then X='-X'; fi &&

-# Copy few files not installed by Makefile
-install --mode=0755 usr/bin/nvidia-{settings,xconfig} /usr/bin &&
-install --mode=0644 usr/share/man/man1/nvidia-{settings,xconfig}.1.gz
/usr/share/man/man1
+./nvidia-installer $e $X -a -q --ui=none --no-runlevel-check \
+--no-rpms --no-network --x-prefix=$INSTALL_ROOT/usr/X11R6 \
+--x-module-path=$INSTALL_ROOT/usr/X11R6/lib/modules \
+--opengl-prefix=$INSTALL_ROOT/usr --utility-prefix=$INSTALL_ROOT/usr \
+--kernel-name=$(get_kernel_version)

==== //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/PRE_BUILD#4 (xtext)
====

@@ -1,12 +1,20 @@
-mk_source_dir ${SOURCE_DIRECTORY} &&
-unpack_file '' &&
-cd ${SOURCE_DIRECTORY} &&
-sh ${SOURCE_CACHE}/${SOURCE} --extract-only &&
-mv NVIDIA*/* . &&
+sh $SOURCE_CACHE/$SOURCE --extract-only \
+ --target $SOURCE_DIRECTORY &&
+cd $SOURCE_DIRECTORY &&

-# Apply fix if kernel > 2.6.15
-KER=`get_kernel_version` &&
-KER=${KER:0:6} &&
-if (( ${KER//\./} > 2615 )); then
- patch -p0 < ${SCRIPT_DIRECTORY}/NVIDIA_kernel-1.0-8178-U012206.diff
+if [[ $VIA4X == "y" ]]; then
+ sedit "s/NVreg_EnableVia4x =0;/NVreg_EnableVia4x = 1;/" \
+ usr/src/nv/os-registry.c
+fi &&
+if [[ $ALiAGP == "y" ]]; then
+ sedit "s/NVreg_EnableALiAGP = 0;/NVreg_EnableALiAGP = 1;/" \
+ usr/src/nv/os-registry.c
+fi &&
+if [[ $AGPSBA == "y" ]]; then
+ sedit "s/NVreg_EnableAGPSBA = 0;/NVreg_EnableAGPSBA = 1;/" \
+ usr/src/nv/os-registry.c
+fi &&
+if [[ $AGPFW == "y" ]]; then
+ sedit "s/NVreg_EnableAGPFW = 0;/NVreg_EnableAGPFW = 1;/" \
+ usr/src/nv/os-registry.c
fi



  • [SM-Commit] PERFORCE change 77775 by Juuso Alasuutari for review, Perforce Review Daemon, 04/14/2006

Archive powered by MHonArc 2.6.24.

Top of Page