From: chang Date: Tue, 8 Jan 2013 01:03:31 +0000 (+0900) Subject: remove xinetd, systemd. X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus;a=commitdiff_plain;h=885cbc7687dbdea351756ed0ce56b73b0694ae2d remove xinetd, systemd. --- diff --git a/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd_2.3.5.bb b/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd_2.3.5.bb index 5125843..22397c4 100644 --- a/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd_2.3.5.bb +++ b/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd_2.3.5.bb @@ -5,13 +5,10 @@ LICENSE = "GPL-2.0-with-OpenSSL-exception" LIC_FILES_CHKSUM = "file://COPYING;md5=a6067ad950b28336613aed9dd47b1271" DEPENDS = "libcap openssl" DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -PR = "r3" +PR = "r4" SRC_URI = " \ https://security.appspot.com/downloads/${BP}.tar.gz \ - file://vsftpd@.service \ - file://vsftpd.socket \ - file://vsftpd.xinetd.in \ file://01-builddefs.patch \ file://02-config.patch \ file://03-db-doc.patch \ @@ -28,7 +25,7 @@ SRC_URI[sha256sum] = "d87ee2987df8f03e1dbe294905f7907b2798deb89c67ca965f6e2f6087 S = "${WORKDIR}/${BP}" -inherit systemd useradd xinetd +inherit useradd CFLAGS = "${TARGET_CFLAGS}" CFLAGS += "-DVSF_BUILD_SSL=1" @@ -86,15 +83,7 @@ do_install() { install -d ${D}${mandir}/man5 install -m 644 vsftpd.conf.5 ${D}${mandir}/man5/vsftpd.conf.5 install -d ${D}${SECURE_CHROOT_DIR} - install -d ${D}${systemd_unitdir}/system - ln -sf /dev/null ${D}${systemd_unitdir}/system/vsftpd.service } -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE_${PN}-systemd = "vsftpd.socket" - USERADD_PACKAGES = "${PN}" USERADD_PARAM_${PN} = "--home-dir ${SECURE_CHROOT_DIR} --no-create-home --system --shell /bin/false --user-group vsftpd" - -XINETD_PACKAGES = "${PN}-xinetd" -XINETD_SERVICE_${PN}-xinetd = "vsftpd" diff --git a/meta-openvuplus/recipes-core/busybox/busybox-1.19.4/defconfig b/meta-openvuplus/recipes-core/busybox/busybox-1.19.4/defconfig index 76331f1..be2e745 100644 --- a/meta-openvuplus/recipes-core/busybox/busybox-1.19.4/defconfig +++ b/meta-openvuplus/recipes-core/busybox/busybox-1.19.4/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.19.4 -# Thu Nov 15 19:28:47 2012 +# Mon Jan 7 17:03:29 2013 # CONFIG_HAVE_DOT_CONFIG=y @@ -778,13 +778,13 @@ CONFIG_FEATURE_IFUPDOWN_IPV4=y CONFIG_FEATURE_IFUPDOWN_IPV6=y CONFIG_FEATURE_IFUPDOWN_MAPPING=y # CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set -# CONFIG_INETD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set -# CONFIG_FEATURE_INETD_RPC is not set +CONFIG_INETD=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN=y +CONFIG_FEATURE_INETD_RPC=y CONFIG_IP=y CONFIG_FEATURE_IP_ADDRESS=y CONFIG_FEATURE_IP_LINK=y diff --git a/meta-openvuplus/recipes-core/busybox/busybox-1.19.4/inetd b/meta-openvuplus/recipes-core/busybox/busybox-1.19.4/inetd new file mode 100755 index 0000000..cf50bcd --- /dev/null +++ b/meta-openvuplus/recipes-core/busybox/busybox-1.19.4/inetd @@ -0,0 +1,33 @@ +#!/bin/sh +# +# start/stop inetd super server. + +if ! [ -x /usr/sbin/inetd ]; then + exit 0 +fi + +case "$1" in + start) + echo -n "Starting internet superserver:" + echo -n " inetd" ; start-stop-daemon -S -x /usr/sbin/inetd > /dev/null + echo "." + ;; + stop) + echo -n "Stopping internet superserver:" + echo -n " inetd" ; start-stop-daemon -K -x /usr/sbin/inetd > /dev/null + echo "." + ;; + restart) + echo -n "Restarting internet superserver:" + echo -n " inetd " + killall -HUP inetd + echo "." + ;; + *) + echo "Usage: /etc/init.d/inetd {start|stop|restart}" + exit 1 + ;; +esac + +exit 0 + diff --git a/meta-openvuplus/recipes-core/busybox/busybox-1.19.4/inetd.conf b/meta-openvuplus/recipes-core/busybox/busybox-1.19.4/inetd.conf new file mode 100644 index 0000000..bafaf40 --- /dev/null +++ b/meta-openvuplus/recipes-core/busybox/busybox-1.19.4/inetd.conf @@ -0,0 +1,23 @@ +# /etc/inetd.conf: see inetd(8) for further informations. +# +# Internet server configuration database +# +# If you want to disable an entry so it isn't touched during +# package updates just comment it out with a single '#' character. +# +# +# +#:INTERNAL: Internal services +#echo stream tcp nowait root internal +#echo dgram udp wait root internal +#chargen stream tcp nowait root internal +#chargen dgram udp wait root internal +#discard stream tcp nowait root internal +#discard dgram udp wait root internal +#daytime stream tcp nowait root internal +#daytime dgram udp wait root internal +#time stream tcp nowait root internal +#time dgram udp wait root internal +ftp stream tcp nowait root /usr/sbin/vsftpd vsftpd +telnet stream tcp nowait root /usr/sbin/telnetd telnetd +8001 stream tcp nowait root /usr/bin/streamproxy streamproxy diff --git a/meta-openvuplus/recipes-core/busybox/busybox_1.19.4.bbappend b/meta-openvuplus/recipes-core/busybox/busybox_1.19.4.bbappend index ac5052b..5c0775b 100644 --- a/meta-openvuplus/recipes-core/busybox/busybox_1.19.4.bbappend +++ b/meta-openvuplus/recipes-core/busybox/busybox_1.19.4.bbappend @@ -1,8 +1,6 @@ -PR .= "-vuplus3" +PR .= "-vuplus4" -SRC_URI += "file://busybox-telnetd.xinetd.in \ - file://busybox-telnetd@.service \ - file://busybox-telnetd.socket \ +SRC_URI += " \ file://0001-ifupdown-support-post-up-pre-down-hooks.patch \ file://0002-ifupdown-code-shrink.patch \ file://0003-ifupdown-remove-interface-from-state_list-if-iface_u.patch \ @@ -13,22 +11,26 @@ SRC_URI += "file://busybox-telnetd.xinetd.in \ file://0002-Create-and-use-our-own-copy-of-linux-ext2_fs.h.patch \ file://0003-Drop-include-bb_linux_ext2_fs.h-use-existing-e2fspro.patch \ file://mount_single_uuid.patch \ + file://inetd \ + file://inetd.conf \ " -inherit systemd xinetd +DEPENDS += "mtd-utils" + +PACKAGES =+ "${PN}-inetd" +INITSCRIPT_PACKAGES += "${PN}-inetd" +INITSCRIPT_NAME_${PN}-inetd = "inetd.${BPN}" +CONFFILES_${PN}-inetd = "${sysconfdir}/inetd.conf" +FILES_${PN}-inetd = "${sysconfdir}/init.d/inetd.${BPN} ${sysconfdir}/inetd.conf" +RDEPENDS_${PN}-inetd += "${PN}" + +RRECOMMENDS_${PN} += "${PN}-inetd" do_install_append() { if grep -q "CONFIG_CRONTAB=y" ${WORKDIR}/defconfig; then install -d ${D}${sysconfdir}/cron/crontabs fi - install -d ${D}${systemd_unitdir}/system - ln -sf /dev/null ${D}${systemd_unitdir}/system/busybox-telnetd.service } FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:" -SYSTEMD_PACKAGES += "${PN}-systemd" -SYSTEMD_SERVICE_${PN}-systemd = "busybox-telnetd.socket" - -XINETD_PACKAGES = "${PN}-xinetd" -XINETD_SERVICE_${PN}-xinetd = "busybox-telnetd" diff --git a/meta-openvuplus/recipes-core/dropbear/dropbear_2012.55.bbappend b/meta-openvuplus/recipes-core/dropbear/dropbear_2012.55.bbappend deleted file mode 100644 index 21b00d1..0000000 --- a/meta-openvuplus/recipes-core/dropbear/dropbear_2012.55.bbappend +++ /dev/null @@ -1,15 +0,0 @@ -PR .= "-vuplus0" - -SRC_URI += "file://dropbear.xinetd.in" - -inherit xinetd - -do_install_append() { - install -d ${D}${sysconfdir}/default - echo 'DAEMON="${base_bindir}/true"' >> ${D}${sysconfdir}/default/dropbear -} - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -XINETD_PACKAGES = "${PN}-xinetd" -XINETD_SERVICE_${PN}-xinetd = "dropbear" diff --git a/meta-openvuplus/recipes-core/tasks/task-core-boot.bb b/meta-openvuplus/recipes-core/tasks/task-core-boot.bb index a4c390b..01e0381 100644 --- a/meta-openvuplus/recipes-core/tasks/task-core-boot.bb +++ b/meta-openvuplus/recipes-core/tasks/task-core-boot.bb @@ -1,7 +1,6 @@ -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" RDEPENDS_${PN} = " \ - busybox-xinetd \ " require task-core-boot.inc diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-streamproxy.bb b/meta-openvuplus/recipes-vuplus/enigma2/enigma2-streamproxy.bb index 07c284d..49e3032 100644 --- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-streamproxy.bb +++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2-streamproxy.bb @@ -2,23 +2,9 @@ SUMMARY = "streamproxy manages streaming data to a PC using enigma2" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" SRCREV = "37a3f198a22d90cdfebf07cf56409cf93a4e74ba" -PR = "r4" - -SRC_URI = "file://streamproxy.xinetd.in \ - file://streamproxy@.service \ - file://streamproxy.socket" +PR = "r5" SCHWERKRAFT_PROJECT = "streamproxy" -inherit autotools schwerkraft-git systemd xinetd - -do_install_append() { - install -d ${D}${systemd_unitdir}/system - ln -sf /dev/null ${D}${systemd_unitdir}/system/streamproxy.service -} - -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE_${PN}-systemd = "streamproxy.socket" +inherit autotools schwerkraft-git -XINETD_PACKAGES = "${PN}-xinetd" -XINETD_SERVICE_${PN}-xinetd = "streamproxy" diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-transtreamproxy.bb b/meta-openvuplus/recipes-vuplus/enigma2/enigma2-transtreamproxy.bb index af394f3..cbe06f6 100644 --- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-transtreamproxy.bb +++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2-transtreamproxy.bb @@ -2,27 +2,18 @@ SUMMARY = "streamproxy manages streaming data to a Mobile device using enigma2" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" SRCREV = "37a3f198a22d90cdfebf07cf56409cf93a4e74ba" -PR = "r4" +PR = "r5" -SRC_URI = "file://transtreamproxy.xinetd.in \ - file://transtreamproxy@.service \ - file://transtreamproxy.socket \ +SRC_URI = " \ file://transcoding.patch;patch=1;pnum=1 \ " SCHWERKRAFT_PROJECT = "streamproxy" -inherit autotools schwerkraft-git systemd xinetd +inherit autotools schwerkraft-git do_install() { install -d ${D}/usr/bin install -m 0755 ${S}/src/streamproxy ${D}/usr/bin/transtreamproxy - install -d ${D}${systemd_unitdir}/system - ln -sf /dev/null ${D}${systemd_unitdir}/system/transtreamproxy.service } -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE_${PN}-systemd = "transtreamproxy.socket" - -XINETD_PACKAGES = "${PN}-xinetd" -XINETD_SERVICE_${PN}-xinetd = "transtreamproxy" diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb index 1089994..6c30b5b 100644 --- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb +++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb @@ -82,7 +82,7 @@ RDEPENDS_enigma2-plugin-systemplugins-3gmodemmanager = "ppp usb-modeswitch usb-m RDEPENDS_enigma2-plugin-systemplugins-devicemanager = "util-linux-blkid ntfs-3g dosfstools" PN = "enigma2" -PR = "r2" +PR = "r3" SRCDATE = "20121128" #SRCDATE is NOT used by git to checkout a specific revision @@ -106,7 +106,7 @@ SRC_URI = "git://code.vuplus.com/git/dvbapp.git;protocol=http;branch=${BRANCH};t file://enigma2_vuplus_vfd_mode.patch;patch=1;pnum=1 \ file://enigma2_vuplus_addlibpythondeps.patch;patch=1;pnum=1 \ file://enigma2_vuplus_pluginbrowser.patch;striplevel=1 \ - file://enigma2_vuplus_transcodingsetup_xinetd.patch;striplevel=1 \ + file://enigma2_vuplus_transcodingsetup_inetd.patch;striplevel=1 \ file://MyriadPro-Regular.otf \ file://MyriadPro-Semibold.otf \ file://MyriadPro-SemiboldIt.otf \ diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_transcodingsetup_inetd.patch b/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_transcodingsetup_inetd.patch new file mode 100644 index 0000000..3900484 --- /dev/null +++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_transcodingsetup_inetd.patch @@ -0,0 +1,53 @@ +diff --git a/lib/python/Plugins/SystemPlugins/TransCodingSetup/plugin.py b/lib/python/Plugins/SystemPlugins/TransCodingSetup/plugin.py +index 09ec093..e46422a 100755 +--- a/lib/python/Plugins/SystemPlugins/TransCodingSetup/plugin.py ++++ b/lib/python/Plugins/SystemPlugins/TransCodingSetup/plugin.py +@@ -37,10 +37,10 @@ class TranscodingSetupInit: + + def setTranscoding(self, transcoding, port): + if not self.getModel(): +- print "This plugin is only supported for solo2/duo2." ++# print "This plugin is only supported for solo2/duo2." + return -8 + if transcoding not in ["enabled","disabled"] or port not in ["8001","8002"]: +- print "Input error." ++# print "Input error." + return -7 + if not fileExists("/proc/stb/encoder/enable"): + return -1 +@@ -57,7 +57,7 @@ class TranscodingSetupInit: + return res + + def setEncoder(self,mode = "disabled"): +- print " set encoder : %s" % mode ++# print " set encoder : %s" % mode + mode = mode.strip(' ').strip('\n') + try: + fd = open("/proc/stb/encoder/enable",'r') +@@ -79,7 +79,7 @@ class TranscodingSetupInit: + return -1 + + def setPort(self, port = "8001"): +- print " set port : %s" % port ++# print " set port : %s" % port + try: + fp = file('/etc/inetd.conf', 'r') + datas = fp.readlines() +@@ -115,6 +115,8 @@ class TranscodingSetupInit: + def inetdRestart(self): + if fileExists("/etc/init.d/inetd"): + os_system("/etc/init.d/inetd restart") ++ elif fileExists("/etc/init.d/inetd.busybox"): ++ os_system("/etc/init.d/inetd.busybox restart") + + def getModel(self): + if fileExists("/proc/stb/info/vumodel"): +@@ -182,7 +184,7 @@ class TranscodingSetup(Screen,ConfigListScreen, TranscodingSetupInit): + def keySave(self): + transcoding = config.plugins.transcodingsetup.transcoding.value + port = config.plugins.transcodingsetup.port.value +- print " Transcoding %s(port : %s)"%(transcoding, port) ++# print " Transcoding %s(port : %s)"%(transcoding, port) + ret = self.setupTranscoding(transcoding, port) + if ret is not None and ret <0 : + self.resetConfig() diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_transcodingsetup_xinetd.patch b/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_transcodingsetup_xinetd.patch deleted file mode 100644 index 77044d1..0000000 --- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_transcodingsetup_xinetd.patch +++ /dev/null @@ -1,177 +0,0 @@ -diff --git a/lib/python/Plugins/SystemPlugins/TransCodingSetup/plugin.py b/lib/python/Plugins/SystemPlugins/TransCodingSetup/plugin.py -index 09ec093..f73da01 100755 ---- a/lib/python/Plugins/SystemPlugins/TransCodingSetup/plugin.py -+++ b/lib/python/Plugins/SystemPlugins/TransCodingSetup/plugin.py -@@ -7,7 +7,7 @@ from Components.Sources.StaticText import StaticText - from Plugins.Plugin import PluginDescriptor - from Tools.Directories import fileExists - from enigma import eTimer --from os import system as os_system -+from os import system as os_system, popen as os_popen - from __init__ import _ - - config.plugins.transcodingsetup = ConfigSubsection() -@@ -15,13 +15,17 @@ config.plugins.transcodingsetup.transcoding = ConfigSelection(default = "disable - config.plugins.transcodingsetup.port = ConfigSelection(default = "8002", choices = [ ("8001", "8001"), ("8002", "8002")] ) - - error_msg ={ -- -1 : "File not exist - /proc/stb/encoder/enable.", -- -2 : "File not exist - /etc/inetd.conf.", -- -3 : "File open error - /proc/stb/encoder/enable.", -- -4 : "File open error - /etc/inetd.conf.", -- -5 : "Set encoder error.", -- -6 : "Set port error.", -- -7 : "Setting value is incorrect." -+ -1 : "File not exist - /proc/stb/encoder/enable", -+ -2 : "File not exist - /etc/inetd.conf", -+ -3 : "File open error - /proc/stb/encoder/enable", -+ -4 : "File open error - /etc/inetd.conf", -+ -5 : "Set encoder error", -+ -6 : "Set port error", -+ -7 : "Setting value is incorrect", -+ -8 : "File not exist - /etc/xinetd.d/streamproxy", -+ -9 : "File not exist - /etc/xinetd.d/transtreamproxy", -+ -10 : "File open error - /etc/xinetd.d/streamproxy", -+ -11 : "File open error - /etc/xinetd.d/transtreamproxy", - } - class TranscodingSetupInit: - def __init__(self): -@@ -44,8 +48,6 @@ class TranscodingSetupInit: - return -7 - if not fileExists("/proc/stb/encoder/enable"): - return -1 -- elif not fileExists("/etc/inetd.conf"): -- return -2 - if self.setEncoder(transcoding) < 0: - return -5 - res = self.setPort(port) -@@ -53,11 +55,11 @@ class TranscodingSetupInit: - self.setEncoder(self.transcoding_old) - return res - else: -- self.inetdRestart() -+ self.restartDaemon() - return res - - def setEncoder(self,mode = "disabled"): -- print " set encoder : %s" % mode -+# print " set encoder : %s" % mode - mode = mode.strip(' ').strip('\n') - try: - fd = open("/proc/stb/encoder/enable",'r') -@@ -78,14 +80,29 @@ class TranscodingSetupInit: - # print "setEncoder exception error" - return -1 - -+ def isXinetd(self): -+ ps_xinetd = os_popen('ps -ef | grep xinetd | grep -v grep').read() -+ if ps_xinetd.strip() == '': -+ return False -+ else: -+ return True -+ - def setPort(self, port = "8001"): -- print " set port : %s" % port -+# print " set port : %s" % port -+ if self.isXinetd(): -+ res = self.setPort_xinetd(port) -+ else: -+ res = self.setPort_inetd(port) -+ return res -+ -+ def setPort_inetd(self, port = "8001"): -+ if not fileExists("/etc/inetd.conf"): -+ return -2 - try: - fp = file('/etc/inetd.conf', 'r') - datas = fp.readlines() - fp.close() - except: --# print "file open error, inetd.conf!" - return -4 - try: - newdatas="" -@@ -112,9 +129,65 @@ class TranscodingSetupInit: - return -6 - return 0 - -- def inetdRestart(self): -- if fileExists("/etc/init.d/inetd"): -- os_system("/etc/init.d/inetd restart") -+ def setPort_xinetd(self, port = "8001"): -+ if not fileExists("/etc/xinetd.d/streamproxy") : -+ return -8 -+ if not fileExists("/etc/xinetd.d/transtreamproxy"): -+ return -9 -+ -+ try: -+ fp_s = file('/etc/xinetd.d/streamproxy') -+ data_s = fp_s.readlines() -+ fp_s.close() -+ except: -+ return -10 -+ -+ try: -+ fp_t = file('/etc/xinetd.d/transtreamproxy') -+ data_t = fp_t.readlines() -+ fp_t.close() -+ except: -+ return -11 -+# fix xinetd port -+ try: -+ if port == "8001": -+ port_s = "8002" -+ port_t = "8001" -+ else: -+ port_s = "8001" -+ port_t = "8002" -+ -+ newdata_s="" -+ for line in data_s: -+ if line.find("port") != -1: -+ line = "\tport = %s\n"%port_s -+ newdata_s+=line -+ -+ newdata_t="" -+ for line in data_t: -+ if line.find("port") != -1: -+ line = "\tport = %s\n"%port_t -+ newdata_t+=line -+ -+ fd = file("/etc/xinetd.d/streamproxy",'w') -+ fd.write(newdata_s) -+ fd.close() -+ -+ fd = file("/etc/xinetd.d/transtreamproxy",'w') -+ fd.write(newdata_t) -+ fd.close() -+ -+ except: -+ return -6 -+ return 0 -+ -+ def restartDaemon(self): -+ if self.isXinetd(): -+ if fileExists("/etc/init.d/xinetd"): -+ os_system("/etc/init.d/xinetd restart") -+ else: -+ if fileExists("/etc/init.d/inetd"): -+ os_system("/etc/init.d/inetd restart") - - def getModel(self): - if fileExists("/proc/stb/info/vumodel"): -@@ -182,12 +255,12 @@ class TranscodingSetup(Screen,ConfigListScreen, TranscodingSetupInit): - def keySave(self): - transcoding = config.plugins.transcodingsetup.transcoding.value - port = config.plugins.transcodingsetup.port.value -- print " Transcoding %s(port : %s)"%(transcoding, port) -+# print " Transcoding %s(port : %s)"%(transcoding, port) - ret = self.setupTranscoding(transcoding, port) - if ret is not None and ret <0 : - self.resetConfig() - global error_msg -- self.session.openWithCallback(self.close, MessageBox, _("Failed, Encoder %s\n(%s).")%(transcoding, error_msg[ret]), MessageBox.TYPE_ERROR) -+ self.session.openWithCallback(self.close, MessageBox, _("Failed, Encoder %s.\n(%s)")%(transcoding, error_msg[ret]), MessageBox.TYPE_ERROR) - else: - self.saveAll() - if transcoding == "enabled" and port == "8001" : diff --git a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-base.bb b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-base.bb index 248b97d..f60f7a0 100644 --- a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-base.bb +++ b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-base.bb @@ -1,8 +1,6 @@ -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" RDEPENDS_${PN} = " \ - dropbear-xinetd \ - vsftpd-xinetd \ " require task-vuplus-base.inc diff --git a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.bb b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.bb index 4db6693..b3cbd4f 100644 --- a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.bb +++ b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-enigma2.bb @@ -1,8 +1,6 @@ -PR = "${INC_PR}.3" +PR = "${INC_PR}.4" RDEPENDS_${PN} = " \ - enigma2-streamproxy-xinetd \ - enigma2-transtreamproxy-xinetd \ " require task-vuplus-enigma2.inc