On Tue, Jan 05, 2016 at 02:24:23PM +0200, Ioan-Adrian Ratiu wrote: > 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. > > Signed-off-by: Ioan-Adrian Ratiu <[email protected]> > --- > meta/conf/distro/include/distro_alias.inc | 1 - > meta/lib/oeqa/runtime/vnc.py | 20 > -------------------- > .../packagegroups/packagegroup-core-x11-sato.bb | 2 -- > 3 files changed, 23 deletions(-) > delete mode 100644 meta/lib/oeqa/runtime/vnc.py > > diff --git a/meta/conf/distro/include/distro_alias.inc > b/meta/conf/distro/include/distro_alias.inc > index dfce760..84eaf03 100644 > --- a/meta/conf/distro/include/distro_alias.inc > +++ b/meta/conf/distro/include/distro_alias.inc > @@ -436,7 +436,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" > diff --git a/meta/lib/oeqa/runtime/vnc.py b/meta/lib/oeqa/runtime/vnc.py > deleted file mode 100644 > index f31deff..0000000 > --- a/meta/lib/oeqa/runtime/vnc.py > +++ /dev/null > @@ -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])) > diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb > b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb > index 753d2bf..812735e 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" > PACKAGE_ARCH = "${MACHINE_ARCH}" > > inherit packagegroup distro_features_check > -# rdepends on x11vnc > REQUIRED_DISTRO_FEATURES = "x11"
This line and distro_features_check inherit aren't needed anymore if
x11vnc was really the only x11 dependency
> PACKAGES = "${PN} ${PN}-base ${PN}-apps ${PN}-games"
> @@ -53,7 +52,6 @@ SUMMARY_${PN}-apps = "Sato desktop - applications"
> RDEPENDS_${PN}-apps = "\
> leafpad \
> gst-player-bin \
> - x11vnc \
> matchbox-terminal \
> sato-screenshot \
> ${FILEMANAGER} \
> --
> 2.1.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> [email protected]
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: [email protected]
signature.asc
Description: Digital signature
-- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
