From 061469c0a172ba27b95dbe1294d3f3d8a3638e8e Mon Sep 17 00:00:00 2001
From: Max Krummenacher <max.krummenacher@toradex.com>
Date: Thu, 19 Jul 2012 18:03:49 +0200
Subject: remove nv odm kit, including init.d/nvrm_daemon script

---
 recipes/trdx-config/files/nvrm_daemon | 37 -----------------------------------
 recipes/trdx-config/trdx-config.bb    | 20 +++++++------------
 2 files changed, 7 insertions(+), 50 deletions(-)
 delete mode 100755 recipes/trdx-config/files/nvrm_daemon

diff --git a/recipes/trdx-config/files/nvrm_daemon b/recipes/trdx-config/files/nvrm_daemon
deleted file mode 100755
index c3a9268..0000000
--- a/recipes/trdx-config/files/nvrm_daemon
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-#
-# Start or stop the Nvidia Ressource Manager Daemon.
-#
-# Based on debian apmd scripts
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-
-[ -f /etc/default/rcS ] && . /etc/default/rcS
-
-case "$1" in
-    start)
-	echo -n "Nvidia Ressource Manager Daemon: "
-	start-stop-daemon -S -x /bin/nvrm_daemon -- --daemon &
-	if [ $? = 0 ]; then
-	    echo "nvrm_daemon."
-	else
-	    echo "(failed.)"
-	fi
-	;;
-    stop)
-	echo -n "Nvidia Ressource Manager Daemon: "
-	start-stop-daemon -K -x /bin/nvrm_daemon
-	echo "nvrm_daemon."
-	;;
-    restart|force-reload) 
-	$0 stop
-	$0 start
-	exit
-	;;
-    *)
-	echo "Usage: /etc/init.d/nvrm_daemon {start|stop|restart|force-reload}"
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/recipes/trdx-config/trdx-config.bb b/recipes/trdx-config/trdx-config.bb
index 097fb78..2a4d772 100644
--- a/recipes/trdx-config/trdx-config.bb
+++ b/recipes/trdx-config/trdx-config.bb
@@ -1,35 +1,29 @@
 DESCRIPTION = "setup files"
 LICENSE = "Public Domain"
-PR = "r4"
+PR = "r5"
 
 inherit update-rc.d
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 SRC_URI =  "	file://inittab \
-		file://nvrm_daemon \
 		file://udev-late-mount \
 		file://COPYING \
-            	"
+	   "
 LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING;md5=1c3a7fb45253c11c74434676d84fe7dd"
 
-PACKAGES = "${PN} ${PN}-udev-late-mount"
+PACKAGES = "${PN}"
 
-FILES_${PN}-udev-late-mount = "${sysconfdir}/init.d/udev-late-mount"
-FILES_${PN}                 = "${sysconfdir}/inittab ${sysconfdir}/init.d/nvrm_daemon"
+FILES_${PN} += "${sysconfdir}/init.d/udev-late-mount"
 
 DEPENDS_${PN} += "update-rc.d"
-RDEPENDS_${PN} += "update-rc.d ${PN}-udev-late-mount"
+RDEPENDS_${PN} += "update-rc.d"
 
 do_install () {
 	install -d ${D}${sysconfdir}/init.d
 	install -m 0644 ${WORKDIR}/inittab ${D}${sysconfdir}
-	install -m 0755 ${WORKDIR}/nvrm_daemon ${D}${sysconfdir}init.d
 	install -m 0755 ${WORKDIR}/udev-late-mount ${D}${sysconfdir}/init.d
 }
 
-INITSCRIPT_PACKAGES = "${PN} ${PN}-udev-late-mount"
-INITSCRIPT_NAME_${PN} = "nvrm_daemon"
-INITSCRIPT_PARAMS_${PN} = "defaults 91"
-INITSCRIPT_NAME_${PN}-udev-late-mount = "udev-late-mount"
-INITSCRIPT_PARAMS_${PN}-udev-late-mount = "defaults 60"
+INITSCRIPT_NAME = "udev-late-mount"
+INITSCRIPT_PARAMS = "defaults 60"
-- 
cgit v1.2.3