mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

x11vnc: remove all references to moved package

Browse Source 
Together with the move to meta-oe, all references to x11vnc should be
removed from oe-core. There are three of these: a distro alias, a
packagegroup rdepends and a runtime test.

(From OE-Core rev: cfd1e4bcd66a9a542007115647cadb8480330fab)

Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ioan-Adrian Ratiu
2016-01-05 14:24:23 +02:00
committed by Richard Purdie
parent 8f865e2c50
commit 8bec5c55a2
3 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
meta/conf/distro/include/distro_alias.inc
View File

@@ -416,7 +416,6 @@ DISTRO_PN_ALIAS_pn-which = "Mandriva=which Fedora=which"
DISTRO_PN_ALIAS_pn-wpa-supplicant = "Meego=wpa_supplicant Fedora=wpa_supplicant OpenSuSE=wpa_supplicant Ubuntu=wpasupplicant Mandriva=wpa_supplicant Debian=wpasupplicant"
DISTRO_PN_ALIAS_pn-x11-common = "OE-Core"
DISTRO_PN_ALIAS_pn-x11perf = "Fedora=xorg-x11-apps Ubuntu=x11-apps"
DISTRO_PN_ALIAS_pn-x11vnc = "Fedora=x11vnc Ubuntu=x11vnc"
DISTRO_PN_ALIAS_pn-xcb-util-image = "Debian=xcb-util Fedora=xcb-util"
DISTRO_PN_ALIAS_pn-xcb-util-keysyms = "Debian=xcb-util Fedora=xcb-util"
DISTRO_PN_ALIAS_pn-xcb-util-wm = "Debian=xcb-util Fedora=xcb-util"

20
meta/lib/oeqa/runtime/vnc.py
View File

@@ -1,20 +0,0 @@
from oeqa.oetest import oeRuntimeTest, skipModuleUnless
from oeqa.utils.decorators import *
import re
def setUpModule():
skipModuleUnless(oeRuntimeTest.hasPackage('x11vnc'), "No x11vnc package in image")
class VNCTest(oeRuntimeTest):
@testcase(213)
@skipUnlessPassed('test_ssh')
def test_vnc(self):
(status, output) = self.target.run('x11vnc -display :0 -bg -o x11vnc.log')
self.assertEqual(status, 0, msg="x11vnc server failed to start: %s" % output)
port = re.search('PORT=[0-9]*', output)
self.assertTrue(port, msg="Listening port not specified in command output: %s" %output)
vncport = port.group(0).split('=')[1]
(status, output) = self.target.run('netstat -ntl | grep ":%s"' % vncport)
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]))

2
meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
View File

@@ -9,7 +9,6 @@ PR = "r33"
PACKAGE_ARCH = "${MACHINE_ARCH}"
inherit packagegroup distro_features_check
# rdepends on x11vnc
REQUIRED_DISTRO_FEATURES = "x11"
PACKAGES = "${PN} ${PN}-base ${PN}-apps ${PN}-games"
@@ -51,7 +50,6 @@ SUMMARY_${PN}-apps = "Sato desktop - applications"
RDEPENDS_${PN}-apps = "\
leafpad \
gst-player-bin \
x11vnc \
matchbox-terminal \
sato-screenshot \
${FILEMANAGER} \