summaryrefslogtreecommitdiffstats
path: root/meta/classes/native.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-07-22 11:27:13 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-22 11:44:28 +0100
commitdc807f54f858419f97e211cd62fd2d30db9a80de (patch)
tree59adc7578ccccd566b5db07ed2a8e764c30510d8 /meta/classes/native.bbclass
parent5c63f8a2494cd74792e1a67b114a90a0a2fdbbcc (diff)
downloadpoky-dc807f54f858419f97e211cd62fd2d30db9a80de.tar.gz
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 <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/classes/native.bbclass')
-rw-r--r--meta/classes/native.bbclass24
1 files changed, 0 insertions, 24 deletions
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 = ""
66SHLIBSDIR = "${STAGING_DIR_NATIVE}/shlibs" 66SHLIBSDIR = "${STAGING_DIR_NATIVE}/shlibs"
67PKG_CONFIG_DIR = "${libdir}/pkgconfig" 67PKG_CONFIG_DIR = "${libdir}/pkgconfig"
68 68
69#
70# If changing this function, please make sure packaged-staging.bbclass is
71# updated too
72#
73do_stage_native () {
74 # If autotools is active, use the autotools staging function, else
75 # use our "make install" equivalent
76 if [ "${AUTOTOOLS_NATIVE_STAGE_INSTALL}" == "1" ]
77 then
78 autotools_stage_all
79 else
80 oe_runmake install
81 fi
82}
83
84do_stage () {
85 do_stage_native
86}
87
88PKG_CONFIG_PATH .= "${EXTRA_NATIVE_PKGCONFIG_PATH}" 69PKG_CONFIG_PATH .= "${EXTRA_NATIVE_PKGCONFIG_PATH}"
89PKG_CONFIG_SYSROOT_DIR = "" 70PKG_CONFIG_SYSROOT_DIR = ""
90 71
@@ -93,11 +74,6 @@ ORIG_DEPENDS := "${DEPENDS}"
93DEPENDS_virtclass-native ?= "${ORIG_DEPENDS}" 74DEPENDS_virtclass-native ?= "${ORIG_DEPENDS}"
94 75
95python __anonymous () { 76python __anonymous () {
96 # If we've a legacy native do_stage, we need to neuter do_install
97 stagefunc = bb.data.getVar('do_stage', d, True)
98 if (stagefunc.strip() != "do_stage_native" and stagefunc.strip() != "autotools_stage_all") and bb.data.getVar('AUTOTOOLS_NATIVE_STAGE_INSTALL', d, 1) == "1":
99 bb.data.setVar("do_install", " :", d)
100
101 if "native" in (bb.data.getVar('BBCLASSEXTEND', d, True) or ""): 77 if "native" in (bb.data.getVar('BBCLASSEXTEND', d, True) or ""):
102 pn = bb.data.getVar("PN", d, True) 78 pn = bb.data.getVar("PN", d, True)
103 depends = bb.data.getVar("DEPENDS_virtclass-native", d, True) 79 depends = bb.data.getVar("DEPENDS_virtclass-native", d, True)