summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2012-07-19 18:03:49 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2012-07-19 18:03:49 +0200
commit2e12e224f0c9c65167e4548d6293f0807c054ace (patch)
tree01e14df9b97d44399334be2c74796e48143c2c4b
parentc65e0f04c1984d823d4c49cfee6723a167afde7f (diff)
remove nv odm kit, including init.d/nvrm_daemon script
-rwxr-xr-xrecipes/trdx-config/files/nvrm_daemon37
-rw-r--r--recipes/trdx-config/trdx-config.bb20
-rwxr-xr-xrecipes/trdx-odm/files/libnvodm_disp.so.allmodesbin54748 -> 0 bytes
-rwxr-xr-xrecipes/trdx-odm/files/libnvodm_disp.so.vgaonlybin53508 -> 0 bytes
-rwxr-xr-xrecipes/trdx-odm/files/libnvodm_dtvtuner.sobin12932 -> 0 bytes
-rwxr-xr-xrecipes/trdx-odm/files/libnvodm_hdmi.sobin2660 -> 0 bytes
-rwxr-xr-xrecipes/trdx-odm/files/libnvodm_imager.sobin119432 -> 0 bytes
-rwxr-xr-xrecipes/trdx-odm/files/libnvodm_misc.sobin5884 -> 0 bytes
-rwxr-xr-xrecipes/trdx-odm/files/libnvodm_query.sobin37028 -> 0 bytes
-rw-r--r--recipes/trdx-odm/trdx-odm.bb31
10 files changed, 7 insertions, 81 deletions
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"
diff --git a/recipes/trdx-odm/files/libnvodm_disp.so.allmodes b/recipes/trdx-odm/files/libnvodm_disp.so.allmodes
deleted file mode 100755
index 523f873..0000000
--- a/recipes/trdx-odm/files/libnvodm_disp.so.allmodes
+++ /dev/null
Binary files differ
diff --git a/recipes/trdx-odm/files/libnvodm_disp.so.vgaonly b/recipes/trdx-odm/files/libnvodm_disp.so.vgaonly
deleted file mode 100755
index 463f121..0000000
--- a/recipes/trdx-odm/files/libnvodm_disp.so.vgaonly
+++ /dev/null
Binary files differ
diff --git a/recipes/trdx-odm/files/libnvodm_dtvtuner.so b/recipes/trdx-odm/files/libnvodm_dtvtuner.so
deleted file mode 100755
index 7d2d744..0000000
--- a/recipes/trdx-odm/files/libnvodm_dtvtuner.so
+++ /dev/null
Binary files differ
diff --git a/recipes/trdx-odm/files/libnvodm_hdmi.so b/recipes/trdx-odm/files/libnvodm_hdmi.so
deleted file mode 100755
index 9a46f28..0000000
--- a/recipes/trdx-odm/files/libnvodm_hdmi.so
+++ /dev/null
Binary files differ
diff --git a/recipes/trdx-odm/files/libnvodm_imager.so b/recipes/trdx-odm/files/libnvodm_imager.so
deleted file mode 100755
index a81419f..0000000
--- a/recipes/trdx-odm/files/libnvodm_imager.so
+++ /dev/null
Binary files differ
diff --git a/recipes/trdx-odm/files/libnvodm_misc.so b/recipes/trdx-odm/files/libnvodm_misc.so
deleted file mode 100755
index 3c2d567..0000000
--- a/recipes/trdx-odm/files/libnvodm_misc.so
+++ /dev/null
Binary files differ
diff --git a/recipes/trdx-odm/files/libnvodm_query.so b/recipes/trdx-odm/files/libnvodm_query.so
deleted file mode 100755
index 4c06f3e..0000000
--- a/recipes/trdx-odm/files/libnvodm_query.so
+++ /dev/null
Binary files differ
diff --git a/recipes/trdx-odm/trdx-odm.bb b/recipes/trdx-odm/trdx-odm.bb
deleted file mode 100644
index c5df6d6..0000000
--- a/recipes/trdx-odm/trdx-odm.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-DESCRIPTION = "binary files"
-LICENSE = "CLOSED"
-PR = "r1"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-SRC_URI = " \
- file://libnvodm_disp.so.vgaonly \
- file://libnvodm_disp.so.allmodes \
- file://libnvodm_dtvtuner.so \
- file://libnvodm_hdmi.so \
- file://libnvodm_imager.so \
- file://libnvodm_misc.so \
- file://libnvodm_query.so \
- "
-
-PACKAGES = "${PN}"
-
-FILES_${PN} += "/usr/lib/* "
-
-#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"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-do_install () {
- install -d ${D}/usr/lib
- install -m 0755 ${WORKDIR}/lib* ${D}/usr/lib/
- cd ${D}/usr/lib/ ; ln -s libnvodm_disp.so.vgaonly libnvodm_disp.so
-}