summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2012-10-27 16:48:17 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-02 16:18:27 +0000
commit5d94d29f553456268351b26065cc69eb19e71b87 (patch)
tree6e9a8651524e8417f96e83595e83c8fa387d5bdf
parent74bb195f9f72d4f281f4c11f03ca46aee95ccd55 (diff)
downloadpoky-5d94d29f553456268351b26065cc69eb19e71b87.tar.gz
recipes-core: replace virtclass-native(sdk) with class-native(sdk)
The overrides virtclass-native and virtclass-nativesdk are deprecated, which should be replaced by class-native and class-nativesdk. [YOCTO #3297] (From OE-Core rev: 5193485a42dfb3396d0f12aaa7732c5db29d7338) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/coreutils/coreutils_6.9.bb4
-rw-r--r--meta/recipes-core/coreutils/coreutils_8.14.bb4
-rw-r--r--meta/recipes-core/dbus/dbus-glib.inc4
-rw-r--r--meta/recipes-core/dbus/dbus.inc12
-rw-r--r--meta/recipes-core/eglibc/eglibc-initial.inc2
-rw-r--r--meta/recipes-core/eglibc/eglibc.inc6
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.16.bb2
-rw-r--r--meta/recipes-core/gettext/gettext_0.16.1.bb4
-rw-r--r--meta/recipes-core/gettext/gettext_0.18.1.1.bb6
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb6
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc6
-rw-r--r--meta/recipes-core/jpeg/jpeg_8d.bb2
-rw-r--r--meta/recipes-core/libxml/libxml2.inc6
-rw-r--r--meta/recipes-core/ncurses/ncurses.inc4
-rw-r--r--meta/recipes-core/uclibc/uclibc-initial_0.9.33.bb2
-rw-r--r--meta/recipes-core/uclibc/uclibc-initial_git.bb2
-rw-r--r--meta/recipes-core/uclibc/uclibc_0.9.33.bb2
-rw-r--r--meta/recipes-core/uclibc/uclibc_git.bb2
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc6
-rw-r--r--meta/recipes-core/util-linux/util-linux_2.21.2.bb2
20 files changed, 42 insertions, 42 deletions
diff --git a/meta/recipes-core/coreutils/coreutils_6.9.bb b/meta/recipes-core/coreutils/coreutils_6.9.bb
index 20d8120930..ffdd2af8c5 100644
--- a/meta/recipes-core/coreutils/coreutils_6.9.bb
+++ b/meta/recipes-core/coreutils/coreutils_6.9.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
10 file://src/ls.c;startline=4;endline=16;md5=482a96d4f25010a4e13f8743e0c3685e" 10 file://src/ls.c;startline=4;endline=16;md5=482a96d4f25010a4e13f8743e0c3685e"
11PR = "r3" 11PR = "r3"
12DEPENDS = "coreutils-native-${PV}" 12DEPENDS = "coreutils-native-${PV}"
13DEPENDS_virtclass-native = "gettext-native" 13DEPENDS_class-native = "gettext-native"
14 14
15inherit autotools gettext 15inherit autotools gettext
16 16
@@ -28,7 +28,7 @@ SRC_URI_BASE = "${GNU_MIRROR}/coreutils/${BP}.tar.bz2 \
28 " 28 "
29 29
30SRC_URI = "${SRC_URI_BASE} file://fix_for_manpage_building.patch" 30SRC_URI = "${SRC_URI_BASE} file://fix_for_manpage_building.patch"
31SRC_URI_virtclass-native = "${SRC_URI_BASE}" 31SRC_URI_class-native = "${SRC_URI_BASE}"
32 32
33SRC_URI[md5sum] = "c9607d8495f16e98906e7ed2d9751a06" 33SRC_URI[md5sum] = "c9607d8495f16e98906e7ed2d9751a06"
34SRC_URI[sha256sum] = "89c2895ad157de50e53298b22d91db116ee4e1dd3fdf4019260254e2e31497b0" 34SRC_URI[sha256sum] = "89c2895ad157de50e53298b22d91db116ee4e1dd3fdf4019260254e2e31497b0"
diff --git a/meta/recipes-core/coreutils/coreutils_8.14.bb b/meta/recipes-core/coreutils/coreutils_8.14.bb
index 178bd674c6..3f58cfdadc 100644
--- a/meta/recipes-core/coreutils/coreutils_8.14.bb
+++ b/meta/recipes-core/coreutils/coreutils_8.14.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\
9 file://src/ls.c;startline=5;endline=16;md5=e1a509558876db58fb6667ba140137ad" 9 file://src/ls.c;startline=5;endline=16;md5=e1a509558876db58fb6667ba140137ad"
10PR = "r5" 10PR = "r5"
11DEPENDS = "gmp libcap" 11DEPENDS = "gmp libcap"
12DEPENDS_virtclass-native = "" 12DEPENDS_class-native = ""
13 13
14inherit autotools gettext 14inherit autotools gettext
15 15
@@ -21,7 +21,7 @@ SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \
21SRC_URI[md5sum] = "bcb135ce553493a45aba01b39eb3920a" 21SRC_URI[md5sum] = "bcb135ce553493a45aba01b39eb3920a"
22SRC_URI[sha256sum] = "0d120817c19292edb19e92ae6b8eac9020e03d51e0af9cb116cf82b65d18b02d" 22SRC_URI[sha256sum] = "0d120817c19292edb19e92ae6b8eac9020e03d51e0af9cb116cf82b65d18b02d"
23 23
24EXTRA_OECONF_virtclass-native = "--without-gmp" 24EXTRA_OECONF_class-native = "--without-gmp"
25 25
26# [ df mktemp base64 gets a special treatment and is not included in this 26# [ df mktemp base64 gets a special treatment and is not included in this
27bindir_progs = "basename chcon cksum comm csplit cut dir dircolors dirname du \ 27bindir_progs = "basename chcon cksum comm csplit cut dir dircolors dirname du \
diff --git a/meta/recipes-core/dbus/dbus-glib.inc b/meta/recipes-core/dbus/dbus-glib.inc
index 3469a4f2b1..dff30c7564 100644
--- a/meta/recipes-core/dbus/dbus-glib.inc
+++ b/meta/recipes-core/dbus/dbus-glib.inc
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=cf5b3a2f7083750d504333114e738656 \
8SECTION = "base" 8SECTION = "base"
9 9
10DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus" 10DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus"
11DEPENDS_virtclass-native = "glib-2.0-native dbus-native" 11DEPENDS_class-native = "glib-2.0-native dbus-native"
12 12
13SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \ 13SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
14 file://no-examples.patch \ 14 file://no-examples.patch \
@@ -24,7 +24,7 @@ PACKAGECONFIG[tests] = "--enable-tests,,,"
24 24
25EXTRA_OECONF = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml \ 25EXTRA_OECONF = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml \
26 --with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool" 26 --with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool"
27EXTRA_OECONF_virtclass-native = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml" 27EXTRA_OECONF_class-native = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml"
28 28
29PACKAGES += "${PN}-bash-completion ${PN}-tests-dbg ${PN}-tests" 29PACKAGES += "${PN}-bash-completion ${PN}-tests-dbg ${PN}-tests"
30 30
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 550eb0ab3b..d165cdd878 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \
7 file://dbus/dbus.h;firstline=6;endline=20;md5=6eea2e0c7750dd8e620dcb1437312fa5" 7 file://dbus/dbus.h;firstline=6;endline=20;md5=6eea2e0c7750dd8e620dcb1437312fa5"
8X11DEPENDS = "virtual/libx11 libsm" 8X11DEPENDS = "virtual/libx11 libsm"
9DEPENDS = "expat virtual/libintl ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" 9DEPENDS = "expat virtual/libintl ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
10DEPENDS_virtclass-native = "expat-native virtual/libintl-native" 10DEPENDS_class-native = "expat-native virtual/libintl-native"
11DEPENDS_virtclass-nativesdk = "nativesdk-expat virtual/nativesdk-libintl virtual/libx11" 11DEPENDS_class-nativesdk = "nativesdk-expat virtual/nativesdk-libintl virtual/libx11"
12 12
13INC_PR = "r5" 13INC_PR = "r5"
14 14
@@ -34,7 +34,7 @@ DEBIANNAME_${PN} = "dbus-1"
34PACKAGES =+ "${PN}-lib ${PN}-systemd" 34PACKAGES =+ "${PN}-lib ${PN}-systemd"
35 35
36OLDPKGNAME = "dbus-x11" 36OLDPKGNAME = "dbus-x11"
37OLDPKGNAME_virtclass-nativesdk = "" 37OLDPKGNAME_class-nativesdk = ""
38 38
39# for compatibility 39# for compatibility
40RPROVIDES_${PN} = "${OLDPKGNAME}" 40RPROVIDES_${PN} = "${OLDPKGNAME}"
@@ -64,7 +64,7 @@ pkg_postinst_dbus() {
64} 64}
65 65
66EXTRA_OECONF_X = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}" 66EXTRA_OECONF_X = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}"
67EXTRA_OECONF_X_virtclass-native = "--without-x --disable-x11-autolaunch" 67EXTRA_OECONF_X_class-native = "--without-x --disable-x11-autolaunch"
68 68
69EXTRA_OECONF = "--disable-tests \ 69EXTRA_OECONF = "--disable-tests \
70 --disable-checks \ 70 --disable-checks \
@@ -105,7 +105,7 @@ do_install() {
105 ln -sf /dev/null ${D}/${systemd_unitdir}/system/dbus-1.service 105 ln -sf /dev/null ${D}/${systemd_unitdir}/system/dbus-1.service
106} 106}
107 107
108do_install_virtclass-native() { 108do_install_class-native() {
109 autotools_do_install 109 autotools_do_install
110 110
111 # for dbus-glib-native introspection generation 111 # for dbus-glib-native introspection generation
@@ -117,7 +117,7 @@ do_install_virtclass-native() {
117 ./bus/dbus-daemon --introspect > ${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml 117 ./bus/dbus-daemon --introspect > ${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml
118} 118}
119 119
120do_install_virtclass-nativesdk() { 120do_install_class-nativesdk() {
121 autotools_do_install 121 autotools_do_install
122} 122}
123BBCLASSEXTEND = "native nativesdk" 123BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-core/eglibc/eglibc-initial.inc b/meta/recipes-core/eglibc/eglibc-initial.inc
index 1520efd718..c1a090e39e 100644
--- a/meta/recipes-core/eglibc/eglibc-initial.inc
+++ b/meta/recipes-core/eglibc/eglibc-initial.inc
@@ -7,7 +7,7 @@ PACKAGES = ""
7PACKAGES_DYNAMIC = "" 7PACKAGES_DYNAMIC = ""
8 8
9STAGINGCC = "gcc-cross-initial" 9STAGINGCC = "gcc-cross-initial"
10STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-initial" 10STAGINGCC_class-nativesdk = "gcc-crosssdk-initial"
11TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}" 11TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}"
12 12
13do_configure () { 13do_configure () {
diff --git a/meta/recipes-core/eglibc/eglibc.inc b/meta/recipes-core/eglibc/eglibc.inc
index e1ec6b2b8c..3d136bf8d7 100644
--- a/meta/recipes-core/eglibc/eglibc.inc
+++ b/meta/recipes-core/eglibc/eglibc.inc
@@ -3,7 +3,7 @@ require eglibc-ld.inc
3require eglibc-testing.inc 3require eglibc-testing.inc
4 4
5STAGINGCC = "gcc-cross-initial" 5STAGINGCC = "gcc-cross-initial"
6STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-initial" 6STAGINGCC_class-nativesdk = "gcc-crosssdk-initial"
7PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:" 7PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:"
8 8
9TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TCBOOTSTRAP}" 9TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TCBOOTSTRAP}"
@@ -39,7 +39,7 @@ CACHED_CONFIGUREVARS += "ac_cv_path_KSH=${base_bindir}/bash \
39 " 39 "
40 40
41GLIBC_EXTRA_OECONF ?= "" 41GLIBC_EXTRA_OECONF ?= ""
42GLIBC_EXTRA_OECONF_virtclass-nativesdk = "" 42GLIBC_EXTRA_OECONF_class-nativesdk = ""
43INHIBIT_DEFAULT_DEPS = "1" 43INHIBIT_DEFAULT_DEPS = "1"
44 44
45ARM_INSTRUCTION_SET = "arm" 45ARM_INSTRUCTION_SET = "arm"
@@ -68,4 +68,4 @@ do_configure_append() {
68 68
69GLIBC_ADDONS ?= "ports,nptl,libidn" 69GLIBC_ADDONS ?= "ports,nptl,libidn"
70SDK_GLIBC_ADDONS ?= "ports,nptl,libidn" 70SDK_GLIBC_ADDONS ?= "ports,nptl,libidn"
71GLIBC_ADDONS_virtclass-nativesdk = "${SDK_GLIBC_ADDONS}" 71GLIBC_ADDONS_class-nativesdk = "${SDK_GLIBC_ADDONS}"
diff --git a/meta/recipes-core/eglibc/eglibc_2.16.bb b/meta/recipes-core/eglibc/eglibc_2.16.bb
index 56a0a38192..aa9256cdc1 100644
--- a/meta/recipes-core/eglibc/eglibc_2.16.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.16.bb
@@ -37,7 +37,7 @@ LIC_FILES_CHKSUM = "file://LICENSES;md5=98a1128c4b58120182cbea3b1752d8b9 \
37 file://posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \ 37 file://posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \
38 file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff " 38 file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff "
39 39
40SRC_URI_append_virtclass-nativesdk = " file://ld-search-order.patch \ 40SRC_URI_append_class-nativesdk = " file://ld-search-order.patch \
41 file://relocatable_sdk.patch \ 41 file://relocatable_sdk.patch \
42 " 42 "
43S = "${WORKDIR}/eglibc-${PV}/libc" 43S = "${WORKDIR}/eglibc-${PV}/libc"
diff --git a/meta/recipes-core/gettext/gettext_0.16.1.bb b/meta/recipes-core/gettext/gettext_0.16.1.bb
index 00045d5560..db8314b02c 100644
--- a/meta/recipes-core/gettext/gettext_0.16.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.16.1.bb
@@ -6,9 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9ea3144f04c41cd2eada5d3f472e6ea5"
6 6
7PR = "r6" 7PR = "r6"
8DEPENDS = "virtual/libiconv" 8DEPENDS = "virtual/libiconv"
9DEPENDS_virtclass-native = "" 9DEPENDS_class-native = ""
10PROVIDES = "virtual/libintl virtual/gettext" 10PROVIDES = "virtual/libintl virtual/gettext"
11PROVIDES_virtclass-native = "" 11PROVIDES_class-native = ""
12 12
13SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ 13SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
14 file://gettext-vpath.patch \ 14 file://gettext-vpath.patch \
diff --git a/meta/recipes-core/gettext/gettext_0.18.1.1.bb b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
index 0f6f0685c6..c3265e1a22 100644
--- a/meta/recipes-core/gettext/gettext_0.18.1.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
@@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
7 7
8PR = "r18" 8PR = "r18"
9DEPENDS = "gettext-native virtual/libiconv ncurses expat" 9DEPENDS = "gettext-native virtual/libiconv ncurses expat"
10DEPENDS_virtclass-native = "gettext-minimal-native" 10DEPENDS_class-native = "gettext-minimal-native"
11PROVIDES = "virtual/libintl virtual/gettext" 11PROVIDES = "virtual/libintl virtual/gettext"
12PROVIDES_virtclass-native = "virtual/gettext-native" 12PROVIDES_class-native = "virtual/gettext-native"
13RCONFLICTS_${PN} = "proxy-libintl" 13RCONFLICTS_${PN} = "proxy-libintl"
14SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ 14SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
15 file://parallel.patch \ 15 file://parallel.patch \
@@ -100,7 +100,7 @@ do_install_append() {
100 rm -f ${D}${libdir}/preloadable_libintl.so 100 rm -f ${D}${libdir}/preloadable_libintl.so
101} 101}
102 102
103do_install_append_virtclass-native () { 103do_install_append_class-native () {
104 rm ${D}${datadir}/aclocal/* 104 rm ${D}${datadir}/aclocal/*
105 rm ${D}${datadir}/gettext/config.rpath 105 rm ${D}${datadir}/gettext/config.rpath
106 rm ${D}${datadir}/gettext/po/Makefile.in.in 106 rm ${D}${datadir}/gettext/po/Makefile.in.in
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb
index 10c0b615ed..22c6c7bef0 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb
@@ -4,8 +4,8 @@ PR = "r6"
4PE = "1" 4PE = "1"
5 5
6DEPENDS += "libffi python-argparse-native zlib" 6DEPENDS += "libffi python-argparse-native zlib"
7DEPENDS_virtclass-native += "libffi-native python-argparse-native" 7DEPENDS_class-native += "libffi-native python-argparse-native"
8DEPENDS_virtclass-nativesdk += "nativesdk-libffi python-argparse-native nativesdk-zlib ${BPN}-native" 8DEPENDS_class-nativesdk += "nativesdk-libffi python-argparse-native nativesdk-zlib ${BPN}-native"
9 9
10SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" 10SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
11 11
@@ -19,7 +19,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
19SRC_URI[md5sum] = "bf84fefd9c1a5b5a7a38736f4ddd674a" 19SRC_URI[md5sum] = "bf84fefd9c1a5b5a7a38736f4ddd674a"
20SRC_URI[sha256sum] = "a5d742a4fda22fb6975a8c0cfcd2499dd1c809b8afd4ef709bda4d11b167fae2" 20SRC_URI[sha256sum] = "a5d742a4fda22fb6975a8c0cfcd2499dd1c809b8afd4ef709bda4d11b167fae2"
21 21
22SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch" 22SRC_URI_append_class-native = " file://glib-gettextize-dir.patch"
23BBCLASSEXTEND = "native nativesdk" 23BBCLASSEXTEND = "native nativesdk"
24 24
25do_configure_prepend() { 25do_configure_prepend() {
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 8b099f223e..6e2b5d2a74 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -14,8 +14,8 @@ BUGTRACKER = "http://bugzilla.gnome.org"
14SECTION = "libs" 14SECTION = "libs"
15 15
16DEPENDS = "glib-2.0-native zip virtual/libiconv" 16DEPENDS = "glib-2.0-native zip virtual/libiconv"
17DEPENDS_virtclass-native = "pkgconfig-native gettext-native" 17DEPENDS_class-native = "pkgconfig-native gettext-native"
18DEPENDS_virtclass-nativesdk = "nativesdk-libtool" 18DEPENDS_class-nativesdk = "nativesdk-libtool"
19PACKAGES =+ "${PN}-utils ${PN}-bash-completion ${PN}-codegen" 19PACKAGES =+ "${PN}-utils ${PN}-bash-completion ${PN}-codegen"
20 20
21LEAD_SONAME = "libglib-2.0.*" 21LEAD_SONAME = "libglib-2.0.*"
@@ -28,7 +28,7 @@ S = "${WORKDIR}/glib-${PV}"
28CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap" 28CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap"
29 29
30EXTRA_OECONF = "--enable-included-printf=no ${CORECONF}" 30EXTRA_OECONF = "--enable-included-printf=no ${CORECONF}"
31EXTRA_OECONF_virtclass-native = "${CORECONF}" 31EXTRA_OECONF_class-native = "${CORECONF}"
32EXTRA_OECONF_linuxstdbase = "--enable-included-printf=no ${CORECONF}" 32EXTRA_OECONF_linuxstdbase = "--enable-included-printf=no ${CORECONF}"
33 33
34FILES_${PN} = "${libdir}/lib*${SOLIBS} ${datadir}/glib-2.0/schemas \ 34FILES_${PN} = "${libdir}/lib*${SOLIBS} ${datadir}/glib-2.0/schemas \
diff --git a/meta/recipes-core/jpeg/jpeg_8d.bb b/meta/recipes-core/jpeg/jpeg_8d.bb
index 67816198dd..eba5bf46d2 100644
--- a/meta/recipes-core/jpeg/jpeg_8d.bb
+++ b/meta/recipes-core/jpeg/jpeg_8d.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://README;md5=4f46756b064c225fae088903300e5c98"
9SECTION = "libs" 9SECTION = "libs"
10 10
11DEPENDS = "libtool-cross" 11DEPENDS = "libtool-cross"
12DEPENDS_virtclass-native = "libtool-native" 12DEPENDS_class-native = "libtool-native"
13 13
14PR = "r1" 14PR = "r1"
15 15
diff --git a/meta/recipes-core/libxml/libxml2.inc b/meta/recipes-core/libxml/libxml2.inc
index 68437ae949..9ec507bad9 100644
--- a/meta/recipes-core/libxml/libxml2.inc
+++ b/meta/recipes-core/libxml/libxml2.inc
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://Copyright;md5=bb90c48926316d9af6e2d70ca7013ade \
9 file://list.c;beginline=4;endline=13;md5=cdbfa3dee51c099edb04e39f762ee907 \ 9 file://list.c;beginline=4;endline=13;md5=cdbfa3dee51c099edb04e39f762ee907 \
10 file://trio.c;beginline=5;endline=14;md5=6c025753c86d958722ec76e94cae932e" 10 file://trio.c;beginline=5;endline=14;md5=6c025753c86d958722ec76e94cae932e"
11 11
12DEPENDS_virtclass-native = "python-native" 12DEPENDS_class-native = "python-native"
13DEPENDS =+ "zlib" 13DEPENDS =+ "zlib"
14 14
15SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz \ 15SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz \
@@ -25,8 +25,8 @@ do_configure_prepend () {
25} 25}
26 26
27EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --with-c14n --without-lzma" 27EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --with-c14n --without-lzma"
28EXTRA_OECONF_virtclass-native = "--with-python=${STAGING_BINDIR}/python --without-legacy --with-catalog --without-docbook --with-c14n --without-lzma" 28EXTRA_OECONF_class-native = "--with-python=${STAGING_BINDIR}/python --without-legacy --with-catalog --without-docbook --with-c14n --without-lzma"
29EXTRA_OECONF_virtclass-nativesdk = "--with-python=${STAGING_BINDIR}/python --without-legacy --with-catalog --without-docbook --with-c14n --without-lzma" 29EXTRA_OECONF_class-nativesdk = "--with-python=${STAGING_BINDIR}/python --without-legacy --with-catalog --without-docbook --with-c14n --without-lzma"
30EXTRA_OECONF_linuxstdbase = "--without-python --with-debug --with-legacy --with-catalog --with-docbook --with-c14n --without-lzma" 30EXTRA_OECONF_linuxstdbase = "--without-python --with-debug --with-legacy --with-catalog --with-docbook --with-c14n --without-lzma"
31 31
32# required for pythong binding 32# required for pythong binding
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index cce080d402..24b19c7d13 100644
--- a/meta/recipes-core/ncurses/ncurses.inc
+++ b/meta/recipes-core/ncurses/ncurses.inc
@@ -5,7 +5,7 @@ LICENSE = "MIT"
5LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=cbc180a8c44ca642e97c35452fab5f66" 5LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=cbc180a8c44ca642e97c35452fab5f66"
6SECTION = "libs" 6SECTION = "libs"
7DEPENDS = "ncurses-native" 7DEPENDS = "ncurses-native"
8DEPENDS_virtclass-native = "" 8DEPENDS_class-native = ""
9INC_PR = "r12" 9INC_PR = "r12"
10 10
11inherit autotools binconfig multilib_header 11inherit autotools binconfig multilib_header
@@ -27,7 +27,7 @@ ENABLE_WIDEC ?= "true"
27BUILD_CPPFLAGS += "-D_GNU_SOURCE" 27BUILD_CPPFLAGS += "-D_GNU_SOURCE"
28 28
29# natives don't generally look in base_libdir 29# natives don't generally look in base_libdir
30base_libdir_virtclass-native = "${libdir}" 30base_libdir_class-native = "${libdir}"
31 31
32# Helper function for do_configure to allow multiple configurations 32# Helper function for do_configure to allow multiple configurations
33# $1 the directory to run configure in 33# $1 the directory to run configure in
diff --git a/meta/recipes-core/uclibc/uclibc-initial_0.9.33.bb b/meta/recipes-core/uclibc/uclibc-initial_0.9.33.bb
index 211d530d70..22f56de1c2 100644
--- a/meta/recipes-core/uclibc/uclibc-initial_0.9.33.bb
+++ b/meta/recipes-core/uclibc/uclibc-initial_0.9.33.bb
@@ -9,7 +9,7 @@ PACKAGES = ""
9PACKAGES_DYNAMIC = "" 9PACKAGES_DYNAMIC = ""
10 10
11STAGINGCC = "gcc-cross-initial" 11STAGINGCC = "gcc-cross-initial"
12STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-initial" 12STAGINGCC_class-nativesdk = "gcc-crosssdk-initial"
13 13
14do_install() { 14do_install() {
15 # Install initial headers into the cross dir 15 # Install initial headers into the cross dir
diff --git a/meta/recipes-core/uclibc/uclibc-initial_git.bb b/meta/recipes-core/uclibc/uclibc-initial_git.bb
index 6fd75299c5..c0b7d52f60 100644
--- a/meta/recipes-core/uclibc/uclibc-initial_git.bb
+++ b/meta/recipes-core/uclibc/uclibc-initial_git.bb
@@ -9,7 +9,7 @@ PACKAGES = ""
9PACKAGES_DYNAMIC = "" 9PACKAGES_DYNAMIC = ""
10 10
11STAGINGCC = "gcc-cross-initial" 11STAGINGCC = "gcc-cross-initial"
12STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-initial" 12STAGINGCC_class-nativesdk = "gcc-crosssdk-initial"
13 13
14do_install() { 14do_install() {
15 # Install initial headers into the cross dir 15 # Install initial headers into the cross dir
diff --git a/meta/recipes-core/uclibc/uclibc_0.9.33.bb b/meta/recipes-core/uclibc/uclibc_0.9.33.bb
index 8deedd3708..4071d2adad 100644
--- a/meta/recipes-core/uclibc/uclibc_0.9.33.bb
+++ b/meta/recipes-core/uclibc/uclibc_0.9.33.bb
@@ -5,7 +5,7 @@ require uclibc-package.inc
5require uclibc-${PV}.inc 5require uclibc-${PV}.inc
6 6
7STAGINGCC = "gcc-cross-initial" 7STAGINGCC = "gcc-cross-initial"
8STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-initial" 8STAGINGCC_class-nativesdk = "gcc-crosssdk-initial"
9 9
10DEPENDS = "virtual/${TARGET_PREFIX}binutils \ 10DEPENDS = "virtual/${TARGET_PREFIX}binutils \
11 virtual/${TARGET_PREFIX}gcc-initial \ 11 virtual/${TARGET_PREFIX}gcc-initial \
diff --git a/meta/recipes-core/uclibc/uclibc_git.bb b/meta/recipes-core/uclibc/uclibc_git.bb
index e8a6d68523..a66656dfec 100644
--- a/meta/recipes-core/uclibc/uclibc_git.bb
+++ b/meta/recipes-core/uclibc/uclibc_git.bb
@@ -3,7 +3,7 @@ require uclibc-package.inc
3require uclibc-git.inc 3require uclibc-git.inc
4 4
5STAGINGCC = "gcc-cross-initial" 5STAGINGCC = "gcc-cross-initial"
6STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-initial" 6STAGINGCC_class-nativesdk = "gcc-crosssdk-initial"
7 7
8PROVIDES += "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" 8PROVIDES += "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
9 9
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index d62d406b3b..f2f9a046bb 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=9c920d811858a74b67a36ba23cbaa95f
17 17
18inherit autotools gettext pkgconfig 18inherit autotools gettext pkgconfig
19DEPENDS = "zlib ncurses" 19DEPENDS = "zlib ncurses"
20DEPENDS_append_virtclass-native = " lzo-native" 20DEPENDS_append_class-native = " lzo-native"
21 21
22SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.bz2 \ 22SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.bz2 \
23 file://MCONFIG \ 23 file://MCONFIG \
@@ -73,8 +73,8 @@ RREPLACES_util-linux-blkid = "e2fsprogs-blkid"
73RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup" 73RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup"
74RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs " 74RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs "
75 75
76RRECOMMENDS_${PN}_virtclass-native = "" 76RRECOMMENDS_${PN}_class-native = ""
77RDEPENDS_${PN}_virtclass-native = "" 77RDEPENDS_${PN}_class-native = ""
78 78
79do_compile () { 79do_compile () {
80 set -e 80 set -e
diff --git a/meta/recipes-core/util-linux/util-linux_2.21.2.bb b/meta/recipes-core/util-linux/util-linux_2.21.2.bb
index e64ebe97ac..24bed2707c 100644
--- a/meta/recipes-core/util-linux/util-linux_2.21.2.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.21.2.bb
@@ -40,4 +40,4 @@ do_remove_lscpu() {
40addtask remove_lscpu before do_configure after do_patch 40addtask remove_lscpu before do_configure after do_patch
41 41
42CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=as" 42CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=as"
43EXTRA_OECONF_virtclass-native += "--disable-fallocate --disable-use-tty-group" 43EXTRA_OECONF_class-native += "--disable-fallocate --disable-use-tty-group"