Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] PERFORCE change 78697 by Robin Cook for review

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <v.merkatz AT gmx.net>
  • To: SM-Commit Daemon <sm-commit AT lists.ibiblio.org>
  • Subject: Re: [SM-Commit] PERFORCE change 78697 by Robin Cook for review
  • Date: Mon, 1 May 2006 10:28:52 +0200

On Sun, Apr 30, 2006 at 08:05:02PM +0100, Perforce Review Daemon wrote:
> Change 78697 by robin_cook AT CuZnDragon-pheuri.wyrms.net on 2006/04/30
> 20:04:02
>
> Add xorg-modular support
>
> Affected files ...
>
> ... //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/DEPENDS#5 edit
> ... //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/HISTORY#29 edit
> ... //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/INSTALL#10 edit
>
> Differences ...
>
> ==== //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/DEPENDS#5 (xtext)
> ====
>
>
> ==== //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/HISTORY#29 (text)
> ====
>
> @@ -1,3 +1,9 @@
> +2006-04-30 Robin Cook <rcook AT wyrms.net>
> + * DEPENDS: uncommented the X11-SERVER depends

You didn't actually change DEPENDS, and given that you check the
X11-SERVER provider later, I guess you didn't want to either.

> + * INSTALL: added X_PRE and X_MOD to local variables
> + added if to test for xorg-modular and set X_PRE and X_MOD
> + changed nvidia_install command to use X_PRE and X_MOD
> +
> 2006-04-18 Juuso Alasuutari <iuso AT sourcemage.org>
> * INSTALL: Made sure that if the xorg.conf auto-edit option has
> been selected once, it doesn't default to y on next cast.
>
> ==== //sgl/grimoires/z-rejected/z-kernels/nvidia_driver/INSTALL#10 (xtext)
> ====
>
> @@ -1,12 +1,19 @@
> -local e X &&
> -if [[ $EXPERT == y ]]; then e='-e'; fi &&
> -if [[ $XCONF == y ]]; then X='-X'; fi &&
> +local e X X_PRE X_MOD
> &&
> +if [[ $EXPERT == y ]]; then e='-e'; fi
> &&
> +if [[ $XCONF == y ]]; then X='-X'; fi
> &&
> +
> +if test "$(get_spell_provider $SPELL X11-SERVER)" = xorg-server; then
> + X_PRE="${INSTALL_ROOT}$(pkg-config --variable=prefix xorg-server)"
> &&
> + X_MOD="${INSTALL_ROOT}$(pkg-config --variable=moduledir xorg-server)"
> &&
> +else
> + X_PRE="${INSTALL_ROOT}/usr/X11R6"
> &&
> + 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=$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) &&
> +./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)
> &&
>
> # To make sure spell doesn't default to editing xorg.conf after it's
> # already done once.
> _______________________________________________
> SM-Commit mailing list
> SM-Commit AT lists.ibiblio.org
> http://lists.ibiblio.org/mailman/listinfo/sm-commit
>

--
Arwed v. Merkatz Source Mage GNU/Linux developer
http://www.sourcemage.org



  • Re: [SM-Commit] PERFORCE change 78697 by Robin Cook for review, Arwed von Merkatz, 05/01/2006

Archive powered by MHonArc 2.6.24.

Top of Page