Update to new NV binary packages L4T R15

Removed nvrm_deamon and corresponding init.d script
Kernel from git.toradex.int

6 files changed, 48 insertions, 115 deletions

diff --git a/recipes/tegrastats/files/Makefile b/recipes/tegrastats/files/Makefile
deleted file mode 100644
index 7eb1f2d..0000000
--- a/recipes/tegrastats/files/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all:
-	echo "Hallo max"
-	$(CC) ${CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o tegrastats main.c
-	
\ No newline at end of file
diff --git a/recipes/tegrastats/tegrastats.bb~ b/recipes/tegrastats/tegrastats.bb~
deleted file mode 100644
index 58eb47a..0000000
--- a/recipes/tegrastats/tegrastats.bb~
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "tegrastats, gives information about cpu use"
-LICENSE = "Nvidia propriatry"
-PR = "r1"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-#SRC_URI =  "file://tegrastats \
-#            "
-
-S = "${WORKDIR}/target-utils/tegrastats"
-
-SVN_REV = 230
-SRC_URI = "svn://tegradev:tegra123!@mammut.toradex.int:8090/colibri_tegra_linux/trunk;module=target-utils/tegrastats;rev=${SVN_REV};proto=http"
-
-PACKAGES = "${PN}"
-
-#FILES_${PN} = 
-
-do_compile() {
-	${CC} -DNV_IS_LDK=1 ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} ${S}/main.c -o tegrastats
-}
-
-do_install() {
-	install -d ${D}/usr/bin
-	install -m 0755  ${S}/tegrastats  ${D}/usr/bin
-}
diff --git a/recipes/trdx-nv-binaries/files/mimeapps.list b/recipes/trdx-nv-binaries/files/mimeapps.list
new file mode 100644
index 0000000..43492e9
--- /dev/null
+++ b/recipes/trdx-nv-binaries/files/mimeapps.list
@@ -0,0 +1,8 @@
+
+[Added Associations]
+video/mpeg=nvgstplayer.desktop;
+video/x-msvideo=nvgstplayer.desktop;
+video/mp4=nvgstplayer.desktop;
+video/quicktime=nvgstplayer.desktop;
+video/x-ms-wmv=nvgstplayer.desktop;
+video/x-matroska=cd nvgstplayer.desktop;
diff --git a/recipes/trdx-nv-binaries/files/nvgstplayer.desktop b/recipes/trdx-nv-binaries/files/nvgstplayer.desktop
new file mode 100644
index 0000000..89cffd9
--- /dev/null
+++ b/recipes/trdx-nv-binaries/files/nvgstplayer.desktop
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Application
+Name=nvgstplayer
+Exec=nvgstplayer --uri %u
+NoDisplay=true
diff --git a/recipes/trdx-nv-binaries/trdx-nv-binaries.bb b/recipes/trdx-nv-binaries/trdx-nv-binaries.bb
index 58c030f..a9aa513 100644
--- a/recipes/trdx-nv-binaries/trdx-nv-binaries.bb
+++ b/recipes/trdx-nv-binaries/trdx-nv-binaries.bb
@@ -1,19 +1,25 @@
 DESCRIPTION = "binary files from Nvidia along with there configuration"
 LICENSE = "CLOSED"
-PR = "r1"
+PR = "r3"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-SRC_URI_colibri-t20 =  "file://bin-files.tar.bz2 \
-            "
+SRC_URI_colibri-t20 =  "file://base.tgz \
+	file://restricted_codecs.tbz2 \
+	file://mimeapps.list \
+	file://nvgstapps.tgz \
+	file://nvgstplayer.desktop \
+"
 
 SRC_URI_colibri-t30 =  "file://base.tgz \
 	file://x/tegra_drv.abi*.so \
 	file://restricted_codecs.tbz2 \
-	file://nvgstplayer.tbz2 \
+	file://Tegra-Linux-nvgstplayerR15.alpha.1.0.tbz2 \
 	file://wifi.tbz2 \
 	file://xorg.conf \
-	"
+	file://mimeapps.list \
+	file://nvgstplayer.desktop \
+"
 
 PACKAGES = "${PN}"
 
@@ -22,21 +28,30 @@ FILES_${PN} += " \
 	${sysconfdir}/X11/xorg.conf.* \
 	/lib/firmware/* \
 	/usr/lib/* \
+	/home/root/.local/share/applications/* \
 	"
 
-#no gnu_hash in NVIDIA binaries, skip QA for this package
-INSANE_SKIP_${PN} = "True"
-#we have symlinks ending in .so , remove "dev-so", refere to ./openembedded-core/meta/classes/insane.bbclass
-ERROR_QA = "debug-deps dev-deps arch la2 pkgconfig la perms"
+#no gnu_hash in NVIDIA binaries, skip QA dev-so for this package
+#we have symlinks ending in .so, skip QA ldflags for this package
+INSANE_SKIP_${PN} = "dev-so ldflags"
 
 do_install_colibri-t20 () {
-	install -d ${D} ${D}/bin ${D}/${sysconfdir}/X11 ${D}/lib/firmware ${D}/usr/lib/gstreamer-0.10 ${D}/usr/lib/xorg/modules/drivers
-	install -m 0755 ${WORKDIR}/bin/* ${D}/bin/
-	install -m 0644 ${WORKDIR}/${sysconfdir}/X11/* ${D}/${sysconfdir}/X11
+	#base.tgz
+	install -d ${D} ${D}/usr/bin ${D}/${sysconfdir}/X11 ${D}/lib/firmware ${D}/usr/lib/gstreamer-0.10 
+	install -d ${D}/usr/lib/xorg/modules/drivers ${D}/home/root/.local/share/applications/
+	install -m 0755 ${WORKDIR}/usr/bin/* ${D}/usr/bin/
+	install -m 0644 ${WORKDIR}/${sysconfdir}/X11/xorg.conf ${D}/${sysconfdir}/X11/xorg.conf.nvidia
+	install -m 0644 ${WORKDIR}/${sysconfdir}/nv* ${D}/${sysconfdir}/
 	install -m 0644 ${WORKDIR}/lib/firmware/* ${D}/lib/firmware/
-	install -m 0755 ${WORKDIR}/usr/lib/*.so ${D}/usr/lib/
-	install -m 0755 ${WORKDIR}/usr/lib/gstreamer-0.10/*.so ${D}/usr/lib/gstreamer-0.10
-	install -m 0755 ${WORKDIR}/usr/lib/xorg/modules/drivers/* ${D}/usr/lib/xorg/modules/drivers/
+	install -m 0644 ${WORKDIR}/usr/lib/*.so ${D}/usr/lib/
+	install -m 0644 ${WORKDIR}/usr/lib/gstreamer-0.10/*.so ${D}/usr/lib/gstreamer-0.10
+	install -m 0644 ${WORKDIR}/usr/lib/xorg/modules/drivers/* ${D}/usr/lib/xorg/modules/drivers/
+	install -m 0644 ${WORKDIR}/mimeapps.list ${D}//home/root/.local/share/applications/
+	install -m 0644 ${WORKDIR}/nvgstplayer.desktop ${D}/home/root/.local/share/applications/
+	ln -s libpcre.so.0.0.1 ${D}/usr/lib/libpcre.so.3
+	ln -s tegra_drv.abi11.so ${D}/usr/lib/xorg/modules/drivers/tegra_drv.so
+	ln -s libGLESv2.so ${D}/usr/lib//libGLESv2.so.2
+	ln -s libEGL.so ${D}/usr/lib/libEGL.so.1
 }
 
 do_install_colibri-t30 () {
@@ -56,9 +71,13 @@ do_install_colibri-t30 () {
 	ln -s libEGL.so ${D}/usr/lib/libEGL.so.1
 
 	#nvgstplayer.tbz2
-	install -d ${D} ${D}/usr/bin ${D}/usr/lib/gstreamer-0.10
+	cd ${WORKDIR}; tar xjf nvgstplayer.tbz2; cd ${S}
+	install -d ${D}/usr/bin ${D}/usr/lib/gstreamer-0.10 ${D}/home/root/.local/share/applications/
 	install -m 0755 ${WORKDIR}/usr/bin/nvgstplayer ${D}/usr/bin/
 	install -m 0644 ${WORKDIR}/usr/lib/gstreamer-0.10/*.so ${D}/usr/lib/gstreamer-0.10/
+	install -m 0644 ${WORKDIR}/mimeapps.list ${D}//home/root/.local/share/applications/
+	install -m 0644 ${WORKDIR}/nvgstplayer.desktop ${D}/home/root/.local/share/applications/
+	ln -s libpcre.so.0.0.1 ${D}/usr/lib/libpcre.so.3
 
 	#wifi.tbz2
 	install -d ${D} ${D}/lib/firmware/bcm4329
diff --git a/recipes/trdx-nv-binaries/trdx-nv-binaries.bb~ b/recipes/trdx-nv-binaries/trdx-nv-binaries.bb~
deleted file mode 100644
index 12f5a77..0000000
--- a/recipes/trdx-nv-binaries/trdx-nv-binaries.bb~
+++ /dev/null
@@ -1,69 +0,0 @@
-DESCRIPTION = "binary files from Nvidia along with there configuration"
-LICENSE = "CLOSED"
-PR = "r1"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-SRC_URI_colibri-t20 =  "file://bin-files.tar.bz2 \
-            "
-
-SRC_URI_colibri-t30 =  "file://base.tgz \
-	file://x/tegra_drv.abi*.so \
-	file://restricted_codecs.tbz2 \
-	file://nvgstplayer.tbz2 \
-	file://wifi.tbz2 \
-	file://xorg.conf \
-	"
-
-PACKAGES = "${PN}"
-
-FILES_${PN} += " \
-	${sysconfdir}/X11/def* \
-	${sysconfdir}/X11/xorg.conf.* \
-	/lib/firmware/* \
-	/usr/lib/* \
-	"
-
-#no gnu_hash in NVIDIA binaries, skip QA for this package
-INSANE_SKIP_${PN} = "True"
-#we have symlinks ending in .so , remove "dev-so", refere to ./openembedded-core/meta/classes/insane.bbclass
-ERROR_QA = "arch la2 pkgconfig la perms"
-
-do_install_colibri-t20 () {
-	install -d ${D} ${D}/bin ${D}/${sysconfdir}/X11 ${D}/lib/firmware ${D}/usr/lib/gstreamer-0.10 ${D}/usr/lib/xorg/modules/drivers
-	install -m 0755 ${WORKDIR}/bin/* ${D}/bin/
-	install -m 0644 ${WORKDIR}/${sysconfdir}/X11/* ${D}/${sysconfdir}/X11
-	install -m 0644 ${WORKDIR}/lib/firmware/* ${D}/lib/firmware/
-	install -m 0755 ${WORKDIR}/usr/lib/*.so ${D}/usr/lib/
-	install -m 0755 ${WORKDIR}/usr/lib/gstreamer-0.10/*.so ${D}/usr/lib/gstreamer-0.10
-	install -m 0755 ${WORKDIR}/usr/lib/xorg/modules/drivers/* ${D}/usr/lib/xorg/modules/drivers/
-}
-
-do_install_colibri-t30 () {
-	#base.tgz, xorg driver, restricted codecs
-	install -d ${D} ${D}/${sysconfdir}/X11/ ${D}/lib/firmware/ ${D}/usr/lib/xorg/modules/drivers
-	install -m 0644 ${WORKDIR}/${sysconfdir}/X11/xorg.conf ${D}/${sysconfdir}/X11/xorg.conf.nvidia
-	install -m 0644 ${WORKDIR}/lib/firmware/nv* ${D}/lib/firmware/
-	install -m 0644 ${WORKDIR}/usr/lib/*.so ${D}/usr/lib/
-	install -m 0644 ${WORKDIR}/x/tegra_drv.abi5.so ${D}/usr/lib/xorg/modules/drivers/
-	install -m 0644 ${WORKDIR}/x/tegra_drv.abi6.so ${D}/usr/lib/xorg/modules/drivers/
-	install -m 0644 ${WORKDIR}/x/tegra_drv.abi7.so ${D}/usr/lib/xorg/modules/drivers/
-	install -m 0644 ${WORKDIR}/x/tegra_drv.abi8.so ${D}/usr/lib/xorg/modules/drivers/
-	install -m 0644 ${WORKDIR}/x/tegra_drv.abi10.so ${D}/usr/lib/xorg/modules/drivers/
-	install -m 0644 ${WORKDIR}/x/tegra_drv.abi11.so ${D}/usr/lib/xorg/modules/drivers/
-	ln -s tegra_drv.abi8.so ${D}/usr/lib/xorg/modules/drivers/tegra_drv.so
-	ln -s libGLESv2.so ${D}/usr/lib//libGLESv2.so.2
-	ln -s libEGL.so ${D}/usr/lib/libEGL.so.1
-
-	#nvgstplayer.tbz2
-	install -d ${D} ${D}/usr/bin ${D}/usr/lib/gstreamer-0.10
-	install -m 0755 ${WORKDIR}/usr/bin/nvgstplayer ${D}/usr/bin/
-	install -m 0644 ${WORKDIR}/usr/lib/gstreamer-0.10/*.so ${D}/usr/lib/gstreamer-0.10/
-
-	#wifi.tbz2
-	install -d ${D} ${D}/lib/firmware/bcm4329
-	install -m 0644 ${WORKDIR}/lib/firmware/bcm4329/* ${D}/lib/firmware/bcm4329
-}
-
-# We want to provide several versions of a so and symlink the one actually used, have OE's QA not throw an error
-ERROR_QA = "debug-deps dev-deps debug-files arch la2 pkgconfig la perms"
\ No newline at end of file