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>

62 files changed, 23 insertions, 188 deletions

diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index 20dc72a1df..649e269f3e 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -1,6 +1,3 @@
-# use autotools_stage_all for native packages
-AUTOTOOLS_NATIVE_STAGE_INSTALL = "1"
-
 def autotools_dep_prepend(d):
 	if bb.data.getVar('INHIBIT_AUTOTOOLS_DEPS', d, 1):
 		return ''
@@ -204,8 +201,4 @@ autotools_stage_all() {
 	rm -rf ${STAGE_TEMP}
 }
 
-do_stage () {
-	autotools_stage_all
-}
-
 EXPORT_FUNCTIONS do_configure do_install
diff --git a/meta/classes/cpan.bbclass b/meta/classes/cpan.bbclass
index 3b1280c07b..513f0b3ce7 100644
--- a/meta/classes/cpan.bbclass
+++ b/meta/classes/cpan.bbclass
@@ -31,9 +31,8 @@ cpan_do_compile () {
 	oe_runmake PASTHRU_INC="${CFLAGS}" CCFLAGS="${CFLAGS}" LD="${CCLD}"
 }
 
-NATIVE_INSTALL_WORKS = "1"
 cpan_do_install () {
 	oe_runmake DESTDIR="${D}" install_vendor
 }
 
-EXPORT_FUNCTIONS do_configure do_compile do_install do_stage
+EXPORT_FUNCTIONS do_configure do_compile do_install
diff --git a/meta/classes/cpan_build.bbclass b/meta/classes/cpan_build.bbclass
index 944e8d4ac0..dd8d5434d5 100644
--- a/meta/classes/cpan_build.bbclass
+++ b/meta/classes/cpan_build.bbclass
@@ -42,7 +42,6 @@ cpan_build_do_compile () {
         perl Build
 }
 
-NATIVE_INSTALL_WORKS = "1"
 cpan_build_do_install () {
 	perl Build install
 }
diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass
index b7dbd86c35..de44e99d70 100644
--- a/meta/classes/cross.bbclass
+++ b/meta/classes/cross.bbclass
@@ -50,10 +50,6 @@ do_install () {
 	oe_runmake 'DESTDIR=${D}' install
 }
 
-do_stage () {
-	autotools_stage_all
-}
-
 #
 # Override the default sysroot staging copy since this won't look like a target system
 #
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)
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index b771b92fae..0b2e457a93 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -76,21 +76,6 @@ sysroot_stage_all() {
 	sysroot_stage_dirs ${D} ${SYSROOT_DESTDIR}
 }
 
-def is_legacy_staging(d):
-    stagefunc = bb.data.getVar('do_stage', d, True)
-    legacy = True
-    if stagefunc is None:
-        legacy = False
-    elif stagefunc.strip() == "use_do_install_for_stage":
-        legacy = False
-    elif stagefunc.strip() == "autotools_stage_all":
-        legacy = False
-    elif stagefunc.strip() == "do_stage_native" and bb.data.getVar('AUTOTOOLS_NATIVE_STAGE_INSTALL', d, 1) == "1":
-        legacy = False
-    elif bb.data.getVar('NATIVE_INSTALL_WORKS', d, 1) == "1":
-        legacy = False
-    return legacy
-
 do_populate_sysroot[dirs] = "${STAGING_DIR_TARGET}/${bindir} ${STAGING_DIR_TARGET}/${libdir} \
 			     ${STAGING_DIR_TARGET}/${includedir} \
 			     ${STAGING_BINDIR_NATIVE} ${STAGING_LIBDIR_NATIVE} \
@@ -119,36 +104,31 @@ python do_populate_sysroot () {
     pstageactive = (bb.data.getVar("PSTAGING_ACTIVE", d, True) == "1")
     lockfile = bb.data.getVar("SYSROOT_LOCK", d, True)
     stagefunc = bb.data.getVar('do_stage', d, True)
-    legacy = is_legacy_staging(d)
-    if legacy:
-        bb.data.setVar("SYSROOT_DESTDIR", "", d)
-        bb.note("Legacy staging mode for %s" % bb.data.getVar("FILE", d, True))
-        lock = bb.utils.lockfile(lockfile)
-        bb.build.exec_func('populate_sysroot_prehook', d)
-        bb.build.exec_func('do_stage', d)
-        for f in (bb.data.getVar('SYSROOT_PREPROCESS_FUNCS', d, True) or '').split():
-            bb.build.exec_func(f, d)
-        bb.build.exec_func('populate_sysroot_posthook', d)
-        bb.utils.unlockfile(lock)
-    else:
-        dest = bb.data.getVar('D', d, True)
-        sysrootdest = bb.data.expand('${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}', d)
-        bb.mkdirhier(sysrootdest)
-
-        bb.build.exec_func("sysroot_stage_all", d)
-        #os.system('cp -pPR %s/* %s/' % (dest, sysrootdest))
-        for f in (bb.data.getVar('SYSROOT_PREPROCESS_FUNCS', d, True) or '').split():
-            bb.build.exec_func(f, d)
-        bb.build.exec_func("packagedstaging_fastpath", d)
-
-        lock = bb.utils.lockfile(lockfile)
-        os.system(bb.data.expand('cp -pPR ${SYSROOT_DESTDIR}${TMPDIR}/* ${TMPDIR}/', d))
-        bb.utils.unlockfile(lock)
+
+    dest = bb.data.getVar('D', d, True)
+    sysrootdest = bb.data.expand('${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}', d)
+    bb.mkdirhier(sysrootdest)
+
+    bb.build.exec_func("sysroot_stage_all", d)
+    #os.system('cp -pPR %s/* %s/' % (dest, sysrootdest))
+    for f in (bb.data.getVar('SYSROOT_PREPROCESS_FUNCS', d, True) or '').split():
+        bb.build.exec_func(f, d)
+    bb.build.exec_func("packagedstaging_fastpath", d)
+
+    lock = bb.utils.lockfile(lockfile)
+    os.system(bb.data.expand('cp -pPR ${SYSROOT_DESTDIR}${TMPDIR}/* ${TMPDIR}/', d))
+    bb.utils.unlockfile(lock)
 }
 
+def is_legacy_staging(d):
+    stagefunc = bb.data.getVar('do_stage', d, True)
+    if stagefunc is None:
+        return False
+    return True
+
 python () {
     if is_legacy_staging(d):
-        bb.note("Legacy staging mode for %s" % bb.data.getVar("FILE", d, True))
+        bb.fatal("Legacy staging found for %s as it has a do_stage function. This will need conversion to a do_install or often simply removal to work with Poky" % bb.data.getVar("FILE", d, True))
 }
 
 
diff --git a/meta/classes/xlibs.bbclass b/meta/classes/xlibs.bbclass
index fc52400b9f..7271d7b029 100644
--- a/meta/classes/xlibs.bbclass
+++ b/meta/classes/xlibs.bbclass
@@ -5,11 +5,3 @@ XLIBS_CVS = "${FREEDESKTOP_CVS}/xlibs"
 
 inherit autotools pkgconfig
 
-do_stage() {
-	oe_runmake install prefix=${STAGING_DIR_HOST}${prefix} \
-	       bindir=${STAGING_BINDIR} \
-	       includedir=${STAGING_INCDIR} \
-	       libdir=${STAGING_LIBDIR} \
-	       datadir=${STAGING_DATADIR} \
-		mandir=${STAGING_DIR_HOST}${mandir}
-}
diff --git a/meta/packages/automake/automake_1.11.1.bb b/meta/packages/automake/automake_1.11.1.bb
index 067898a44f..a78b6901f1 100644
--- a/meta/packages/automake/automake_1.11.1.bb
+++ b/meta/packages/automake/automake_1.11.1.bb
@@ -33,7 +33,6 @@ PATHFIXPATCH_virtclass-native = ""
 
 SRC_URI += "${PATHFIXPATCH}"
 
-NATIVE_INSTALL_WORKS = "1"
 do_install () {
 	oe_runmake 'DESTDIR=${D}' install
 	install -d ${D}${datadir}
diff --git a/meta/packages/binutils/binutils-cross-canadian.inc b/meta/packages/binutils/binutils-cross-canadian.inc
index 9fe3ed5451..23dfa161eb 100644
--- a/meta/packages/binutils/binutils-cross-canadian.inc
+++ b/meta/packages/binutils/binutils-cross-canadian.inc
@@ -18,7 +18,3 @@ do_install () {
         install -m 644 ${S}/include/ansidecl.h ${D}${includedir}
         install -m 644 ${S}/include/libiberty.h ${D}${includedir}
 }
-
-do_stage () {
-    use_do_install_for_stage
-}
diff --git a/meta/packages/binutils/binutils-cross.inc b/meta/packages/binutils/binutils-cross.inc
index f784a66ce0..b5310a6187 100644
--- a/meta/packages/binutils/binutils-cross.inc
+++ b/meta/packages/binutils/binutils-cross.inc
@@ -23,7 +23,3 @@ do_install () {
 	rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/${libdir}64 || :
 	rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/${prefix} || :
 }
-
-do_stage () {
-	use_do_install_for_stage
-}
diff --git a/meta/packages/cdrtools/cdrtools-native_2.01.bb b/meta/packages/cdrtools/cdrtools-native_2.01.bb
index b4b496f6e7..2421b23640 100644
--- a/meta/packages/cdrtools/cdrtools-native_2.01.bb
+++ b/meta/packages/cdrtools/cdrtools-native_2.01.bb
@@ -15,7 +15,6 @@ inherit native
 
 STAGE_TEMP="${WORKDIR}/image-temp"
 
-NATIVE_INSTALL_WORKS = "1"
 do_install() {
 	install -d ${STAGE_TEMP}
 	make install INS_BASE=${STAGE_TEMP}
diff --git a/meta/packages/dosfstools/dosfstools_2.10.bb b/meta/packages/dosfstools/dosfstools_2.10.bb
index 4d8f6fb8e0..100044b75d 100644
--- a/meta/packages/dosfstools/dosfstools_2.10.bb
+++ b/meta/packages/dosfstools/dosfstools_2.10.bb
@@ -16,7 +16,6 @@ SRC_URI = "ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-${PV}
            file://msdos_fat12_undefined.patch;patch=1 \
 	   file://include-linux-types.patch;patch=1"
 
-NATIVE_INSTALL_WORKS = "1"
 do_install () {
 	oe_runmake "PREFIX=${D}" "SBINDIR=${D}${sbindir}" \
 		   "MANDIR=${D}${mandir}/man8" install
diff --git a/meta/packages/dosfstools/dosfstools_2.11.bb b/meta/packages/dosfstools/dosfstools_2.11.bb
index 91430c0b6b..a5f6e034dd 100644
--- a/meta/packages/dosfstools/dosfstools_2.11.bb
+++ b/meta/packages/dosfstools/dosfstools_2.11.bb
@@ -15,7 +15,6 @@ SRC_URI = "ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-${PV}
            file://msdos_fat12_undefined.patch;patch=1 \
 	   file://include-linux-types.patch;patch=1"
 
-NATIVE_INSTALL_WORKS = "1"
 do_install () {
 	oe_runmake "PREFIX=${D}" "SBINDIR=${D}${sbindir}" \
 		   "MANDIR=${D}${mandir}/man8" install
diff --git a/meta/packages/fuse/fuse_2.7.2.bb b/meta/packages/fuse/fuse_2.7.2.bb
index a1795e7f0c..d284a25f5f 100644
--- a/meta/packages/fuse/fuse_2.7.2.bb
+++ b/meta/packages/fuse/fuse_2.7.2.bb
@@ -20,8 +20,3 @@ FILES_fuse-utils-dbg = "${bindir}/.debug ${base_sbindir}/.debug"
 DEBIAN_NOAUTONAME_fuse-utils = "1"
 DEBIAN_NOAUTONAME_fuse-utils-dbg = "1"
 
-fakeroot do_stage() {
-        autotools_stage_all
-}
-
-
diff --git a/meta/packages/gcc/gcc-cross-kernel.inc b/meta/packages/gcc/gcc-cross-kernel.inc
index 02d44583c9..5347762762 100644
--- a/meta/packages/gcc/gcc-cross-kernel.inc
+++ b/meta/packages/gcc/gcc-cross-kernel.inc
@@ -8,7 +8,3 @@ do_install () {
 	oe_runmake 'DESTDIR=${D}' install-common install-headers install-libgcc
 	install -m 0755 xgcc ${D}${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX}gcc-${PV}
 }
-
-do_stage () {
-    use_do_install_for_stage
-}
\ No newline at end of file
diff --git a/meta/packages/gcc/gcc-cross.inc b/meta/packages/gcc/gcc-cross.inc
index 02b23ffce0..5a796bcde6 100644
--- a/meta/packages/gcc/gcc-cross.inc
+++ b/meta/packages/gcc/gcc-cross.inc
@@ -3,10 +3,6 @@ inherit cross
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc ${NATIVEDEPS}"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
 
-do_stage () {
-    use_do_install_for_stage
-}
-
 require gcc-configure-cross.inc
 require gcc-package-cross.inc
 
diff --git a/meta/packages/glibc/ldconfig-native_2.5.bb b/meta/packages/glibc/ldconfig-native_2.5.bb
index 3c3a1b1a64..d08787af6d 100644
--- a/meta/packages/glibc/ldconfig-native_2.5.bb
+++ b/meta/packages/glibc/ldconfig-native_2.5.bb
@@ -14,7 +14,6 @@ do_compile () {
 	$CC ldconfig.c -std=gnu99 chroot_canon.c xmalloc.c xstrdup.c cache.c readlib.c  -I. dl-cache.c -o ldconfig
 }
 
-NATIVE_INSTALL_WORKS = "1"
 do_install () {
 	install -d ${D}/${bindir}/
 	install ldconfig ${D}/${bindir}/
diff --git a/meta/packages/gnu-config/gnu-config_20080123.bb b/meta/packages/gnu-config/gnu-config_20080123.bb
index 5dc76524d3..66d027e933 100644
--- a/meta/packages/gnu-config/gnu-config_20080123.bb
+++ b/meta/packages/gnu-config/gnu-config_20080123.bb
@@ -36,4 +36,3 @@ PACKAGES = "${PN}"
 FILES_${PN} = "${bindir} ${datadir}/gnu-config"
 
 BBCLASSEXTEND = "native"
-NATIVE_INSTALL_WORKS = "1"
diff --git a/meta/packages/gtk-doc/gtk-doc.bb b/meta/packages/gtk-doc/gtk-doc.bb
index b60bc85ed3..3f5e29121b 100644
--- a/meta/packages/gtk-doc/gtk-doc.bb
+++ b/meta/packages/gtk-doc/gtk-doc.bb
@@ -7,7 +7,6 @@ ALLOW_EMPTY_${PN} = "1"
 
 BBCLASSEXTEND = "native"
 
-NATIVE_INSTALL_WORKS = "1"
 do_install () {
 	install -d ${D}${datadir}/aclocal/
 	install -m 0644 ${WORKDIR}/gtk-doc.m4 ${D}${datadir}/aclocal/
diff --git a/meta/packages/insserv/insserv_1.11.0.bb b/meta/packages/insserv/insserv_1.11.0.bb
index 0fe439ba69..a45ccda48f 100644
--- a/meta/packages/insserv/insserv_1.11.0.bb
+++ b/meta/packages/insserv/insserv_1.11.0.bb
@@ -9,7 +9,6 @@ SRC_URI = "ftp://ftp.suse.com/pub/projects/init/${BPN}-${PV}.tar.gz \
         file://crosscompile_fix.patch;patch=1 \
         file://insserv.conf"
 
-NATIVE_INSTALL_WORKS = "1"
 do_install () {
 	oe_runmake 'DESTDIR=${D}' install
 	install -m0644 ${WORKDIR}/insserv.conf ${D}${sysconfdir}/insserv.conf
diff --git a/meta/packages/kern-tools/kern-tools-native_git.bb b/meta/packages/kern-tools/kern-tools-native_git.bb
index 417bcb689b..4e4b86b979 100644
--- a/meta/packages/kern-tools/kern-tools-native_git.bb
+++ b/meta/packages/kern-tools/kern-tools-native_git.bb
@@ -7,9 +7,6 @@ DEPENDS = "git-native"
 PR = r4
 PV = "0.1+git${SRCPV}"
 
-# needed until the native do_stage goes away
-NATIVE_INSTALL_WORKS=1
-
 inherit native
 
 SRC_URI = "git://git.pokylinux.org/wr-kernel-tools.git;protocol=git"
diff --git a/meta/packages/libsoup/libsoup-2.4_2.31.2.bb b/meta/packages/libsoup/libsoup-2.4_2.31.2.bb
index da1499b5fc..9a00e07da0 100644
--- a/meta/packages/libsoup/libsoup-2.4_2.31.2.bb
+++ b/meta/packages/libsoup/libsoup-2.4_2.31.2.bb
@@ -15,6 +15,3 @@ S = "${WORKDIR}/libsoup-${PV}"
 
 inherit autotools pkgconfig
 
-do_stage() {
-	autotools_stage_all
-}
diff --git a/meta/packages/libsoup/libsoup-2.4_2.4.1.bb b/meta/packages/libsoup/libsoup-2.4_2.4.1.bb
index 303f667dcf..f48ac3d6c9 100644
--- a/meta/packages/libsoup/libsoup-2.4_2.4.1.bb
+++ b/meta/packages/libsoup/libsoup-2.4_2.4.1.bb
@@ -9,6 +9,3 @@ S = "${WORKDIR}/libsoup-${PV}"
 
 inherit autotools pkgconfig
 
-do_stage() {
-	autotools_stage_all
-}
diff --git a/meta/packages/makedevs/makedevs_1.0.0.bb b/meta/packages/makedevs/makedevs_1.0.0.bb
index 7e87765207..5db2d9b142 100644
--- a/