[oe-commits] Leon Woestenberg : nvidia-display: Added 190.42 release. Builds but packaging needs clean-up.

[git version control]

Module: openembedded.git
Branch: martin_jansa/srcpv
Commit: c652a59cbb2f103a6397fce327b4753d7c5e7b10
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=c652a59cbb2f103a6397fce327b4753d7c5e7b10

Author: Leon Woestenberg <leon at sidebranch.com>
Date:   Sun Nov 22 01:17:08 2009 +0100

nvidia-display: Added 190.42 release. Builds but packaging needs clean-up.

Signed-off-by: Leon Woestenberg <leon at sidebranch.com>

---

 .../nvidia-display-190.42/nvidia-oe-conftest.patch |   27 +++++++++++
 recipes/nvidia-drivers/nvidia-display_190.42.bb    |   46 ++++++++++++++++++++
 recipes/nvidia-drivers/nvidia-drivers.inc          |    2 +
 3 files changed, 75 insertions(+), 0 deletions(-)

diff --git a/recipes/nvidia-drivers/nvidia-display-190.42/nvidia-oe-conftest.patch b/recipes/nvidia-drivers/nvidia-display-190.42/nvidia-oe-conftest.patch
new file mode 100644
index 0000000..95cf980
--- /dev/null
+++ b/recipes/nvidia-drivers/nvidia-display-190.42/nvidia-oe-conftest.patch
@@ -0,0 +1,27 @@
+Index: nv/Makefile.kbuild
+===================================================================
+--- nv.orig/Makefile.kbuild	2009-10-21 06:04:11.000000000 +0200
++++ nv/Makefile.kbuild	2009-11-22 00:55:06.000000000 +0100
+@@ -284,19 +284,16 @@
+ # sufficient privileges. Rebuild the module dependency file.
+ #
+ 
+-module-install: suser-sanity-check module
++module-install: module
+ 	@mkdir -p $(MODULE_ROOT)/video; \
+-	install -m 0664 -o root -g root $(MODULE_OBJECT) $(MODULE_ROOT)/video; \
+-	PATH="$(PATH):/bin:/sbin" depmod -ae;
++	install -m 0664 $(MODULE_OBJECT) $(MODULE_ROOT)/video;
+ 
+ #
+ # This target builds, then installs, then creates device nodes and inserts
+ # the module, if successful.
+ #
+ 
+-package-install: module-install rmmod-sanity-check
+-	PATH="$(PATH):/bin:/sbin" modprobe $(MODULE_NAME) && \
+-	echo "$(MODULE_OBJECT) installed successfully.";
++package-install: module-install
+ 
+ #
+ # Build an object file suitable for further processing by the installer and
diff --git a/recipes/nvidia-drivers/nvidia-display_190.42.bb b/recipes/nvidia-drivers/nvidia-display_190.42.bb
new file mode 100644
index 0000000..0ef15e8
--- /dev/null
+++ b/recipes/nvidia-drivers/nvidia-display_190.42.bb
@@ -0,0 +1,46 @@
+# nvidia-display .bb build file
+# Copyright (C) 2005-2006, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see /COPYING)
+
+require nvidia-drivers.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+PKG_BASENAME="NVIDIA-Linux-${NVIDIA_ARCH}-${PV}-${NVIDIA_PKGRUN}"
+
+SRC_URI="http://download.nvidia.com/XFree86/Linux-${NVIDIA_ARCH}/${PV}/${PKG_BASENAME}.run \
+	file://nvidia-oe-conftest.patch;patch=1"
+
+S="${WORKDIR}/${PKG_BASENAME}/usr/src/nv"
+
+EXTRA_OEMAKE=" KERNEL_SOURCES=${STAGING_KERNEL_DIR} KERNEL_MODLIB=${STAGING_KERNEL_DIR} KERNEL_UNAME=${KERNEL_VERSION} PATCHLEVEL=${KERNEL_PATCHLEVEL} MODULE_ROOT=${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers IGNORE_CC_MISMATCH=1"
+
+FILES_${PN} += " /usr/lib /usr/bin /usr/share"
+FILES_${PN}-dev += " /usr/lib/xorg/modules/extensions/libglx.so"
+
+INSANE_SKIP_${PN} = True
+
+do_configure() {
+	rm -f ${S}/makefile
+	if [ "${KERNEL_PATCHLEVEL}" != "4" ] ; then
+		ln -sf Makefile.kbuild ${S}/Makefile
+	else
+		ln -sf Makefile.nvidia ${S}/Makefile
+	fi
+}
+
+do_install() {
+	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+	oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" install
+
+	install -d ${D}/usr
+	for dir in bin include lib share ; do
+		cp -pPR ${WORKDIR}/${PKG_BASENAME}/usr/$dir ${D}/usr/
+	done
+
+	#X11R7.0 style...
+	install -d ${D}/usr/lib/xorg/
+	cp ${WORKDIR}/${PKG_BASENAME}/usr/X11R6/lib/lib* ${D}/usr/lib/
+	cp -pPR ${WORKDIR}/${PKG_BASENAME}/usr/X11R6/lib/modules ${D}/usr/lib/xorg/
+	ln -s libglx.so.1.0.8756 ${D}/usr/lib/xorg/modules/extensions/libglx.so
+}
diff --git a/recipes/nvidia-drivers/nvidia-drivers.inc b/recipes/nvidia-drivers/nvidia-drivers.inc
index fbb28cb..32f16a4 100644
--- a/recipes/nvidia-drivers/nvidia-drivers.inc
+++ b/recipes/nvidia-drivers/nvidia-drivers.inc
@@ -42,6 +42,8 @@ EXTRA_OEMAKE=" KERNEL_SOURCES=${STAGING_KERNEL_DIR} KERNEL_MODLIB=${STAGING_KERN
 
 PKG_BASENAME="NVIDIA-Linux-${NVIDIA_ARCH}-${PV}-${NVIDIA_PKGRUN}"
 
+FILES_${PN}-doc += " /usr/share/doc/*"
+
 nvidia_do_unpack() {
 	sh ${PKG_BASENAME}.run -x
 }