support manual-nameserver.

diff --git a/meta-openvuplus/recipes-connectivity/openresolv/openresolv-3.5.2/000resolvconf.if-up b/meta-openvuplus/recipes-connectivity/openresolv/openresolv-3.5.2/000resolvconf.if-up
new file mode 100644 (file)
index 0000000..f8d079e
--- /dev/null
+++ b/meta-openvuplus/recipes-connectivity/openresolv/openresolv-3.5.2/000resolvconf.if-up
@@ -0,0 +1,22 @@
+#!/bin/sh
+# ifup hook script for resolvconf
+# Written by Roy Marples <roy@marples.name> under the BSD-2 license
+
+[ -x /sbin/resolvconf ] || exit 0
+case "$ADDRFAM" in
+       inet|inet6) : ;;
+       *) exit 0;;
+esac
+
+conf=
+[ -n "$IF_DNS_DOMAIN" ] && conf="${conf}domain $IF_DNS_DOMAIN\n"
+[ -n "$IF_DNS_SEARCH" ] && conf="${conf}search $IF_DNS_SEARCH\n"
+[ -n "$IF_DNS_SORTLIST" ] && conf="${conf}sortlist $IF_DNS_SORTLIST\n"
+[ -n "$IF_DNS_OPTIONS" ] && conf="${conf}options $IF_DNS_OPTIONS\n"
+for nameserver in $IF_DNS_NAMESERVERS; do
+       conf="${conf}nameserver $nameserver\n"
+done
+if [ -n "$conf" ]; then
+       conf="# Generated by ifup for $IFACE.$ADDRFAM\n$conf"
+       printf "$conf" | /sbin/resolvconf -a "$IFACE.$ADDRFAM"
+fi

diff --git a/meta-openvuplus/recipes-connectivity/openresolv/openresolv-3.5.2/000resolvconf.ppp.ip-down b/meta-openvuplus/recipes-connectivity/openresolv/openresolv-3.5.2/000resolvconf.ppp.ip-down
new file mode 100644 (file)
index 0000000..b4f26cb
--- /dev/null
+++ b/meta-openvuplus/recipes-connectivity/openresolv/openresolv-3.5.2/000resolvconf.ppp.ip-down
@@ -0,0 +1,6 @@
+#!/bin/sh
+# ppp.ip-down hook script for resolvconf
+# Written by Roy Marples <roy@marples.name> under the BSD-2 license
+
+[ -x /sbin/resolvconf ] || exit 0
+/sbin/resolvconf -f -d "$PPP_IFACE"

diff --git a/meta-openvuplus/recipes-connectivity/openresolv/openresolv-3.5.2/000resolvconf.ppp.ip-up b/meta-openvuplus/recipes-connectivity/openresolv/openresolv-3.5.2/000resolvconf.ppp.ip-up
new file mode 100644 (file)
index 0000000..e2963c0
--- /dev/null
+++ b/meta-openvuplus/recipes-connectivity/openresolv/openresolv-3.5.2/000resolvconf.ppp.ip-up
@@ -0,0 +1,12 @@
+#!/bin/sh
+# ppp.ip-up hook script for resolvconf
+# Written by Roy Marples <roy@marples.name> under the BSD-2 license
+
+[ -x /sbin/resolvconf ] || exit 0
+
+if [ -n "$DNS1" -o -n "$DNS2" ]; then
+       conf="# Generated by ppp.ip-up for $PPP_IFACE\n"
+       [ -n "$DNS1" ] && conf="${conf}nameserver $DNS1\n"
+       [ -n "$DNS2" ] && conf="${conf}nameserver $DNS2\n"
+       printf "$conf" | /sbin/resolvconf -a "$PPP_IFACE"
+fi

diff --git a/meta-openvuplus/recipes-connectivity/openresolv/openresolv-3.5.2/resolvconf.conf b/meta-openvuplus/recipes-connectivity/openresolv/openresolv-3.5.2/resolvconf.conf
new file mode 100644 (file)
index 0000000..e4d177f
--- /dev/null
+++ b/meta-openvuplus/recipes-connectivity/openresolv/openresolv-3.5.2/resolvconf.conf
@@ -0,0 +1 @@
+resolv_conf=/var/run/resolv.conf

diff --git a/meta-openvuplus/recipes-connectivity/openresolv/openresolv-3.5.2/resolvconf.if-down b/meta-openvuplus/recipes-connectivity/openresolv/openresolv-3.5.2/resolvconf.if-down
new file mode 100644 (file)
index 0000000..acba208
--- /dev/null
+++ b/meta-openvuplus/recipes-connectivity/openresolv/openresolv-3.5.2/resolvconf.if-down
@@ -0,0 +1,11 @@
+#!/bin/sh
+# ifdown hook script for resolvconf
+# Written by Roy Marples <roy@marples.name> under the BSD-2 license
+
+[ -x /sbin/resolvconf ] || exit 0
+case "$ADDRFAM" in
+       inet|inet6) : ;;
+       *) exit 0;;
+esac
+[ "$METHOD" = dhcp ] && /sbin/resolvconf -f -d "$IFACE"
+/sbin/resolvconf -f -d "$IFACE.$ADDRFAM"

diff --git a/meta-openvuplus/recipes-connectivity/openresolv/openresolv-3.5.2/volatiles.99_openresolv b/meta-openvuplus/recipes-connectivity/openresolv/openresolv-3.5.2/volatiles.99_openresolv
new file mode 100644 (file)
index 0000000..0c6f514
--- /dev/null
+++ b/meta-openvuplus/recipes-connectivity/openresolv/openresolv-3.5.2/volatiles.99_openresolv
@@ -0,0 +1,2 @@
+# <type> <owner> <group> <mode> <path> <linksource>
+d root root 0755 /var/run/resolvconf none

diff --git a/meta-openvuplus/recipes-connectivity/openresolv/openresolv_3.5.2.bb b/meta-openvuplus/recipes-connectivity/openresolv/openresolv_3.5.2.bb
new file mode 100644 (file)
index 0000000..bfb6c8a
--- /dev/null
+++ b/meta-openvuplus/recipes-connectivity/openresolv/openresolv_3.5.2.bb
@@ -0,0 +1,60 @@
+SUMMARY = "management framework for resolv.conf"
+AUTHOR = "Roy Marples <roy@marples.name>"
+HOMEPAGE = "http://roy.marples.name/projects/openresolv"
+LICENSE = "BSD-2-Clause"
+LIC_FILES_CHKSUM = "file://resolvconf.in;beginline=4;endline=26;md5=e962049f535f7385f0f2a0ac9638cd43"
+PR = "r0"
+
+SRC_URI = "http://roy.marples.name/downloads/${BPN}/${BP}.tar.bz2 \
+           file://000resolvconf.if-up \
+           file://000resolvconf.ppp.ip-down \
+           file://000resolvconf.ppp.ip-up \
+           file://resolvconf.conf \
+           file://resolvconf.if-down \
+           file://volatiles.99_openresolv"
+SRC_URI[md5sum] = "76337107ff56d7450d4ed622630c5574"
+SRC_URI[sha256sum] = "4a4cf4ef20a1ce207937fb669bbae43f9db36f6298090b5e074c80ed2fe4a996"
+
+inherit allarch
+
+do_configure() {
+        echo "SYSCONFDIR=${sysconfdir}" > config.mk
+        echo "SBINDIR=${base_sbindir}" >> config.mk
+        echo "LIBEXECDIR=/lib/resolvconf" >> config.mk
+        echo "VARDIR=${localstatedir}/run/resolvconf" >> config.mk
+        echo "MANDIR=${mandir}" >> config.mk
+        echo "RCDIR=${sysconfdir}/init.d" >> config.mk
+        echo "RESTARTCMD=if ${sysconfdir}/init.d/\1 status >/dev/null 2>\&1; then ${sysconfdir}/init.d/\1 restart; fi" >> config.mk
+}
+do_install() {
+        oe_runmake "DESTDIR=${D}" install
+        install -d ${D}${sysconfdir}
+        install -m 0644 ${WORKDIR}/resolvconf.conf ${D}${sysconfdir}/resolvconf.conf
+        install -d ${D}${sysconfdir}/default/volatiles
+        install -m 0644 ${WORKDIR}/volatiles.99_openresolv ${D}${sysconfdir}/default/volatiles/99_openresolv
+        install -d ${D}${sysconfdir}/network/if-down.d
+        install -m 0755 ${WORKDIR}/resolvconf.if-down ${D}${sysconfdir}/network/if-down.d/resolvconf
+        install -d ${D}${sysconfdir}/network/if-up.d
+        install -m 0755 ${WORKDIR}/000resolvconf.if-up ${D}${sysconfdir}/network/if-up.d/000resolvconf
+        install -d ${D}${sysconfdir}/ppp/ip-down.d
+        install -m 0755 ${WORKDIR}/000resolvconf.ppp.ip-down ${D}${sysconfdir}/ppp/ip-down.d/000resolvconf
+        install -d ${D}${sysconfdir}/ppp/ip-up.d
+        install -m 0755 ${WORKDIR}/000resolvconf.ppp.ip-up ${D}${sysconfdir}/ppp/ip-up.d/000resolvconf
+}
+
+RPROVIDES_${PN} = "resolvconf"
+
+RCONFLICTS_${PN} = "resolvconf"
+
+FILES_${PN} += "/lib/resolvconf"
+
+pkg_postinst_${PN}() {
+if [ -z "$D" -a -x ${sysconfdir}/init.d/populate-volatile.sh ]; then
+       ${sysconfdir}/init.d/populate-volatile.sh update
+fi
+}
+pkg_postrm_${PN}() {
+if [ -z "$D" -a -x ${sysconfdir}/init.d/populate-volatile.sh ]; then
+       ${sysconfdir}/init.d/populate-volatile.sh update
+fi
+}

diff --git a/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/volatiles b/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/volatiles
deleted file mode 100644 (file)
index c70d637..0000000
--- a/meta-openvuplus/recipes-core/initscripts/initscripts-1.0/volatiles
+++ /dev/null
@@ -1,38 +0,0 @@
-# This configuration file lists filesystem objects that should get verified
-# during startup and be created if missing.
-#
-# Every line must either be a comment starting with #
-# or a definition of format:
-# <type> <owner> <group> <mode> <path> <linksource>
-# where the items are separated by whitespace !
-#
-# <type> : d|f|l : (d)irectory|(f)ile|(l)ink
-#
-# A linking example:
-# l root root 0777 /var/test /tmp/testfile
-# f root root 0644 /var/test none
-#
-# Understanding links:
-# When populate-volatile is to verify/create a directory or file, it will first
-# check it's existence. If a link is found to exist in the place of the target,
-# the path of the target is replaced with the target the link points to.
-# Thus, if a link is in the place to be verified, the object will be created
-# in the place the link points to instead.
-# This explains the order of "link before object" as in the example above, where
-# a link will be created at /var/test pointing to /tmp/testfile and due to this
-# link the file defined as /var/test will actually be created as /tmp/testfile.
-d root root 0755 /var/volatile/cache none
-d root root 1777 /var/volatile/lock none
-d root root 0755 /var/volatile/log none
-d root root 0755 /var/volatile/run none
-d root root 1777 /var/volatile/tmp none
-l root root 0755 /var/cache /var/volatile/cache
-l root root 1777 /var/lock /var/volatile/lock
-l root root 0755 /var/log /var/volatile/log
-l root root 0755 /var/run /var/volatile/run
-l root root 1777 /var/tmp /var/volatile/tmp
-d root root 0755 /var/lock/subsys none
-f root root 0664 /var/log/wtmp none
-f root root 0664 /var/run/utmp none
-
-

diff --git a/meta-openvuplus/recipes-core/initscripts/initscripts_1.0.bbappend b/meta-openvuplus/recipes-core/initscripts/initscripts_1.0.bbappend
index 0059c2d..bc3d6e7 100644 (file)
--- a/meta-openvuplus/recipes-core/initscripts/initscripts_1.0.bbappend
+++ b/meta-openvuplus/recipes-core/initscripts/initscripts_1.0.bbappend
@@ -1,4 +1,4 @@
-PR .= "-vuplus6"
+PR .= "-vuplus7"

 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
 
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
 

diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
index 3db6116..1fe22fc 100644 (file)
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
+++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
@@ -85,7 +85,7 @@ RDEPENDS_enigma2-plugin-systemplugins-3gmodemmanager = "ppp usb-modeswitch usb-m
 RDEPENDS_enigma2-plugin-systemplugins-devicemanager = "util-linux-blkid ntfs-3g dosfstools"
 
 PN = "enigma2"
 RDEPENDS_enigma2-plugin-systemplugins-devicemanager = "util-linux-blkid ntfs-3g dosfstools"
 
 PN = "enigma2"

-PR = "r12"
+PR = "r13"

 
 SRCDATE = "20121128"
 #SRCDATE is NOT used by git to checkout a specific revision
 
 SRCDATE = "20121128"
 #SRCDATE is NOT used by git to checkout a specific revision

diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_skin.patch b/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_skin.patch
index ff3c483..d123bf9 100644 (file)
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_skin.patch
+++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_skin.patch
@@ -80,8 +80,8 @@ index 0000000..20f24d9
 +install_DATA = \
 +      *.png
 diff --git a/data/750S/skin.xml b/data/750S/skin.xml
 +install_DATA = \
 +      *.png
 diff --git a/data/750S/skin.xml b/data/750S/skin.xml

-new file mode 100644
-index 0000000..294cf68
+new file mode 100755
+index 0000000..3148751

 --- /dev/null
 +++ b/data/750S/skin.xml
 @@ -0,0 +1,2852 @@
 --- /dev/null
 +++ b/data/750S/skin.xml
 @@ -0,0 +1,2852 @@


@@ -505,7 +505,6 @@ index 0000000..294cf68
 +      <!-- Adapter setup -->
 +      <screen name="AdapterSetup" position="110,115" size="500,415" title="Network Setup" >
 +              <ePixmap pixmap="750S/buttons/red.png" position="0,375" size="140,40" alphatest="on" />
 +      <!-- Adapter setup -->
 +      <screen name="AdapterSetup" position="110,115" size="500,415" title="Network Setup" >
 +              <ePixmap pixmap="750S/buttons/red.png" position="0,375" size="140,40" alphatest="on" />

-+              <ePixmap pixmap="750S/buttons/blue.png" position="360,375" size="140,40" alphatest="on" />

 +              <widget source="key_red" render="Label" position="20,375" zPosition="1" size="115,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
 +              <widget source="key_blue" render="Label" position="380,375" zPosition="1" size="115,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1" />
 +
 +              <widget source="key_red" render="Label" position="20,375" zPosition="1" size="115,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
 +              <widget source="key_blue" render="Label" position="380,375" zPosition="1" size="115,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1" />
 +


@@ -2864,21 +2863,22 @@ index 0000000..294cf68
 +      <screen name="WlanConfig" position="center,120" size="510,400" title="Wireless Network Configuration..." >
 +              <ePixmap pixmap="750S/buttons/red.png" position="10,360" size="140,40" alphatest="on" />
 +              <ePixmap pixmap="750S/buttons/green.png" position="360,360" size="140,40" alphatest="on" />
 +      <screen name="WlanConfig" position="center,120" size="510,400" title="Wireless Network Configuration..." >
 +              <ePixmap pixmap="750S/buttons/red.png" position="10,360" size="140,40" alphatest="on" />
 +              <ePixmap pixmap="750S/buttons/green.png" position="360,360" size="140,40" alphatest="on" />

-+

 +              <widget source="key_red" render="Label" position="15,360" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1" />
 +              <widget source="key_green" render="Label" position="365,360" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1" />
 +              <widget source="key_red" render="Label" position="15,360" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1" />
 +              <widget source="key_green" render="Label" position="365,360" zPosition="1" size="135,40" font="Regular;20" halign="center" valign="center" transparent="1" />

-+
-+              <widget name="config" position="10,10" backgroundColor="#371e1c1a" transparent="1" size="480,210" scrollbarMode="showOnDemand" />
-+              <ePixmap pixmap="750S/div-h.png" position="0,225" zPosition="1" size="550,2" />
-+
-+              <eLabel text="IP Address : " position="100,250" size="190,21" font="Regular;19" />
-+              <widget source="ipaddress" render="Label" position="300,250" zPosition="1" size="150,26" font="Regular;20" halign="center" valign="center" />
-+              <eLabel text="NetMask : " position="100,275" size="190,21" font="Regular;19" />
-+              <widget source="netmask" render="Label" position="300,275" zPosition="1" size="150,26" font="Regular;20" halign="center" valign="center" />     
-+              <eLabel text="Gateway : " position="100,300" size="190,21" font="Regular;19" />
-+              <widget source="gateway" render="Label" position="300,300" zPosition="1" size="150,26" font="Regular;20" halign="center" valign="center" />
-+              <widget name="VKeyIcon" pixmap="750S/buttons/key_text.png" position="460,245" zPosition="10" size="35,25" transparent="1" alphatest="on" />                  
-+                <widget name="HelpWindow" pixmap="750S/vkey_icon.png" position="160,350" zPosition="1" size="1,1" transparent="1" alphatest="on" />
++              <widget name="config" position="10,10" backgroundColor="#371e1c1a" transparent="1" size="480,195" scrollbarMode="showOnDemand" />
++              <ePixmap pixmap="750S/div-h.png" position="0,210" zPosition="1" size="550,2" />
++              <widget source="ipaddresstext" render="Label" position="100,220" zPosition="1" size="190,21" font="Regular;19" halign="Left" valign="center" />
++              <widget source="ipaddress" render="Label" position="300,220" zPosition="1" size="150,21" font="Regular;19" halign="Left" valign="center" />
++              <widget source="netmasktext" render="Label" position="100,245" zPosition="1" size="190,21" font="Regular;19" halign="Left" valign="center" />
++              <widget source="netmask" render="Label" position="300,245" zPosition="1" size="150,21" font="Regular;19" halign="Left" valign="center" />
++              <widget source="gatewaytext" render="Label" position="100,270" zPosition="1" size="190,21" font="Regular;19" halign="Left" valign="center" />
++              <widget source="gateway" render="Label" position="300,270" zPosition="1" size="150,21" font="Regular;19" halign="Left" valign="center" />
++              <widget source="DNS1text" render="Label" position="100,295" zPosition="1" size="190,21" font="Regular;19" halign="Left" valign="center" />
++              <widget source="DNS1" render="Label" position="300,295" zPosition="1" size="150,21" font="Regular;19" halign="Left" valign="center" />
++              <widget source="DNS2text" render="Label" position="100,320" zPosition="1" size="190,21" font="Regular;19" halign="Left" valign="center" />
++              <widget source="DNS2" render="Label" position="300,320" zPosition="1" size="150,21" font="Regular;19" halign="Left" valign="center" />
++              <widget name="VKeyIcon" pixmap="750S/buttons/key_text.png" position="460,245" zPosition="10" size="35,25" transparent="1" alphatest="on" />
++              <widget name="HelpWindow" pixmap="750S/vkey_icon.png" position="160,350" zPosition="1" size="1,1" transparent="1" alphatest="on" />

 +      </screen>
 +
 +      <screen name="WlanScanAp" position="center,120" size="510,400" title="Wireless Network AP Scan..." >
 +      </screen>
 +
 +      <screen name="WlanScanAp" position="center,120" size="510,400" title="Wireless Network AP Scan..." >


@@ -3008,11 +3008,11 @@ index 0000000..9d4f458
 +install_DATA = \
 +      *.png
 diff --git a/data/Vu_HD/skin.xml b/data/Vu_HD/skin.xml
 +install_DATA = \
 +      *.png
 diff --git a/data/Vu_HD/skin.xml b/data/Vu_HD/skin.xml

-new file mode 100644
-index 0000000..a78c611
+new file mode 100755
+index 0000000..06205e7

 --- /dev/null
 +++ b/data/Vu_HD/skin.xml
 --- /dev/null
 +++ b/data/Vu_HD/skin.xml

-@@ -0,0 +1,3448 @@
+@@ -0,0 +1,3452 @@

 +<skin>
 +      <!-- VU+ skin (skin.xml)  -->
 +      <output id="0">
 +<skin>
 +      <!-- VU+ skin (skin.xml)  -->
 +      <output id="0">


@@ -3413,7 +3413,7 @@ index 0000000..a78c611
 +              <ePixmap pixmap="Vu_HD/buttons/red.png" position="45,98" size="25,25" alphatest="blend" />
 +              <ePixmap pixmap="Vu_HD/buttons/button_off.png" position="240,98" size="25,25" alphatest="blend" />
 +              <ePixmap pixmap="Vu_HD/buttons/button_off.png" position="435,98" size="25,25" alphatest="blend" />
 +              <ePixmap pixmap="Vu_HD/buttons/red.png" position="45,98" size="25,25" alphatest="blend" />
 +              <ePixmap pixmap="Vu_HD/buttons/button_off.png" position="240,98" size="25,25" alphatest="blend" />
 +              <ePixmap pixmap="Vu_HD/buttons/button_off.png" position="435,98" size="25,25" alphatest="blend" />

-+              <ePixmap pixmap="Vu_HD/buttons/blue.png" position="630,98" size="25,25" alphatest="blend" />
++              <ePixmap pixmap="Vu_HD/buttons/button_off.png" position="630,98" size="25,25" alphatest="blend" />

 +              <widget source="key_red" render="Label" position="66,97" zPosition="1" size="150,25" font="Regular;20" halign="center" valign="center" backgroundColor="darkgrey" foregroundColor="#1c1c1c" transparent="1" />
 +              <widget source="key_blue" render="Label" position="668,97" zPosition="1" size="150,25" font="Regular;20" halign="center" valign="center" backgroundColor="darkgrey" foregroundColor="#1c1c1c" transparent="1" />
 +              <widget name="config" position="160,140" transparent="1" backgroundColor="#27d9dee2" size="500,125" scrollbarMode="showOnDemand" />     
 +              <widget source="key_red" render="Label" position="66,97" zPosition="1" size="150,25" font="Regular;20" halign="center" valign="center" backgroundColor="darkgrey" foregroundColor="#1c1c1c" transparent="1" />
 +              <widget source="key_blue" render="Label" position="668,97" zPosition="1" size="150,25" font="Regular;20" halign="center" valign="center" backgroundColor="darkgrey" foregroundColor="#1c1c1c" transparent="1" />
 +              <widget name="config" position="160,140" transparent="1" backgroundColor="#27d9dee2" size="500,125" scrollbarMode="showOnDemand" />     


@@ -6328,13 +6328,17 @@ index 0000000..a78c611
 +              <widget source="key_green" render="Label" position="268,97" zPosition="1" size="150,25" font="Regular;20" halign="center" valign="center" backgroundColor="darkgrey" foregroundColor="#1c1c1c" transparent="1" />
 +              <ePixmap pixmap="Vu_HD/border_menu.png" position="120,140" zPosition="-1" size="342,358" transparent="1" alphatest="blend" />
 +              <widget name="config" position="130,150" size="322,338" transparent="1" backgroundColor="#27d9dee2" zPosition="10" scrollbarMode="showOnDemand" />
 +              <widget source="key_green" render="Label" position="268,97" zPosition="1" size="150,25" font="Regular;20" halign="center" valign="center" backgroundColor="darkgrey" foregroundColor="#1c1c1c" transparent="1" />
 +              <ePixmap pixmap="Vu_HD/border_menu.png" position="120,140" zPosition="-1" size="342,358" transparent="1" alphatest="blend" />
 +              <widget name="config" position="130,150" size="322,338" transparent="1" backgroundColor="#27d9dee2" zPosition="10" scrollbarMode="showOnDemand" />

-+              <eLabel text="IP Address : " position="500,160" size="200,26" font="Semiboldit;22" foregroundColor="#5d5d5d" backgroundColor="#27b5b9bd" transparent="1" />             
-+              <widget source="ipaddress" render="Label" position="530,190" zPosition="1" size="150,26" font="Regular;20" halign="center" valign="center" backgroundColor="#27b5b9bd" foregroundColor="#1c1c1c" transparent="1" />             
-+              <eLabel text="NetMask : " position="500,220" size="200,26" font="Semiboldit;22" foregroundColor="#5d5d5d" backgroundColor="#27b5b9bd" transparent="1" />                
-+              <widget source="netmask" render="Label" position="530,250" zPosition="1" size="150,26" font="Regular;20" halign="center" valign="center" backgroundColor="#27b5b9bd" foregroundColor="#1c1c1c" transparent="1" />               
-+              <eLabel text="Gateway : " position="500,280" size="200,26" font="Semiboldit;22" foregroundColor="#5d5d5d" backgroundColor="#27b5b9bd" transparent="1" />                
-+              <widget source="gateway" render="Label" position="530,310" zPosition="1" size="150,26" font="Regular;20" halign="center" valign="center" backgroundColor="#27b5b9bd" foregroundColor="#1c1c1c" transparent="1" />               
-+              <widget name="VKeyIcon" pixmap="Vu_HD/buttons/key_text.png" position="500,350" zPosition="10" size="35,25" transparent="1" alphatest="on" />
++              <widget source="ipaddresstext" render="Label" position="500,160" zPosition="1" size="200,26" font="Semiboldit;22" foregroundColor="#5d5d5d" backgroundColor="#27b5b9bd" transparent="1" />
++              <widget source="ipaddress" render="Label" position="530,190" zPosition="1" size="150,26" font="Regular;20" valign="center" backgroundColor="#27b5b9bd" foregroundColor="#1c1c1c" transparent="1" />     
++              <widget source="netmasktext" render="Label" position="500,220" zPosition="1" size="200,26" font="Semiboldit;22" foregroundColor="#5d5d5d" backgroundColor="#27b5b9bd" transparent="1" />
++              <widget source="netmask" render="Label" position="530,250" zPosition="1" size="150,26" font="Regular;20" valign="center" backgroundColor="#27b5b9bd" foregroundColor="#1c1c1c" transparent="1" />
++              <widget source="gatewaytext" render="Label" position="500,280" zPosition="1" size="200,26" font="Semiboldit;22" foregroundColor="#5d5d5d" backgroundColor="#27b5b9bd" transparent="1" />
++              <widget source="gateway" render="Label" position="530,310" zPosition="1" size="150,26" font="Regular;20"  valign="center" backgroundColor="#27b5b9bd" foregroundColor="#1c1c1c" transparent="1" />
++              <widget source="DNS1text" render="Label" position="500,350" zPosition="1" size="200,26" font="Semiboldit;22" foregroundColor="#5d5d5d" backgroundColor="#27b5b9bd" transparent="1" />
++              <widget source="DNS1" render="Label" position="530,380" zPosition="1" size="150,26" font="Regular;20" valign="center" backgroundColor="#27b5b9bd" foregroundColor="#1c1c1c" transparent="1" />
++              <widget source="DNS2text" render="Label" position="500,410" zPosition="1" size="200,26" font="Semiboldit;22" foregroundColor="#5d5d5d" backgroundColor="#27b5b9bd" transparent="1" />
++              <widget source="DNS2" render="Label" position="530,440" zPosition="1" size="150,26" font="Regular;20" valign="center" backgroundColor="#27b5b9bd" foregroundColor="#1c1c1c" transparent="1" />
++              <widget name="VKeyIcon" pixmap="Vu_HD/buttons/key_text.png" position="500,480" zPosition="10" size="35,25" transparent="1" alphatest="on" />

 +                <widget name="HelpWindow" pixmap="Vu_HD/vkey_icon.png" position="310,535" zPosition="1" size="1,1" transparent="1" alphatest="on" />
 +      </screen>
 +
 +                <widget name="HelpWindow" pixmap="Vu_HD/vkey_icon.png" position="310,535" zPosition="1" size="1,1" transparent="1" alphatest="on" />
 +      </screen>
 +

diff --git a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-base.inc b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-base.inc
index d509c89..ae9f3be 100644 (file)
--- a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-base.inc
+++ b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-base.inc
@@ -2,7 +2,7 @@ SUMMARY = "Vuplus: Base Task for Vuplus."
 SECTION = "vuplus/base"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 SECTION = "vuplus/base"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"

-INC_PR = "r6"
+INC_PR = "r7"

 
 inherit task
 
 
 inherit task
 


@@ -33,6 +33,7 @@ VUPLUS_BASE_ESSENTIAL = "\
   usbtunerhelper \
   ${VUPLUS_FIRMWARE_DVB} \
   killall \
   usbtunerhelper \
   ${VUPLUS_FIRMWARE_DVB} \
   killall \

+  openresolv \

 "
 
 VUPLUS_FIRMWARE_DVB = " \
 "
 
 VUPLUS_FIRMWARE_DVB = " \