diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-12 12:11:34 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-13 11:41:21 +0000 |
commit | 4db39d233c268f99ce73fe78af3921a18da08056 (patch) | |
tree | 1914073e95c1af0411f76a6aba42df0bae04b036 /meta/classes | |
parent | 3d0dccd02612caecf1a82395160121ba47153ddc (diff) | |
download | poky-4db39d233c268f99ce73fe78af3921a18da08056.tar.gz |
meta/recipes: Remove virtclass references
The virtclass overrides will go away at some point (apart from the multilib one).
Change them all to class-xxx instead since people enjoy copy and pasting them.
(From OE-Core rev: d1c073d2813bd913617990cd047507353ea0c09e)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/ptest.bbclass | 4 | ||||
-rw-r--r-- | meta/classes/update-rc.d.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/useradd.bbclass | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/meta/classes/ptest.bbclass b/meta/classes/ptest.bbclass index caf7101224..c37dfaca3d 100644 --- a/meta/classes/ptest.bbclass +++ b/meta/classes/ptest.bbclass | |||
@@ -8,8 +8,8 @@ SECTION_${PN}-ptest = "devel" | |||
8 | ALLOW_EMPTY_${PN}-ptest = "1" | 8 | ALLOW_EMPTY_${PN}-ptest = "1" |
9 | PTEST_ENABLED = "${@base_contains('DISTRO_FEATURES', 'ptest', '1', '0', d)}" | 9 | PTEST_ENABLED = "${@base_contains('DISTRO_FEATURES', 'ptest', '1', '0', d)}" |
10 | PTEST_ENABLED_class-native = "" | 10 | PTEST_ENABLED_class-native = "" |
11 | RDEPENDS_${PN}-ptest_virtclass-native = "" | 11 | RDEPENDS_${PN}-ptest_class-native = "" |
12 | RDEPENDS_${PN}-ptest_virtclass-nativesdk = "" | 12 | RDEPENDS_${PN}-ptest_class-nativesdk = "" |
13 | 13 | ||
14 | PACKAGES =+ "${@base_contains('DISTRO_FEATURES', 'ptest', '${PN}-ptest', '', d)}" | 14 | PACKAGES =+ "${@base_contains('DISTRO_FEATURES', 'ptest', '${PN}-ptest', '', d)}" |
15 | 15 | ||
diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass index ad803c2d82..4b92d8d6f1 100644 --- a/meta/classes/update-rc.d.bbclass +++ b/meta/classes/update-rc.d.bbclass | |||
@@ -2,7 +2,7 @@ UPDATERCPN ?= "${PN}" | |||
2 | 2 | ||
3 | DEPENDS_append = " update-rc.d-native" | 3 | DEPENDS_append = " update-rc.d-native" |
4 | UPDATERCD = "update-rc.d" | 4 | UPDATERCD = "update-rc.d" |
5 | UPDATERCD_virtclass-cross = "" | 5 | UPDATERCD_class-cross = "" |
6 | UPDATERCD_class-native = "" | 6 | UPDATERCD_class-native = "" |
7 | UPDATERCD_class-nativesdk = "" | 7 | UPDATERCD_class-nativesdk = "" |
8 | 8 | ||
diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass index 22bae97324..b5f37688fe 100644 --- a/meta/classes/useradd.bbclass +++ b/meta/classes/useradd.bbclass | |||
@@ -5,7 +5,7 @@ inherit useradd_base | |||
5 | # and support files needed to add and modify user and group accounts | 5 | # and support files needed to add and modify user and group accounts |
6 | DEPENDS_append = "${USERADDDEPENDS}" | 6 | DEPENDS_append = "${USERADDDEPENDS}" |
7 | USERADDDEPENDS = " base-passwd shadow-native shadow-sysroot shadow" | 7 | USERADDDEPENDS = " base-passwd shadow-native shadow-sysroot shadow" |
8 | USERADDDEPENDS_virtclass-cross = "" | 8 | USERADDDEPENDS_class-cross = "" |
9 | USERADDDEPENDS_class-native = "" | 9 | USERADDDEPENDS_class-native = "" |
10 | USERADDDEPENDS_class-nativesdk = "" | 10 | USERADDDEPENDS_class-nativesdk = "" |
11 | 11 | ||
@@ -117,17 +117,17 @@ useradd_sysroot_sstate () { | |||
117 | 117 | ||
118 | do_install[prefuncs] += "${SYSROOTFUNC}" | 118 | do_install[prefuncs] += "${SYSROOTFUNC}" |
119 | SYSROOTFUNC = "useradd_sysroot" | 119 | SYSROOTFUNC = "useradd_sysroot" |
120 | SYSROOTFUNC_virtclass-cross = "" | 120 | SYSROOTFUNC_class-cross = "" |
121 | SYSROOTFUNC_class-native = "" | 121 | SYSROOTFUNC_class-native = "" |
122 | SYSROOTFUNC_class-nativesdk = "" | 122 | SYSROOTFUNC_class-nativesdk = "" |
123 | SSTATEPREINSTFUNCS += "${SYSROOTPOSTFUNC}" | 123 | SSTATEPREINSTFUNCS += "${SYSROOTPOSTFUNC}" |
124 | SYSROOTPOSTFUNC = "useradd_sysroot_sstate" | 124 | SYSROOTPOSTFUNC = "useradd_sysroot_sstate" |
125 | SYSROOTPOSTFUNC_virtclass-cross = "" | 125 | SYSROOTPOSTFUNC_class-cross = "" |
126 | SYSROOTPOSTFUNC_class-native = "" | 126 | SYSROOTPOSTFUNC_class-native = "" |
127 | SYSROOTPOSTFUNC_class-nativesdk = "" | 127 | SYSROOTPOSTFUNC_class-nativesdk = "" |
128 | 128 | ||
129 | USERADDSETSCENEDEPS = "${MLPREFIX}base-passwd:do_populate_sysroot_setscene shadow-native:do_populate_sysroot_setscene ${MLPREFIX}shadow-sysroot:do_populate_sysroot_setscene" | 129 | USERADDSETSCENEDEPS = "${MLPREFIX}base-passwd:do_populate_sysroot_setscene shadow-native:do_populate_sysroot_setscene ${MLPREFIX}shadow-sysroot:do_populate_sysroot_setscene" |
130 | USERADDSETSCENEDEPS_virtclass-cross = "" | 130 | USERADDSETSCENEDEPS_class-cross = "" |
131 | USERADDSETSCENEDEPS_class-native = "" | 131 | USERADDSETSCENEDEPS_class-native = "" |
132 | USERADDSETSCENEDEPS_class-nativesdk = "" | 132 | USERADDSETSCENEDEPS_class-nativesdk = "" |
133 | do_package_setscene[depends] += "${USERADDSETSCENEDEPS}" | 133 | do_package_setscene[depends] += "${USERADDSETSCENEDEPS}" |