[oe-commits] Robert Yang : classes: replace virtclass-native(sdk) with class-native(sdk)
git at git.openembedded.org
git at git.openembedded.org
Fri Nov 2 16:20:02 UTC 2012
Module: openembedded-core.git
Branch: master-next
Commit: 9fbeab63315fef0dbcc91c5e7051665764758a6e
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=9fbeab63315fef0dbcc91c5e7051665764758a6e
Author: Robert Yang <liezhi.yang at windriver.com>
Date: Sat Oct 27 16:48:17 2012 +0800
classes: replace virtclass-native(sdk) with class-native(sdk)
The overrides virtclass-native and virtclass-nativesdk are deprecated,
which should be replaced by class-native and class-nativesdk.
[YOCTO #3297]
Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
meta/classes/cross.bbclass | 2 +-
meta/classes/insane.bbclass | 4 ++--
meta/classes/native.bbclass | 6 +++---
meta/classes/update-rc.d.bbclass | 4 ++--
meta/classes/useradd.bbclass | 16 ++++++++--------
5 files changed, 16 insertions(+), 16 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/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/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass
index eef2e8c..3364269 100644
--- a/meta/classes/update-rc.d.bbclass
+++ b/meta/classes/update-rc.d.bbclass
@@ -3,8 +3,8 @@ UPDATERCPN ?= "${PN}"
DEPENDS_append = " update-rc.d-native"
UPDATERCD = "update-rc.d"
UPDATERCD_virtclass-cross = ""
-UPDATERCD_virtclass-native = ""
-UPDATERCD_virtclass-nativesdk = ""
+UPDATERCD_class-native = ""
+UPDATERCD_class-nativesdk = ""
RDEPENDS_${UPDATERCPN}_append = " ${UPDATERCD}"
diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
index bb8f42b..0a4feba 100644
--- a/meta/classes/useradd.bbclass
+++ b/meta/classes/useradd.bbclass
@@ -4,8 +4,8 @@
DEPENDS_append = "${USERADDDEPENDS}"
USERADDDEPENDS = " base-passwd shadow-native shadow-sysroot shadow"
USERADDDEPENDS_virtclass-cross = ""
-USERADDDEPENDS_virtclass-native = ""
-USERADDDEPENDS_virtclass-nativesdk = ""
+USERADDDEPENDS_class-native = ""
+USERADDDEPENDS_class-nativesdk = ""
# This preinstall function can be run in four different contexts:
#
@@ -138,18 +138,18 @@ useradd_sysroot_sstate () {
do_install[prefuncs] += "${SYSROOTFUNC}"
SYSROOTFUNC = "useradd_sysroot"
SYSROOTFUNC_virtclass-cross = ""
-SYSROOTFUNC_virtclass-native = ""
-SYSROOTFUNC_virtclass-nativesdk = ""
+SYSROOTFUNC_class-native = ""
+SYSROOTFUNC_class-nativesdk = ""
SSTATEPREINSTFUNCS += "${SYSROOTPOSTFUNC}"
SYSROOTPOSTFUNC = "useradd_sysroot_sstate"
SYSROOTPOSTFUNC_virtclass-cross = ""
-SYSROOTPOSTFUNC_virtclass-native = ""
-SYSROOTPOSTFUNC_virtclass-nativesdk = ""
+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-native = ""
+USERADDSETSCENEDEPS_class-nativesdk = ""
do_package_setscene[depends] = "${USERADDSETSCENEDEPS}"
# Recipe parse-time sanity checks
More information about the Openembedded-commits
mailing list