* [PATCH 00/11] replace virtclass-native(sdk) with class-native(sdk)
@ 2012-10-30 9:33 Robert Yang
2012-10-30 9:33 ` [PATCH 01/11] classes: " Robert Yang
` (10 more replies)
0 siblings, 11 replies; 14+ messages in thread
From: Robert Yang @ 2012-10-30 9:33 UTC (permalink / raw)
To: openembedded-core; +Cc: Zhenfeng.Zhao
The following overrides are deprecated:
virtclass-native
virtclass-nativesdk
We should use the new overrides:
class-target
class-native
class-nativesdk
class-cross
class-crosssdk
class-multilib
These patches replace the old ways with the new ones, but keep the
compatibility with the old ways, which means that the virtclass-native
and virtclass-nativesdk still work correctly.
Test info:
# With MACHINE=qemux86/qemux86-64/qemuarm/qemumips/qemuppc
$ bitbake core-image-minimal core-image-sato core-image-sato-sdk
# With MACHINE=qemux86
$ bitbake meta-toolchain-sdk world
Used the buildhistory.bbclass to verify that there isn't any apparent
changes which is caused by these patches.
Will send the patch for meta-yocto to its mailing list sooner.
// Robert
The following changes since commit 93c04c16e45a3c8f60f8ffc0b26a78c24bda71da:
bitbake: hob: reordering the layers in the Hob Layers dialog (2012-10-27 09:55:55 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib robert/virtclass
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/virtclass
Robert Yang (11):
classes: replace virtclass-native(sdk) with class-native(sdk)
multilib.bbclass: add class-multilib to override
conf: replace virtclass-native(sdk) with class-native(sdk)
recipes-core: replace virtclass-native(sdk) with class-native(sdk)
recipes-devtools: replace virtclass-native(sdk) with
class-native(sdk)
recipes-extended: replace virtclass-native(sdk) with
class-native(sdk)
recipes-graphics: replace virtclass-native(sdk) with
class-native(sdk)
recipes-support: replace virtclass-native(sdk) with class-native(sdk)
recipes-gnome: replace virtclass-native(sdk) with class-native(sdk)
recipes-kernel: replace virtclass-native(sdk) with class-native(sdk)
recipes-connectivity: replace virtclass-native(sdk) with
class-native(sdk)
meta/classes/cross.bbclass | 2 +-
meta/classes/insane.bbclass | 4 ++--
meta/classes/multilib.bbclass | 4 +++-
meta/classes/multilib_global.bbclass | 4 ++--
meta/classes/native.bbclass | 6 +++---
meta/classes/populate_sdk_rpm.bbclass | 2 +-
meta/classes/rootfs_rpm.bbclass | 2 +-
meta/classes/sanity.bbclass | 3 ++-
meta/classes/update-rc.d.bbclass | 6 +++---
meta/classes/useradd.bbclass | 24 +++++++++++-----------
meta/conf/distro/include/default-distrovars.inc | 2 +-
meta/recipes-connectivity/openssl/openssl.inc | 2 +-
meta/recipes-core/coreutils/coreutils_6.9.bb | 4 ++--
meta/recipes-core/coreutils/coreutils_8.14.bb | 4 ++--
meta/recipes-core/dbus/dbus-glib.inc | 4 ++--
meta/recipes-core/dbus/dbus.inc | 12 +++++------
meta/recipes-core/eglibc/eglibc-initial.inc | 2 +-
meta/recipes-core/eglibc/eglibc.inc | 6 +++---
meta/recipes-core/eglibc/eglibc_2.16.bb | 2 +-
meta/recipes-core/gettext/gettext_0.16.1.bb | 4 ++--
meta/recipes-core/gettext/gettext_0.18.1.1.bb | 6 +++---
meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb | 6 +++---
meta/recipes-core/glib-2.0/glib.inc | 6 +++---
meta/recipes-core/jpeg/jpeg_8d.bb | 2 +-
meta/recipes-core/libxml/libxml2.inc | 6 +++---
meta/recipes-core/ncurses/ncurses.inc | 4 ++--
meta/recipes-core/uclibc/uclibc-initial_0.9.33.bb | 2 +-
meta/recipes-core/uclibc/uclibc-initial_git.bb | 2 +-
meta/recipes-core/uclibc/uclibc_0.9.33.bb | 2 +-
meta/recipes-core/uclibc/uclibc_git.bb | 2 +-
meta/recipes-core/util-linux/util-linux.inc | 6 +++---
meta/recipes-core/util-linux/util-linux_2.21.2.bb | 2 +-
meta/recipes-devtools/autoconf/autoconf.inc | 6 +++---
meta/recipes-devtools/autoconf/autoconf_2.69.bb | 2 +-
meta/recipes-devtools/automake/automake_1.12.3.bb | 8 ++++----
meta/recipes-devtools/binutils/binutils_2.22.bb | 4 ++--
meta/recipes-devtools/bison/bison_2.3.bb | 6 +++---
meta/recipes-devtools/bison/bison_2.5.1.bb | 6 +++---
meta/recipes-devtools/chrpath/chrpath_0.14.bb | 4 ++--
meta/recipes-devtools/dpkg/dpkg.inc | 10 ++++-----
meta/recipes-devtools/elfutils/elfutils_0.148.bb | 6 +++---
meta/recipes-devtools/file/file_5.11.bb | 4 ++--
meta/recipes-devtools/flex/flex.inc | 2 +-
meta/recipes-devtools/git/git.inc | 4 ++--
.../gnu-config/gnu-config_20120814.bb | 2 +-
meta/recipes-devtools/gnu-config/gnu-config_git.bb | 2 +-
meta/recipes-devtools/guile/guile_2.0.6.bb | 2 +-
meta/recipes-devtools/insserv/insserv_1.14.0.bb | 2 +-
meta/recipes-devtools/intltool/intltool.inc | 8 ++++----
meta/recipes-devtools/intltool/intltool_0.50.0.bb | 2 +-
meta/recipes-devtools/opensp/opensp_1.5.2.bb | 4 ++--
meta/recipes-devtools/opkg-utils/opkg-utils_git.bb | 4 ++--
meta/recipes-devtools/opkg/opkg.inc | 8 ++++----
.../perl/libxml-parser-perl_2.41.bb | 2 +-
meta/recipes-devtools/perl/perl_5.14.2.bb | 2 +-
meta/recipes-devtools/pkgconfig/pkgconfig.inc | 8 ++++----
meta/recipes-devtools/pseudo/pseudo.inc | 12 +++++------
.../python/python-pygobject_2.27.91.bb | 4 ++--
.../python/python-setuptools_0.6c11.bb | 2 +-
meta/recipes-devtools/python/python_2.7.3.bb | 2 +-
meta/recipes-devtools/qemu/qemu.inc | 12 +++++------
meta/recipes-devtools/qemu/qemu_1.2.0.bb | 6 +++---
meta/recipes-devtools/rpm/rpm_5.4.9.bb | 6 +++---
meta/recipes-devtools/rpm/rpmresolve_1.0.bb | 2 +-
meta/recipes-devtools/tcltk/tcl_8.5.11.bb | 6 +++---
.../unfs-server/unfs-server_2.1+2.2beta47.bb | 4 ++--
meta/recipes-extended/bzip2/bzip2_1.0.6.bb | 4 ++--
.../ghostscript/ghostscript_9.05.bb | 10 ++++-----
meta/recipes-extended/groff/groff_1.20.1.bb | 4 ++--
meta/recipes-extended/gzip/gzip_1.5.bb | 2 +-
.../recipes-extended/perl/libtimedate-perl_1.20.bb | 2 +-
meta/recipes-extended/pigz/pigz.inc | 2 +-
meta/recipes-extended/stat/stat_3.3.bb | 2 +-
meta/recipes-extended/texinfo/texinfo_4.13a.bb | 6 +++---
meta/recipes-extended/unzip/unzip_6.0.bb | 2 +-
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb | 6 +++---
meta/recipes-gnome/gnome/gconf_3.2.3.bb | 6 +++---
meta/recipes-gnome/gnome/gnome-doc-utils.inc | 4 ++--
meta/recipes-gnome/gtk+/gtk+_2.24.8.bb | 4 ++--
meta/recipes-gnome/librsvg/librsvg_2.32.1.bb | 4 ++--
meta/recipes-graphics/freetype/freetype_2.4.10.bb | 4 ++--
meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | 2 +-
meta/recipes-graphics/pango/pango.inc | 2 +-
meta/recipes-graphics/xcb/xcb-proto.inc | 2 +-
meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb | 2 +-
.../recipes-graphics/xorg-font/font-alias_1.0.3.bb | 2 +-
meta/recipes-graphics/xorg-font/font-util_1.3.0.bb | 4 ++--
meta/recipes-kernel/systemtap/systemtap_git.bb | 4 ++--
meta/recipes-support/apr/apr-util_1.4.1.bb | 4 ++--
meta/recipes-support/attr/ea-acl.inc | 4 ++--
meta/recipes-support/boost/boost.inc | 12 +++++------
.../createrepo/createrepo_0.4.11.bb | 4 ++--
meta/recipes-support/curl/curl_7.26.0.bb | 8 ++++----
meta/recipes-support/icu/icu-3.6.inc | 4 ++--
meta/recipes-support/libcap/libcap.inc | 8 +++-----
meta/recipes-support/neon/neon_0.29.6.bb | 2 +-
.../shared-mime-info/shared-mime-info.inc | 4 ++--
meta/recipes-support/sqlite/sqlite3.inc | 4 ++--
98 files changed, 222 insertions(+), 221 deletions(-)
--
1.7.11.2
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 01/11] classes: replace virtclass-native(sdk) with class-native(sdk)
2012-10-30 9:33 [PATCH 00/11] replace virtclass-native(sdk) with class-native(sdk) Robert Yang
@ 2012-10-30 9:33 ` Robert Yang
2012-10-30 9:33 ` [PATCH 02/11] multilib.bbclass: add class-multilib to override Robert Yang
` (9 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Robert Yang @ 2012-10-30 9:33 UTC (permalink / raw)
To: openembedded-core; +Cc: Zhenfeng.Zhao
The overrides virtclass-native and virtclass-nativesdk are deprecated,
which should be replaced by class-native and class-nativesdk.
[YOCTO #3297]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/classes/cross.bbclass | 2 +-
meta/classes/insane.bbclass | 4 ++--
meta/classes/multilib.bbclass | 2 +-
meta/classes/multilib_global.bbclass | 4 ++--
meta/classes/native.bbclass | 6 +++---
meta/classes/populate_sdk_rpm.bbclass | 2 +-
meta/classes/rootfs_rpm.bbclass | 2 +-
meta/classes/update-rc.d.bbclass | 6 +++---
meta/classes/useradd.bbclass | 24 ++++++++++++------------
9 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass
index e998307..735f6d2 100644
--- a/meta/classes/cross.bbclass
+++ b/meta/classes/cross.bbclass
@@ -7,7 +7,7 @@ EXCLUDE_FROM_WORLD = "1"
CLASSOVERRIDE = "class-cross"
PACKAGES = ""
PACKAGES_DYNAMIC = ""
-PACKAGES_DYNAMIC_virtclass-native = ""
+PACKAGES_DYNAMIC_class-native = ""
HOST_ARCH = "${BUILD_ARCH}"
HOST_VENDOR = "${BUILD_VENDOR}"
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 2dc9ba3..d51d1a1 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -24,8 +24,8 @@ PACKAGEFUNCS += " do_package_qa "
# unsafe-references-in-binaries requires prelink-rtld from
# prelink-native, but we don't want this DEPENDS for -native builds
QADEPENDS = "prelink-native"
-QADEPENDS_virtclass-native = ""
-QADEPENDS_virtclass-nativesdk = ""
+QADEPENDS_class-native = ""
+QADEPENDS_class-nativesdk = ""
#
# dictionary for elf headers
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index c249925..77ccce4 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -44,7 +44,7 @@ python multilib_virtclass_handler () {
e.data.setVar("MLPREFIX", variant + "-")
e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False))
- e.data.setVar("SHLIBSDIR_virtclass-multilib-" + variant ,e.data.getVar("SHLIBSDIR", False) + "/" + variant)
+ e.data.setVar("SHLIBSDIR_class-multilib-" + variant ,e.data.getVar("SHLIBSDIR", False) + "/" + variant)
e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override)
}
diff --git a/meta/classes/multilib_global.bbclass b/meta/classes/multilib_global.bbclass
index f55e3a2..3b5faa0 100644
--- a/meta/classes/multilib_global.bbclass
+++ b/meta/classes/multilib_global.bbclass
@@ -4,8 +4,8 @@ python multilib_virtclass_handler_global () {
if isinstance(e, bb.event.RecipePreFinalise):
for v in e.data.getVar("MULTILIB_VARIANTS", True).split():
- if e.data.getVar("TARGET_VENDOR_virtclass-multilib-" + v, False) is None:
- e.data.setVar("TARGET_VENDOR_virtclass-multilib-" + v, e.data.getVar("TARGET_VENDOR", False) + "ml" + v)
+ if e.data.getVar("TARGET_VENDOR_class-multilib-" + v, False) is None:
+ e.data.setVar("TARGET_VENDOR_class-multilib-" + v, e.data.getVar("TARGET_VENDOR", False) + "ml" + v)
variant = e.data.getVar("BBEXTENDVARIANT", True)
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index 93f96f5..6314ba1 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -6,14 +6,14 @@ inherit relocatable
EXCLUDE_FROM_WORLD = "1"
PACKAGES = ""
-PACKAGES_virtclass-native = ""
+PACKAGES_class-native = ""
PACKAGES_DYNAMIC = ""
-PACKAGES_DYNAMIC_virtclass-native = ""
+PACKAGES_DYNAMIC_class-native = ""
PACKAGE_ARCH = "${BUILD_ARCH}"
# used by cmake class
OECMAKE_RPATH = "${libdir}"
-OECMAKE_RPATH_virtclass-native = "${libdir}"
+OECMAKE_RPATH_class-native = "${libdir}"
# When this class has packaging enabled, setting
# RPROVIDES becomes unnecessary.
diff --git a/meta/classes/populate_sdk_rpm.bbclass b/meta/classes/populate_sdk_rpm.bbclass
index 1c54049..d4c880e 100644
--- a/meta/classes/populate_sdk_rpm.bbclass
+++ b/meta/classes/populate_sdk_rpm.bbclass
@@ -128,7 +128,7 @@ python () {
eext = ext.split(':')
if len(eext) > 1 and eext[0] == 'multilib':
localdata = bb.data.createCopy(d)
- default_tune = localdata.getVar("DEFAULTTUNE_virtclass-multilib-" + eext[1], False)
+ default_tune = localdata.getVar("DEFAULTTUNE_class-multilib-" + eext[1], False)
if default_tune:
localdata.setVar("DEFAULTTUNE", default_tune)
package_archs = localdata.getVar("PACKAGE_ARCHS", True) or ""
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index c86cd09..16b7779 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -194,7 +194,7 @@ python () {
eext = ext.split(':')
if len(eext) > 1 and eext[0] == 'multilib':
localdata = bb.data.createCopy(d)
- default_tune = localdata.getVar("DEFAULTTUNE_virtclass-multilib-" + eext[1], False)
+ default_tune = localdata.getVar("DEFAULTTUNE_class-multilib-" + eext[1], False)
if default_tune:
localdata.setVar("DEFAULTTUNE", default_tune)
package_archs = localdata.getVar("PACKAGE_ARCHS", True) or ""
diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass
index eef2e8c..a512503 100644
--- a/meta/classes/update-rc.d.bbclass
+++ b/meta/classes/update-rc.d.bbclass
@@ -2,9 +2,9 @@ UPDATERCPN ?= "${PN}"
DEPENDS_append = " update-rc.d-native"
UPDATERCD = "update-rc.d"
-UPDATERCD_virtclass-cross = ""
-UPDATERCD_virtclass-native = ""
-UPDATERCD_virtclass-nativesdk = ""
+UPDATERCD_class-cross = ""
+UPDATERCD_class-native = ""
+UPDATERCD_class-nativesdk = ""
RDEPENDS_${UPDATERCPN}_append = " ${UPDATERCD}"
diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
index bb8f42b..2ee95da 100644
--- a/meta/classes/useradd.bbclass
+++ b/meta/classes/useradd.bbclass
@@ -3,9 +3,9 @@
# and support files needed to add and modify user and group accounts
DEPENDS_append = "${USERADDDEPENDS}"
USERADDDEPENDS = " base-passwd shadow-native shadow-sysroot shadow"
-USERADDDEPENDS_virtclass-cross = ""
-USERADDDEPENDS_virtclass-native = ""
-USERADDDEPENDS_virtclass-nativesdk = ""
+USERADDDEPENDS_class-cross = ""
+USERADDDEPENDS_class-native = ""
+USERADDDEPENDS_class-nativesdk = ""
# This preinstall function can be run in four different contexts:
#
@@ -137,19 +137,19 @@ useradd_sysroot_sstate () {
do_install[prefuncs] += "${SYSROOTFUNC}"
SYSROOTFUNC = "useradd_sysroot"
-SYSROOTFUNC_virtclass-cross = ""
-SYSROOTFUNC_virtclass-native = ""
-SYSROOTFUNC_virtclass-nativesdk = ""
+SYSROOTFUNC_class-cross = ""
+SYSROOTFUNC_class-native = ""
+SYSROOTFUNC_class-nativesdk = ""
SSTATEPREINSTFUNCS += "${SYSROOTPOSTFUNC}"
SYSROOTPOSTFUNC = "useradd_sysroot_sstate"
-SYSROOTPOSTFUNC_virtclass-cross = ""
-SYSROOTPOSTFUNC_virtclass-native = ""
-SYSROOTPOSTFUNC_virtclass-nativesdk = ""
+SYSROOTPOSTFUNC_class-cross = ""
+SYSROOTPOSTFUNC_class-native = ""
+SYSROOTPOSTFUNC_class-nativesdk = ""
USERADDSETSCENEDEPS = "${MLPREFIX}base-passwd:do_populate_sysroot_setscene shadow-native:do_populate_sysroot_setscene ${MLPREFIX}shadow-sysroot:do_populate_sysroot_setscene"
-USERADDSETSCENEDEPS_virtclass-cross = ""
-USERADDSETSCENEDEPS_virtclass-native = ""
-USERADDSETSCENEDEPS_virtclass-nativesdk = ""
+USERADDSETSCENEDEPS_class-cross = ""
+USERADDSETSCENEDEPS_class-native = ""
+USERADDSETSCENEDEPS_class-nativesdk = ""
do_package_setscene[depends] = "${USERADDSETSCENEDEPS}"
# Recipe parse-time sanity checks
--
1.7.11.2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 02/11] multilib.bbclass: add class-multilib to override
2012-10-30 9:33 [PATCH 00/11] replace virtclass-native(sdk) with class-native(sdk) Robert Yang
2012-10-30 9:33 ` [PATCH 01/11] classes: " Robert Yang
@ 2012-10-30 9:33 ` Robert Yang
2012-10-30 9:54 ` Richard Purdie
2012-10-30 9:33 ` [PATCH 03/11] conf: replace virtclass-native(sdk) with class-native(sdk) Robert Yang
` (8 subsequent siblings)
10 siblings, 1 reply; 14+ messages in thread
From: Robert Yang @ 2012-10-30 9:33 UTC (permalink / raw)
To: openembedded-core; +Cc: Zhenfeng.Zhao
Add the new override way CLASSOVERRIDE = "class-multilib" to
multilib.bbclass, and add the check code to sanity.bbclass, we keep both
the old and new way, which means, both of the following are supported:
virtclass-multilib
class-multilib
[YOCTO #3297]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/classes/multilib.bbclass | 2 ++
meta/classes/sanity.bbclass | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index 77ccce4..2dd2f85 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -1,3 +1,5 @@
+CLASSOVERRIDE = "class-multilib"
+
python multilib_virtclass_handler () {
if not isinstance(e, bb.event.RecipePreFinalise):
return
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 3806bc5..ba1cd6d 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -122,7 +122,8 @@ def check_toolchain(data):
tune_error_set.append("The multilib '%s' appears more than once." % lib)
else:
seen_libs.append(lib)
- tune = data.getVar("DEFAULTTUNE_virtclass-multilib-%s" % lib, True)
+ tune = data.getVar("DEFAULTTUNE_virtclass-multilib-%s" % lib, True) or \
+ data.getVar("DEFAULTTUNE_class-multilib-%s" % lib, True)
if tune in seen_tunes:
tune_error_set.append("The tuning '%s' appears in more than one multilib." % tune)
else:
--
1.7.11.2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 03/11] conf: replace virtclass-native(sdk) with class-native(sdk)
2012-10-30 9:33 [PATCH 00/11] replace virtclass-native(sdk) with class-native(sdk) Robert Yang
2012-10-30 9:33 ` [PATCH 01/11] classes: " Robert Yang
2012-10-30 9:33 ` [PATCH 02/11] multilib.bbclass: add class-multilib to override Robert Yang
@ 2012-10-30 9:33 ` Robert Yang
2012-10-30 9:33 ` [PATCH 04/11] recipes-core: " Robert Yang
` (7 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Robert Yang @ 2012-10-30 9:33 UTC (permalink / raw)
To: openembedded-core; +Cc: Zhenfeng.Zhao
The overrides virtclass-native and virtclass-nativesdk are deprecated,
which should be replaced by class-native and class-nativesdk.
[YOCTO #3297]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/conf/distro/include/default-distrovars.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc
index ef8232d..9002fd6 100644
--- a/meta/conf/distro/include/default-distrovars.inc
+++ b/meta/conf/distro/include/default-distrovars.inc
@@ -18,7 +18,7 @@ DISTRO_FEATURES_LIBC_DEFAULT ?= "ipv4 ipv6 libc-backtrace libc-big-macros libc-b
libc-utmp libc-utmpx libc-wordexp libc-posix-clang-wchar libc-posix-regexp libc-posix-regexp-glibc \
libc-posix-wchar-io"
DISTRO_FEATURES_LIBC ?= "${DISTRO_FEATURES_LIBC_DEFAULT}"
-DISTRO_FEATURES_LIBC_virtclass-nativesdk = "${DISTRO_FEATURES_LIBC_DEFAULT}"
+DISTRO_FEATURES_LIBC_class-nativesdk = "${DISTRO_FEATURES_LIBC_DEFAULT}"
DISTRO_FEATURES ?= "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g x11 ${DISTRO_FEATURES_LIBC}"
IMAGE_FEATURES ?= ""
--
1.7.11.2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 04/11] recipes-core: replace virtclass-native(sdk) with class-native(sdk)
2012-10-30 9:33 [PATCH 00/11] replace virtclass-native(sdk) with class-native(sdk) Robert Yang
` (2 preceding siblings ...)
2012-10-30 9:33 ` [PATCH 03/11] conf: replace virtclass-native(sdk) with class-native(sdk) Robert Yang
@ 2012-10-30 9:33 ` Robert Yang
2012-10-30 9:33 ` [PATCH 05/11] recipes-devtools: " Robert Yang
` (6 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Robert Yang @ 2012-10-30 9:33 UTC (permalink / raw)
To: openembedded-core; +Cc: Zhenfeng.Zhao
The overrides virtclass-native and virtclass-nativesdk are deprecated,
which should be replaced by class-native and class-nativesdk.
[YOCTO #3297]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/recipes-core/coreutils/coreutils_6.9.bb | 4 ++--
meta/recipes-core/coreutils/coreutils_8.14.bb | 4 ++--
meta/recipes-core/dbus/dbus-glib.inc | 4 ++--
meta/recipes-core/dbus/dbus.inc | 12 ++++++------
meta/recipes-core/eglibc/eglibc-initial.inc | 2 +-
meta/recipes-core/eglibc/eglibc.inc | 6 +++---
meta/recipes-core/eglibc/eglibc_2.16.bb | 2 +-
meta/recipes-core/gettext/gettext_0.16.1.bb | 4 ++--
meta/recipes-core/gettext/gettext_0.18.1.1.bb | 6 +++---
meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb | 6 +++---
meta/recipes-core/glib-2.0/glib.inc | 6 +++---
meta/recipes-core/jpeg/jpeg_8d.bb | 2 +-
meta/recipes-core/libxml/libxml2.inc | 6 +++---
meta/recipes-core/ncurses/ncurses.inc | 4 ++--
meta/recipes-core/uclibc/uclibc-initial_0.9.33.bb | 2 +-
meta/recipes-core/uclibc/uclibc-initial_git.bb | 2 +-
meta/recipes-core/uclibc/uclibc_0.9.33.bb | 2 +-
meta/recipes-core/uclibc/uclibc_git.bb | 2 +-
meta/recipes-core/util-linux/util-linux.inc | 6 +++---
meta/recipes-core/util-linux/util-linux_2.21.2.bb | 2 +-
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 20d8120..ffdd2af 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 \
file://src/ls.c;startline=4;endline=16;md5=482a96d4f25010a4e13f8743e0c3685e"
PR = "r3"
DEPENDS = "coreutils-native-${PV}"
-DEPENDS_virtclass-native = "gettext-native"
+DEPENDS_class-native = "gettext-native"
inherit autotools gettext
@@ -28,7 +28,7 @@ SRC_URI_BASE = "${GNU_MIRROR}/coreutils/${BP}.tar.bz2 \
"
SRC_URI = "${SRC_URI_BASE} file://fix_for_manpage_building.patch"
-SRC_URI_virtclass-native = "${SRC_URI_BASE}"
+SRC_URI_class-native = "${SRC_URI_BASE}"
SRC_URI[md5sum] = "c9607d8495f16e98906e7ed2d9751a06"
SRC_URI[sha256sum] = "89c2895ad157de50e53298b22d91db116ee4e1dd3fdf4019260254e2e31497b0"
diff --git a/meta/recipes-core/coreutils/coreutils_8.14.bb b/meta/recipes-core/coreutils/coreutils_8.14.bb
index 178bd67..3f58cfd 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\
file://src/ls.c;startline=5;endline=16;md5=e1a509558876db58fb6667ba140137ad"
PR = "r5"
DEPENDS = "gmp libcap"
-DEPENDS_virtclass-native = ""
+DEPENDS_class-native = ""
inherit autotools gettext
@@ -21,7 +21,7 @@ SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \
SRC_URI[md5sum] = "bcb135ce553493a45aba01b39eb3920a"
SRC_URI[sha256sum] = "0d120817c19292edb19e92ae6b8eac9020e03d51e0af9cb116cf82b65d18b02d"
-EXTRA_OECONF_virtclass-native = "--without-gmp"
+EXTRA_OECONF_class-native = "--without-gmp"
# [ df mktemp base64 gets a special treatment and is not included in this
bindir_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 3469a4f..dff30c7 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 \
SECTION = "base"
DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus"
-DEPENDS_virtclass-native = "glib-2.0-native dbus-native"
+DEPENDS_class-native = "glib-2.0-native dbus-native"
SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
file://no-examples.patch \
@@ -24,7 +24,7 @@ PACKAGECONFIG[tests] = "--enable-tests,,,"
EXTRA_OECONF = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml \
--with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool"
-EXTRA_OECONF_virtclass-native = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml"
+EXTRA_OECONF_class-native = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml"
PACKAGES += "${PN}-bash-completion ${PN}-tests-dbg ${PN}-tests"
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 550eb0a..d165cdd 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 \
file://dbus/dbus.h;firstline=6;endline=20;md5=6eea2e0c7750dd8e620dcb1437312fa5"
X11DEPENDS = "virtual/libx11 libsm"
DEPENDS = "expat virtual/libintl ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
-DEPENDS_virtclass-native = "expat-native virtual/libintl-native"
-DEPENDS_virtclass-nativesdk = "nativesdk-expat virtual/nativesdk-libintl virtual/libx11"
+DEPENDS_class-native = "expat-native virtual/libintl-native"
+DEPENDS_class-nativesdk = "nativesdk-expat virtual/nativesdk-libintl virtual/libx11"
INC_PR = "r5"
@@ -34,7 +34,7 @@ DEBIANNAME_${PN} = "dbus-1"
PACKAGES =+ "${PN}-lib ${PN}-systemd"
OLDPKGNAME = "dbus-x11"
-OLDPKGNAME_virtclass-nativesdk = ""
+OLDPKGNAME_class-nativesdk = ""
# for compatibility
RPROVIDES_${PN} = "${OLDPKGNAME}"
@@ -64,7 +64,7 @@ pkg_postinst_dbus() {
}
EXTRA_OECONF_X = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}"
-EXTRA_OECONF_X_virtclass-native = "--without-x --disable-x11-autolaunch"
+EXTRA_OECONF_X_class-native = "--without-x --disable-x11-autolaunch"
EXTRA_OECONF = "--disable-tests \
--disable-checks \
@@ -105,7 +105,7 @@ do_install() {
ln -sf /dev/null ${D}/${systemd_unitdir}/system/dbus-1.service
}
-do_install_virtclass-native() {
+do_install_class-native() {
autotools_do_install
# for dbus-glib-native introspection generation
@@ -117,7 +117,7 @@ do_install_virtclass-native() {
./bus/dbus-daemon --introspect > ${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml
}
-do_install_virtclass-nativesdk() {
+do_install_class-nativesdk() {
autotools_do_install
}
BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-core/eglibc/eglibc-initial.inc b/meta/recipes-core/eglibc/eglibc-initial.inc
index 1520efd..c1a090e 100644
--- a/meta/recipes-core/eglibc/eglibc-initial.inc
+++ b/meta/recipes-core/eglibc/eglibc-initial.inc
@@ -7,7 +7,7 @@ PACKAGES = ""
PACKAGES_DYNAMIC = ""
STAGINGCC = "gcc-cross-initial"
-STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-initial"
+STAGINGCC_class-nativesdk = "gcc-crosssdk-initial"
TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}"
do_configure () {
diff --git a/meta/recipes-core/eglibc/eglibc.inc b/meta/recipes-core/eglibc/eglibc.inc
index e1ec6b2..3d136bf 100644
--- a/meta/recipes-core/eglibc/eglibc.inc
+++ b/meta/recipes-core/eglibc/eglibc.inc
@@ -3,7 +3,7 @@ require eglibc-ld.inc
require eglibc-testing.inc
STAGINGCC = "gcc-cross-initial"
-STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-initial"
+STAGINGCC_class-nativesdk = "gcc-crosssdk-initial"
PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:"
TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TCBOOTSTRAP}"
@@ -39,7 +39,7 @@ CACHED_CONFIGUREVARS += "ac_cv_path_KSH=${base_bindir}/bash \
"
GLIBC_EXTRA_OECONF ?= ""
-GLIBC_EXTRA_OECONF_virtclass-nativesdk = ""
+GLIBC_EXTRA_OECONF_class-nativesdk = ""
INHIBIT_DEFAULT_DEPS = "1"
ARM_INSTRUCTION_SET = "arm"
@@ -68,4 +68,4 @@ do_configure_append() {
GLIBC_ADDONS ?= "ports,nptl,libidn"
SDK_GLIBC_ADDONS ?= "ports,nptl,libidn"
-GLIBC_ADDONS_virtclass-nativesdk = "${SDK_GLIBC_ADDONS}"
+GLIBC_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 56a0a38..aa9256c 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 \
file://posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \
file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff "
-SRC_URI_append_virtclass-nativesdk = " file://ld-search-order.patch \
+SRC_URI_append_class-nativesdk = " file://ld-search-order.patch \
file://relocatable_sdk.patch \
"
S = "${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 00045d5..db8314b 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"
PR = "r6"
DEPENDS = "virtual/libiconv"
-DEPENDS_virtclass-native = ""
+DEPENDS_class-native = ""
PROVIDES = "virtual/libintl virtual/gettext"
-PROVIDES_virtclass-native = ""
+PROVIDES_class-native = ""
SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
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 0f6f068..c3265e1 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"
PR = "r18"
DEPENDS = "gettext-native virtual/libiconv ncurses expat"
-DEPENDS_virtclass-native = "gettext-minimal-native"
+DEPENDS_class-native = "gettext-minimal-native"
PROVIDES = "virtual/libintl virtual/gettext"
-PROVIDES_virtclass-native = "virtual/gettext-native"
+PROVIDES_class-native = "virtual/gettext-native"
RCONFLICTS_${PN} = "proxy-libintl"
SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
file://parallel.patch \
@@ -100,7 +100,7 @@ do_install_append() {
rm -f ${D}${libdir}/preloadable_libintl.so
}
-do_install_append_virtclass-native () {
+do_install_append_class-native () {
rm ${D}${datadir}/aclocal/*
rm ${D}${datadir}/gettext/config.rpath
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 10c0b61..22c6c7b 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"
PE = "1"
DEPENDS += "libffi python-argparse-native zlib"
-DEPENDS_virtclass-native += "libffi-native python-argparse-native"
-DEPENDS_virtclass-nativesdk += "nativesdk-libffi python-argparse-native nativesdk-zlib ${BPN}-native"
+DEPENDS_class-native += "libffi-native python-argparse-native"
+DEPENDS_class-nativesdk += "nativesdk-libffi python-argparse-native nativesdk-zlib ${BPN}-native"
SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
@@ -19,7 +19,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
SRC_URI[md5sum] = "bf84fefd9c1a5b5a7a38736f4ddd674a"
SRC_URI[sha256sum] = "a5d742a4fda22fb6975a8c0cfcd2499dd1c809b8afd4ef709bda4d11b167fae2"
-SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch"
+SRC_URI_append_class-native = " file://glib-gettextize-dir.patch"
BBCLASSEXTEND = "native nativesdk"
do_configure_prepend() {
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 8b099f2..6e2b5d2 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"
SECTION = "libs"
DEPENDS = "glib-2.0-native zip virtual/libiconv"
-DEPENDS_virtclass-native = "pkgconfig-native gettext-native"
-DEPENDS_virtclass-nativesdk = "nativesdk-libtool"
+DEPENDS_class-native = "pkgconfig-native gettext-native"
+DEPENDS_class-nativesdk = "nativesdk-libtool"
PACKAGES =+ "${PN}-utils ${PN}-bash-completion ${PN}-codegen"
LEAD_SONAME = "libglib-2.0.*"
@@ -28,7 +28,7 @@ S = "${WORKDIR}/glib-${PV}"
CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap"
EXTRA_OECONF = "--enable-included-printf=no ${CORECONF}"
-EXTRA_OECONF_virtclass-native = "${CORECONF}"
+EXTRA_OECONF_class-native = "${CORECONF}"
EXTRA_OECONF_linuxstdbase = "--enable-included-printf=no ${CORECONF}"
FILES_${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 6781619..eba5bf4 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"
SECTION = "libs"
DEPENDS = "libtool-cross"
-DEPENDS_virtclass-native = "libtool-native"
+DEPENDS_class-native = "libtool-native"
PR = "r1"
diff --git a/meta/recipes-core/libxml/libxml2.inc b/meta/recipes-core/libxml/libxml2.inc
index 68437ae..9ec507b 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 \
file://list.c;beginline=4;endline=13;md5=cdbfa3dee51c099edb04e39f762ee907 \
file://trio.c;beginline=5;endline=14;md5=6c025753c86d958722ec76e94cae932e"
-DEPENDS_virtclass-native = "python-native"
+DEPENDS_class-native = "python-native"
DEPENDS =+ "zlib"
SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz \
@@ -25,8 +25,8 @@ do_configure_prepend () {
}
EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --with-c14n --without-lzma"
-EXTRA_OECONF_virtclass-native = "--with-python=${STAGING_BINDIR}/python --without-legacy --with-catalog --without-docbook --with-c14n --without-lzma"
-EXTRA_OECONF_virtclass-nativesdk = "--with-python=${STAGING_BINDIR}/python --without-legacy --with-catalog --without-docbook --with-c14n --without-lzma"
+EXTRA_OECONF_class-native = "--with-python=${STAGING_BINDIR}/python --without-legacy --with-catalog --without-docbook --with-c14n --without-lzma"
+EXTRA_OECONF_class-nativesdk = "--with-python=${STAGING_BINDIR}/python --without-legacy --with-catalog --without-docbook --with-c14n --without-lzma"
EXTRA_OECONF_linuxstdbase = "--without-python --with-debug --with-legacy --with-catalog --with-docbook --with-c14n --without-lzma"
# required for pythong binding
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index cce080d..24b19c7 100644
--- a/meta/recipes-core/ncurses/ncurses.inc
+++ b/meta/recipes-core/ncurses/ncurses.inc
@@ -5,7 +5,7 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=cbc180a8c44ca642e97c35452fab5f66"
SECTION = "libs"
DEPENDS = "ncurses-native"
-DEPENDS_virtclass-native = ""
+DEPENDS_class-native = ""
INC_PR = "r12"
inherit autotools binconfig multilib_header
@@ -27,7 +27,7 @@ ENABLE_WIDEC ?= "true"
BUILD_CPPFLAGS += "-D_GNU_SOURCE"
# natives don't generally look in base_libdir
-base_libdir_virtclass-native = "${libdir}"
+base_libdir_class-native = "${libdir}"
# Helper function for do_configure to allow multiple configurations
# $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 211d530..22f56de 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 = ""
PACKAGES_DYNAMIC = ""
STAGINGCC = "gcc-cross-initial"
-STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-initial"
+STAGINGCC_class-nativesdk = "gcc-crosssdk-initial"
do_install() {
# 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 6fd7529..c0b7d52 100644
--- a/meta/recipes-core/uclibc/uclibc-initial_git.bb
+++ b/meta/recipes-core/uclibc/uclibc-initial_git.bb
@@ -9,7 +9,7 @@ PACKAGES = ""
PACKAGES_DYNAMIC = ""
STAGINGCC = "gcc-cross-initial"
-STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-initial"
+STAGINGCC_class-nativesdk = "gcc-crosssdk-initial"
do_install() {
# 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 8deedd3..4071d2a 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
require uclibc-${PV}.inc
STAGINGCC = "gcc-cross-initial"
-STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-initial"
+STAGINGCC_class-nativesdk = "gcc-crosssdk-initial"
DEPENDS = "virtual/${TARGET_PREFIX}binutils \
virtual/${TARGET_PREFIX}gcc-initial \
diff --git a/meta/recipes-core/uclibc/uclibc_git.bb b/meta/recipes-core/uclibc/uclibc_git.bb
index e8a6d68..a66656d 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
require uclibc-git.inc
STAGINGCC = "gcc-cross-initial"
-STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-initial"
+STAGINGCC_class-nativesdk = "gcc-crosssdk-initial"
PROVIDES += "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index d62d406..f2f9a04 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
inherit autotools gettext pkgconfig
DEPENDS = "zlib ncurses"
-DEPENDS_append_virtclass-native = " lzo-native"
+DEPENDS_append_class-native = " lzo-native"
SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.bz2 \
file://MCONFIG \
@@ -73,8 +73,8 @@ RREPLACES_util-linux-blkid = "e2fsprogs-blkid"
RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup"
RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs "
-RRECOMMENDS_${PN}_virtclass-native = ""
-RDEPENDS_${PN}_virtclass-native = ""
+RRECOMMENDS_${PN}_class-native = ""
+RDEPENDS_${PN}_class-native = ""
do_compile () {
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 e64ebe9..24bed27 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() {
addtask remove_lscpu before do_configure after do_patch
CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=as"
-EXTRA_OECONF_virtclass-native += "--disable-fallocate --disable-use-tty-group"
+EXTRA_OECONF_class-native += "--disable-fallocate --disable-use-tty-group"
--
1.7.11.2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 05/11] recipes-devtools: replace virtclass-native(sdk) with class-native(sdk)
2012-10-30 9:33 [PATCH 00/11] replace virtclass-native(sdk) with class-native(sdk) Robert Yang
` (3 preceding siblings ...)
2012-10-30 9:33 ` [PATCH 04/11] recipes-core: " Robert Yang
@ 2012-10-30 9:33 ` Robert Yang
2012-10-30 9:33 ` [PATCH 06/11] recipes-extended: " Robert Yang
` (5 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Robert Yang @ 2012-10-30 9:33 UTC (permalink / raw)
To: openembedded-core; +Cc: Zhenfeng.Zhao
The overrides virtclass-native and virtclass-nativesdk are deprecated,
which should be replaced by class-native and class-nativesdk.
[YOCTO #3297]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/recipes-devtools/autoconf/autoconf.inc | 6 +++---
meta/recipes-devtools/autoconf/autoconf_2.69.bb | 2 +-
meta/recipes-devtools/automake/automake_1.12.3.bb | 8 ++++----
meta/recipes-devtools/binutils/binutils_2.22.bb | 4 ++--
meta/recipes-devtools/bison/bison_2.3.bb | 6 +++---
meta/recipes-devtools/bison/bison_2.5.1.bb | 6 +++---
meta/recipes-devtools/chrpath/chrpath_0.14.bb | 4 ++--
meta/recipes-devtools/dpkg/dpkg.inc | 10 +++++-----
meta/recipes-devtools/elfutils/elfutils_0.148.bb | 6 +++---
meta/recipes-devtools/file/file_5.11.bb | 4 ++--
meta/recipes-devtools/flex/flex.inc | 2 +-
meta/recipes-devtools/git/git.inc | 4 ++--
meta/recipes-devtools/gnu-config/gnu-config_20120814.bb | 2 +-
meta/recipes-devtools/gnu-config/gnu-config_git.bb | 2 +-
meta/recipes-devtools/guile/guile_2.0.6.bb | 2 +-
meta/recipes-devtools/insserv/insserv_1.14.0.bb | 2 +-
meta/recipes-devtools/intltool/intltool.inc | 8 ++++----
meta/recipes-devtools/intltool/intltool_0.50.0.bb | 2 +-
meta/recipes-devtools/opensp/opensp_1.5.2.bb | 4 ++--
meta/recipes-devtools/opkg-utils/opkg-utils_git.bb | 4 ++--
meta/recipes-devtools/opkg/opkg.inc | 8 ++++----
meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb | 2 +-
meta/recipes-devtools/perl/perl_5.14.2.bb | 2 +-
meta/recipes-devtools/pkgconfig/pkgconfig.inc | 8 ++++----
meta/recipes-devtools/pseudo/pseudo.inc | 12 ++++++------
meta/recipes-devtools/python/python-pygobject_2.27.91.bb | 4 ++--
meta/recipes-devtools/python/python-setuptools_0.6c11.bb | 2 +-
meta/recipes-devtools/python/python_2.7.3.bb | 2 +-
meta/recipes-devtools/qemu/qemu.inc | 12 ++++++------
meta/recipes-devtools/qemu/qemu_1.2.0.bb | 6 +++---
meta/recipes-devtools/rpm/rpm_5.4.9.bb | 6 +++---
meta/recipes-devtools/rpm/rpmresolve_1.0.bb | 2 +-
meta/recipes-devtools/tcltk/tcl_8.5.11.bb | 6 +++---
.../unfs-server/unfs-server_2.1+2.2beta47.bb | 4 ++--
34 files changed, 82 insertions(+), 82 deletions(-)
diff --git a/meta/recipes-devtools/autoconf/autoconf.inc b/meta/recipes-devtools/autoconf/autoconf.inc
index ff375cd..2c46117 100644
--- a/meta/recipes-devtools/autoconf/autoconf.inc
+++ b/meta/recipes-devtools/autoconf/autoconf.inc
@@ -6,8 +6,8 @@ LICENSE = "GPLv3"
HOMEPAGE = "http://www.gnu.org/software/autoconf/"
SECTION = "devel"
DEPENDS += "m4-native"
-DEPENDS_virtclass-native = "m4-native gnu-config-native"
-DEPENDS_virtclass-nativesdk = "nativesdk-m4 nativesdk-gnu-config"
+DEPENDS_class-native = "m4-native gnu-config-native"
+DEPENDS_class-nativesdk = "nativesdk-m4 nativesdk-gnu-config"
RDEPENDS_${PN} = "m4 gnu-config \
perl \
perl-module-carp \
@@ -25,7 +25,7 @@ RDEPENDS_${PN} = "m4 gnu-config \
perl-module-io-file \
perl-module-posix \
"
-RDEPENDS_${PN}_virtclass-native = "m4-native gnu-config-native"
+RDEPENDS_${PN}_class-native = "m4-native gnu-config-native"
SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.gz \
file://program_prefix.patch"
diff --git a/meta/recipes-devtools/autoconf/autoconf_2.69.bb b/meta/recipes-devtools/autoconf/autoconf_2.69.bb
index a4afd33..730c89e 100644
--- a/meta/recipes-devtools/autoconf/autoconf_2.69.bb
+++ b/meta/recipes-devtools/autoconf/autoconf_2.69.bb
@@ -21,7 +21,7 @@ SRC_URI += "file://autoreconf-include.patch \
SRC_URI[md5sum] = "82d05e03b93e45f5a39b828dc9c6c29b"
SRC_URI[sha256sum] = "954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969"
-SRC_URI_append_virtclass-native = " file://fix_path_xtra.patch"
+SRC_URI_append_class-native = " file://fix_path_xtra.patch"
EXTRA_OECONF += "ac_cv_path_M4=m4"
diff --git a/meta/recipes-devtools/automake/automake_1.12.3.bb b/meta/recipes-devtools/automake/automake_1.12.3.bb
index 362500c..aaa5ee5 100644
--- a/meta/recipes-devtools/automake/automake_1.12.3.bb
+++ b/meta/recipes-devtools/automake/automake_1.12.3.bb
@@ -1,7 +1,7 @@
require automake.inc
LICENSE="GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-DEPENDS_virtclass-native = "autoconf-native"
+DEPENDS_class-native = "autoconf-native"
RDEPENDS_${PN} += "\
autoconf \
@@ -14,11 +14,11 @@ RDEPENDS_${PN} += "\
perl-module-threads \
perl-module-vars "
-RDEPENDS_${PN}_virtclass-native = "autoconf-native perl-native-runtime"
+RDEPENDS_${PN}_class-native = "autoconf-native perl-native-runtime"
PATHFIXPATCH = "file://path_prog_fixes.patch"
-PATHFIXPATCH_virtclass-native = ""
-PATHFIXPATCH_virtclass-nativesdk = ""
+PATHFIXPATCH_class-native = ""
+PATHFIXPATCH_class-nativesdk = ""
SRC_URI += "${PATHFIXPATCH} \
file://prefer-cpio-over-pax-for-ustar-archives.patch \
diff --git a/meta/recipes-devtools/binutils/binutils_2.22.bb b/meta/recipes-devtools/binutils/binutils_2.22.bb
index b8250d8..17eeb9c 100644
--- a/meta/recipes-devtools/binutils/binutils_2.22.bb
+++ b/meta/recipes-devtools/binutils/binutils_2.22.bb
@@ -8,9 +8,9 @@ EXTRA_OECONF += "--with-sysroot=/ \
--enable-shared \
"
-EXTRA_OECONF_virtclass-native = "--enable-target=all --enable-64-bit-bfd --enable-install-libbfd"
+EXTRA_OECONF_class-native = "--enable-target=all --enable-64-bit-bfd --enable-install-libbfd"
-do_install_virtclass-native () {
+do_install_class-native () {
autotools_do_install
# Install the libiberty header
diff --git a/meta/recipes-devtools/bison/bison_2.3.bb b/meta/recipes-devtools/bison/bison_2.3.bb
index 86edf3e..027782c 100644
--- a/meta/recipes-devtools/bison/bison_2.3.bb
+++ b/meta/recipes-devtools/bison/bison_2.3.bb
@@ -19,8 +19,8 @@ SRC_URI = "${BASE_SRC_URI}"
SRC_URI[md5sum] = "22327efdd5080e2b1acb6e560a04b43a"
SRC_URI[sha256sum] = "52f78aa4761a74ceb7fdf770f3554dd84308c3b93c4255e3a5c17558ecda293e"
-DEPENDS_virtclass-native = "gettext-native"
-SRC_URI_virtclass-native = "${BASE_SRC_URI}"
+DEPENDS_class-native = "gettext-native"
+SRC_URI_class-native = "${BASE_SRC_URI}"
inherit autotools gettext
acpaths = "-I ${S}/m4"
@@ -30,7 +30,7 @@ do_configure_prepend () {
cp ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/runtime-po/
}
-do_install_append_virtclass-native() {
+do_install_append_class-native() {
create_wrapper ${D}/${bindir}/bison \
M4=${STAGING_BINDIR_NATIVE}/m4 \
BISON_PKGDATADIR=${STAGING_DATADIR_NATIVE}/bison
diff --git a/meta/recipes-devtools/bison/bison_2.5.1.bb b/meta/recipes-devtools/bison/bison_2.5.1.bb
index 47b4a6c..5fe5113 100644
--- a/meta/recipes-devtools/bison/bison_2.5.1.bb
+++ b/meta/recipes-devtools/bison/bison_2.5.1.bb
@@ -21,13 +21,13 @@ SRC_URI[md5sum] = "8fedf916f1aa2c4a31441d8f8bbc603c"
SRC_URI[sha256sum] = "48dc3649231b75ac160d73528000ec89b6cd8d3b87cb7d0713f72ef4610442d4"
LDFLAGS_prepend_libc-uclibc = " -lrt "
-DEPENDS_virtclass-native = "gettext-minimal-native"
-SRC_URI_virtclass-native = "${BASE_SRC_URI}"
+DEPENDS_class-native = "gettext-minimal-native"
+SRC_URI_class-native = "${BASE_SRC_URI}"
inherit autotools gettext
acpaths = "-I ${S}/m4"
-do_install_append_virtclass-native() {
+do_install_append_class-native() {
create_wrapper ${D}/${bindir}/bison \
M4=${STAGING_BINDIR_NATIVE}/m4 \
BISON_PKGDATADIR=${STAGING_DATADIR_NATIVE}/bison
diff --git a/meta/recipes-devtools/chrpath/chrpath_0.14.bb b/meta/recipes-devtools/chrpath/chrpath_0.14.bb
index bb9b4b6..533e974 100644
--- a/meta/recipes-devtools/chrpath/chrpath_0.14.bb
+++ b/meta/recipes-devtools/chrpath/chrpath_0.14.bb
@@ -18,9 +18,9 @@ inherit autotools
# We don't have a staged chrpath-native for ensuring our binary is
# relocatable, so use the one we've just built
-CHRPATH_BIN_virtclass-native = "${S}/chrpath"
+CHRPATH_BIN_class-native = "${S}/chrpath"
-PROVIDES_append_virtclass-native = " chrpath-replacement-native"
+PROVIDES_append_class-native = " chrpath-replacement-native"
NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}"
BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index 723d1b2..27f69ef 100644
--- a/meta/recipes-devtools/dpkg/dpkg.inc
+++ b/meta/recipes-devtools/dpkg/dpkg.inc
@@ -8,9 +8,9 @@ SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.xz \
file://ignore_extra_fields.patch"
DEPENDS = "zlib bzip2 perl"
-DEPENDS_virtclass-native = "bzip2-native zlib-native virtual/update-alternatives-native gettext-native perl-native-runtime"
+DEPENDS_class-native = "bzip2-native zlib-native virtual/update-alternatives-native gettext-native perl-native-runtime"
RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}"
-RDEPENDS_${PN}_virtclass-native = ""
+RDEPENDS_${PN}_class-native = ""
S = "${WORKDIR}/${BPN}-${PV}"
@@ -19,7 +19,7 @@ PARALLEL_MAKE = ""
inherit autotools gettext perlnative
export PERL_LIBDIR = "${libdir}/perl"
-PERL_LIBDIR_virtclass-native = "${libdir}/perl-native/perl"
+PERL_LIBDIR_class-native = "${libdir}/perl-native/perl"
EXTRA_OECONF = "--without-static-progs \
--without-dselect \
@@ -58,7 +58,7 @@ do_install_append () {
# Create a wrapper for the perl script to avoid the "bad interpreter"
# error when the tmpdir is longer than 150.
-do_install_append_virtclass-native () {
+do_install_append_class-native () {
tmp=`find ${D}${bindir} -type f -exec grep -m 1 -l '#!/.*/perl-native/perl' {} \;`
for i in $tmp; do
create_wrapper $i ${STAGING_BINDIR_NATIVE}/perl-native/perl
@@ -66,7 +66,7 @@ do_install_append_virtclass-native () {
}
PROV = "virtual/update-alternatives"
-PROV_virtclass-native = ""
+PROV_class-native = ""
PROVIDES += "${PROV}"
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.148.bb b/meta/recipes-devtools/elfutils/elfutils_0.148.bb
index 5d45f3a..45931b0 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.148.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.148.bb
@@ -46,7 +46,7 @@ SRC_URI += "\
inherit autotools gettext
EXTRA_OECONF = "--program-prefix=eu- --without-lzma"
-EXTRA_OECONF_append_virtclass-native = " --without-bzlib"
+EXTRA_OECONF_append_class-native = " --without-bzlib"
EXTRA_OECONF_append_libc-uclibc = " --enable-uclibc"
do_configure_prepend() {
@@ -60,8 +60,8 @@ do_configure_prepend() {
# build only libelf for uclibc case
EXTRA_OEMAKE_libc-uclibc = "-C libelf"
-EXTRA_OEMAKE_virtclass-native = ""
-EXTRA_OEMAKE_virtclass-nativesdk = ""
+EXTRA_OEMAKE_class-native = ""
+EXTRA_OEMAKE_class-nativesdk = ""
BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-devtools/file/file_5.11.bb b/meta/recipes-devtools/file/file_5.11.bb
index 540c2b2..be6a863 100644
--- a/meta/recipes-devtools/file/file_5.11.bb
+++ b/meta/recipes-devtools/file/file_5.11.bb
@@ -9,7 +9,7 @@ LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=6a7382872edb68d33e1a9398b6e03188"
DEPENDS = "zlib file-native"
-DEPENDS_virtclass-native = "zlib-native"
+DEPENDS_class-native = "zlib-native"
PR = "r0"
SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \
@@ -29,7 +29,7 @@ do_configure_prepend() {
FILES_${PN} += "${datadir}/misc/*.mgc"
-do_install_append_virtclass-native() {
+do_install_append_class-native() {
create_cmdline_wrapper ${D}/${bindir}/file \
--magic-file ${datadir}/misc/magic.mgc
}
diff --git a/meta/recipes-devtools/flex/flex.inc b/meta/recipes-devtools/flex/flex.inc
index 01f7571..472813b 100644
--- a/meta/recipes-devtools/flex/flex.inc
+++ b/meta/recipes-devtools/flex/flex.inc
@@ -10,6 +10,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/flex/flex-${PV}.tar.bz2 "
inherit autotools gettext
-do_install_append_virtclass-native() {
+do_install_append_class-native() {
create_wrapper ${D}/${bindir}/flex M4=${STAGING_BINDIR_NATIVE}/m4
}
diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc
index 4a0c4aa..55e1482 100644
--- a/meta/recipes-devtools/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
@@ -3,7 +3,7 @@ SECTION = "console/utils"
LICENSE = "GPLv2"
DEPENDS = "openssl curl zlib expat"
-PROVIDES_append_virtclass-native = " git-replacement-native"
+PROVIDES_append_class-native = " git-replacement-native"
SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.bz2 "
S = "${WORKDIR}/git-${PV}"
@@ -31,7 +31,7 @@ do_install () {
rm -rf ${D}${libdir}/perl-native
}
-do_install_append_virtclass-native() {
+do_install_append_class-native() {
create_wrapper ${D}/${bindir}/git \
GIT_EXEC_PATH=${libexecdir}/git-core \
GIT_TEMPLATE_DIR=${STAGING_DATADIR_NATIVE}/git-core/templates
diff --git a/meta/recipes-devtools/gnu-config/gnu-config_20120814.bb b/meta/recipes-devtools/gnu-config/gnu-config_20120814.bb
index dd9248f..97c66b3 100644
--- a/meta/recipes-devtools/gnu-config/gnu-config_20120814.bb
+++ b/meta/recipes-devtools/gnu-config/gnu-config_20120814.bb
@@ -4,7 +4,7 @@ SECTION = "devel"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://config.guess;endline=39;md5=b79a4663475f4d724846463277817e0d"
-DEPENDS_virtclass-native = "perl-native-runtime"
+DEPENDS_class-native = "perl-native-runtime"
INHIBIT_DEFAULT_DEPS = "1"
diff --git a/meta/recipes-devtools/gnu-config/gnu-config_git.bb b/meta/recipes-devtools/gnu-config/gnu-config_git.bb
index 73efbb0..8112690 100644
--- a/meta/recipes-devtools/gnu-config/gnu-config_git.bb
+++ b/meta/recipes-devtools/gnu-config/gnu-config_git.bb
@@ -4,7 +4,7 @@ SECTION = "devel"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://config.guess;endline=39;md5=0e6ca0501b27177f3bc640f7225e3ead"
-DEPENDS_virtclass-native = "perl-native-runtime"
+DEPENDS_class-native = "perl-native-runtime"
INHIBIT_DEFAULT_DEPS = "1"
diff --git a/meta/recipes-devtools/guile/guile_2.0.6.bb b/meta/recipes-devtools/guile/guile_2.0.6.bb
index a9df4f7..b5f55af 100644
--- a/meta/recipes-devtools/guile/guile_2.0.6.bb
+++ b/meta/recipes-devtools/guile/guile_2.0.6.bb
@@ -56,7 +56,7 @@ do_compile_append() {
fi
}
-do_install_append_virtclass-native() {
+do_install_append_class-native() {
install -m 0755 ${D}${bindir}/guile ${D}${bindir}/${HOST_SYS}-guile
create_wrapper ${D}/${bindir}/guile \
diff --git a/meta/recipes-devtools/insserv/insserv_1.14.0.bb b/meta/recipes-devtools/insserv/insserv_1.14.0.bb
index c424a15..1d1f59d 100644
--- a/meta/recipes-devtools/insserv/insserv_1.14.0.bb
+++ b/meta/recipes-devtools/insserv/insserv_1.14.0.bb
@@ -21,7 +21,7 @@ do_install () {
install -m0644 ${WORKDIR}/insserv.conf ${D}${sysconfdir}/insserv.conf
}
-do_install_virtclass-native () {
+do_install_class-native () {
oe_runmake 'DESTDIR=${D}/${STAGING_DIR_NATIVE}' install
install -m0644 ${WORKDIR}/insserv.conf ${D}${sysconfdir}/insserv.conf
}
diff --git a/meta/recipes-devtools/intltool/intltool.inc b/meta/recipes-devtools/intltool/intltool.inc
index 59974d8..bf0e45b 100644
--- a/meta/recipes-devtools/intltool/intltool.inc
+++ b/meta/recipes-devtools/intltool/intltool.inc
@@ -8,11 +8,11 @@ S = "${WORKDIR}/intltool-${PV}"
DEPENDS = "libxml-parser-perl-native"
RDEPENDS_${PN} = "gettext-dev libxml-parser-perl"
-DEPENDS_virtclass-native = "libxml-parser-perl-native"
+DEPENDS_class-native = "libxml-parser-perl-native"
# gettext is assumed to exist on the host
-RDEPENDS_${PN}_virtclass-native = "libxml-parser-perl-native"
+RDEPENDS_${PN}_class-native = "libxml-parser-perl-native"
RRECOMMENDS_${PN} = "perl-modules"
-RRECOMMENDS_${PN}_virtclass-native = ""
+RRECOMMENDS_${PN}_class-native = ""
FILES_${PN}-dev = ""
FILES_${PN} += "${datadir}/aclocal"
@@ -22,6 +22,6 @@ INSANE_SKIP_${PN} += "dev-deps"
inherit autotools pkgconfig perlnative
export PERL = "${bindir}/env perl"
-PERL_virtclass-native = "/usr/bin/env nativeperl"
+PERL_class-native = "/usr/bin/env nativeperl"
BBCLASSEXTEND = "native"
diff --git a/meta/recipes-devtools/intltool/intltool_0.50.0.bb b/meta/recipes-devtools/intltool/intltool_0.50.0.bb
index fa9850f..f890e92 100644
--- a/meta/recipes-devtools/intltool/intltool_0.50.0.bb
+++ b/meta/recipes-devtools/intltool/intltool_0.50.0.bb
@@ -13,7 +13,7 @@ SRC_URI += "file://intltool-nowarn-0.50.0.patch \
# in the intltool.m4 via the remove-xml-check.patch
NATIVEPATCHES = "file://noperlcheck.patch \
file://remove-xml-check.patch"
-NATIVEPATCHES_virtclass-native = "file://use-nativeperl.patch"
+NATIVEPATCHES_class-native = "file://use-nativeperl.patch"
SRC_URI[md5sum] = "0da9847a60391ca653df35123b1f7cc0"
SRC_URI[sha256sum] = "dccfb0b7dd35a170130e8934bfd30c29da6ae73bcd3ca4ba71317c977b2893d6"
diff --git a/meta/recipes-devtools/opensp/opensp_1.5.2.bb b/meta/recipes-devtools/opensp/opensp_1.5.2.bb
index ecf8a37..7edd59d 100644
--- a/meta/recipes-devtools/opensp/opensp_1.5.2.bb
+++ b/meta/recipes-devtools/opensp/opensp_1.5.2.bb
@@ -22,7 +22,7 @@ inherit autotools gettext
EXTRA_OECONF = "--disable-doc-build"
-EXTRA_OECONF_virtclass-native = "\
+EXTRA_OECONF_class-native = "\
--disable-doc-build \
--enable-default-catalog=${sysconfdir}/sgml/catalog \
--enable-default-search-path=${datadir}/sgml \
@@ -41,7 +41,7 @@ do_install_append() {
ln -sf osx sgml2xml
}
-do_install_append_virtclass-native() {
+do_install_append_class-native() {
for util in nsgmls sgmlnorm spam spcat spent sx; do
create_cmdline_wrapper ${D}/${bindir}/$util \
-D ${sysconfdir}/sgml
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
index a3c6702..c74febc 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
@@ -5,7 +5,7 @@ LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://opkg.py;beginline=1;endline=18;md5=15917491ad6bf7acc666ca5f7cc1e083"
RDEPENDS_${PN} = "python python-shell python-io python-math python-crypt python-logging python-fcntl python-subprocess python-pickle python-compression python-textutils python-stringold"
-RDEPENDS_${PN}_virtclass-native = ""
+RDEPENDS_${PN}_class-native = ""
SRCREV = "f1a9d6701993a6f6b1930b4c2bdb71525aa25320"
PV = "0.1.8+git${SRCPV}"
@@ -15,7 +15,7 @@ SRC_URI = "git://git.yoctoproject.org/opkg-utils;protocol=git \
S = "${WORKDIR}/git"
# Avoid circular dependencies from package_ipk.bbclass
-PACKAGES_virtclass-native = ""
+PACKAGES_class-native = ""
do_install() {
oe_runmake PREFIX=${prefix} DESTDIR=${D} install
diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc
index 28cc6a6..b3d587c 100644
--- a/meta/recipes-devtools/opkg/opkg.inc
+++ b/meta/recipes-devtools/opkg/opkg.inc
@@ -27,15 +27,15 @@ EXTRA_OECONF += " --disable-gpg \
target_localstatedir := "${localstatedir}"
EXTRA_OECONF += "--with-opkglibdir=${localstatedir}/lib"
-EXTRA_OECONF_virtclass-native = "--with-opkglibdir=${target_localstatedir}/lib --disable-gpg --disable-curl --disable-openssl"
-EXTRA_OECONF_virtclass-nativesdk = "--with-opkglibdir=${target_localstatedir}/lib --disable-gpg --disable-curl --disable-openssl"
+EXTRA_OECONF_class-native = "--with-opkglibdir=${target_localstatedir}/lib --disable-gpg --disable-curl --disable-openssl"
+EXTRA_OECONF_class-nativesdk = "--with-opkglibdir=${target_localstatedir}/lib --disable-gpg --disable-curl --disable-openssl"
PROVIDES += "virtual/update-alternatives"
RPROVIDES_update-alternatives-cworth += "update-alternatives"
RCONFLICTS_update-alternatives-cworth = "update-alternatives-dpkg"
RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-config-base"
-RDEPENDS_${PN}_virtclass-native = ""
-RDEPENDS_${PN}_virtclass-nativesdk = ""
+RDEPENDS_${PN}_class-native = ""
+RDEPENDS_${PN}_class-nativesdk = ""
PACKAGE_ARCH_update-alternatives-cworth = "all"
RREPLACES_${PN} = "opkg-nogpg"
diff --git a/meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb b/meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb
index 33b4d83..66df915 100644
--- a/meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb
+++ b/meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb
@@ -29,7 +29,7 @@ do_compile() {
cpan_do_compile
}
-do_compile_virtclass-native() {
+do_compile_class-native() {
cpan_do_compile
}
diff --git a/meta/recipes-devtools/perl/perl_5.14.2.bb b/meta/recipes-devtools/perl/perl_5.14.2.bb
index 1e1eb04..bfc34d5 100644
--- a/meta/recipes-devtools/perl/perl_5.14.2.bb
+++ b/meta/recipes-devtools/perl/perl_5.14.2.bb
@@ -312,7 +312,7 @@ python populate_packages_prepend () {
}
PACKAGES_DYNAMIC += "^perl-module-.*"
-PACKAGES_DYNAMIC_virtclass-nativesdk += "^nativesdk-perl-module-.*"
+PACKAGES_DYNAMIC_class-nativesdk += "^nativesdk-perl-module-.*"
RPROVIDES_perl-lib = "perl-lib"
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig.inc b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
index 8a8320e..83a9cdf 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig.inc
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
@@ -9,8 +9,8 @@ LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
DEPENDS = "glib-2.0 popt"
-DEPENDS_virtclass-native = ""
-DEPENDS_virtclass-nativesdk = ""
+DEPENDS_class-native = ""
+DEPENDS_class-nativesdk = ""
SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz \
file://autofoo.patch \
@@ -22,8 +22,8 @@ S = "${WORKDIR}/pkg-config-${PV}/"
inherit autotools
EXTRA_OECONF = "--with-installed-glib --with-installed-popt --disable-legacy-scripts"
-EXTRA_OECONF_virtclass-native = "--disable-legacy-scripts"
-EXTRA_OECONF_virtclass-nativesdk = "--disable-legacy-scripts"
+EXTRA_OECONF_class-native = "--disable-legacy-scripts"
+EXTRA_OECONF_class-nativesdk = "--disable-legacy-scripts"
acpaths = "-I ."
do_configure_prepend () {
diff --git a/meta/recipes-devtools/pseudo/pseudo.inc b/meta/recipes-devtools/pseudo/pseudo.inc
index 095e6e0..98f706c 100644
--- a/meta/recipes-devtools/pseudo/pseudo.inc
+++ b/meta/recipes-devtools/pseudo/pseudo.inc
@@ -9,9 +9,9 @@ SECTION = "base"
LICENSE = "LGPL2.1"
DEPENDS = "sqlite3"
-SRC_URI_append_virtclass-nativesdk = " file://symver.patch"
+SRC_URI_append_class-nativesdk = " file://symver.patch"
-SRC_URI_append_virtclass-native = " file://symver.patch"
+SRC_URI_append_class-native = " file://symver.patch"
FILES_${PN} = "${libdir}/pseudo/lib*/libpseudo.so ${bindir}/* ${localstatedir}/pseudo ${prefix}/var/pseudo"
FILES_${PN}-dbg += "${libdir}/pseudo/lib*/.debug"
@@ -40,7 +40,7 @@ do_compile () {
# Two below are the same
# If necessary compile for the alternative machine arch. This is only
# necessary in a native build.
-do_compile_prepend_virtclass-native () {
+do_compile_prepend_class-native () {
if [ "${SITEINFO_BITS}" = "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" = "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
# We need the 32-bit libpseudo on a 64-bit machine...
# ... and we really, really, hope that the native host is
@@ -58,7 +58,7 @@ do_compile_prepend_virtclass-native () {
fi
}
-do_compile_prepend_virtclass-nativesdk () {
+do_compile_prepend_class-nativesdk () {
if [ "${SITEINFO_BITS}" = "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" = "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
# We need the 32-bit libpseudo on a 64-bit machine...
# ... and we really, really, hope that the native host is
@@ -77,14 +77,14 @@ do_install () {
# Two below are the same
# If necessary install for the alternative machine arch. This is only
# necessary in a native build.
-do_install_append_virtclass-native () {
+do_install_append_class-native () {
if [ "${SITEINFO_BITS}" = "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" = "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
mkdir -p ${D}${prefix}/lib/pseudo/lib
cp lib/pseudo/lib/libpseudo.so ${D}${prefix}/lib/pseudo/lib/.
fi
}
-do_install_append_virtclass-nativesdk () {
+do_install_append_class-nativesdk () {
if [ "${SITEINFO_BITS}" = "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" = "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
mkdir -p ${D}${prefix}/lib/pseudo/lib
cp lib/pseudo/lib/libpseudo.so ${D}${prefix}/lib/pseudo/lib/.
diff --git a/meta/recipes-devtools/python/python-pygobject_2.27.91.bb b/meta/recipes-devtools/python/python-pygobject_2.27.91.bb
index d08668e..daf570d 100644
--- a/meta/recipes-devtools/python/python-pygobject_2.27.91.bb
+++ b/meta/recipes-devtools/python/python-pygobject_2.27.91.bb
@@ -3,8 +3,8 @@ SECTION = "devel/python"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7"
DEPENDS = "python python-pygobject-native glib-2.0"
-DEPENDS_virtclass-native = "glib-2.0-native"
-RDEPENDS_virtclass-native = ""
+DEPENDS_class-native = "glib-2.0-native"
+RDEPENDS_class-native = ""
PR = "r5"
MAJ_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
diff --git a/meta/recipes-devtools/python/python-setuptools_0.6c11.bb b/meta/recipes-devtools/python/python-setuptools_0.6c11.bb
index 24dd9e5..8608104 100644
--- a/meta/recipes-devtools/python/python-setuptools_0.6c11.bb
+++ b/meta/recipes-devtools/python/python-setuptools_0.6c11.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://setup.py;beginline=23;endline=23;md5=8a314270dd7a8dbc
SRCNAME = "setuptools"
PR = "ml5"
DEPENDS += "python"
-DEPENDS_virtclass-native += "python-native"
+DEPENDS_class-native += "python-native"
SRC_URI = "\
http://cheeseshop.python.org/packages/source/s/setuptools/${SRCNAME}-${PV}.tar.gz\
diff --git a/meta/recipes-devtools/python/python_2.7.3.bb b/meta/recipes-devtools/python/python_2.7.3.bb
index 3eb36fc..3a17c85 100644
--- a/meta/recipes-devtools/python/python_2.7.3.bb
+++ b/meta/recipes-devtools/python/python_2.7.3.bb
@@ -148,7 +148,7 @@ require python-${PYTHON_MAJMIN}-manifest.inc
RPROVIDES_${PN}-core = "${PN}"
RRECOMMENDS_${PN}-core = "${PN}-readline"
RRECOMMENDS_${PN}-crypt = "openssl"
-RRECOMMENDS_${PN}-crypt_virtclass-nativesdk = "nativesdk-openssl"
+RRECOMMENDS_${PN}-crypt_class-nativesdk = "nativesdk-openssl"
# package libpython2
PACKAGES =+ "lib${BPN}2"
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 28ff760..95556ba 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -9,8 +9,8 @@ QEMU_TARGETS ?= "arm i386 mips mipsel mips64 mips64el ppc sh4 x86_64"
require qemu-targets.inc
SDL ?= "--disable-sdl"
-SDL_virtclass-native ?= ""
-SDL_virtclass-nativesdk ?= ""
+SDL_class-native ?= ""
+SDL_class-nativesdk ?= ""
EXTRA_OECONF += "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls --audio-drv-list=oss,alsa --audio-card-list=ac97,es1370 ${SDL} --disable-curl --disable-vnc-jpeg --disable-bluez"
@@ -40,10 +40,10 @@ do_install () {
PACKAGECONFIG ??= ""
-DEPENDS_virtclass-native = "zlib-native alsa-lib-native glib-2.0-native"
-DEPENDS_virtclass-nativesdk = "nativesdk-zlib nativesdk-libsdl nativesdk-glib-2.0"
-RDEPENDS_virtclass-nativesdk = "nativesdk-libsdl"
-EXTRA_OECONF_virtclass-nativesdk = "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls \
+DEPENDS_class-native = "zlib-native alsa-lib-native glib-2.0-native"
+DEPENDS_class-nativesdk = "nativesdk-zlib nativesdk-libsdl nativesdk-glib-2.0"
+RDEPENDS_class-nativesdk = "nativesdk-libsdl"
+EXTRA_OECONF_class-nativesdk = "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls \
--disable-curl \
"
diff --git a/meta/recipes-devtools/qemu/qemu_1.2.0.bb b/meta/recipes-devtools/qemu/qemu_1.2.0.bb
index 5cc142a..af5eb03 100644
--- a/meta/recipes-devtools/qemu/qemu_1.2.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_1.2.0.bb
@@ -20,11 +20,11 @@ SRC_URI[sha256sum] = "c8b84420d9f4869397f84cad2dabd9a475b7723d619a924a873740353e
PR = "r4"
-SRC_URI_append_virtclass-nativesdk = "\
+SRC_URI_append_class-nativesdk = "\
file://relocatable_sdk.patch \
"
-do_configure_prepend_virtclass-nativesdk() {
+do_configure_prepend_class-nativesdk() {
if [ "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "" ] ; then
# Undo the -lX11 added by linker-flags.patch
sed -i 's/-lX11//g' Makefile.target
@@ -45,7 +45,7 @@ do_install_append() {
}
# END of qemu-mips workaround
-do_configure_prepend_virtclass-native() {
+do_configure_prepend_class-native() {
# Undo the -lX11 added by linker-flags.patch, don't assume that host has libX11 installed
sed -i 's/-lX11//g' Makefile.target
}
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.9.bb b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
index e838f40..3268160 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.9.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
@@ -91,13 +91,13 @@ acpaths = "-I ${S}/db/dist/aclocal -I ${S}/db/dist/aclocal_java"
# Specify the default rpm macros in terms of adjustable variables
rpm_macros = "%{_usrlibrpm}/macros:%{_usrlibrpm}/poky/macros:%{_usrlibrpm}/poky/%{_target}/macros:%{_etcrpm}/macros.*:%{_etcrpm}/macros:%{_etcrpm}/%{_target}/macros:~/.oerpmmacros"
-rpm_macros_virtclass-native = "%{_usrlibrpm}/macros:%{_usrlibrpm}/poky/macros:%{_usrlibrpm}/poky/%{_target}/macros:~/.oerpmmacros"
+rpm_macros_class-native = "%{_usrlibrpm}/macros:%{_usrlibrpm}/poky/macros:%{_usrlibrpm}/poky/%{_target}/macros:~/.oerpmmacros"
# sqlite lua tcl augeas nss gcrypt neon xz xar keyutils perl selinux
# Note: perl and sqlite w/o db specified does not currently work.
# tcl, augeas, nss, gcrypt, xar and keyutils support is untested.
-PACKAGECONFIG_virtclass-native ??= "db bzip2 zlib beecrypt openssl libelf python"
+PACKAGECONFIG_class-native ??= "db bzip2 zlib beecrypt openssl libelf python"
PACKAGECONFIG ??= "db bzip2 zlib beecrypt openssl libelf python"
PACKAGECONFIG[bzip2] = "--with-bzip2,--without-bzip2,bzip2,"
@@ -431,7 +431,7 @@ do_install_append() {
rm -f ${D}/usr/lib/rpm/bin/api-sanity-checker.pl
}
-do_install_append_virtclass-native() {
+do_install_append_class-native() {
create_wrapper ${D}/${bindir}/rpm \
RPM_USRLIBRPM=${STAGING_LIBDIR_NATIVE}/rpm \
RPM_ETCRPM=${STAGING_ETCDIR_NATIVE}/rpm \
diff --git a/meta/recipes-devtools/rpm/rpmresolve_1.0.bb b/meta/recipes-devtools/rpm/rpmresolve_1.0.bb
index ea542e1..48c52c0 100644
--- a/meta/recipes-devtools/rpm/rpmresolve_1.0.bb
+++ b/meta/recipes-devtools/rpm/rpmresolve_1.0.bb
@@ -19,7 +19,7 @@ do_install() {
install -m 0755 rpmresolve ${D}${bindir}
}
-do_install_append_virtclass-native() {
+do_install_append_class-native() {
create_wrapper ${D}/${bindir}/rpmresolve \
RPM_USRLIBRPM=${STAGING_LIBDIR_NATIVE}/rpm \
RPM_ETCRPM=${STAGING_ETCDIR_NATIVE}/rpm \
diff --git a/meta/recipes-devtools/tcltk/tcl_8.5.11.bb b/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
index fab6057..b8f1e9a 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
@@ -23,13 +23,13 @@ SRC_URI = "${BASE_SRC_URI} \
SRC_URI[md5sum] = "b01a9691c83990b3db0ce62d1012ca67"
SRC_URI[sha256sum] = "8addc385fa6b5be4605e6d68fbdc4c0e674c5af1dc1c95ec5420390c4b08042a"
-SRC_URI_virtclass-native = "${BASE_SRC_URI}"
+SRC_URI_class-native = "${BASE_SRC_URI}"
S = "${WORKDIR}/tcl${PV}/unix"
inherit autotools
-DEPENDS_virtclass-native = ""
+DEPENDS_class-native = ""
EXTRA_OECONF = "--enable-threads --disable-rpath"
@@ -71,6 +71,6 @@ FILES_${PN}-dev += "${libdir}/tclConfig.sh"
# isn't getting picked up by shlibs code
RDEPENDS_${PN} += "tcl-lib"
-RDEPENDS_${PN}_virtclass-native = ""
+RDEPENDS_${PN}_class-native = ""
BBCLASSEXTEND = "native"
diff --git a/meta/recipes-devtools/unfs-server/unfs-server_2.1+2.2beta47.bb b/meta/recipes-devtools/unfs-server/unfs-server_2.1+2.2beta47.bb
index 7480638..f65e92b 100644
--- a/meta/recipes-devtools/unfs-server/unfs-server_2.1+2.2beta47.bb
+++ b/meta/recipes-devtools/unfs-server/unfs-server_2.1+2.2beta47.bb
@@ -4,8 +4,8 @@ LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
RDEPENDS_${PN} = "pseudo"
-RDEPENDS_${PN}_virtclass-native = "pseudo-native"
-RDEPENDS_${PN}_virtclass-nativesdk = "nativesdk-pseudo"
+RDEPENDS_${PN}_class-native = "pseudo-native"
+RDEPENDS_${PN}_class-nativesdk = "nativesdk-pseudo"
BASEPV = "2.2beta47"
PR = "r1"
--
1.7.11.2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 06/11] recipes-extended: replace virtclass-native(sdk) with class-native(sdk)
2012-10-30 9:33 [PATCH 00/11] replace virtclass-native(sdk) with class-native(sdk) Robert Yang
` (4 preceding siblings ...)
2012-10-30 9:33 ` [PATCH 05/11] recipes-devtools: " Robert Yang
@ 2012-10-30 9:33 ` Robert Yang
2012-10-30 9:33 ` [PATCH 07/11] recipes-graphics: " Robert Yang
` (4 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Robert Yang @ 2012-10-30 9:33 UTC (permalink / raw)
To: openembedded-core; +Cc: Zhenfeng.Zhao
The overrides virtclass-native and virtclass-nativesdk are deprecated,
which should be replaced by class-native and class-nativesdk.
[YOCTO #3297]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/recipes-extended/bzip2/bzip2_1.0.6.bb | 4 ++--
meta/recipes-extended/ghostscript/ghostscript_9.05.bb | 10 +++++-----
meta/recipes-extended/groff/groff_1.20.1.bb | 4 ++--
meta/recipes-extended/gzip/gzip_1.5.bb | 2 +-
meta/recipes-extended/perl/libtimedate-perl_1.20.bb | 2 +-
meta/recipes-extended/pigz/pigz.inc | 2 +-
meta/recipes-extended/stat/stat_3.3.bb | 2 +-
meta/recipes-extended/texinfo/texinfo_4.13a.bb | 6 +++---
meta/recipes-extended/unzip/unzip_6.0.bb | 2 +-
9 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/meta/recipes-extended/bzip2/bzip2_1.0.6.bb b/meta/recipes-extended/bzip2/bzip2_1.0.6.bb
index d03b57d..6e160cd 100644
--- a/meta/recipes-extended/bzip2/bzip2_1.0.6.bb
+++ b/meta/recipes-extended/bzip2/bzip2_1.0.6.bb
@@ -25,7 +25,7 @@ ALTERNATIVE_PRIORITY = "100"
ALTERNATIVE_${PN} = "bunzip2 bzcat"
#install binaries to bzip2-native under sysroot for replacement-native
-EXTRA_OECONF_virtclass-native += "--bindir=${STAGING_BINDIR_NATIVE}/${PN}"
+EXTRA_OECONF_class-native += "--bindir=${STAGING_BINDIR_NATIVE}/${PN}"
do_configure_prepend () {
cp ${WORKDIR}/configure.ac ${S}/
cp ${WORKDIR}/Makefile.am ${S}/
@@ -42,6 +42,6 @@ FILES_libbz2-staticdev = "${libdir}/*.a"
SECTION_libbz2-staticdev = "devel"
RDEPENDS_libbz2-staticdev = "libbz2-dev (= ${EXTENDPKGV})"
-PROVIDES_append_virtclass-native = " bzip2-replacement-native"
+PROVIDES_append_class-native = " bzip2-replacement-native"
BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.05.bb b/meta/recipes-extended/ghostscript/ghostscript_9.05.bb
index 1c18b21..1fdcb99 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_9.05.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_9.05.bb
@@ -18,7 +18,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c5326026692dbed183f0558f926580f8"
PR = "r3"
DEPENDS = "ghostscript-native tiff jpeg fontconfig cups"
-DEPENDS_virtclass-native = ""
+DEPENDS_class-native = ""
SRC_URI_BASE = "http://downloads.ghostscript.com/public/ghostscript-${PV}.tar.gz"
@@ -30,7 +30,7 @@ SRC_URI = "${SRC_URI_BASE} \
file://ghostscript-9.05-NOT-check-endian.patch \
"
-SRC_URI_virtclass-native = "${SRC_URI_BASE}"
+SRC_URI_class-native = "${SRC_URI_BASE}"
SRC_URI[md5sum] = "f7c6f0431ca8d44ee132a55d583212c1"
SRC_URI[sha256sum] = "593f77f7584704bdf9de41598a084a4208c3ad3b940a1de1faaf8f59a15cc207"
@@ -80,18 +80,18 @@ do_install_append () {
chown -R root:lp ${D}${sysconfdir}/cups
}
-python do_patch_virtclass-native () {
+python do_patch_class-native () {
pass
}
-do_compile_virtclass-native () {
+do_compile_class-native () {
mkdir -p obj
for i in genarch genconf mkromfs echogs gendev genht; do
oe_runmake obj/aux/$i
done
}
-do_install_virtclass-native () {
+do_install_class-native () {
install -d ${D}${bindir}/ghostscript-${PV}
for i in genarch genconf mkromfs echogs gendev genht; do
install -m 755 obj/aux/$i ${D}${bindir}/ghostscript-${PV}/$i
diff --git a/meta/recipes-extended/groff/groff_1.20.1.bb b/meta/recipes-extended/groff/groff_1.20.1.bb
index c7da1b4..157365b 100644
--- a/meta/recipes-extended/groff/groff_1.20.1.bb
+++ b/meta/recipes-extended/groff/groff_1.20.1.bb
@@ -14,7 +14,7 @@ SRC_URI[md5sum] = "48fa768dd6fdeb7968041dd5ae8e2b02"
SRC_URI[sha256sum] = "b645878135cb620c6c417c5601bfe96172245af12045540d7344938b4c2cd805"
DEPENDS = "groff-native"
-DEPENDS_virtclass-native = ""
+DEPENDS_class-native = ""
inherit autotools
@@ -44,7 +44,7 @@ do_install_append() {
done
}
-do_install_append_virtclass-native() {
+do_install_append_class-native() {
# Some distros have both /bin/perl and /usr/bin/perl, but we set perl location
# for target as /usr/bin/perl, so fix it to /usr/bin/perl.
for i in afmtodit mmroff; do
diff --git a/meta/recipes-extended/gzip/gzip_1.5.bb b/meta/recipes-extended/gzip/gzip_1.5.bb
index 2c6917d..f7b8593 100644
--- a/meta/recipes-extended/gzip/gzip_1.5.bb
+++ b/meta/recipes-extended/gzip/gzip_1.5.bb
@@ -2,7 +2,7 @@ require gzip.inc
PR = "r0"
-PROVIDES_append_virtclass-native = " gzip-replacement-native"
+PROVIDES_append_class-native = " gzip-replacement-native"
NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}"
BBCLASSEXTEND = "native"
diff --git a/meta/recipes-extended/perl/libtimedate-perl_1.20.bb b/meta/recipes-extended/perl/libtimedate-perl_1.20.bb
index 12439cf..780f774 100644
--- a/meta/recipes-extended/perl/libtimedate-perl_1.20.bb
+++ b/meta/recipes-extended/perl/libtimedate-perl_1.20.bb
@@ -13,7 +13,7 @@ inherit cpan allarch
BBCLASSEXTEND = "native"
-RDEPENDS_${PN}_virtclass-native = ""
+RDEPENDS_${PN}_class-native = ""
RDEPENDS_${PN} += "perl-module-carp perl-module-exporter perl-module-strict perl-module-time-local"
SRC_URI[md5sum] = "7da7452bce4c684e4238e6d09b390200"
diff --git a/meta/recipes-extended/pigz/pigz.inc b/meta/recipes-extended/pigz/pigz.inc
index 3721c97..c897f15 100644
--- a/meta/recipes-extended/pigz/pigz.inc
+++ b/meta/recipes-extended/pigz/pigz.inc
@@ -12,7 +12,7 @@ PR = "r1"
SRC_URI = "http://zlib.net/pigz/pigz-${PV}.tar.gz \
file://ldflags.patch"
-PROVIDES_virtclass-native += "gzip-native"
+PROVIDES_class-native += "gzip-native"
DEPENDS = "zlib"
diff --git a/meta/recipes-extended/stat/stat_3.3.bb b/meta/recipes-extended/stat/stat_3.3.bb
index b7666f0..73e0873 100644
--- a/meta/recipes-extended/stat/stat_3.3.bb
+++ b/meta/recipes-extended/stat/stat_3.3.bb
@@ -18,7 +18,7 @@ do_install() {
install -m 644 stat.1 ${D}${mandir}/man1
}
-#do_install_virtclass-native() {
+#do_install_class-native() {
# install -d ${D}${bindir}
# install -m 755 stat ${D}${bindir}
#}
diff --git a/meta/recipes-extended/texinfo/texinfo_4.13a.bb b/meta/recipes-extended/texinfo/texinfo_4.13a.bb
index 50892ce..327faab 100644
--- a/meta/recipes-extended/texinfo/texinfo_4.13a.bb
+++ b/meta/recipes-extended/texinfo/texinfo_4.13a.bb
@@ -9,10 +9,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=adefda309052235aa5d1e99ce7557010"
PR = "r5"
DEPENDS = "zlib ncurses texinfo-native"
-DEPENDS_virtclass-native = "zlib-native ncurses-native"
+DEPENDS_class-native = "zlib-native ncurses-native"
TARGET_PATCH = "file://use_host_makedoc.patch"
-TARGET_PATCH_virtclass-native = ""
+TARGET_PATCH_class-native = ""
SRC_URI = "${GNU_MIRROR}/texinfo/texinfo-${PV}.tar.gz \
file://texinfo-4.12-zlib.patch \
@@ -44,7 +44,7 @@ do_install_append() {
mkdir -p ${D}${datadir}/${tex_texinfo}
install -p -m644 doc/texinfo.tex doc/txi-??.tex ${D}${datadir}/${tex_texinfo}
}
-do_install_append_virtclass-native() {
+do_install_append_class-native() {
install -m 755 info/makedoc ${D}${bindir}
}
diff --git a/meta/recipes-extended/unzip/unzip_6.0.bb b/meta/recipes-extended/unzip/unzip_6.0.bb
index e11f9f7..a1547fc 100644
--- a/meta/recipes-extended/unzip/unzip_6.0.bb
+++ b/meta/recipes-extended/unzip/unzip_6.0.bb
@@ -16,7 +16,7 @@ S = "${WORKDIR}/unzip60"
EXTRA_OEMAKE += "STRIP=true LF2=''"
export LD = "${CC}"
-LD_virtclass-native = "${CC}"
+LD_class-native = "${CC}"
do_compile() {
oe_runmake -f unix/Makefile generic
--
1.7.11.2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 07/11] recipes-graphics: replace virtclass-native(sdk) with class-native(sdk)
2012-10-30 9:33 [PATCH 00/11] replace virtclass-native(sdk) with class-native(sdk) Robert Yang
` (5 preceding siblings ...)
2012-10-30 9:33 ` [PATCH 06/11] recipes-extended: " Robert Yang
@ 2012-10-30 9:33 ` Robert Yang
2012-10-30 9:33 ` [PATCH 08/11] recipes-support: " Robert Yang
` (3 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Robert Yang @ 2012-10-30 9:33 UTC (permalink / raw)
To: openembedded-core; +Cc: Zhenfeng.Zhao
The overrides virtclass-native and virtclass-nativesdk are deprecated,
which should be replaced by class-native and class-nativesdk.
[YOCTO #3297]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/recipes-graphics/freetype/freetype_2.4.10.bb | 4 ++--
meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | 2 +-
meta/recipes-graphics/pango/pango.inc | 2 +-
meta/recipes-graphics/xcb/xcb-proto.inc | 2 +-
meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb | 2 +-
meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb | 2 +-
meta/recipes-graphics/xorg-font/font-util_1.3.0.bb | 4 ++--
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/meta/recipes-graphics/freetype/freetype_2.4.10.bb b/meta/recipes-graphics/freetype/freetype_2.4.10.bb
index cf2a78e..9365475 100644
--- a/meta/recipes-graphics/freetype/freetype_2.4.10.bb
+++ b/meta/recipes-graphics/freetype/freetype_2.4.10.bb
@@ -27,7 +27,7 @@ inherit autotools pkgconfig binconfig
LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool"
EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'"
-EXTRA_OEMAKE_virtclass-native = ""
+EXTRA_OEMAKE_class-native = ""
EXTRA_OECONF = "--without-zlib --without-bzip2"
do_configure() {
@@ -40,7 +40,7 @@ do_configure() {
oe_runconf
}
-do_configure_virtclass-native() {
+do_configure_class-native() {
(cd builds/unix && gnu-configize) || die "failure running gnu-configize"
oe_runconf
}
diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
index d5c127d..e25c597 100644
--- a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
+++ b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
@@ -16,7 +16,7 @@ DEPENDS = "${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} \
${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxext libxrandr libxrender', '', d)} \
tslib"
-DEPENDS_virtclass-nativesdk = "${@base_contains('DISTRO_FEATURES', 'x11', 'nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}"
+DEPENDS_class-nativesdk = "${@base_contains('DISTRO_FEATURES', 'x11', 'nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}"
PR = "r1"
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc
index b361978..839c00d 100644
--- a/meta/recipes-graphics/pango/pango.inc
+++ b/meta/recipes-graphics/pango/pango.inc
@@ -16,7 +16,7 @@ PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
PACKAGECONFIG[x11] = "--with-x,--without-x,${X11DEPENDS}"
BBCLASSEXTEND = "native"
-DEPENDS_virtclass-native = "glib-2.0-native cairo-native"
+DEPENDS_class-native = "glib-2.0-native cairo-native"
PACKAGES_DYNAMIC += "^pango-module-.*"
diff --git a/meta/recipes-graphics/xcb/xcb-proto.inc b/meta/recipes-graphics/xcb/xcb-proto.inc
index feb9e4d..2e1b57b 100644
--- a/meta/recipes-graphics/xcb/xcb-proto.inc
+++ b/meta/recipes-graphics/xcb/xcb-proto.inc
@@ -21,5 +21,5 @@ FILES_python-xcbgen = "${libdir}/python*"
RDEPENDS_${PN}-dev = ""
RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
-DEPENDS_append_virtclass-native = " python-native"
+DEPENDS_append_class-native = " python-native"
BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb b/meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb
index 6637326..a453e24 100644
--- a/meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb
+++ b/meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb
@@ -12,7 +12,7 @@ PE = "1"
PR = "${INC_PR}.0"
RDEPENDS_${PN} += "mkfontscale"
-RDEPENDS_${PN}_virtclass-native += "mkfontscale-native"
+RDEPENDS_${PN}_class-native += "mkfontscale-native"
BBCLASSEXTEND = "native"
diff --git a/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb b/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb
index a212f19..2c51cbb 100644
--- a/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb
+++ b/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb
@@ -13,7 +13,7 @@ SRC_URI += "file://nocompiler.patch"
DEPENDS = "util-macros-native"
RDEPENDS_${PN} = "encodings font-util"
-RDEPENDS_${PN}_virtclass-native = "font-util-native"
+RDEPENDS_${PN}_class-native = "font-util-native"
inherit allarch
diff --git a/meta/recipes-graphics/xorg-font/font-util_1.3.0.bb b/meta/recipes-graphics/xorg-font/font-util_1.3.0.bb
index 180c7dd..723cb0c 100644
--- a/meta/recipes-graphics/xorg-font/font-util_1.3.0.bb
+++ b/meta/recipes-graphics/xorg-font/font-util_1.3.0.bb
@@ -10,9 +10,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c0067273d90f6336008cb2504e14bd32 \
file://map-ISO8859-1;beginline=9;endline=23;md5=1cecb984063248f29ffe5c46f5c04f34"
DEPENDS = "encodings util-macros"
-DEPENDS_virtclass-native = "util-macros-native"
+DEPENDS_class-native = "util-macros-native"
RDEPENDS_${PN} = "mkfontdir mkfontscale encodings"
-RDEPENDS_${PN}_virtclass-native = "mkfontdir-native mkfontscale-native"
+RDEPENDS_${PN}_class-native = "mkfontdir-native mkfontscale-native"
PR = "${INC_PR}.0"
--
1.7.11.2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 08/11] recipes-support: replace virtclass-native(sdk) with class-native(sdk)
2012-10-30 9:33 [PATCH 00/11] replace virtclass-native(sdk) with class-native(sdk) Robert Yang
` (6 preceding siblings ...)
2012-10-30 9:33 ` [PATCH 07/11] recipes-graphics: " Robert Yang
@ 2012-10-30 9:33 ` Robert Yang
2012-10-30 9:33 ` [PATCH 09/11] recipes-gnome: " Robert Yang
` (2 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Robert Yang @ 2012-10-30 9:33 UTC (permalink / raw)
To: openembedded-core; +Cc: Zhenfeng.Zhao
The overrides virtclass-native and virtclass-nativesdk are deprecated,
which should be replaced by class-native and class-nativesdk.
NOTE:
There were 2 errors in libcap.inc, the BUILD_LDFLAGS_virtclass_native
should be BUILD_LDFLAGS_virtclass-native (the "_" should be "-"),
otherwise it doesn't work, and the value was: "-Wl,rpath=...", this is
incorrect, it shoudl be: "-Wl,-rpath=..." (lacked a - ), but we don't
need this line, since it is already in the default BUILD_LDFLAGS. Remove
it and we don't need to bump the PR since we just removed a unused line.
[YOCTO #3297]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/recipes-support/apr/apr-util_1.4.1.bb | 4 ++--
meta/recipes-support/attr/ea-acl.inc | 4 ++--
meta/recipes-support/boost/boost.inc | 12 ++++++------
meta/recipes-support/createrepo/createrepo_0.4.11.bb | 4 ++--
meta/recipes-support/curl/curl_7.26.0.bb | 8 ++++----
meta/recipes-support/icu/icu-3.6.inc | 4 ++--
meta/recipes-support/libcap/libcap.inc | 8 +++-----
meta/recipes-support/neon/neon_0.29.6.bb | 2 +-
meta/recipes-support/shared-mime-info/shared-mime-info.inc | 4 ++--
meta/recipes-support/sqlite/sqlite3.inc | 4 ++--
10 files changed, 26 insertions(+), 28 deletions(-)
diff --git a/meta/recipes-support/apr/apr-util_1.4.1.bb b/meta/recipes-support/apr/apr-util_1.4.1.bb
index 238af97..7ee3de5 100644
--- a/meta/recipes-support/apr/apr-util_1.4.1.bb
+++ b/meta/recipes-support/apr/apr-util_1.4.1.bb
@@ -37,10 +37,10 @@ do_configure_append() {
cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk
fi
}
-do_configure_prepend_virtclass-native() {
+do_configure_prepend_class-native() {
cp ${STAGING_DATADIR_NATIVE}/apr/apr_rules.mk ${S}/build/rules.mk
}
-do_configure_append_virtclass-native() {
+do_configure_append_class-native() {
sed -i "s#LIBTOOL=\$(SHELL) \$(apr_builddir)#LIBTOOL=\$(SHELL) ${STAGING_BINDIR_NATIVE}#" ${S}/build/rules.mk
# sometimes there isn't SHELL
sed -i "s#LIBTOOL=\$(apr_builddir)#LIBTOOL=${STAGING_BINDIR_NATIVE}#" ${S}/build/rules.mk
diff --git a/meta/recipes-support/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc
index 0f506bc..bcc7acc 100644
--- a/meta/recipes-support/attr/ea-acl.inc
+++ b/meta/recipes-support/attr/ea-acl.inc
@@ -9,7 +9,7 @@ inherit autotools gettext
# overwritten by autoheader
export AUTOHEADER = "true"
EXTRA_OECONF = "INSTALL_USER=root INSTALL_GROUP=root"
-EXTRA_OECONF_append_virtclass-native = " --enable-gettext=no"
+EXTRA_OECONF_append_class-native = " --enable-gettext=no"
EXTRA_OEMAKE = "PKG_LIB_DIR=${base_libdir} PKG_DEVLIB_DIR=${libdir}"
@@ -55,4 +55,4 @@ fix_symlink () {
ln -sf ${libdir}/lib${BPN}.la ${base_libdir}/lib${BPN}.la
fi
}
-SSTATEPOSTINSTFUNCS_virtclass-native += "fix_symlink"
+SSTATEPOSTINSTFUNCS_class-native += "fix_symlink"
diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc
index ec602a6..36a94e1 100644
--- a/meta/recipes-support/boost/boost.inc
+++ b/meta/recipes-support/boost/boost.inc
@@ -7,7 +7,7 @@ DESCRIPTION = "Free peer-reviewed portable C++ source libraries"
HOMEPAGE = "http://www.boost.org/"
SECTION = "libs"
DEPENDS = "boost-native zlib"
-DEPENDS_virtclass-native = ""
+DEPENDS_class-native = ""
LICENSE = "BSL-1.0 & MIT & Python-2.0"
ARM_INSTRUCTION_SET = "arm"
@@ -73,7 +73,7 @@ FILES_${PN}-staticdev = "${libdir}/libboost_*.a"
# "boost" is a metapackage which pulls in all boost librabries
PACKAGES += "${PN}"
RRECOMMENDS_${PN} += "${BOOST_PACKAGES}"
-RRECOMMENDS_${PN}_virtclass-native = ""
+RRECOMMENDS_${PN}_class-native = ""
ALLOW_EMPTY_${PN} = "1"
# to avoid GNU_HASH QA errors added LDFLAGS to ARCH; a little bit dirty but at least it works
@@ -176,15 +176,15 @@ do_install() {
BBCLASSEXTEND = "native"
-do_configure_virtclass-native() {
+do_configure_class-native() {
:
}
-do_boostconfig_virtclass-native() {
+do_boostconfig_class-native() {
:
}
-do_compile_virtclass-native() {
+do_compile_class-native() {
set -ex
cd ${S}/tools/build/v2/engine
rm -rf bin.*
@@ -194,7 +194,7 @@ do_compile_virtclass-native() {
# This is too terrible - the build script doesn't give any good
# way I can see to find out where the binaries are placed, so
# rely on only one bin.foo directory being created.
-do_install_virtclass-native () {
+do_install_class-native () {
set -ex
cd ${S}/tools/build/v2/engine
install -d ${D}${bindir}/
diff --git a/meta/recipes-support/createrepo/createrepo_0.4.11.bb b/meta/recipes-support/createrepo/createrepo_0.4.11.bb
index 344cc77..8d2dcdf 100644
--- a/meta/recipes-support/createrepo/createrepo_0.4.11.bb
+++ b/meta/recipes-support/createrepo/createrepo_0.4.11.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://createrepo.baseurl.org/"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760"
-RDEPENDS_${PN}_virtclass-native += "libxml2-native rpm-native"
+RDEPENDS_${PN}_class-native += "libxml2-native rpm-native"
PR = "r7"
@@ -28,7 +28,7 @@ do_install () {
# Wrap the python script since the native python is
# ${bindir}/python-native/python, and the "#! /usr/bin/env python" can't
# find it since it is not in PATH.
-do_install_append_virtclass-native () {
+do_install_append_class-native () {
# Not all the python scripts should be wrapped since some of
# them are modules (be imported).
for i in ${D}${datadir}/createrepo/genpkgmetadata.py \
diff --git a/meta/recipes-support/curl/curl_7.26.0.bb b/meta/recipes-support/curl/curl_7.26.0.bb
index dad5572..9a0e7ce 100644
--- a/meta/recipes-support/curl/curl_7.26.0.bb
+++ b/meta/recipes-support/curl/curl_7.26.0.bb
@@ -6,8 +6,8 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e664ac"
DEPENDS = "zlib gnutls"
-DEPENDS_virtclass-native = "zlib-native openssl-native"
-DEPENDS_virtclass-nativesdk = "nativesdk-zlib"
+DEPENDS_class-native = "zlib-native openssl-native"
+DEPENDS_class-nativesdk = "nativesdk-zlib"
PR = "r1"
SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
@@ -29,8 +29,8 @@ EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
"
CURLGNUTLS = " --with-gnutls=${STAGING_LIBDIR}/../ --without-ssl"
-CURLGNUTLS_virtclass-native = "--without-gnutls --with-ssl"
-CURLGNUTLS_virtclass-nativesdk = "--without-gnutls --without-ssl"
+CURLGNUTLS_class-native = "--without-gnutls --with-ssl"
+CURLGNUTLS_class-nativesdk = "--without-gnutls --without-ssl"
do_configure_prepend() {
sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g configure.ac
diff --git a/meta/recipes-support/icu/icu-3.6.inc b/meta/recipes-support/icu/icu-3.6.inc
index d969caa..272f6d1 100644
--- a/meta/recipes-support/icu/icu-3.6.inc
+++ b/meta/recipes-support/icu/icu-3.6.inc
@@ -11,12 +11,12 @@ BASE_SRC_URI = "ftp://ftp.software.ibm.com/software/globalization/icu/3.6/icu4c-
SRC_URI = "${BASE_SRC_URI} \
file://noldlibpath.patch \
"
-SRC_URI_virtclass-native = "${BASE_SRC_URI}"
+SRC_URI_class-native = "${BASE_SRC_URI}"
LICENSE = "ICU"
LIC_FILES_CHKSUM = "file://../license.html;md5=5c94767cedb5d6987c902ac850ded2c6"
DEPENDS = "icu-native"
-DEPENDS_virtclass-native = ""
+DEPENDS_class-native = ""
S = "${WORKDIR}/icu/source"
diff --git a/meta/recipes-support/libcap/libcap.inc b/meta/recipes-support/libcap/libcap.inc
index 27552ad..7f16a56 100644
--- a/meta/recipes-support/libcap/libcap.inc
+++ b/meta/recipes-support/libcap/libcap.inc
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://License;md5=3f84fd6f29d453a56514cb7e4ead25f1"
DEPENDS = "attr perl-native-runtime"
DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
-# attr and pam are disabled by EXTRA_OEMAKE_virtclass-native
-DEPENDS_virtclass-native = "perl-native-runtime"
+# attr and pam are disabled by EXTRA_OEMAKE_class-native
+DEPENDS_class-native = "perl-native-runtime"
SRC_URI = "${DEBIAN_MIRROR}/main/libc/libcap2/${BPN}2_${PV}.orig.tar.gz"
@@ -23,15 +23,13 @@ do_configure() {
sed -e 's,BUILD_CFLAGS ?=,BUILD_CFLAGS := $(BUILD_CFLAGS),' -i Make.Rules
}
-BUILD_LDFLAGS_virtclass_native += "-Wl,rpath=${base_libdir}"
-
EXTRA_OEMAKE = " \
LIBATTR=yes \
PAM_CAP=${@base_contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)} \
INDENT= SYSTEM_HEADERS=${STAGING_INCDIR} RAISE_SETFCAP=no \
lib=${@os.path.basename('${libdir}')} \
"
-EXTRA_OEMAKE_virtclass-native = " \
+EXTRA_OEMAKE_class-native = " \
LIBATTR=no \
PAM_CAP=no \
INDENT= \
diff --git a/meta/recipes-support/neon/neon_0.29.6.bb b/meta/recipes-support/neon/neon_0.29.6.bb
index 170a47c..42d5e52 100644
--- a/meta/recipes-support/neon/neon_0.29.6.bb
+++ b/meta/recipes-support/neon/neon_0.29.6.bb
@@ -5,7 +5,7 @@ LICENSE = "LGPLv2+"
LIC_FILES_CHKSUM = "file://src/COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a \
file://src/ne_utils.h;beginline=1;endline=20;md5=2caca609538eddaa6f6adf120a218037"
DEPENDS = "zlib libxml2 expat time gnutls libproxy"
-DEPENDS_virtclass-native = "zlib-native libxml2-native expat-native gnutls-native"
+DEPENDS_class-native = "zlib-native libxml2-native expat-native gnutls-native"
PR = "r2"
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info.inc b/meta/recipes-support/shared-mime-info/shared-mime-info.inc
index d7fa67c..93f6010 100644
--- a/meta/recipes-support/shared-mime-info/shared-mime-info.inc
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info.inc
@@ -6,7 +6,7 @@ LICENSE = "LGPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
DEPENDS = "libxml2 intltool-native glib-2.0 shared-mime-info-native"
-DEPENDS_virtclass-native = "libxml2-native intltool-native glib-2.0-native"
+DEPENDS_class-native = "libxml2-native intltool-native glib-2.0-native"
SRC_URI = "http://freedesktop.org/~hadess/shared-mime-info-${PV}.tar.xz"
@@ -29,7 +29,7 @@ do_install () {
update-mime-database ${D}${datadir}/mime
}
-do_install_virtclass-native () {
+do_install_class-native () {
autotools_do_install
}
diff --git a/meta/recipes-support/sqlite/sqlite3.inc b/meta/recipes-support/sqlite/sqlite3.inc
index 70841f8..e94c6ef 100644
--- a/meta/recipes-support/sqlite/sqlite3.inc
+++ b/meta/recipes-support/sqlite/sqlite3.inc
@@ -2,13 +2,13 @@ DESCRIPTION = "An Embeddable SQL Database Engine"
HOMEPAGE = "http://www.sqlite.org"
SECTION = "libs"
DEPENDS = "readline ncurses"
-DEPENDS_virtclass-native = ""
+DEPENDS_class-native = ""
LICENSE = "PD"
inherit autotools pkgconfig
EXTRA_OECONF = "--disable-tcl --enable-shared --enable-threadsafe"
-EXTRA_OECONF_virtclass-native = "--disable-tcl --enable-shared --enable-threadsafe --disable-readline --enable-tempstore"
+EXTRA_OECONF_class-native = "--disable-tcl --enable-shared --enable-threadsafe --disable-readline --enable-tempstore"
export config_BUILD_CC = "${BUILD_CC}"
export config_BUILD_CFLAGS = "${BUILD_CFLAGS}"
export config_BUILD_LIBS = "${BUILD_LDFLAGS}"
--
1.7.11.2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 09/11] recipes-gnome: replace virtclass-native(sdk) with class-native(sdk)
2012-10-30 9:33 [PATCH 00/11] replace virtclass-native(sdk) with class-native(sdk) Robert Yang
` (7 preceding siblings ...)
2012-10-30 9:33 ` [PATCH 08/11] recipes-support: " Robert Yang
@ 2012-10-30 9:33 ` Robert Yang
2012-10-30 9:33 ` [PATCH 10/11] recipes-kernel: " Robert Yang
2012-10-30 9:33 ` [PATCH 11/11] recipes-connectivity: " Robert Yang
10 siblings, 0 replies; 14+ messages in thread
From: Robert Yang @ 2012-10-30 9:33 UTC (permalink / raw)
To: openembedded-core; +Cc: Zhenfeng.Zhao
The overrides virtclass-native and virtclass-nativesdk are deprecated,
which should be replaced by class-native and class-nativesdk.
[YOCTO #3297]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb | 6 +++---
meta/recipes-gnome/gnome/gconf_3.2.3.bb | 6 +++---
meta/recipes-gnome/gnome/gnome-doc-utils.inc | 4 ++--
meta/recipes-gnome/gtk+/gtk+_2.24.8.bb | 4 ++--
meta/recipes-gnome/librsvg/librsvg_2.32.1.bb | 4 ++--
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
index a77eee1..65a2d68 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
@@ -35,7 +35,7 @@ EXTRA_OECONF = "\
"
X11DEPENDS = "--without-x11"
X11DEPENDS_linuxstdbase = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x11', '--without-x11', d)}"
-X11DEPENDS_virtclass-native = "--without-x11"
+X11DEPENDS_class-native = "--without-x11"
PACKAGES =+ "${PN}-xlib"
@@ -73,7 +73,7 @@ fi
}
PACKAGES_DYNAMIC += "^gdk-pixbuf-loader-.*"
-PACKAGES_DYNAMIC_virtclass-native = ""
+PACKAGES_DYNAMIC_class-native = ""
python populate_packages_prepend () {
postinst_pixbufloader = d.getVar("postinst_pixbufloader", True)
@@ -83,7 +83,7 @@ python populate_packages_prepend () {
do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', postinst_pixbufloader)
}
-do_install_append_virtclass-native() {
+do_install_append_class-native() {
#Use wrapper script rather than binary as required libtool library is not installed now
GDK_PIXBUF_MODULEDIR=${D}${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders ${S}/gdk-pixbuf/gdk-pixbuf-query-loaders > ${D}${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders.cache
sed -i -e 's#${D}##g' ${D}${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders.cache
diff --git a/meta/recipes-gnome/gnome/gconf_3.2.3.bb b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
index 4d77a14..f80c910 100644
--- a/meta/recipes-gnome/gnome/gconf_3.2.3.bb
+++ b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
@@ -7,7 +7,7 @@ POLKIT = "polkit"
POLKIT_libc-uclibc = ""
DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native ${POLKIT} gobject-introspection-stub"
-DEPENDS_virtclass-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native gobject-introspection-stub-native"
+DEPENDS_class-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native gobject-introspection-stub-native"
PR = "r12"
@@ -22,7 +22,7 @@ SRC_URI[archive.sha256sum] = "52008a82a847527877d9e1e549a351c86cc53cada4733b8a70
S = "${WORKDIR}/GConf-${PV}"
POLKIT_OECONF = "--enable-defaults-service"
-POLKIT_OECONF_virtclass-native = "--disable-defaults-service"
+POLKIT_OECONF_class-native = "--disable-defaults-service"
POLKIT_OECONF_libc-uclibc = "--disable-default-service"
EXTRA_OECONF = "--enable-shared --disable-static --enable-debug=yes \
@@ -39,7 +39,7 @@ do_install_append() {
# disable dbus-x11 when x11 isn't in DISTRO_FEATURES
RDEPENDS_${PN} += "${@base_contains('DISTRO_FEATURES', 'x11', 'dbus-x11', '', d)}"
-RDEPENDS_${PN}_virtclass-native = ""
+RDEPENDS_${PN}_class-native = ""
FILES_${PN} += "${libdir}/GConf/* \
${libdir}/gio/*/*.so \
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils.inc b/meta/recipes-gnome/gnome/gnome-doc-utils.inc
index b2570d6..8ea0b96 100644
--- a/meta/recipes-gnome/gnome/gnome-doc-utils.inc
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils.inc
@@ -1,6 +1,6 @@
LICENSE = "GPLv2 & LGPLv2.1"
DEPENDS = "libxml2 libxslt libxslt-native gnome-doc-utils-native glib-2.0"
-DEPENDS_virtclass-native = "libxml2-native libxslt-native intltool-native glib-2.0-native"
+DEPENDS_class-native = "libxml2-native libxslt-native intltool-native glib-2.0-native"
inherit gnome gettext python-dir pythonnative
@@ -20,6 +20,6 @@ do_install_append_class-native () {
FILES_${PN} += "${datadir}/xml* ${PYTHON_SITEPACKAGES_DIR}/*"
RDEPENDS_${PN} = "bash"
-RDEPENDS_${PN}_virtclass-native = ""
+RDEPENDS_${PN}_class-native = ""
BBCLASSEXTEND = "native"
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb
index 5481f82..bbf765b 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb
@@ -38,8 +38,8 @@ LIBV = "2.10.0"
PACKAGES_DYNAMIC += "^gtk-immodule-.* ^gtk-printbackend-.*"
BBCLASSEXTEND = "native"
-RRECOMMENDS_${PN}_virtclass-native = ""
-DEPENDS_virtclass-native = "glib-2.0-native atk-native pango-native cairo-native gdk-pixbuf-native"
+RRECOMMENDS_${PN}_class-native = ""
+DEPENDS_class-native = "glib-2.0-native atk-native pango-native cairo-native gdk-pixbuf-native"
python populate_packages_prepend () {
prologue = d.getVar("postinst_prologue", True)
diff --git a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
index 100b51e..4f838e0 100644
--- a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
+++ b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
SECTION = "x11/utils"
DEPENDS = "gtk+ cairo libxml2"
-DEPENDS_virtclass-native = "cairo-native pango-native gdk-pixbuf-native"
+DEPENDS_class-native = "cairo-native pango-native gdk-pixbuf-native"
BBCLASSEXTEND = "native"
PR = "r10"
@@ -19,7 +19,7 @@ EXTRA_OECONF = "--disable-mozilla-plugin --without-svgz"
PACKAGECONFIG ??= "croco"
# When native we can manage without croco, as it's only for GTK+
-PACKAGECONFIG_virtclass-native = ""
+PACKAGECONFIG_class-native = ""
PACKAGECONFIG[croco] = "--with-croco,--without-croco,libcroco"
--
1.7.11.2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 10/11] recipes-kernel: replace virtclass-native(sdk) with class-native(sdk)
2012-10-30 9:33 [PATCH 00/11] replace virtclass-native(sdk) with class-native(sdk) Robert Yang
` (8 preceding siblings ...)
2012-10-30 9:33 ` [PATCH 09/11] recipes-gnome: " Robert Yang
@ 2012-10-30 9:33 ` Robert Yang
2012-10-30 9:33 ` [PATCH 11/11] recipes-connectivity: " Robert Yang
10 siblings, 0 replies; 14+ messages in thread
From: Robert Yang @ 2012-10-30 9:33 UTC (permalink / raw)
To: openembedded-core; +Cc: Zhenfeng.Zhao
The overrides virtclass-native and virtclass-nativesdk are deprecated,
which should be replaced by class-native and class-nativesdk.
[YOCTO #3297]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/recipes-kernel/systemtap/systemtap_git.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb
index 3f94e98..9e88ee9 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.bb
+++ b/meta/recipes-kernel/systemtap/systemtap_git.bb
@@ -3,8 +3,8 @@ DESCRIPTION = "SystemTap - script-directed dynamic tracing and performance analy
require systemtap_git.inc
DEPENDS = "elfutils sqlite3 systemtap-native"
-DEPENDS_virtclass-native = "elfutils-native sqlite3-native gettext-native"
-DEPENDS_virtclass-nativesdk = "nativesdk-elfutils nativesdk-sqlite3 nativesdk-gettext"
+DEPENDS_class-native = "elfutils-native sqlite3-native gettext-native"
+DEPENDS_class-nativesdk = "nativesdk-elfutils nativesdk-sqlite3 nativesdk-gettext"
PR = "r0"
--
1.7.11.2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 11/11] recipes-connectivity: replace virtclass-native(sdk) with class-native(sdk)
2012-10-30 9:33 [PATCH 00/11] replace virtclass-native(sdk) with class-native(sdk) Robert Yang
` (9 preceding siblings ...)
2012-10-30 9:33 ` [PATCH 10/11] recipes-kernel: " Robert Yang
@ 2012-10-30 9:33 ` Robert Yang
10 siblings, 0 replies; 14+ messages in thread
From: Robert Yang @ 2012-10-30 9:33 UTC (permalink / raw)
To: openembedded-core; +Cc: Zhenfeng.Zhao
The overrides virtclass-native and virtclass-nativesdk are deprecated,
which should be replaced by class-native and class-nativesdk.
[YOCTO #3297]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/recipes-connectivity/openssl/openssl.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index 089b9a4..c88b77a 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -23,7 +23,7 @@ CFLAG = "${@base_conditional('SITEINFO_ENDIANNESS', 'le', '-DL_ENDIAN', '-DB_END
# Avoid binaries being marked as requiring an executable stack (which causes
# issues with SELinux on the host)
-CFLAG_append_virtclass-native = " -Wa,--noexecstack"
+CFLAG_append_class-native = " -Wa,--noexecstack"
# -02 does not work on mipsel: ssh hangs when it tries to read /dev/urandom
CFLAG_mtx-1 := "${@'${CFLAG}'.replace('-O2', '')}"
--
1.7.11.2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH 02/11] multilib.bbclass: add class-multilib to override
2012-10-30 9:33 ` [PATCH 02/11] multilib.bbclass: add class-multilib to override Robert Yang
@ 2012-10-30 9:54 ` Richard Purdie
2012-10-30 14:04 ` Robert Yang
0 siblings, 1 reply; 14+ messages in thread
From: Richard Purdie @ 2012-10-30 9:54 UTC (permalink / raw)
To: Robert Yang; +Cc: Zhenfeng.Zhao, openembedded-core
On Tue, 2012-10-30 at 17:33 +0800, Robert Yang wrote:
> Add the new override way CLASSOVERRIDE = "class-multilib" to
> multilib.bbclass, and add the check code to sanity.bbclass, we keep both
> the old and new way, which means, both of the following are supported:
>
> virtclass-multilib
> class-multilib
>
> [YOCTO #3297]
>
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
> meta/classes/multilib.bbclass | 2 ++
> meta/classes/sanity.bbclass | 3 ++-
> 2 files changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
> index 77ccce4..2dd2f85 100644
> --- a/meta/classes/multilib.bbclass
> +++ b/meta/classes/multilib.bbclass
> @@ -1,3 +1,5 @@
> +CLASSOVERRIDE = "class-multilib"
> +
> python multilib_virtclass_handler () {
> if not isinstance(e, bb.event.RecipePreFinalise):
> return
> diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
> index 3806bc5..ba1cd6d 100644
> --- a/meta/classes/sanity.bbclass
> +++ b/meta/classes/sanity.bbclass
> @@ -122,7 +122,8 @@ def check_toolchain(data):
> tune_error_set.append("The multilib '%s' appears more than once." % lib)
> else:
> seen_libs.append(lib)
> - tune = data.getVar("DEFAULTTUNE_virtclass-multilib-%s" % lib, True)
> + tune = data.getVar("DEFAULTTUNE_virtclass-multilib-%s" % lib, True) or \
> + data.getVar("DEFAULTTUNE_class-multilib-%s" % lib, True)
> if tune in seen_tunes:
> tune_error_set.append("The tuning '%s' appears in more than one multilib." % tune)
> else:
Sorry but this isn't right. The multilib case is special since it sets
"class-multilib-xxx", not "class-multilib" without the suffix. The above
changes are just going to confuse people and depending on what you do in
other patches, may or may not work.
Can you resend the patch set just changing the native/nativesdk values
please? We can then look at multilib specifically as a follow up.
Cheers,
Richard
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 02/11] multilib.bbclass: add class-multilib to override
2012-10-30 9:54 ` Richard Purdie
@ 2012-10-30 14:04 ` Robert Yang
0 siblings, 0 replies; 14+ messages in thread
From: Robert Yang @ 2012-10-30 14:04 UTC (permalink / raw)
To: Richard Purdie; +Cc: Zhenfeng.Zhao, openembedded-core
Hi Richard,
I've pushed the new patches again (removed the old branch, and create
a new one):
git://git.pokylinux.org/poky-contrib robert/virtclass
Now only change the native/nativesdk values. I think that the virtclass-cross
should be changed to class-cross, too, but I didn't do it in these patches,
I will send another pull request for the virtclass-cross if it is fine.
// Robert
On 10/30/2012 05:54 PM, Richard Purdie wrote:
> On Tue, 2012-10-30 at 17:33 +0800, Robert Yang wrote:
>> Add the new override way CLASSOVERRIDE = "class-multilib" to
>> multilib.bbclass, and add the check code to sanity.bbclass, we keep both
>> the old and new way, which means, both of the following are supported:
>>
>> virtclass-multilib
>> class-multilib
>>
>> [YOCTO #3297]
>>
>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>> ---
>> meta/classes/multilib.bbclass | 2 ++
>> meta/classes/sanity.bbclass | 3 ++-
>> 2 files changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
>> index 77ccce4..2dd2f85 100644
>> --- a/meta/classes/multilib.bbclass
>> +++ b/meta/classes/multilib.bbclass
>> @@ -1,3 +1,5 @@
>> +CLASSOVERRIDE = "class-multilib"
>> +
>> python multilib_virtclass_handler () {
>> if not isinstance(e, bb.event.RecipePreFinalise):
>> return
>> diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
>> index 3806bc5..ba1cd6d 100644
>> --- a/meta/classes/sanity.bbclass
>> +++ b/meta/classes/sanity.bbclass
>> @@ -122,7 +122,8 @@ def check_toolchain(data):
>> tune_error_set.append("The multilib '%s' appears more than once." % lib)
>> else:
>> seen_libs.append(lib)
>> - tune = data.getVar("DEFAULTTUNE_virtclass-multilib-%s" % lib, True)
>> + tune = data.getVar("DEFAULTTUNE_virtclass-multilib-%s" % lib, True) or \
>> + data.getVar("DEFAULTTUNE_class-multilib-%s" % lib, True)
>> if tune in seen_tunes:
>> tune_error_set.append("The tuning '%s' appears in more than one multilib." % tune)
>> else:
>
> Sorry but this isn't right. The multilib case is special since it sets
> "class-multilib-xxx", not "class-multilib" without the suffix. The above
> changes are just going to confuse people and depending on what you do in
> other patches, may or may not work.
>
> Can you resend the patch set just changing the native/nativesdk values
> please? We can then look at multilib specifically as a follow up.
>
> Cheers,
>
> Richard
>
>
>
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2012-10-30 14:18 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-30 9:33 [PATCH 00/11] replace virtclass-native(sdk) with class-native(sdk) Robert Yang
2012-10-30 9:33 ` [PATCH 01/11] classes: " Robert Yang
2012-10-30 9:33 ` [PATCH 02/11] multilib.bbclass: add class-multilib to override Robert Yang
2012-10-30 9:54 ` Richard Purdie
2012-10-30 14:04 ` Robert Yang
2012-10-30 9:33 ` [PATCH 03/11] conf: replace virtclass-native(sdk) with class-native(sdk) Robert Yang
2012-10-30 9:33 ` [PATCH 04/11] recipes-core: " Robert Yang
2012-10-30 9:33 ` [PATCH 05/11] recipes-devtools: " Robert Yang
2012-10-30 9:33 ` [PATCH 06/11] recipes-extended: " Robert Yang
2012-10-30 9:33 ` [PATCH 07/11] recipes-graphics: " Robert Yang
2012-10-30 9:33 ` [PATCH 08/11] recipes-support: " Robert Yang
2012-10-30 9:33 ` [PATCH 09/11] recipes-gnome: " Robert Yang
2012-10-30 9:33 ` [PATCH 10/11] recipes-kernel: " Robert Yang
2012-10-30 9:33 ` [PATCH 11/11] recipes-connectivity: " Robert Yang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox