xorg: Remove unneeded XORG_PN settings and replace some native/sdk recipes with BBCLASSEXTEND

3 files changed, 4 insertions, 13 deletions

diff --git a/meta/packages/xorg-app/xkbcomp-native_1.0.5.bb b/meta/packages/xorg-app/xkbcomp-native_1.0.5.bb
deleted file mode 100644
index ee7c25c407..0000000000
--- a/meta/packages/xorg-app/xkbcomp-native_1.0.5.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
-
-SECTION = "x11/applications"
-LICENSE = "MIT-X"
-S="${WORKDIR}/xkbcomp-${PV}"
-
-DEPENDS = "libx11-native libxkbfile-native"
-
-SRC_URI = "${XORG_MIRROR}/individual/app/xkbcomp-${PV}.tar.bz2"
-
-inherit native autotools pkgconfig
diff --git a/meta/packages/xorg-app/xkbcomp_1.0.5.bb b/meta/packages/xorg-app/xkbcomp_1.0.5.bb
index ca6cdb8898..e436a71ed4 100644
--- a/meta/packages/xorg-app/xkbcomp_1.0.5.bb
+++ b/meta/packages/xorg-app/xkbcomp_1.0.5.bb
@@ -2,4 +2,6 @@ require xorg-app-common.inc
 
 DESCRIPTION = "The X Keyboard Extension essentially replaces the core protocol definition of keyboard."
 
-DEPENDS += " virtual/libx11 libxkbfile"
+DEPENDS += "libxkbfile"
+
+BBCLASSEXTEND = "native"
diff --git a/meta/packages/xorg-app/xorg-app-common.inc b/meta/packages/xorg-app/xorg-app-common.inc
index 2dc659a0fa..32a2f061c9 100644
--- a/meta/packages/xorg-app/xorg-app-common.inc
+++ b/meta/packages/xorg-app/xorg-app-common.inc
@@ -4,7 +4,7 @@ SECTION = "x11/apps"
 LICENSE = "MIT-X"
 DEPENDS = "util-macros-native virtual/libx11"
 
-XORG_PN = "${PN}"
+XORG_PN = "${BPN}"
 
 SRC_URI = "${XORG_MIRROR}/individual/app/${XORG_PN}-${PV}.tar.bz2"