summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <joshua.lock@collabora.co.uk>2015-10-16 14:07:33 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-11-16 11:39:30 +0000
commitaf8c1365d352e9f052d8a7aed6e29c0b320cb5b9 (patch)
tree4db5f9ced015593977336f2e1943068c5dce4e4c
parentb66706740b994ff39f69ab7e86c483991ea238e6 (diff)
downloadpoky-af8c1365d352e9f052d8a7aed6e29c0b320cb5b9.tar.gz
xserver-xorg: drop empty ${PN}-security-policy package
The SecurityPolicy hasn't been included since 2007[1] and the last remnants were removed from the code base in 2010[2]. 1. http://cgit.freedesktop.org/xorg/xserver/commit/?id=9d03ca 2. http://cgit.freedesktop.org/xorg/xserver/commit/?id=19d03d (From OE-Core rev: 58f5ccc7a04cada4251eb6a321bd98973581582e) Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg.inc6
1 files changed, 2 insertions, 4 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 30b34850b2..91df2b7ced 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -44,8 +44,7 @@ DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util"
44# libextmod.so 44# libextmod.so
45# libdbe.so 45# libdbe.so
46 46
47PACKAGES =+ "${PN}-security-policy \ 47PACKAGES =+ "${PN}-sdl \
48 ${PN}-sdl \
49 ${PN}-fbdev \ 48 ${PN}-fbdev \
50 ${PN}-xvfb \ 49 ${PN}-xvfb \
51 ${PN}-utils \ 50 ${PN}-utils \
@@ -72,7 +71,7 @@ PACKAGES =+ "${PN}-security-policy \
72SUMMARY_xf86-video-modesetting = "X.Org X server -- modesetting display driver" 71SUMMARY_xf86-video-modesetting = "X.Org X server -- modesetting display driver"
73INSANE_SKIP_xf86-video-modesetting = "xorg-driver-abi" 72INSANE_SKIP_xf86-video-modesetting = "xorg-driver-abi"
74 73
75XSERVER_RRECOMMENDS = "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config xkbcomp" 74XSERVER_RRECOMMENDS = "xkeyboard-config rgb xserver-xf86-config xkbcomp"
76RRECOMMENDS_${PN} += "${XSERVER_RRECOMMENDS}" 75RRECOMMENDS_${PN} += "${XSERVER_RRECOMMENDS}"
77RRECOMMENDS_${PN}-xwayland += "${XSERVER_RRECOMMENDS}" 76RRECOMMENDS_${PN}-xwayland += "${XSERVER_RRECOMMENDS}"
78RDEPENDS_${PN}-xvfb += "xkeyboard-config" 77RDEPENDS_${PN}-xvfb += "xkeyboard-config"
@@ -85,7 +84,6 @@ FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \
85 ${libdir}/xorg/modules/*/.debug \ 84 ${libdir}/xorg/modules/*/.debug \
86 ${libdir}/xorg/modules/*/*/.debug \ 85 ${libdir}/xorg/modules/*/*/.debug \
87 " 86 "
88FILES_${PN}-security-policy += "${libdir}/xserver/SecurityPolicy"
89FILES_${PN}-sdl = "${bindir}/Xsdl" 87FILES_${PN}-sdl = "${bindir}/Xsdl"
90FILES_${PN}-fbdev = "${bindir}/Xfbdev" 88FILES_${PN}-fbdev = "${bindir}/Xfbdev"
91FILES_${PN}-xvfb = "${bindir}/Xvfb" 89FILES_${PN}-xvfb = "${bindir}/Xvfb"