summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2012-10-27 16:48:17 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-02 16:18:27 +0000
commit51c7ad682f00a13ada21c5458030948aaa699748 (patch)
treebf3c399c846b7c952ac21993bb4458869cdc85c3
parentffec48ad4e16bfd85ac852d907e4f14fc155eef0 (diff)
downloadpoky-51c7ad682f00a13ada21c5458030948aaa699748.tar.gz
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] (From OE-Core rev: 9fbeab63315fef0dbcc91c5e7051665764758a6e) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/cross.bbclass2
-rw-r--r--meta/classes/insane.bbclass4
-rw-r--r--meta/classes/native.bbclass6
-rw-r--r--meta/classes/update-rc.d.bbclass4
-rw-r--r--meta/classes/useradd.bbclass16
5 files changed, 16 insertions, 16 deletions
diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass
index e998307236..735f6d263f 100644
--- a/meta/classes/cross.bbclass
+++ b/meta/classes/cross.bbclass
@@ -7,7 +7,7 @@ EXCLUDE_FROM_WORLD = "1"
7CLASSOVERRIDE = "class-cross" 7CLASSOVERRIDE = "class-cross"
8PACKAGES = "" 8PACKAGES = ""
9PACKAGES_DYNAMIC = "" 9PACKAGES_DYNAMIC = ""
10PACKAGES_DYNAMIC_virtclass-native = "" 10PACKAGES_DYNAMIC_class-native = ""
11 11
12HOST_ARCH = "${BUILD_ARCH}" 12HOST_ARCH = "${BUILD_ARCH}"
13HOST_VENDOR = "${BUILD_VENDOR}" 13HOST_VENDOR = "${BUILD_VENDOR}"
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 2dc9ba31f7..d51d1a1e00 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -24,8 +24,8 @@ PACKAGEFUNCS += " do_package_qa "
24# unsafe-references-in-binaries requires prelink-rtld from 24# unsafe-references-in-binaries requires prelink-rtld from
25# prelink-native, but we don't want this DEPENDS for -native builds 25# prelink-native, but we don't want this DEPENDS for -native builds
26QADEPENDS = "prelink-native" 26QADEPENDS = "prelink-native"
27QADEPENDS_virtclass-native = "" 27QADEPENDS_class-native = ""
28QADEPENDS_virtclass-nativesdk = "" 28QADEPENDS_class-nativesdk = ""
29 29
30# 30#
31# dictionary for elf headers 31# dictionary for elf headers
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index 93f96f5dad..6314ba1b1d 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -6,14 +6,14 @@ inherit relocatable
6EXCLUDE_FROM_WORLD = "1" 6EXCLUDE_FROM_WORLD = "1"
7 7
8PACKAGES = "" 8PACKAGES = ""
9PACKAGES_virtclass-native = "" 9PACKAGES_class-native = ""
10PACKAGES_DYNAMIC = "" 10PACKAGES_DYNAMIC = ""
11PACKAGES_DYNAMIC_virtclass-native = "" 11PACKAGES_DYNAMIC_class-native = ""
12PACKAGE_ARCH = "${BUILD_ARCH}" 12PACKAGE_ARCH = "${BUILD_ARCH}"
13 13
14# used by cmake class 14# used by cmake class
15OECMAKE_RPATH = "${libdir}" 15OECMAKE_RPATH = "${libdir}"
16OECMAKE_RPATH_virtclass-native = "${libdir}" 16OECMAKE_RPATH_class-native = "${libdir}"
17 17
18# When this class has packaging enabled, setting 18# When this class has packaging enabled, setting
19# RPROVIDES becomes unnecessary. 19# RPROVIDES becomes unnecessary.
diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass
index eef2e8caa0..3364269167 100644
--- a/meta/classes/update-rc.d.bbclass
+++ b/meta/classes/update-rc.d.bbclass
@@ -3,8 +3,8 @@ UPDATERCPN ?= "${PN}"
3DEPENDS_append = " update-rc.d-native" 3DEPENDS_append = " update-rc.d-native"
4UPDATERCD = "update-rc.d" 4UPDATERCD = "update-rc.d"
5UPDATERCD_virtclass-cross = "" 5UPDATERCD_virtclass-cross = ""
6UPDATERCD_virtclass-native = "" 6UPDATERCD_class-native = ""
7UPDATERCD_virtclass-nativesdk = "" 7UPDATERCD_class-nativesdk = ""
8 8
9RDEPENDS_${UPDATERCPN}_append = " ${UPDATERCD}" 9RDEPENDS_${UPDATERCPN}_append = " ${UPDATERCD}"
10 10
diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
index bb8f42b357..0a4febadc8 100644
--- a/meta/classes/useradd.bbclass
+++ b/meta/classes/useradd.bbclass
@@ -4,8 +4,8 @@
4DEPENDS_append = "${USERADDDEPENDS}" 4DEPENDS_append = "${USERADDDEPENDS}"
5USERADDDEPENDS = " base-passwd shadow-native shadow-sysroot shadow" 5USERADDDEPENDS = " base-passwd shadow-native shadow-sysroot shadow"
6USERADDDEPENDS_virtclass-cross = "" 6USERADDDEPENDS_virtclass-cross = ""
7USERADDDEPENDS_virtclass-native = "" 7USERADDDEPENDS_class-native = ""
8USERADDDEPENDS_virtclass-nativesdk = "" 8USERADDDEPENDS_class-nativesdk = ""
9 9
10# This preinstall function can be run in four different contexts: 10# This preinstall function can be run in four different contexts:
11# 11#
@@ -138,18 +138,18 @@ useradd_sysroot_sstate () {
138do_install[prefuncs] += "${SYSROOTFUNC}" 138do_install[prefuncs] += "${SYSROOTFUNC}"
139SYSROOTFUNC = "useradd_sysroot" 139SYSROOTFUNC = "useradd_sysroot"
140SYSROOTFUNC_virtclass-cross = "" 140SYSROOTFUNC_virtclass-cross = ""
141SYSROOTFUNC_virtclass-native = "" 141SYSROOTFUNC_class-native = ""
142SYSROOTFUNC_virtclass-nativesdk = "" 142SYSROOTFUNC_class-nativesdk = ""
143SSTATEPREINSTFUNCS += "${SYSROOTPOSTFUNC}" 143SSTATEPREINSTFUNCS += "${SYSROOTPOSTFUNC}"
144SYSROOTPOSTFUNC = "useradd_sysroot_sstate" 144SYSROOTPOSTFUNC = "useradd_sysroot_sstate"
145SYSROOTPOSTFUNC_virtclass-cross = "" 145SYSROOTPOSTFUNC_virtclass-cross = ""
146SYSROOTPOSTFUNC_virtclass-native = "" 146SYSROOTPOSTFUNC_class-native = ""
147SYSROOTPOSTFUNC_virtclass-nativesdk = "" 147SYSROOTPOSTFUNC_class-nativesdk = ""
148 148
149USERADDSETSCENEDEPS = "${MLPREFIX}base-passwd:do_populate_sysroot_setscene shadow-native:do_populate_sysroot_setscene ${MLPREFIX}shadow-sysroot:do_populate_sysroot_setscene" 149USERADDSETSCENEDEPS = "${MLPREFIX}base-passwd:do_populate_sysroot_setscene shadow-native:do_populate_sysroot_setscene ${MLPREFIX}shadow-sysroot:do_populate_sysroot_setscene"
150USERADDSETSCENEDEPS_virtclass-cross = "" 150USERADDSETSCENEDEPS_virtclass-cross = ""
151USERADDSETSCENEDEPS_virtclass-native = "" 151USERADDSETSCENEDEPS_class-native = ""
152USERADDSETSCENEDEPS_virtclass-nativesdk = "" 152USERADDSETSCENEDEPS_class-nativesdk = ""
153do_package_setscene[depends] = "${USERADDSETSCENEDEPS}" 153do_package_setscene[depends] = "${USERADDSETSCENEDEPS}"
154 154
155# Recipe parse-time sanity checks 155# Recipe parse-time sanity checks