diff options
| -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" ALLOW_EMPTY_${PN}-ptest = "1" PTEST_ENABLED = "${@base_contains('DISTRO_FEATURES', 'ptest', '1', '0', d)}" PTEST_ENABLED_class-native = "" -RDEPENDS_${PN}-ptest_virtclass-native = "" -RDEPENDS_${PN}-ptest_virtclass-nativesdk = "" +RDEPENDS_${PN}-ptest_class-native = "" +RDEPENDS_${PN}-ptest_class-nativesdk = "" PACKAGES =+ "${@base_contains('DISTRO_FEATURES', 'ptest', '${PN}-ptest', '', d)}" 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}" DEPENDS_append = " update-rc.d-native" UPDATERCD = "update-rc.d" -UPDATERCD_virtclass-cross = "" +UPDATERCD_class-cross = "" UPDATERCD_class-native = "" UPDATERCD_class-nativesdk = "" 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 # 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_class-cross = "" USERADDDEPENDS_class-native = "" USERADDDEPENDS_class-nativesdk = "" @@ -117,17 +117,17 @@ useradd_sysroot_sstate () { do_install[prefuncs] += "${SYSROOTFUNC}" SYSROOTFUNC = "useradd_sysroot" -SYSROOTFUNC_virtclass-cross = "" +SYSROOTFUNC_class-cross = "" SYSROOTFUNC_class-native = "" SYSROOTFUNC_class-nativesdk = "" SSTATEPREINSTFUNCS += "${SYSROOTPOSTFUNC}" SYSROOTPOSTFUNC = "useradd_sysroot_sstate" -SYSROOTPOSTFUNC_virtclass-cross = "" +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_class-cross = "" USERADDSETSCENEDEPS_class-native = "" USERADDSETSCENEDEPS_class-nativesdk = "" 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" inherit autotools pkgconfig gettext ptest EXTRA_OECONF_X = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}" -EXTRA_OECONF_X_virtclass-native = "--without-x" +EXTRA_OECONF_X_class-native = "--without-x" EXTRA_OECONF = "--enable-tests \ --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}" # This was derrived from the upstream debian ncurses which uses # these settings for 32 and 64 bit hosts. EXCONFIG_ARGS = "" -EXCONFIG_ARGS_virtclass-native = " \ +EXCONFIG_ARGS_class-native = " \ --disable-lp64 \ --with-chtype='long' \ --with-mmask-t='long'" -EXCONFIG_ARGS_virtclass-nativesdk = " \ +EXCONFIG_ARGS_class-nativesdk = " \ --disable-lp64 \ --with-chtype='long' \ --with-mmask-t='long'" @@ -50,11 +50,11 @@ PACKAGES_DYNAMIC = "^${PN}-lib.*" # because the sstate had a hard coded search path. Until this is fixed # another way this is deemed good enough. EX_TERMCAP = "" -EX_TERMCAP_virtclass-native = ":/etc/termcap:/usr/share/misc/termcap" -EX_TERMCAP_virtclass-nativesdk = ":/etc/termcap:/usr/share/misc/termcap" +EX_TERMCAP_class-native = ":/etc/termcap:/usr/share/misc/termcap" +EX_TERMCAP_class-nativesdk = ":/etc/termcap:/usr/share/misc/termcap" EX_TERMINFO = "" -EX_TERMINFO_virtclass-native = ":/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo" -EX_TERMINFO_virtclass-nativesdk = ":/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo" +EX_TERMINFO_class-native = ":/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo" +EX_TERMINFO_class-nativesdk = ":/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo" # Helper function for do_configure to allow multiple configurations # $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 () { } NO32LIBS ??= "1" -NO32LIBS_virtclass-nativesdk = "1" +NO32LIBS_class-nativesdk = "1" # Compile for the local machine arch... 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 SRCNAME = "distribute" PR = "ml5" DEPENDS += "python" -DEPENDS_virtclass-native += "python-native" +DEPENDS_class-native += "python-native" SRC_URI = " \ 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 SRCNAME = "distribute" PR = "ml5" DEPENDS += "python3" -DEPENDS_virtclass-native += "python3-native" +DEPENDS_class-native += "python3-native" SRC_URI = " \ 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 # We need wayland-native for the wayland-scanner utility BBCLASSEXTEND = "native" -DEPENDS_virtclass-native = "expat-native libffi-native" +DEPENDS_class-native = "expat-native libffi-native" DEPENDS = "expat libffi wayland-native" -EXTRA_OECONF_virtclass-native = "--disable-documentation" +EXTRA_OECONF_class-native = "--disable-documentation" EXTRA_OECONF = "--disable-documentation --disable-scanner" # Wayland installs a M4 macro for other projects to use, which uses the target |