summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/include/distro_alias.inc1
-rw-r--r--meta/lib/oeqa/runtime/vnc.py20
-rw-r--r--meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb2
3 files changed, 0 insertions, 23 deletions
diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc
index 530917760a..0a213ba2e4 100644
--- a/meta/conf/distro/include/distro_alias.inc
+++ b/meta/conf/distro/include/distro_alias.inc
@@ -416,7 +416,6 @@ DISTRO_PN_ALIAS_pn-which = "Mandriva=which Fedora=which"
416DISTRO_PN_ALIAS_pn-wpa-supplicant = "Meego=wpa_supplicant Fedora=wpa_supplicant OpenSuSE=wpa_supplicant Ubuntu=wpasupplicant Mandriva=wpa_supplicant Debian=wpasupplicant" 416DISTRO_PN_ALIAS_pn-wpa-supplicant = "Meego=wpa_supplicant Fedora=wpa_supplicant OpenSuSE=wpa_supplicant Ubuntu=wpasupplicant Mandriva=wpa_supplicant Debian=wpasupplicant"
417DISTRO_PN_ALIAS_pn-x11-common = "OE-Core" 417DISTRO_PN_ALIAS_pn-x11-common = "OE-Core"
418DISTRO_PN_ALIAS_pn-x11perf = "Fedora=xorg-x11-apps Ubuntu=x11-apps" 418DISTRO_PN_ALIAS_pn-x11perf = "Fedora=xorg-x11-apps Ubuntu=x11-apps"
419DISTRO_PN_ALIAS_pn-x11vnc = "Fedora=x11vnc Ubuntu=x11vnc"
420DISTRO_PN_ALIAS_pn-xcb-util-image = "Debian=xcb-util Fedora=xcb-util" 419DISTRO_PN_ALIAS_pn-xcb-util-image = "Debian=xcb-util Fedora=xcb-util"
421DISTRO_PN_ALIAS_pn-xcb-util-keysyms = "Debian=xcb-util Fedora=xcb-util" 420DISTRO_PN_ALIAS_pn-xcb-util-keysyms = "Debian=xcb-util Fedora=xcb-util"
422DISTRO_PN_ALIAS_pn-xcb-util-wm = "Debian=xcb-util Fedora=xcb-util" 421DISTRO_PN_ALIAS_pn-xcb-util-wm = "Debian=xcb-util Fedora=xcb-util"
diff --git a/meta/lib/oeqa/runtime/vnc.py b/meta/lib/oeqa/runtime/vnc.py
deleted file mode 100644
index f31deff306..0000000000
--- a/meta/lib/oeqa/runtime/vnc.py
+++ /dev/null
@@ -1,20 +0,0 @@
1from oeqa.oetest import oeRuntimeTest, skipModuleUnless
2from oeqa.utils.decorators import *
3import re
4
5def setUpModule():
6 skipModuleUnless(oeRuntimeTest.hasPackage('x11vnc'), "No x11vnc package in image")
7
8class VNCTest(oeRuntimeTest):
9
10 @testcase(213)
11 @skipUnlessPassed('test_ssh')
12 def test_vnc(self):
13 (status, output) = self.target.run('x11vnc -display :0 -bg -o x11vnc.log')
14 self.assertEqual(status, 0, msg="x11vnc server failed to start: %s" % output)
15 port = re.search('PORT=[0-9]*', output)
16 self.assertTrue(port, msg="Listening port not specified in command output: %s" %output)
17
18 vncport = port.group(0).split('=')[1]
19 (status, output) = self.target.run('netstat -ntl | grep ":%s"' % vncport)
20 self.assertEqual(status, 0, msg="x11vnc server not running on port %s\n\n%s" % (vncport, self.target.run('netstat -ntl; cat x11vnc.log')[1]))
diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
index b3f6830293..8ba49231d5 100644
--- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
+++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
@@ -9,7 +9,6 @@ PR = "r33"
9PACKAGE_ARCH = "${MACHINE_ARCH}" 9PACKAGE_ARCH = "${MACHINE_ARCH}"
10 10
11inherit packagegroup distro_features_check 11inherit packagegroup distro_features_check
12# rdepends on x11vnc
13REQUIRED_DISTRO_FEATURES = "x11" 12REQUIRED_DISTRO_FEATURES = "x11"
14 13
15PACKAGES = "${PN} ${PN}-base ${PN}-apps ${PN}-games" 14PACKAGES = "${PN} ${PN}-base ${PN}-apps ${PN}-games"
@@ -51,7 +50,6 @@ SUMMARY_${PN}-apps = "Sato desktop - applications"
51RDEPENDS_${PN}-apps = "\ 50RDEPENDS_${PN}-apps = "\
52 leafpad \ 51 leafpad \
53 gst-player-bin \ 52 gst-player-bin \
54 x11vnc \
55 matchbox-terminal \ 53 matchbox-terminal \
56 sato-screenshot \ 54 sato-screenshot \
57 ${FILEMANAGER} \ 55 ${FILEMANAGER} \