[SM-Commit] PERFORCE change 79102 by Eric Sandall for review

Robin Cook rcook at wyrms.net
Wed May 10 18:38:48 EDT 2006


This is going to break xorg-modular....

CuZnDragon
Robin Cook

On Wed, 2006-05-10 at 20:40 +0100, Perforce Review Daemon wrote:
> Change 79102 by eric_sandall at sandalle-moby on 2006/05/10 20:39:17
> 
> 	   * PREPARE: Remove check for running X, no longer needed
> 	   * PRE_BUILD: Setup Makefile -> Makefile.kbuild symlink in usr/src/nv
> 	   * BUILD: Build the module in BUILD, not INSTALL
> 	     Override KERNEL_MODLIB, KERNEL_UNAME, and SYSSRC
> 	   * INSTALL: No longer use broken nvidia-installer binary.
> 	     Manually install binaries, scripts, modules, headers, and libraries
> 	     Checked against an installation done by nvidia-installer, only differences
> 	     are that we install the html documentation as well and we do not create
> 	     /var/lib/nvidia/*.
> 
> Affected files ...
> 
> ... //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/BUILD#11 edit
> ... //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/HISTORY#33 edit
> ... //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/INSTALL#12 edit
> ... //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/PREPARE#2 edit
> ... //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/PRE_BUILD#8 edit
> 
> Differences ...
> 
> ==== //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/BUILD#11 (xtext) ====
> 
> @@ -1,1 +1,9 @@
> -true
> +local  KVER                 &&
> +KVER=$(get_kernel_version)  &&
> +
> +pushd  $SOURCE_DIRECTORY/usr/src/nv                  &&
> +make  KERNEL_MODLIB=$INSTALL_ROOT/lib/modules/$KVER  \
> +      KERNEL_UNAME=$KVER                             \
> +      SYSSRC=$INSTALL_ROOT/lib/modules/$KVER/source  \
> +      -f Makefile.kbuild  &&
> +popd
> 
> ==== //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/HISTORY#33 (text) ====
> 
> @@ -1,3 +1,14 @@
> +2006-05-10 Eric Sandall <eric at sandall.us>
> +	* PREPARE: Remove check for running X, no longer needed
> +	* PRE_BUILD: Setup Makefile -> Makefile.kbuild symlink in usr/src/nv
> +	* BUILD: Build the module in BUILD, not INSTALL
> +	  Override KERNEL_MODLIB, KERNEL_UNAME, and SYSSRC
> +	* INSTALL: No longer use broken nvidia-installer binary.
> +	  Manually install binaries, scripts, modules, headers, and libraries
> +	  Checked against an installation done by nvidia-installer, only differences
> +	  are that we install the html documentation as well and we do not create
> +	  /var/lib/nvidia/*.
> +
>  2006-05-02 David Brown <dmlb2000 at gmail.com>
>  	* PRE_BUILD: fixed syntax errors
>  
> 
> ==== //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/INSTALL#12 (xtext) ====
> 
> @@ -10,10 +10,140 @@
>     X_MOD="${INSTALL_ROOT}/usr/X11R6/lib/modules"                          
>  fi                                                                        &&
>  
> -./nvidia-installer  $e $X -a -q --ui=none --no-runlevel-check             \
> ---no-rpms --no-network --x-prefix=$X_PRE --x-module-path=$X_MOD           \
> ---opengl-prefix=$INSTALL_ROOT/usr --utility-prefix=$INSTALL_ROOT/usr      \
> ---kernel-name=$(get_kernel_version)                                       &&
> +#
> +# Do not use NVIDIA's installer anymore
> +#
> +#./nvidia-installer  $e $X -a -q --ui=none --no-runlevel-check             \
> +#--no-rpms --no-network --x-prefix=$X_PRE --x-module-path=$X_MOD           \
> +#--opengl-prefix=$INSTALL_ROOT/usr --utility-prefix=$INSTALL_ROOT/usr      \
> +#--kernel-name=$(get_kernel_version)                                       &&
> +
> +#
> +# Install kernel module 'nvidia.ko'
> +#
> +pushd  $SOURCE_DIRECTORY/usr/src/nv       &&
> +make  -f Makefile.kbuild  module-install  &&
> +popd                                      &&
> +
> +#
> +# Install binaries and script
> +#
> +pushd  $SOURCE_DIRECTORY/usr/bin  &&
> +for file in nvidia-bug-report.sh nvidia-settings nvidia-xconfig;  do
> +  install  -m 0755  -o root  -g root  $file  $INSTALL_ROOT/usr/bin
> +done                              &&
> +popd                              &&
> +install  -m 0766  -o root  -g root  nvidia-installer  $INSTALL_ROOT/usr/bin  &&
> +
> +#
> +# Install OpenGL headers
> +#
> +pushd  $SOURCE_DIRECTORY/usr/include/GL  &&
> +if  [  !  -d  $INSTALL_ROOT/usr/X11R6/include/GL  ];  then
> +  mkdir  -p  $INSTALL_ROOT/usr/X11R6/include/GL
> +fi                                       &&
> +for file in glext.h gl.h glxext.h glx.h; do
> +  install  -m 0644  -o root  -g root  $file  $INSTALL_ROOT/usr/X11R6/include/GL/
> +done                                     &&
> +popd                                     &&
> +
> +#
> +# Install OpenGL libraries
> +#
> +pushd  $SOURCE_DIRECTORY/usr/lib  &&
> +for lib in libGLcore.so.${VERSION/-/.} libGL.la libGL.so.${VERSION/-/.}  \
> +           libnvidia-tls.so.${VERSION/-/.} libnvidia-cfg.so.${VERSION/-/.}; do
> +  install  -m 0644  -o root  -g root  $lib  $INSTALL_ROOT/usr/lib
> +done                              &&
> +
> +if  [  !  -d  $INSTALL_ROOT/usr/lib/tls  ];  then
> +  mkdir  -p  $INSTALL_ROOT/usr/lib/tls
> +fi  &&
> +
> +install  -m 0644  -o root  -g root  tls/libnvidia-tls.so.1.0.8756  \
> +         $INSTALL_ROOT/usr/lib/tls                                 &&
> +  #
> +  # Create library symlinks
> +  #
> +  pushd  $INSTALL_ROOT/usr/lib                                   &&
> +  ln  -sfn  libGLcore.so.${VERSION/-/.}      libGLcore.so.1      &&
> +  ln  -sfn  libGL.so.${VERSION/-/.}          libGL.so.1          &&
> +  ln  -sfn  libGL.so.1                       libGL.so            &&
> +  ln  -sfn  libnvidia-cfg.so.${VERSION/-/.}  libnvidia-cfg.so.1  &&
> +  ln  -sfn  libnvidia-cfg.so.1               libnvidia-cfg.so    &&
> +  ln  -sfn  libnvidia-tls.so.${VERSION/-/.}  libnvidia-tls.so.1  &&
> +  popd                                                           &&
> +  pushd  $INSTALL_ROOT/usr/lib/tls                               &&
> +  ln  -sfn  libnvidia-tls.so.${VERSION/-/.}  libnvidia-tls.so.1  &&
> +  popd                                                           &&
> +popd                              &&
> +
> +#
> +# Install X11 OpenGL libraries
> +#
> +pushd  $SOURCE_DIRECTORY/usr/X11R6/lib  &&
> +for lib in libXvMCNVIDIA.a libXvMCNVIDIA.so.${VERSION/-/.}; do
> +  install  -m 0644  -o root  -g root  $lib  $INSTALL_ROOT/usr/X11R6/lib
> +done                                    &&
> +  #
> +  # Setup symlinks
> +  #
> +  pushd  $INSTALL_ROOT/usr/X11R6/lib                                     &&
> +  ln  -sfn  libXvMCNVIDIA.so.${VERSION/-/.}  libXvMCNVIDIA_dynamic.so.1  &&
> +  popd                                                                   &&
> +popd                                    &&
> +
> +#
> +# Install X11 modules
> +#
> +pushd  $SOURCE_DIRECTORY/usr/X11R6/lib/modules  &&
> +for driver in nvidia_drv.o nvidia_drv.so; do
> +  install  -m 0644  -o root  -g root  drivers/$driver   \
> +           $INSTALL_ROOT/usr/X11R6/lib/modules/drivers
> +done                                            &&
> +install  -m 0644  -o root  -g root  extensions/libglx.so.${VERSION/-/.}  \
> +         $INSTALL_ROOT/usr/X11R6/lib/modules/extensions                  &&
> +  #
> +  # Setup extension symlink
> +  #
> +  pushd  $INSTALL_ROOT/usr/X11R6/lib/modules/extensions  &&
> +  ln  -sfn  libglx.so.${VERSION/-/.}  libglx.so          &&
> +  popd                                                   &&
> +popd                                            &&
> +
> +#
> +# Install Freedesktop.org spec
> +#
> +install  -m 0644  -o root  -g root                                         \
> +         $SOURCE_DIRECTORY/usr/share/applications/nvidia-settings.desktop  \
> +         $INSTALL_ROOT/usr/share/applications                              &&
> +
> +#
> +# Install documentation
> +#
> +pushd  $SOURCE_DIRECTORY/usr/share/doc                         &&
> +if  [  !  -d  $INSTALL_ROOT/usr/share/doc/NVIDIA_GLX-1.0  ];  then
> +  mkdir  -p  $INSTALL_ROOT/usr/share/doc/NVIDIA_GLX-1.0
> +fi                                                             &&
> +cp  -a  *  $INSTALL_ROOT/usr/share/doc/NVIDIA_GLX-1.0          &&
> +popd                                                           &&
> +if  [  !  -d  $INSTALL_ROOT/usr/share/doc/$SPELL  ];  then
> +  mkdir  -p  $INSTALL_ROOT/usr/share/doc/$SPELL
> +fi                                                             &&
> +install  -m 0644  -o root  -g root  $SOURCE_DIRECTORY/LICENSE  \
> +         $INSTALL_ROOT/usr/share/doc/$SPELL                    &&
> +install  -m 0644  -o root  -g root  $SOURCE_DIRECTORY/LICENSE  \
> +         $INSTALL_ROOT/usr/share/doc/NVIDIA_GLX-1.0            &&
> +
> +#
> +# Install man pages
> +#
> +pushd  $SOURCE_DIRECTORY/usr/share/man/man1  &&
> +for manual in nvidia-installer.1.gz  nvidia-settings.1.gz  nvidia-xconfig.1.gz
> +do
> +  install  -m 0644  -o root  -g root  $manual  $INSTALL_ROOT/usr/share/man/man1
> +done                                         &&
> +popd                                         &&
>  
>  # To make sure spell doesn't default to editing xorg.conf after it's 
>  # already done once.
> 
> ==== //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/PREPARE#2 (xtext) ====
> 
> @@ -1,12 +1,5 @@
>  . $GRIMOIRE/REJECTED_MSG  &&
>  
> -if [[ -n $(find /tmp -type f -name ".X*-lock" 2>/dev/null) ]]; then
> -  message "${PROBLEM_COLOR}You appear to be running X, cannot continue with install. Please exit" &&
> -  message "and try again. If you're sure you're not running X, remove stale" &&
> -  message ".X*-lock files from /tmp and try again.${DEFAULT_COLOR}" &&
> -  exit 1
> -fi  &&
> -
>  if ! spell_ok $SPELL; then
>    cat  $SCRIPT_DIRECTORY/LICENSE                       &&
>    config_query  LEGAL  "Accept license agreement?"  n  &&
> 
> ==== //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/PRE_BUILD#8 (xtext) ====
> 
> @@ -47,5 +47,10 @@
>  if [[ $AGPFW == "y" ]]; then
>    sedit "s/NVreg_EnableAGPFW = 0;/NVreg_EnableAGPFW = 1;/"    \
>                                    usr/src/nv/os-registry.c
> -fi
> +fi  &&
>  
> +#
> +# Setup Makefile symlink
> +#
> +cd  $SOURCE_DIRECTORY/usr/src/nv     &&
> +ln  -sfn  Makefile.kbuild  Makefile
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 827 bytes
Desc: This is a digitally signed message part
Url : http://lists.ibiblio.org/pipermail/sm-commit/attachments/20060510/1d0acc98/attachment.bin 


More information about the SM-Commit mailing list