From dc807f54f858419f97e211cd62fd2d30db9a80de Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 22 Jul 2010 11:27:13 +0100 Subject: Finally deprecate all legacy do_stage functions. This changes the existing warning into a fatal error if any legacy do_stage functions are found. Signed-off-by: Richard Purdie --- meta/classes/native.bbclass | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'meta/classes/native.bbclass') diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass index 9d678fd802..529f1c259d 100644 --- a/meta/classes/native.bbclass +++ b/meta/classes/native.bbclass @@ -66,25 +66,6 @@ STAGING_DIR_TARGET = "" SHLIBSDIR = "${STAGING_DIR_NATIVE}/shlibs" PKG_CONFIG_DIR = "${libdir}/pkgconfig" -# -# If changing this function, please make sure packaged-staging.bbclass is -# updated too -# -do_stage_native () { - # If autotools is active, use the autotools staging function, else - # use our "make install" equivalent - if [ "${AUTOTOOLS_NATIVE_STAGE_INSTALL}" == "1" ] - then - autotools_stage_all - else - oe_runmake install - fi -} - -do_stage () { - do_stage_native -} - PKG_CONFIG_PATH .= "${EXTRA_NATIVE_PKGCONFIG_PATH}" PKG_CONFIG_SYSROOT_DIR = "" @@ -93,11 +74,6 @@ ORIG_DEPENDS := "${DEPENDS}" DEPENDS_virtclass-native ?= "${ORIG_DEPENDS}" python __anonymous () { - # If we've a legacy native do_stage, we need to neuter do_install - stagefunc = bb.data.getVar('do_stage', d, True) - if (stagefunc.strip() != "do_stage_native" and stagefunc.strip() != "autotools_stage_all") and bb.data.getVar('AUTOTOOLS_NATIVE_STAGE_INSTALL', d, 1) == "1": - bb.data.setVar("do_install", " :", d) - if "native" in (bb.data.getVar('BBCLASSEXTEND', d, True) or ""): pn = bb.data.getVar("PN", d, True) depends = bb.data.getVar("DEPENDS_virtclass-native", d, True) -- cgit v1.2.3-54-g00ecf