diff options
55 files changed, 91 insertions, 150 deletions
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass index 8f7993504..9f6501f58 100644 --- a/meta/classes/native.bbclass +++ b/meta/classes/native.bbclass @@ -95,3 +95,21 @@ do_install () { PKG_CONFIG_PATH .= "${EXTRA_NATIVE_PKGCONFIG_PATH}" PKG_CONFIG_SYSROOT_DIR = "" + +python __anonymous () { + pn = bb.data.getVar("PN", d, True) + depends = bb.data.getVar("DEPENDS", d, True) + deps = bb.utils.explode_deps(depends) + if "native" in (bb.data.getVar('BBCLASSEXTEND', d, True) or ""): + autoextend = True + else: + autoextend = False + for dep in deps: + if not dep.endswith("-native"): + if autoextend: + depends = depends.replace(dep, dep + "-native") + else: + bb.note("%s has depends %s which doesn't end in -native?" % (pn, dep)) + bb.data.setVar("DEPENDS", depends, d) +} + diff --git a/meta/classes/sdk.bbclass b/meta/classes/sdk.bbclass index 62d4b2b6f..dd62e2a02 100644 --- a/meta/classes/sdk.bbclass +++ b/meta/classes/sdk.bbclass @@ -71,3 +71,34 @@ python () { bb.data.setVar('PACKAGE_ARCHS', " ".join(sdkarchs), d) } +python __anonymous () { + pn = bb.data.getVar("PN", d, True) + depends = bb.data.getVar("DEPENDS", d, True) + deps = bb.utils.explode_deps(depends) + if "sdk" in (bb.data.getVar('BBCLASSEXTEND', d, True) or ""): + autoextend = True + else: + autoextend = False + for dep in deps: + if dep.endswith("-native") or dep.endswith("-cross") or dep.startswith("virtual/"): + continue + if not dep.endswith("-sdk"): + if autoextend: + depends = depends.replace(dep, dep + "-sdk") + else: + bb.note("%s has depends %s which doesn't end in -sdk?" % (pn, dep)) + bb.data.setVar("DEPENDS", depends, d) + provides = bb.data.getVar("PROVIDES", d, True) + for prov in provides.split(): + if prov.find(pn) != -1: + continue + if not prov.endswith("-sdk"): + if autoextend: + provides = provides.replace(prov, prov + "-sdk") + #else: + # bb.note("%s has rouge PROVIDES of %s which doesn't end in -sdk?" % (pn, prov)) + bb.data.setVar("PROVIDES", provides, d) + +} + + diff --git a/meta/packages/sed/sed-native_4.1.2.bb b/meta/packages/sed/sed-native_4.1.2.bb deleted file mode 100644 index 3bfacd88a..000000000 --- a/meta/packages/sed/sed-native_4.1.2.bb +++ /dev/null @@ -1,3 +0,0 @@ -SECTION = "console/utils" -require sed_${PV}.bb -inherit native diff --git a/meta/packages/sed/sed_4.1.2.bb b/meta/packages/sed/sed_4.1.2.bb index e3383b3a0..3ca3fd7ff 100644 --- a/meta/packages/sed/sed_4.1.2.bb +++ b/meta/packages/sed/sed_4.1.2.bb @@ -23,3 +23,4 @@ pkg_prerm_${PN} () { update-alternatives --remove sed sed.${PN} } +BBCLASSEXTEND = "native" diff --git a/meta/packages/xorg-lib/libfontenc-native_1.0.4.bb b/meta/packages/xorg-lib/libfontenc-native_1.0.4.bb deleted file mode 100644 index a907e08f1..000000000 --- a/meta/packages/xorg-lib/libfontenc-native_1.0.4.bb +++ /dev/null @@ -1,8 +0,0 @@ -require libfontenc_${PV}.bb - -DEPENDS = "zlib-native xproto-native" -PE = "1" - -XORG_PN = "libfontenc" - -inherit native diff --git a/meta/packages/xorg-lib/libfontenc_1.0.4.bb b/meta/packages/xorg-lib/libfontenc_1.0.4.bb index 654fc72ec..2a32b1770 100644 --- a/meta/packages/xorg-lib/libfontenc_1.0.4.bb +++ b/meta/packages/xorg-lib/libfontenc_1.0.4.bb @@ -5,3 +5,5 @@ LICENSE = "BSD-X" DEPENDS += "zlib xproto" PR = "r1" PE = "1" + +BBCLASSEXTEND = "native" diff --git a/meta/packages/xorg-lib/libxau-native_1.0.4.bb b/meta/packages/xorg-lib/libxau-native_1.0.4.bb deleted file mode 100644 index 9f01e139b..000000000 --- a/meta/packages/xorg-lib/libxau-native_1.0.4.bb +++ /dev/null @@ -1,6 +0,0 @@ -require libxau_${PV}.bb - -DEPENDS = "xproto-native util-macros-native" -PROVIDES = "" - -inherit native diff --git a/meta/packages/xorg-lib/libxau-sdk_1.0.4.bb b/meta/packages/xorg-lib/libxau-sdk_1.0.4.bb deleted file mode 100644 index 64373f45a..000000000 --- a/meta/packages/xorg-lib/libxau-sdk_1.0.4.bb +++ /dev/null @@ -1,6 +0,0 @@ -require libxau_${PV}.bb - -DEPENDS = "xproto-sdk util-macros-sdk" -PROVIDES = "" - -inherit sdk diff --git a/meta/packages/xorg-lib/libxau_1.0.4.bb b/meta/packages/xorg-lib/libxau_1.0.4.bb index 3a77534cf..b590a9012 100644 --- a/meta/packages/xorg-lib/libxau_1.0.4.bb +++ b/meta/packages/xorg-lib/libxau_1.0.4.bb @@ -6,3 +6,5 @@ PROVIDES = "xau" PE = "1" XORG_PN = "libXau" + +BBCLASSEXTEND = "native sdk" diff --git a/meta/packages/xorg-lib/libxdmcp-native_1.0.2.bb b/meta/packages/xorg-lib/libxdmcp-native_1.0.2.bb deleted file mode 100644 index ddb164215..000000000 --- a/meta/packages/xorg-lib/libxdmcp-native_1.0.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require libxdmcp_${PV}.bb - -DEPENDS = "xproto-native util-macros-native" -PROVIDES = "" - -inherit native diff --git a/meta/packages/xorg-lib/libxdmcp-sdk_1.0.2.bb b/meta/packages/xorg-lib/libxdmcp-sdk_1.0.2.bb deleted file mode 100644 index d58bb07a8..000000000 --- a/meta/packages/xorg-lib/libxdmcp-sdk_1.0.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require libxdmcp_${PV}.bb - -DEPENDS = "xproto-sdk util-macros-sdk" -PROVIDES = "" - -inherit sdk diff --git a/meta/packages/xorg-lib/libxdmcp_1.0.2.bb b/meta/packages/xorg-lib/libxdmcp_1.0.2.bb index 0aa95b467..bf8fe55e6 100644 --- a/meta/packages/xorg-lib/libxdmcp_1.0.2.bb +++ b/meta/packages/xorg-lib/libxdmcp_1.0.2.bb @@ -7,3 +7,5 @@ PR = "r1" PE = "1" XORG_PN = "libXdmcp" + +BBCLASSEXTEND = "native sdk" diff --git a/meta/packages/xorg-lib/libxext-sdk_git.bb b/meta/packages/xorg-lib/libxext-sdk_git.bb deleted file mode 100644 index e508b5b8e..000000000 --- a/meta/packages/xorg-lib/libxext-sdk_git.bb +++ /dev/null @@ -1,6 +0,0 @@ -require libxext_git.bb - -DEPENDS = "xproto-sdk util-macros-sdk libx11-sdk libxau-sdk xextproto-sdk" -PROVIDES = "" - -inherit sdk diff --git a/meta/packages/xorg-lib/libxext_git.bb b/meta/packages/xorg-lib/libxext_git.bb index 1cd9ebd93..898f61d8b 100644 --- a/meta/packages/xorg-lib/libxext_git.bb +++ b/meta/packages/xorg-lib/libxext_git.bb @@ -10,3 +10,5 @@ XORG_PN = "libXext" SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/${XORG_PN};protocol=git" S = "${WORKDIR}/git/" + +BBCLASSEXTEND = "sdk" diff --git a/meta/packages/xorg-lib/libxfont-native_1.3.4.bb b/meta/packages/xorg-lib/libxfont-native_1.3.4.bb deleted file mode 100644 index efd1e07d6..000000000 --- a/meta/packages/xorg-lib/libxfont-native_1.3.4.bb +++ /dev/null @@ -1,10 +0,0 @@ -require libxfont_${PV}.bb - -DEPENDS = "xproto-native zlib-native fontcacheproto-native fontsproto-native \ - libfontenc-native xtrans-native freetype-native util-macros-native" -PE = "1" - -# no need for patch used in libxfont -SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.bz2" - -inherit native diff --git a/meta/packages/xorg-lib/libxfont_1.3.4.bb b/meta/packages/xorg-lib/libxfont_1.3.4.bb index a5afe7e95..baed4bf3d 100644 --- a/meta/packages/xorg-lib/libxfont_1.3.4.bb +++ b/meta/packages/xorg-lib/libxfont_1.3.4.bb @@ -9,3 +9,5 @@ PE = "1" #SRC_URI += "file://no-scalable-crash.patch;patch=1" XORG_PN = "libXfont" + +BBCLASSEXTEND = "native" diff --git a/meta/packages/xorg-lib/libxkbfile-native_1.0.5.bb b/meta/packages/xorg-lib/libxkbfile-native_1.0.5.bb deleted file mode 100644 index 27c5dce5e..000000000 --- a/meta/packages/xorg-lib/libxkbfile-native_1.0.5.bb +++ /dev/null @@ -1,8 +0,0 @@ -require libxkbfile_${PV}.bb - -DEPENDS = "libx11-native kbproto-native" -PE = "1" - -XORG_PN = "libxkbfile" - -inherit native diff --git a/meta/packages/xorg-lib/libxkbfile_1.0.5.bb b/meta/packages/xorg-lib/libxkbfile_1.0.5.bb index a404180d4..86f6051fd 100644 --- a/meta/packages/xorg-lib/libxkbfile_1.0.5.bb +++ b/meta/packages/xorg-lib/libxkbfile_1.0.5.bb @@ -5,3 +5,5 @@ LICENSE= "GPL" DEPENDS += "virtual/libx11 kbproto" PR = "r1" PE = "1" + +BBCLASSEXTEND = "native" diff --git a/meta/packages/xorg-lib/libxrandr-sdk_1.2.3.bb b/meta/packages/xorg-lib/libxrandr-sdk_1.2.3.bb deleted file mode 100644 index 1f7d30dd0..000000000 --- a/meta/packages/xorg-lib/libxrandr-sdk_1.2.3.bb +++ /dev/null @@ -1,5 +0,0 @@ -require libxrandr_${PV}.bb - -DEPENDS = "randrproto-sdk util-macros-sdk libxext-sdk libxrender-sdk" - -inherit sdk diff --git a/meta/packages/xorg-lib/libxrandr_1.2.3.bb b/meta/packages/xorg-lib/libxrandr_1.2.3.bb index 611859fd5..620fd7e2f 100644 --- a/meta/packages/xorg-lib/libxrandr_1.2.3.bb +++ b/meta/packages/xorg-lib/libxrandr_1.2.3.bb @@ -7,3 +7,5 @@ PR = "r1" PE = "1" XORG_PN = "libXrandr" + +BBCLASSEXTEND = "sdk" diff --git a/meta/packages/xorg-lib/libxrender-sdk_0.9.4.bb b/meta/packages/xorg-lib/libxrender-sdk_0.9.4.bb deleted file mode 100644 index 3765c8a27..000000000 --- a/meta/packages/xorg-lib/libxrender-sdk_0.9.4.bb +++ /dev/null @@ -1,5 +0,0 @@ -require libxrender_${PV}.bb - -DEPENDS = "xproto-sdk renderproto-sdk util-macros-sdk libx11-sdk" - -inherit sdk diff --git a/meta/packages/xorg-lib/libxrender_0.9.4.bb b/meta/packages/xorg-lib/libxrender_0.9.4.bb index ad833a825..5913ab725 100644 --- a/meta/packages/xorg-lib/libxrender_0.9.4.bb +++ b/meta/packages/xorg-lib/libxrender_0.9.4.bb @@ -7,3 +7,5 @@ PR = "r1" PE = "1" XORG_PN = "libXrender" + +BBCLASSEXTEND = "sdk" diff --git a/meta/packages/xorg-lib/xtrans-native_1.2.2.bb b/meta/packages/xorg-lib/xtrans-native_1.2.2.bb deleted file mode 100644 index c7988c726..000000000 --- a/meta/packages/xorg-lib/xtrans-native_1.2.2.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xtrans_${PV}.bb - -DEPENDS = "util-macros-native" - -inherit native diff --git a/meta/packages/xorg-lib/xtrans-sdk_1.2.2.bb b/meta/packages/xorg-lib/xtrans-sdk_1.2.2.bb deleted file mode 100644 index 9f671180b..000000000 --- a/meta/packages/xorg-lib/xtrans-sdk_1.2.2.bb +++ /dev/null @@ -1,5 +0,0 @@ -require xtrans_${PV}.bb - -DEPENDS = "util-macros-sdk" - -inherit sdk diff --git a/meta/packages/xorg-lib/xtrans_1.2.2.bb b/meta/packages/xorg-lib/xtrans_1.2.2.bb index 0722dad84..270abf074 100644 --- a/meta/packages/xorg-lib/xtrans_1.2.2.bb +++ b/meta/packages/xorg-lib/xtrans_1.2.2.bb @@ -8,3 +8,5 @@ PR = "r0" RDEPENDS_${PN}-dev = "" XORG_PN = "xtrans" + +BBCLASSEXTEND = "native sdk" diff --git a/meta/packages/xorg-proto/bigreqsproto-native_1.0.2.bb b/meta/packages/xorg-proto/bigreqsproto-native_1.0.2.bb deleted file mode 100644 index ce281c297..000000000 --- a/meta/packages/xorg-proto/bigreqsproto-native_1.0.2.bb +++ /dev/null @@ -1,3 +0,0 @@ -require bigreqsproto_${PV}.bb - -inherit native diff --git a/meta/packages/xorg-proto/bigreqsproto-sdk_1.0.2.bb b/meta/packages/xorg-proto/bigreqsproto-sdk_1.0.2.bb deleted file mode 100644 index 057013f92..000000000 --- a/meta/packages/xorg-proto/bigreqsproto-sdk_1.0.2.bb +++ /dev/null @@ -1,3 +0,0 @@ -require bigreqsproto_${PV}.bb - -inherit sdk diff --git a/meta/packages/xorg-proto/bigreqsproto_1.0.2.bb b/meta/packages/xorg-proto/bigreqsproto_1.0.2.bb index ffe3bce8d..5d0bd8075 100644 --- a/meta/packages/xorg-proto/bigreqsproto_1.0.2.bb +++ b/meta/packages/xorg-proto/bigreqsproto_1.0.2.bb @@ -4,3 +4,5 @@ PR = "r1" PE = "1" XORG_PN = "bigreqsproto" + +BBCLASSEXTEND = "native sdk" diff --git a/meta/packages/xorg-proto/fontcacheproto-native_0.1.2.bb b/meta/packages/xorg-proto/fontcacheproto-native_0.1.2.bb deleted file mode 100644 index f4a42c520..000000000 --- a/meta/packages/xorg-proto/fontcacheproto-native_0.1.2.bb +++ /dev/null @@ -1,5 +0,0 @@ -require fontcacheproto_${PV}.bb - -XORG_PN = "fontcacheproto" - -inherit native diff --git a/meta/packages/xorg-proto/fontcacheproto_0.1.2.bb b/meta/packages/xorg-proto/fontcacheproto_0.1.2.bb index 9f09fff7b..2a9b73adf 100644 --- a/meta/packages/xorg-proto/fontcacheproto_0.1.2.bb +++ b/meta/packages/xorg-proto/fontcacheproto_0.1.2.bb @@ -2,3 +2,5 @@ require xorg-proto-common.inc PR = "r1" PE = "1" + +BBCLASSEXTEND = "native" diff --git a/meta/packages/xorg-proto/fontsproto-native_2.0.2.bb b/meta/packages/xorg-proto/fontsproto-native_2.0.2.bb deleted file mode 100644 index 4371a0783..000000000 --- a/meta/packages/xorg-proto/fontsproto-native_2.0.2.bb +++ /dev/null @@ -1,9 +0,0 @@ -require fontsproto_${PV}.bb - -PR = "r1" - -XORG_PN = "fontsproto" - -S = "${WORKDIR}/fontsproto-${PV}" - -inherit native diff --git a/meta/packages/xorg-proto/fontsproto_2.0.2.bb b/meta/packages/xorg-proto/fontsproto_2.0.2.bb index 9f09fff7b..2a9b73adf 100644 --- a/meta/packages/xorg-proto/fontsproto_2.0.2.bb +++ b/meta/packages/xorg-proto/fontsproto_2.0.2.bb @@ -2,3 +2,5 @@ require xorg-proto-common.inc PR = "r1" PE = "1" + +BBCLASSEXTEND = "native" diff --git a/meta/packages/xorg-proto/inputproto-native_1.9.99.5git.bb b/meta/packages/xorg-proto/inputproto-native_1.9.99.5git.bb deleted file mode 100644 index b6ce61142..000000000 --- a/meta/packages/xorg-proto/inputproto-native_1.9.99.5git.bb +++ /dev/null @@ -1,3 +0,0 @@ -require inputproto_${PV}.bb - -inherit native diff --git a/meta/packages/xorg-proto/inputproto-sdk_1.9.99.5git.bb b/meta/packages/xorg-proto/inputproto-sdk_1.9.99.5git.bb deleted file mode 100644 index f0e1985bf..000000000 --- a/meta/packages/xorg-proto/inputproto-sdk_1.9.99.5git.bb +++ /dev/null @@ -1,3 +0,0 @@ -require inputproto_${PV}.bb - -inherit sdk diff --git a/meta/packages/xorg-proto/inputproto_1.9.99.5git.bb b/meta/packages/xorg-proto/inputproto_1.9.99.5git.bb index 5c62eb44d..e669a2792 100644 --- a/meta/packages/xorg-proto/inputproto_1.9.99.5git.bb +++ b/meta/packages/xorg-proto/inputproto_1.9.99.5git.bb @@ -8,3 +8,5 @@ SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/inputproto;protocol=git" S = "${WORKDIR}/git" XORG_PN = "inputproto" + +BBCLASSEXTEND = "native sdk" diff --git a/meta/packages/xorg-proto/kbproto-native_1.0.3.bb b/meta/packages/xorg-proto/kbproto-native_1.0.3.bb deleted file mode 100644 index fa872e561..000000000 --- a/meta/packages/xorg-proto/kbproto-native_1.0.3.bb +++ /dev/null @@ -1,3 +0,0 @@ -require kbproto_${PV}.bb - -inherit native diff --git a/meta/packages/xorg-proto/kbproto-sdk_1.0.3.bb b/meta/packages/xorg-proto/kbproto-sdk_1.0.3.bb deleted file mode 100644 index b821e4522..000000000 --- a/meta/packages/xorg-proto/kbproto-sdk_1.0.3.bb +++ /dev/null @@ -1,3 +0,0 @@ -require kbproto_${PV}.bb - -inherit sdk diff --git a/meta/packages/xorg-proto/kbproto_1.0.3.bb b/meta/packages/xorg-proto/kbproto_1.0.3.bb index b3e9ffc36..220da1d43 100644 --- a/meta/packages/xorg-proto/kbproto_1.0.3.bb +++ b/meta/packages/xorg-proto/kbproto_1.0.3.bb @@ -4,3 +4,5 @@ PR = "r1" PE = "1" XORG_PN = "kbproto" + +BBCLASSEXTEND = "native sdk" diff --git a/meta/packages/xorg-proto/xcmiscproto-native_1.1.2.bb b/meta/packages/xorg-proto/xcmiscproto-native_1.1.2.bb deleted file mode 100644 index 615e7d786..000000000 --- a/meta/packages/xorg-proto/xcmiscproto-native_1.1.2.bb +++ /dev/null @@ -1,3 +0,0 @@ -require xcmiscproto_${PV}.bb - -inherit native diff --git a/meta/packages/xorg-proto/xcmiscproto-sdk_1.1.2.bb b/meta/packages/xorg-proto/xcmiscproto-sdk_1.1.2.bb deleted file mode 100644 index 83c31204d..000000000 --- a/meta/packages/xorg-proto/xcmiscproto-sdk_1.1.2.bb +++ /dev/null @@ -1,3 +0,0 @@ -require xcmiscproto_${PV}.bb - -inherit sdk diff --git a/meta/packages/xorg-proto/xcmiscproto_1.1.2.bb b/meta/packages/xorg-proto/xcmiscproto_1.1.2.bb index 8f48ecd9c..2a501fed9 100644 --- a/meta/packages/xorg-proto/xcmiscproto_1.1.2.bb +++ b/meta/packages/xorg-proto/xcmiscproto_1.1.2.bb @@ -4,3 +4,5 @@ PR = "r1" PE = "1" XORG_PN = "xcmiscproto" + +BBCLASSEXTEND = "native sdk" diff --git a/meta/packages/xorg-proto/xextproto-native_7.0.4.bb b/meta/packages/xorg-proto/xextproto-native_7.0.4.bb deleted file mode 100644 index 2529e62ca..000000000 --- a/meta/packages/xorg-proto/xextproto-native_7.0.4.bb +++ /dev/null @@ -1,3 +0,0 @@ -require xextproto_${PV}.bb - -inherit native diff --git a/meta/packages/xorg-proto/xextproto-sdk_7.0.4.bb b/meta/packages/xorg-proto/xextproto-sdk_7.0.4.bb deleted file mode 100644 index 3b182a02f..000000000 --- a/meta/packages/xorg-proto/xextproto-sdk_7.0.4.bb +++ /dev/null @@ -1,3 +0,0 @@ -require xextproto_${PV}.bb - -inherit sdk diff --git a/meta/packages/xorg-proto/xextproto_7.0.4.bb b/meta/packages/xorg-proto/xextproto_7.0.4.bb index 644cbd12f..ff065edc3 100644 --- a/meta/packages/xorg-proto/xextproto_7.0.4.bb +++ b/meta/packages/xorg-proto/xextproto_7.0.4.bb @@ -4,3 +4,5 @@ PR = "r2" PE = "1" XORG_PN = "xextproto" + +BBCLASSEXTEND = "native sdk" diff --git a/meta/packages/xorg-proto/xf86bigfontproto-native_1.1.2.bb b/meta/packages/xorg-proto/xf86bigfontproto-native_1.1.2.bb deleted file mode 100644 index 5e1353803..000000000 --- a/meta/packages/xorg-proto/xf86bigfontproto-native_1.1.2.bb +++ /dev/null @@ -1,3 +0,0 @@ -require xf86bigfontproto_${PV}.bb - -inherit native diff --git a/meta/packages/xorg-proto/xf86bigfontproto-sdk_1.1.2.bb b/meta/packages/xorg-proto/xf86bigfontproto-sdk_1.1.2.bb deleted file mode 100644 index 32b6280c0..000000000 --- a/meta/packages/xorg-proto/xf86bigfontproto-sdk_1.1.2.bb +++ /dev/null @@ -1,3 +0,0 @@ -require xf86bigfontproto_${PV}.bb - -inherit sdk diff --git a/meta/packages/xorg-proto/xf86bigfontproto_1.1.2.bb b/meta/packages/xorg-proto/xf86bigfontproto_1.1.2.bb index f29fdb84a..445bdf619 100644 --- a/meta/packages/xorg-proto/xf86bigfontproto_1.1.2.bb +++ b/meta/packages/xorg-proto/xf86bigfontproto_1.1.2.bb @@ -4,3 +4,5 @@ PR = "r1" PE = "1" XORG_PN = "xf86bigfontproto" + +BBCLASSEXTEND = "native sdk" diff --git a/meta/packages/xorg-proto/xproto-native_7.0.14.bb b/meta/packages/xorg-proto/xproto-native_7.0.14.bb deleted file mode 100644 index 5dde8a7d4..000000000 --- a/meta/packages/xorg-proto/xproto-native_7.0.14.bb +++ /dev/null @@ -1,3 +0,0 @@ -require xproto_${PV}.bb - -inherit native diff --git a/meta/packages/xorg-proto/xproto-sdk_7.0.14.bb b/meta/packages/xorg-proto/xproto-sdk_7.0.14.bb deleted file mode 100644 index 1c1a934bb..000000000 --- a/meta/packages/xorg-proto/xproto-sdk_7.0.14.bb +++ /dev/null @@ -1,3 +0,0 @@ -require xproto_${PV}.bb - -inherit sdk diff --git a/meta/packages/xorg-proto/xproto_7.0.14.bb b/meta/packages/xorg-proto/xproto_7.0.14.bb index 1adf55d97..ebe6fe409 100644 --- a/meta/packages/xorg-proto/xproto_7.0.14.bb +++ b/meta/packages/xorg-proto/xproto_7.0.14.bb @@ -4,3 +4,6 @@ PR = "r1" PE = "1" XORG_PN = "xproto" + +BBCLASSEXTEND = "native sdk" + diff --git a/meta/packages/xorg-util/makedepend-native_1.0.1.bb b/meta/packages/xorg-util/makedepend-native_1.0.1.bb deleted file mode 100644 index 9facfc69f..000000000 --- a/meta/packages/xorg-util/makedepend-native_1.0.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -require xorg-util-common.inc -inherit native - -DESCRIPTION = "create dependencies in makefiles" -DEPENDS = "xproto-native util-macros-native" -PR = "r2" -PE = "1" - -XORG_PN = "makedepend" diff --git a/meta/packages/xorg-util/makedepend_1.0.1.bb b/meta/packages/xorg-util/makedepend_1.0.1.bb index e998bba1b..7d6a5355a 100644 --- a/meta/packages/xorg-util/makedepend_1.0.1.bb +++ b/meta/packages/xorg-util/makedepend_1.0.1.bb @@ -4,3 +4,5 @@ DESCRIPTION = "create dependencies in makefiles" DEPENDS = "xproto util-macros" PR = "r2" PE = "1" + +BBCLASSEXTEND = "native" diff --git a/meta/packages/xorg-util/util-macros-native_1.2.1.bb b/meta/packages/xorg-util/util-macros-native_1.2.1.bb deleted file mode 100644 index 0f4ed124f..000000000 --- a/meta/packages/xorg-util/util-macros-native_1.2.1.bb +++ /dev/null @@ -1,3 +0,0 @@ -require util-macros_${PV}.bb - -inherit native diff --git a/meta/packages/xorg-util/util-macros-sdk_1.2.1.bb b/meta/packages/xorg-util/util-macros-sdk_1.2.1.bb deleted file mode 100644 index 597868f9b..000000000 --- a/meta/packages/xorg-util/util-macros-sdk_1.2.1.bb +++ /dev/null @@ -1,3 +0,0 @@ -require util-macros_${PV}.bb - -inherit sdk diff --git a/meta/packages/xorg-util/util-macros_1.2.1.bb b/meta/packages/xorg-util/util-macros_1.2.1.bb index 3e4c16b05..8f33775a2 100644 --- a/meta/packages/xorg-util/util-macros_1.2.1.bb +++ b/meta/packages/xorg-util/util-macros_1.2.1.bb @@ -11,3 +11,5 @@ XORG_PN = "util-macros" # ${PN} is empty so we need to tweak -dev and -dbg package dependencies RDEPENDS_${PN}-dev = "" RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})" + +BBCLASSEXTEND = "native sdk" |