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 | |
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>
-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 | ||||
-rw-r--r-- | meta/recipes-core/dbus/dbus-ptest_1.6.18.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/ncurses/ncurses.inc | 12 | ||||
-rw-r--r-- | meta/recipes-devtools/pseudo/pseudo.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python-distribute_0.6.32.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3-distribute_0.6.32.bb | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/wayland/wayland_1.3.0.bb | 4 |
9 files changed, 19 insertions, 19 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}" |
diff --git a/meta/recipes-core/dbus/dbus-ptest_1.6.18.bb b/meta/recipes-core/dbus/dbus-ptest_1.6.18.bb index 386f561024..30e8223482 100644 --- a/meta/recipes-core/dbus/dbus-ptest_1.6.18.bb +++ b/meta/recipes-core/dbus/dbus-ptest_1.6.18.bb | |||
@@ -27,7 +27,7 @@ FILESPATH = "${FILE_DIRNAME}/dbus" | |||
27 | inherit autotools pkgconfig gettext ptest | 27 | inherit autotools pkgconfig gettext ptest |
28 | 28 | ||
29 | EXTRA_OECONF_X = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}" | 29 | EXTRA_OECONF_X = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}" |
30 | EXTRA_OECONF_X_virtclass-native = "--without-x" | 30 | EXTRA_OECONF_X_class-native = "--without-x" |
31 | 31 | ||
32 | EXTRA_OECONF = "--enable-tests \ | 32 | EXTRA_OECONF = "--enable-tests \ |
33 | --enable-modular-tests \ | 33 | --enable-modular-tests \ |
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index 01cdf132da..a94466a634 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc | |||
@@ -33,11 +33,11 @@ base_libdir_class-native = "${libdir}" | |||
33 | # This was derrived from the upstream debian ncurses which uses | 33 | # This was derrived from the upstream debian ncurses which uses |
34 | # these settings for 32 and 64 bit hosts. | 34 | # these settings for 32 and 64 bit hosts. |
35 | EXCONFIG_ARGS = "" | 35 | EXCONFIG_ARGS = "" |
36 | EXCONFIG_ARGS_virtclass-native = " \ | 36 | EXCONFIG_ARGS_class-native = " \ |
37 | --disable-lp64 \ | 37 | --disable-lp64 \ |
38 | --with-chtype='long' \ | 38 | --with-chtype='long' \ |
39 | --with-mmask-t='long'" | 39 | --with-mmask-t='long'" |
40 | EXCONFIG_ARGS_virtclass-nativesdk = " \ | 40 | EXCONFIG_ARGS_class-nativesdk = " \ |
41 | --disable-lp64 \ | 41 | --disable-lp64 \ |
42 | --with-chtype='long' \ | 42 | --with-chtype='long' \ |
43 | --with-mmask-t='long'" | 43 | --with-mmask-t='long'" |
@@ -50,11 +50,11 @@ PACKAGES_DYNAMIC = "^${PN}-lib.*" | |||
50 | # because the sstate had a hard coded search path. Until this is fixed | 50 | # because the sstate had a hard coded search path. Until this is fixed |
51 | # another way this is deemed good enough. | 51 | # another way this is deemed good enough. |
52 | EX_TERMCAP = "" | 52 | EX_TERMCAP = "" |
53 | EX_TERMCAP_virtclass-native = ":/etc/termcap:/usr/share/misc/termcap" | 53 | EX_TERMCAP_class-native = ":/etc/termcap:/usr/share/misc/termcap" |
54 | EX_TERMCAP_virtclass-nativesdk = ":/etc/termcap:/usr/share/misc/termcap" | 54 | EX_TERMCAP_class-nativesdk = ":/etc/termcap:/usr/share/misc/termcap" |
55 | EX_TERMINFO = "" | 55 | EX_TERMINFO = "" |
56 | EX_TERMINFO_virtclass-native = ":/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo" | 56 | EX_TERMINFO_class-native = ":/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo" |
57 | EX_TERMINFO_virtclass-nativesdk = ":/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo" | 57 | EX_TERMINFO_class-nativesdk = ":/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo" |
58 | 58 | ||
59 | # Helper function for do_configure to allow multiple configurations | 59 | # Helper function for do_configure to allow multiple configurations |
60 | # $1 the directory to run configure in | 60 | # $1 the directory to run configure in |
diff --git a/meta/recipes-devtools/pseudo/pseudo.inc b/meta/recipes-devtools/pseudo/pseudo.inc index f1d3db5a08..42738abfc5 100644 --- a/meta/recipes-devtools/pseudo/pseudo.inc +++ b/meta/recipes-devtools/pseudo/pseudo.inc | |||
@@ -29,7 +29,7 @@ do_configure () { | |||
29 | } | 29 | } |
30 | 30 | ||
31 | NO32LIBS ??= "1" | 31 | NO32LIBS ??= "1" |
32 | NO32LIBS_virtclass-nativesdk = "1" | 32 | NO32LIBS_class-nativesdk = "1" |
33 | 33 | ||
34 | # Compile for the local machine arch... | 34 | # Compile for the local machine arch... |
35 | do_compile () { | 35 | do_compile () { |
diff --git a/meta/recipes-devtools/python/python-distribute_0.6.32.bb b/meta/recipes-devtools/python/python-distribute_0.6.32.bb index ddc8d00bcf..2925114c3f 100644 --- a/meta/recipes-devtools/python/python-distribute_0.6.32.bb +++ b/meta/recipes-devtools/python/python-distribute_0.6.32.bb | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://setup.py;beginline=234;endline=234;md5=26f6b02022b737 | |||
7 | SRCNAME = "distribute" | 7 | SRCNAME = "distribute" |
8 | PR = "ml5" | 8 | PR = "ml5" |
9 | DEPENDS += "python" | 9 | DEPENDS += "python" |
10 | DEPENDS_virtclass-native += "python-native" | 10 | DEPENDS_class-native += "python-native" |
11 | 11 | ||
12 | SRC_URI = " \ | 12 | SRC_URI = " \ |
13 | http://pypi.python.org/packages/source/d/distribute/${SRCNAME}-${PV}.tar.gz \ | 13 | http://pypi.python.org/packages/source/d/distribute/${SRCNAME}-${PV}.tar.gz \ |
diff --git a/meta/recipes-devtools/python/python3-distribute_0.6.32.bb b/meta/recipes-devtools/python/python3-distribute_0.6.32.bb index d4f00cd797..d3b15c17fe 100644 --- a/meta/recipes-devtools/python/python3-distribute_0.6.32.bb +++ b/meta/recipes-devtools/python/python3-distribute_0.6.32.bb | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://setup.py;beginline=234;endline=234;md5=26f6b02022b737 | |||
7 | SRCNAME = "distribute" | 7 | SRCNAME = "distribute" |
8 | PR = "ml5" | 8 | PR = "ml5" |
9 | DEPENDS += "python3" | 9 | DEPENDS += "python3" |
10 | DEPENDS_virtclass-native += "python3-native" | 10 | DEPENDS_class-native += "python3-native" |
11 | 11 | ||
12 | SRC_URI = " \ | 12 | SRC_URI = " \ |
13 | http://pypi.python.org/packages/source/d/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \ | 13 | http://pypi.python.org/packages/source/d/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \ |
diff --git a/meta/recipes-graphics/wayland/wayland_1.3.0.bb b/meta/recipes-graphics/wayland/wayland_1.3.0.bb index 212e08ae1b..aa04f8d1c5 100644 --- a/meta/recipes-graphics/wayland/wayland_1.3.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.3.0.bb | |||
@@ -21,10 +21,10 @@ inherit autotools pkgconfig | |||
21 | # We need wayland-native for the wayland-scanner utility | 21 | # We need wayland-native for the wayland-scanner utility |
22 | BBCLASSEXTEND = "native" | 22 | BBCLASSEXTEND = "native" |
23 | 23 | ||
24 | DEPENDS_virtclass-native = "expat-native libffi-native" | 24 | DEPENDS_class-native = "expat-native libffi-native" |
25 | DEPENDS = "expat libffi wayland-native" | 25 | DEPENDS = "expat libffi wayland-native" |
26 | 26 | ||
27 | EXTRA_OECONF_virtclass-native = "--disable-documentation" | 27 | EXTRA_OECONF_class-native = "--disable-documentation" |
28 | EXTRA_OECONF = "--disable-documentation --disable-scanner" | 28 | EXTRA_OECONF = "--disable-documentation --disable-scanner" |
29 | 29 | ||
30 | # Wayland installs a M4 macro for other projects to use, which uses the target | 30 | # Wayland installs a M4 macro for other projects to use, which uses the target |