diff options
| -rw-r--r-- | base/nvidia-utils/.footprint.i686 (renamed from base/nvidia/.footprint.i686) | 15 | ||||
| -rw-r--r-- | base/nvidia-utils/.footprint.x86_64 (renamed from base/nvidia/.footprint.x86_64) | 15 | ||||
| -rw-r--r-- | base/nvidia-utils/.md5sum.i686 (renamed from base/nvidia/.md5sum.i686) | 0 | ||||
| -rw-r--r-- | base/nvidia-utils/.md5sum.x86_64 (renamed from base/nvidia/.md5sum.x86_64) | 0 | ||||
| -rwxr-xr-x | base/nvidia-utils/Pkgfile (renamed from base/nvidia/Pkgfile) | 24 | ||||
| -rw-r--r-- | base/nvidia-utils/post-install (renamed from base/nvidia/post-install) | 0 | ||||
| -rw-r--r-- | base/nvidia-utils/pre-install (renamed from base/nvidia/pre-install) | 0 |
7 files changed, 30 insertions, 24 deletions
diff --git a/base/nvidia/.footprint.i686 b/base/nvidia-utils/.footprint.i686 index d772c5586..147738262 100644 --- a/base/nvidia/.footprint.i686 +++ b/base/nvidia-utils/.footprint.i686 @@ -2,14 +2,10 @@ drwxr-xr-x root/root etc/ drwxr-xr-x root/root etc/X11/ drwxr-xr-x root/root etc/X11/xorg.conf.d/ -rw-r--r-- root/root etc/X11/xorg.conf.d/30-nvidia.conf -drwxr-xr-x root/root lib/ -drwxr-xr-x root/root lib/modules/ -drwxr-xr-x root/root lib/modules/<kernel-version>/ -drwxr-xr-x root/root lib/modules/<kernel-version>/kernel/ -drwxr-xr-x root/root lib/modules/<kernel-version>/kernel/video/ -drwxr-xr-x root/root lib/modules/<kernel-version>/kernel/video/nvidia/ --rw-r--r-- root/root lib/modules/<kernel-version>/kernel/video/nvidia/nvidia.ko drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/bin/ +-rwxr-xr-x root/root usr/bin/nvidia-settings +-rwxr-xr-x root/root usr/bin/nvidia-xconfig drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/X11/ drwxr-xr-x root/root usr/lib/X11/modules/ @@ -34,3 +30,8 @@ drwxr-xr-x root/root usr/lib/tls/ drwxr-xr-x root/root usr/lib/vdpau/ -rwxr-xr-x root/root usr/lib/vdpau/libvdpau_nvidia.so.275.09.07 -rwxr-xr-x root/root usr/lib/vdpau/libvdpau_trace.so.275.09.07 +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man1/ +-rw-r--r-- root/root usr/share/man/man1/nvidia-settings.1.gz +-rw-r--r-- root/root usr/share/man/man1/nvidia-xconfig.1.gz diff --git a/base/nvidia/.footprint.x86_64 b/base/nvidia-utils/.footprint.x86_64 index d772c5586..147738262 100644 --- a/base/nvidia/.footprint.x86_64 +++ b/base/nvidia-utils/.footprint.x86_64 @@ -2,14 +2,10 @@ drwxr-xr-x root/root etc/ drwxr-xr-x root/root etc/X11/ drwxr-xr-x root/root etc/X11/xorg.conf.d/ -rw-r--r-- root/root etc/X11/xorg.conf.d/30-nvidia.conf -drwxr-xr-x root/root lib/ -drwxr-xr-x root/root lib/modules/ -drwxr-xr-x root/root lib/modules/<kernel-version>/ -drwxr-xr-x root/root lib/modules/<kernel-version>/kernel/ -drwxr-xr-x root/root lib/modules/<kernel-version>/kernel/video/ -drwxr-xr-x root/root lib/modules/<kernel-version>/kernel/video/nvidia/ --rw-r--r-- root/root lib/modules/<kernel-version>/kernel/video/nvidia/nvidia.ko drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/bin/ +-rwxr-xr-x root/root usr/bin/nvidia-settings +-rwxr-xr-x root/root usr/bin/nvidia-xconfig drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/X11/ drwxr-xr-x root/root usr/lib/X11/modules/ @@ -34,3 +30,8 @@ drwxr-xr-x root/root usr/lib/tls/ drwxr-xr-x root/root usr/lib/vdpau/ -rwxr-xr-x root/root usr/lib/vdpau/libvdpau_nvidia.so.275.09.07 -rwxr-xr-x root/root usr/lib/vdpau/libvdpau_trace.so.275.09.07 +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man1/ +-rw-r--r-- root/root usr/share/man/man1/nvidia-settings.1.gz +-rw-r--r-- root/root usr/share/man/man1/nvidia-xconfig.1.gz diff --git a/base/nvidia/.md5sum.i686 b/base/nvidia-utils/.md5sum.i686 index 5ab208687..5ab208687 100644 --- a/base/nvidia/.md5sum.i686 +++ b/base/nvidia-utils/.md5sum.i686 diff --git a/base/nvidia/.md5sum.x86_64 b/base/nvidia-utils/.md5sum.x86_64 index a4dc3c96b..a4dc3c96b 100644 --- a/base/nvidia/.md5sum.x86_64 +++ b/base/nvidia-utils/.md5sum.x86_64 diff --git a/base/nvidia/Pkgfile b/base/nvidia-utils/Pkgfile index ecc64ca17..d2ddd909d 100755 --- a/base/nvidia/Pkgfile +++ b/base/nvidia-utils/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: NuTyX core team # Packager: thierryn1 at hispeed dot ch -name=nvidia +name=nvidia-utils version=275.09.07 release=2 [ "`uname -m`" == "i686" ] && _ARCH=x86 @@ -29,21 +29,25 @@ build() { done install -m 0755 tls/libnvidia-tls.so.$version $PKG/usr/lib/tls install -m 0644 libXvMCNVIDIA.a $PKG/usr/lib + + # install xconfig/settings programs and manpages + install -d $PKG/usr/{bin,share/man/man1} + + # install xconfig/settings programs and manpages + install -m 0755 nvidia-{xconfig,settings} $PKG/usr/bin/ + install -m 0644 nvidia-{xconfig,settings}.1.gz \ + $PKG/usr/share/man/man1/ + + install -m 0755 nvidia-{xconfig,settings} $PKG/usr/bin/ + install -m 0644 nvidia-{xconfig,settings}.1.gz \ + $PKG/usr/share/man/man1/ # xorg driver/extensions install -d $PKG/usr/lib/X11/modules/{drivers,extensions} install -m 0755 nvidia_drv.so $PKG/usr/lib/X11/modules/drivers install -m 0755 libglx.so.$version $PKG/usr/lib/X11/modules/extensions ln -s libglx.so.$version $PKG/usr/lib/X11/modules/extensions/libglx.so install -m 0755 libnvidia-wfb.so.$version $PKG/usr/lib/X11/modules - # build the module - cd kernel - - ln -s Makefile{.kbuild,} - IGNORE_CC_MISMATCH=1 make module - - # install it - install -m 0644 -D nvidia.ko \ - $PKG/lib/modules/`uname -r`/kernel/video/nvidia/nvidia.ko + # xorg config mkdir -p $PKG/etc/X11/xorg.conf.d cat > $PKG/etc/X11/xorg.conf.d/30-nvidia.conf << "EOF" diff --git a/base/nvidia/post-install b/base/nvidia-utils/post-install index 4772910f3..4772910f3 100644 --- a/base/nvidia/post-install +++ b/base/nvidia-utils/post-install diff --git a/base/nvidia/pre-install b/base/nvidia-utils/pre-install index a1ee5214f..a1ee5214f 100644 --- a/base/nvidia/pre-install +++ b/base/nvidia-utils/pre-install |