diff --git a/make/target-blobs.mk b/make/target-blobs.mk index 0add7833..af58e834 100644 --- a/make/target-blobs.mk +++ b/make/target-blobs.mk @@ -262,10 +262,10 @@ endif vuplus-platform-util: $(ARCHIVE)/$(BOXMODEL-PLATFORM-UTIL_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(BOXMODEL-PLATFORM-UTIL_TMP) $(UNTAR)/$(BOXMODEL-PLATFORM-UTIL_SOURCE) - $(INSTALL_EXEC) $(BUILD_TMP)/$(BOXMODEL-PLATFORM-UTIL_TMP)/* $(TARGET_BIN_DIR) - $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/$(BOXMODEL)-platform-util.init $(TARGET_DIR)/etc/init.d/vuplus-platform-util + $(INSTALL_EXEC) -D $(BUILD_TMP)/$(BOXMODEL-PLATFORM-UTIL_TMP)/* $(TARGET_DIR)/usr/bin + $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/vuplus-platform-util.init $(TARGET_DIR)/etc/init.d/vuplus-platform-util ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vuduo4k)) - $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/bp3flash.sh $(TARGET_DIR)/bin/bp3flash.sh + $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/bp3flash.sh $(TARGET_DIR)/usr/bin/bp3flash.sh endif $(REMOVE)/$(BOXMODEL-PLATFORM-UTIL_TMP) $(TOUCH) diff --git a/skel-root/general/scripts/vuduo4k-platform-util.init b/skel-root/general/scripts/vuplus-platform-util.init similarity index 56% rename from skel-root/general/scripts/vuduo4k-platform-util.init rename to skel-root/general/scripts/vuplus-platform-util.init index 057402af..4efd0b4b 100644 --- a/skel-root/general/scripts/vuduo4k-platform-util.init +++ b/skel-root/general/scripts/vuplus-platform-util.init @@ -4,21 +4,27 @@ if [ -e /sys/class/net/sys0 ]; then ifconfig sys0 up fi +DRV_PATH=/lib/modules/`uname -r`/extra + +if [ ! -e $DRV_PATH/dvb-bcm.ko ]; then + cd $DRV_PATH + ln -s dvb-bcm*.ko dvb-bcm.ko +fi + case "$1" in start) - # first boot? - [ -f /etc/dropbear/dropbear_rsa_host_key ] - echo -n "Starting vuplus-platform-util" + echo -n "Starting vuplus-platform-util" if [ ! -e /dev/brcm0 ]; then - /bin/bp3flash.sh 2>/dev/null - DRV_PATH=/lib/modules/`uname -r`/extra + if [ -x /usr/bin/bp3flash.sh ]; then + /usr/bin/bp3flash.sh 2>/dev/null + fi insmod $DRV_PATH/procmk.ko insmod $DRV_PATH/bcm_event.ko insmod $DRV_PATH/dvb_base.ko - start-stop-daemon --start --quiet --exec /bin/dvb_server -- & + start-stop-daemon --start --quiet --exec /usr/bin/dvb_server -- & mknod -m a=rw /dev/brcm0 c 30 0 - start-stop-daemon --start --quiet --exec /bin/init_client $DRV_PATH/dvb-bcm7278.ko $DRV_PATH/brcmfb.ko -- & + start-stop-daemon --start --quiet --exec /usr/bin/init_client $DRV_PATH/dvb-bcm.ko $DRV_PATH/brcmfb.ko -- & fi while [ ! -c /dev/fb0 ]; do diff --git a/skel-root/general/scripts/vusolo4k-platform-util.init b/skel-root/general/scripts/vusolo4k-platform-util.init deleted file mode 100644 index 6eab86c8..00000000 --- a/skel-root/general/scripts/vusolo4k-platform-util.init +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -if [ -e /sys/class/net/sys0 ]; then - ifconfig sys0 up -fi - -case "$1" in - start) - # first boot? - [ -f /etc/dropbear/dropbear_rsa_host_key ] - echo -n "Starting vuplus-platform-util" - if [ ! -e /dev/brcm0 ]; then - DRV_PATH=/lib/modules/`uname -r`/extra - insmod $DRV_PATH/procmk.ko - insmod $DRV_PATH/bcm_event.ko - insmod $DRV_PATH/dvb_base.ko - - start-stop-daemon --start --quiet --exec /bin/dvb_server -- & - mknod -m a=rw /dev/brcm0 c 30 0 - start-stop-daemon --start --quiet --exec /bin/init_client $DRV_PATH/dvb-bcm7376.ko $DRV_PATH/brcmfb.ko -- & - fi - - while [ ! -c /dev/fb0 ]; do - usleep 100000 - done - - if [ -e /bin/initfb ]; then - /bin/initfb $(sed -n 's/osd_resolution=//p' /var/tuxbox/config/neutrino.conf) - fi - - echo "." - ;; - stop) - ;; - restart) - ;; - *) - echo "Usage: /etc/init.d/vuplus-platform-util {start|stop|restart}" - exit 1 -esac - -exit 0 diff --git a/skel-root/general/scripts/vuultimo4k-platform-util.init b/skel-root/general/scripts/vuultimo4k-platform-util.init deleted file mode 100644 index ee7f0123..00000000 --- a/skel-root/general/scripts/vuultimo4k-platform-util.init +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -if [ -e /sys/class/net/sys0 ]; then - ifconfig sys0 up -fi - -case "$1" in - start) - # first boot? - [ -f /etc/dropbear/dropbear_rsa_host_key ] - echo -n "Starting vuplus-platform-util" - if [ ! -e /dev/brcm0 ]; then - DRV_PATH=/lib/modules/`uname -r`/extra - insmod $DRV_PATH/procmk.ko - insmod $DRV_PATH/bcm_event.ko - insmod $DRV_PATH/dvb_base.ko - - start-stop-daemon --start --quiet --exec /bin/dvb_server -- & - mknod -m a=rw /dev/brcm0 c 30 0 - start-stop-daemon --start --quiet --exec /bin/init_client $DRV_PATH/dvb-bcm7444.ko $DRV_PATH/brcmfb.ko -- & - fi - - while [ ! -c /dev/fb0 ]; do - usleep 100000 - done - - if [ -e /bin/initfb ]; then - /bin/initfb $(sed -n 's/osd_resolution=//p' /var/tuxbox/config/neutrino.conf) - fi - - echo "." - ;; - stop) - ;; - restart) - ;; - *) - echo "Usage: /etc/init.d/vuplus-platform-util {start|stop|restart}" - exit 1 -esac - -exit 0 diff --git a/skel-root/general/scripts/vuuno4k-platform-util.init b/skel-root/general/scripts/vuuno4k-platform-util.init deleted file mode 100644 index 9e0c0ca5..00000000 --- a/skel-root/general/scripts/vuuno4k-platform-util.init +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -if [ -e /sys/class/net/sys0 ]; then - ifconfig sys0 up -fi - -case "$1" in - start) - # first boot? - [ -f /etc/dropbear/dropbear_rsa_host_key ] - echo -n "Starting vuplus-platform-util" - if [ ! -e /dev/brcm0 ]; then - DRV_PATH=/lib/modules/`uname -r`/extra - insmod $DRV_PATH/procmk.ko - insmod $DRV_PATH/bcm_event.ko - insmod $DRV_PATH/dvb_base.ko - - start-stop-daemon --start --quiet --exec /bin/dvb_server -- & - mknod -m a=rw /dev/brcm0 c 30 0 - start-stop-daemon --start --quiet --exec /bin/init_client $DRV_PATH/dvb-bcm7252s.ko $DRV_PATH/brcmfb.ko -- & - fi - - while [ ! -c /dev/fb0 ]; do - usleep 100000 - done - - if [ -e /bin/initfb ]; then - /bin/initfb $(sed -n 's/osd_resolution=//p' /var/tuxbox/config/neutrino.conf) - fi - - echo "." - ;; - stop) - ;; - restart) - ;; - *) - echo "Usage: /etc/init.d/vuplus-platform-util {start|stop|restart}" - exit 1 -esac - -exit 0 diff --git a/skel-root/general/scripts/vuuno4kse-platform-util.init b/skel-root/general/scripts/vuuno4kse-platform-util.init deleted file mode 100644 index f516aced..00000000 --- a/skel-root/general/scripts/vuuno4kse-platform-util.init +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -if [ -e /sys/class/net/sys0 ]; then - ifconfig sys0 up -fi - -case "$1" in - start) - # first boot? - [ -f /etc/dropbear/dropbear_rsa_host_key ] - echo -n "Starting vuplus-platform-util" - if [ ! -e /dev/brcm0 ]; then - DRV_PATH=/lib/modules/`uname -r`/extra - insmod $DRV_PATH/procmk.ko - insmod $DRV_PATH/bcm_event.ko - insmod $DRV_PATH/dvb_base.ko - - start-stop-daemon --start --quiet --exec /bin/dvb_server -- & - mknod -m a=rw /dev/brcm0 c 30 0 - start-stop-daemon --start --quiet --exec /bin/init_client $DRV_PATH/dvb-bcm7252sse.ko $DRV_PATH/brcmfb.ko -- & - fi - - while [ ! -c /dev/fb0 ]; do - usleep 100000 - done - - if [ -e /bin/initfb ]; then - /bin/initfb $(sed -n 's/osd_resolution=//p' /var/tuxbox/config/neutrino.conf) - fi - - echo "." - ;; - stop) - ;; - restart) - ;; - *) - echo "Usage: /etc/init.d/vuplus-platform-util {start|stop|restart}" - exit 1 -esac - -exit 0 diff --git a/skel-root/general/scripts/vuzero4k-platform-util.init b/skel-root/general/scripts/vuzero4k-platform-util.init deleted file mode 100644 index bed2051f..00000000 --- a/skel-root/general/scripts/vuzero4k-platform-util.init +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -if [ -e /sys/class/net/sys0 ]; then - ifconfig sys0 up -fi - -case "$1" in - start) - # first boot? - [ -f /etc/dropbear/dropbear_rsa_host_key ] - echo -n "Starting vuplus-platform-util" - if [ ! -e /dev/brcm0 ]; then - DRV_PATH=/lib/modules/`uname -r`/extra - insmod $DRV_PATH/procmk.ko - insmod $DRV_PATH/bcm_event.ko - insmod $DRV_PATH/dvb_base.ko - - start-stop-daemon --start --quiet --exec /bin/dvb_server -- & - mknod -m a=rw /dev/brcm0 c 30 0 - start-stop-daemon --start --quiet --exec /bin/init_client $DRV_PATH/dvb-bcm72604.ko $DRV_PATH/brcmfb.ko -- & - fi - - while [ ! -c /dev/fb0 ]; do - usleep 100000 - done - - if [ -e /bin/initfb ]; then - /bin/initfb $(sed -n 's/osd_resolution=//p' /var/tuxbox/config/neutrino.conf) - fi - - echo "." - ;; - stop) - ;; - restart) - ;; - *) - echo "Usage: /etc/init.d/vuplus-platform-util {start|stop|restart}" - exit 1 -esac - -exit 0