classes/autotools_stage.bbclass: Add autotools_stage class to further recipes to simplify recipes using standard autotools

43 files changed, 46 insertions, 213 deletions

diff --git a/meta/packages/libglade/libglade_2.6.2.bb b/meta/packages/libglade/libglade_2.6.2.bb
index 502e1ced40..2279b3b706 100644
--- a/meta/packages/libglade/libglade_2.6.2.bb
+++ b/meta/packages/libglade/libglade_2.6.2.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "gtk+ gtk-doc-native"
 
-inherit autotools pkgconfig gnome
+inherit autotools_stage pkgconfig gnome
 
 SRC_URI += "file://glade-cruft.patch;patch=1 file://no-xml2.patch;patch=1"
 
@@ -17,7 +17,3 @@ FILES_${PN} = "${libdir}/lib*.so.*"
 FILES_${PN}-data = "${datadir}/xml/libglade/glade-2.0.dtd"
 FILES_${PN}-dev += "${bindir}/libglade-convert"
 #RDEPENDS_${PN} = "${PN}-data"
-
-do_stage () {
-        autotools_stage_all
-}
diff --git a/meta/packages/libgsf/libgsf_1.14.5.bb b/meta/packages/libgsf/libgsf_1.14.5.bb
index c9804c7392..ebb13bd9fd 100644
--- a/meta/packages/libgsf/libgsf_1.14.5.bb
+++ b/meta/packages/libgsf/libgsf_1.14.5.bb
@@ -11,14 +11,10 @@ PACKAGES =+ "${PN}-gnome ${PN}-gnome-dev "
 FILES_${PN}-gnome = "${libdir}/libgsf-gnome-1.so.*"
 FILES_${PN}-gnome-dev = "${libdir}/libgsf-gnome-1.* ${includedir}/libgsf-1/gsf-gnome"
 
-inherit autotools pkgconfig gnome gconf
+inherit autotools_stage pkgconfig gnome gconf
 
 EXTRA_OECONF = "\
                 --without-python \
                 --without-gnome \
                 --disable-gtk-doc \
                 --with-bz2"
-
-do_stage() {
-autotools_stage_all
-}
diff --git a/meta/packages/libidl/libidl_0.8.3.bb b/meta/packages/libidl/libidl_0.8.3.bb
index 32979027a3..ac10a2422f 100644
--- a/meta/packages/libidl/libidl_0.8.3.bb
+++ b/meta/packages/libidl/libidl_0.8.3.bb
@@ -8,11 +8,7 @@ SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/libIDL-${PV}.tar.bz
 S = "${WORKDIR}/libIDL-${PV}"
 
 BINCONFIG_GLOB = "*-config-2"
-inherit autotools pkgconfig binconfig
-
-do_stage() {
-        autotools_stage_all
-}
+inherit autotools_stage pkgconfig binconfig
 
 FILES_${PN} = "${libdir}/*.so.*"
 FILES_${PN}-dev += " ${bindir}" 
diff --git a/meta/packages/libidn/libidn_0.5.19.bb b/meta/packages/libidn/libidn_0.5.19.bb
index 322790b8ab..a093c111c9 100644
--- a/meta/packages/libidn/libidn_0.5.19.bb
+++ b/meta/packages/libidn/libidn_0.5.19.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
 PRIORITY    = "optional"
 PR          = "r0"
 
-inherit pkgconfig autotools
+inherit pkgconfig autotools_stage
 
 SRC_URI = "http://josefsson.org/libidn/releases/${P}.tar.gz"
 
@@ -13,7 +13,3 @@ EXTRA_OECONF = " --disable-tld"
 do_configure_prepend () {
         autoreconf -f -i -s
 }
-
-do_stage () {
-        autotools_stage_all
-}
diff --git a/meta/packages/libnl/libnl_1.0-pre6.bb b/meta/packages/libnl/libnl_1.0-pre6.bb
index 300222ca42..740bc937d7 100644
--- a/meta/packages/libnl/libnl_1.0-pre6.bb
+++ b/meta/packages/libnl/libnl_1.0-pre6.bb
@@ -5,14 +5,9 @@ HOMEPAGE = "http://people.suug.ch/~tgr/libnl/"
 PRIORITY = "optional"
 PV = "0.99+1.0-pre6"
 
-inherit autotools pkgconfig
+inherit autotools_stage pkgconfig
 
 SRC_URI= "http://people.suug.ch/~tgr/libnl/files/${PN}-1.0-pre6.tar.gz \
            file://local-includes.patch;patch=1"
 
 S = "${WORKDIR}/${PN}-1.0-pre6"
-
-do_stage () {
-        autotools_stage_all prefix=${prefix}
-}
-
diff --git a/meta/packages/libogg/libogg_1.1.bb b/meta/packages/libogg/libogg_1.1.bb
index cf5e81da36..78927726d0 100644
--- a/meta/packages/libogg/libogg_1.1.bb
+++ b/meta/packages/libogg/libogg_1.1.bb
@@ -8,8 +8,4 @@ PR = "r4"
 SRC_URI = "http://www.vorbis.com/files/1.0.1/unix/libogg-${PV}.tar.gz \
 file://m4.patch;patch=1"
 
-inherit autotools pkgconfig
-
-do_stage () {
-        autotools_stage_all
-}
+inherit autotools_stage pkgconfig
diff --git a/meta/packages/liboil/liboil_0.3.14.bb b/meta/packages/liboil/liboil_0.3.14.bb
index 55c423b034..edc9b932c9 100644
--- a/meta/packages/liboil/liboil_0.3.14.bb
+++ b/meta/packages/liboil/liboil_0.3.14.bb
@@ -7,10 +7,6 @@ PR = "r1"
 SRC_URI = "http://liboil.freedesktop.org/download/${P}.tar.gz \
            file://no-tests.patch;patch=1"
 
-inherit autotools pkgconfig
-
-do_stage() {
-        autotools_stage_all
-}
+inherit autotools_stage pkgconfig
 
 ARM_INSTRUCTION_SET = "arm"
diff --git a/meta/packages/librds/librds_0.0.1.bb b/meta/packages/librds/librds_0.0.1.bb
index 2d15d9b92a..b5e2c60d20 100644
--- a/meta/packages/librds/librds_0.0.1.bb
+++ b/meta/packages/librds/librds_0.0.1.bb
@@ -8,8 +8,4 @@ PR = "r1"
 
 SRC_URI = "http://download.berlios.de/rdsd/librds-${PV}.tar.gz"
 
-inherit autotools pkgconfig
-
-do_stage() {
-        autotools_stage_all
-}
+inherit autotools_stage pkgconfig
diff --git a/meta/packages/librsvg/librsvg_2.18.2.bb b/meta/packages/librsvg/librsvg_2.18.2.bb
index c33dca155f..5e68648c12 100644
--- a/meta/packages/librsvg/librsvg_2.18.2.bb
+++ b/meta/packages/librsvg/librsvg_2.18.2.bb
@@ -6,7 +6,7 @@ PR = "r3"
 
 EXTRA_OECONF = "--disable-mozilla-plugin --without-svgz --without-croco --disable-gnome-vfs"
 
-inherit autotools pkgconfig gnome
+inherit autotools_stage pkgconfig gnome
 
 PACKAGES =+ "librsvg-gtk librsvg-gtk-dbg librsvg-gtk-dev rsvg"
 FILES_${PN} = "${libdir}/*.so.*"
@@ -21,10 +21,6 @@ FILES_librsvg-gtk-dev += "${libdir}/gtk-2.0/*.*a \
 FILES_librsvg-gtk-dbg += "${libdir}/gtk-2.0/.debug \
                           ${libdir}/gtk-2.0/*/*/.debug"
 
-do_stage() {
-        autotools_stage_all
-}
-
 pkg_postinst_librsvg-gtk() {
 if [ "x$D" != "x" ]; then
   exit 1
diff --git a/meta/packages/librsvg/librsvg_2.22.3.bb b/meta/packages/librsvg/librsvg_2.22.3.bb
index c33dca155f..5e68648c12 100644
--- a/meta/packages/librsvg/librsvg_2.22.3.bb
+++ b/meta/packages/librsvg/librsvg_2.22.3.bb
@@ -6,7 +6,7 @@ PR = "r3"
 
 EXTRA_OECONF = "--disable-mozilla-plugin --without-svgz --without-croco --disable-gnome-vfs"
 
-inherit autotools pkgconfig gnome
+inherit autotools_stage pkgconfig gnome
 
 PACKAGES =+ "librsvg-gtk librsvg-gtk-dbg librsvg-gtk-dev rsvg"
 FILES_${PN} = "${libdir}/*.so.*"
@@ -21,10 +21,6 @@ FILES_librsvg-gtk-dev += "${libdir}/gtk-2.0/*.*a \
 FILES_librsvg-gtk-dbg += "${libdir}/gtk-2.0/.debug \
                           ${libdir}/gtk-2.0/*/*/.debug"
 
-do_stage() {
-        autotools_stage_all
-}
-
 pkg_postinst_librsvg-gtk() {
 if [ "x$D" != "x" ]; then
   exit 1
diff --git a/meta/packages/librsvg/librsvg_svn.bb b/meta/packages/librsvg/librsvg_svn.bb
index 92a8253714..580196c2a7 100644
--- a/meta/packages/librsvg/librsvg_svn.bb
+++ b/meta/packages/librsvg/librsvg_svn.bb
@@ -6,7 +6,7 @@ PR = "r3"
 
 EXTRA_OECONF = "--disable-mozilla-plugin --without-svgz --without-croco --disable-gnome-vfs"
 
-inherit autotools pkgconfig gnome
+inherit autotools_stage pkgconfig gnome
 
 SRC_URI = "svn://svn.gnome.org/svn/${PN};module=trunk"
 PV = "2.22.3+svnr${SRCREV}"
@@ -30,10 +30,6 @@ FILES_librsvg-gtk-dev += "${libdir}/gtk-2.0/*.*a \
 FILES_librsvg-gtk-dbg += "${libdir}/gtk-2.0/.debug \
                           ${libdir}/gtk-2.0/*/*/.debug"
 
-do_stage() {
-        autotools_stage_all
-}
-
 pkg_postinst_librsvg-gtk() {
 if [ "x$D" != "x" ]; then
   exit 1
diff --git a/meta/packages/libsdl/libsdl-sdk_1.2.11.bb b/meta/packages/libsdl/libsdl-sdk_1.2.11.bb
index fb19248a69..6cea742f17 100644
--- a/meta/packages/libsdl/libsdl-sdk_1.2.11.bb
+++ b/meta/packages/libsdl/libsdl-sdk_1.2.11.bb
@@ -12,7 +12,7 @@ SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
            file://kernel-asm-page.patch;patch=1 "
 S = "${WORKDIR}/SDL-${PV}"
 
-inherit autotools binconfig pkgconfig sdk
+inherit autotools_stage binconfig pkgconfig sdk
 
 EXTRA_OECONF = "--disable-static --disable-debug --disable-cdrom --enable-threads --enable-timers --enable-endian \
                 --enable-file --disable-oss --disable-alsa --disable-esd --disable-arts \
@@ -30,7 +30,6 @@ do_configure_prepend() {
         cp ${WORKDIR}/acinclude.m4 ${S}/acinclude.m4
 }
 
-do_stage() {
-        autotools_stage_all
+do_stage_append() {
         install -m 0644 ${S}/build/libSDLmain.a ${STAGING_LIBDIR}
 }
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..36c5250c40 100644
--- a/meta/packages/libsoup/libsoup-2.4_2.4.1.bb
+++ b/meta/packages/libsoup/libsoup-2.4_2.4.1.bb
@@ -7,7 +7,7 @@ DEPENDS = "glib-2.0 gnutls libxml2"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.4/libsoup-${PV}.tar.bz2"
 S = "${WORKDIR}/libsoup-${PV}"
 
-inherit autotools pkgconfig
+inherit autotools_stage pkgconfig
 
 do_stage() {
         autotools_stage_all
diff --git a/meta/packages/libsoup/libsoup_2.2.100.bb b/meta/packages/libsoup/libsoup_2.2.100.bb
index 116e2b4bd1..7ea15ec9b5 100644
--- a/meta/packages/libsoup/libsoup_2.2.100.bb
+++ b/meta/packages/libsoup/libsoup_2.2.100.bb
@@ -7,12 +7,8 @@ DEPENDS = "glib-2.0 gnutls libxml2"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.2/${PN}-${PV}.tar.bz2"
 
-inherit autotools pkgconfig
+inherit autotools_stage pkgconfig
 
 FILES_${PN} = "${libdir}/lib*.so.*"
 FILES_${PN}-dev = "${includedir}/ ${libdir}/"
 FILES_${PN}-doc = "${datadir}/"
-
-do_stage() {
-        autotools_stage_all
-}
diff --git a/meta/packages/libusb/libusb1_0.9.2.bb b/meta/packages/libusb/libusb1_0.9.2.bb
index 2c144f053d..96daedf24f 100644
--- a/meta/packages/libusb/libusb1_0.9.2.bb
+++ b/meta/packages/libusb/libusb1_0.9.2.bb
@@ -12,7 +12,7 @@ SRC_URI = "\
 "
 S = "${WORKDIR}/libusb-${PV}"
 
-inherit autotools pkgconfig binconfig lib_package
+inherit autotools_stage pkgconfig binconfig lib_package
 
 PARALLEL_MAKE = ""
 EXTRA_OECONF = "--disable-build-docs"
@@ -22,9 +22,5 @@ export CXXFLAGS += "-lstdc++ -I${STAGING_INCDIR}"
 LIBTOOL = "${HOST_SYS}-libtool"
 EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'"
 
-do_stage() {
-        autotools_stage_all
-}
-
 PACKAGES =+ "libusbpp"
 FILES_libusbpp = "${libdir}/libusbpp*.so.*"
diff --git a/meta/packages/libvorbis/libvorbis_1.0.1.bb b/meta/packages/libvorbis/libvorbis_1.0.1.bb
index 6dd677a830..4dfd389831 100644
--- a/meta/packages/libvorbis/libvorbis_1.0.1.bb
+++ b/meta/packages/libvorbis/libvorbis_1.0.1.bb
@@ -9,7 +9,7 @@ PR = "r5"
 SRC_URI = "http://www.vorbis.com/files/${PV}/unix/libvorbis-${PV}.tar.gz \
            file://m4.patch;patch=1"
 
-inherit autotools pkgconfig
+inherit autotools_stage pkgconfig
 
 # vorbisfile.c reveals a problem in the gcc register spilling for the
 # thumb instruction set...
@@ -17,7 +17,3 @@ FULL_OPTIMIZATION_thumb = "-O0"
 
 EXTRA_OECONF = "--with-ogg-libraries=${STAGING_LIBDIR} \
                 --with-ogg-includes=${STAGING_INCDIR}"
-
-do_stage () {
-        autotools_stage_all
-}
diff --git a/meta/packages/libxslt/libxslt_1.1.22.bb b/meta/packages/libxslt/libxslt_1.1.22.bb
index 85c97fada0..82a3096a7d 100644
--- a/meta/packages/libxslt/libxslt_1.1.22.bb
+++ b/meta/packages/libxslt/libxslt_1.1.22.bb
@@ -9,14 +9,10 @@ SRC_URI = "ftp://xmlsoft.org/libxml2/libxslt-${PV}.tar.gz \
            file://pkgconfig_fix.patch;patch=1"
 S = "${WORKDIR}/libxslt-${PV}"
 
-inherit autotools pkgconfig
+inherit autotools_stage pkgconfig
 
 EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto"
 
-do_stage () {
-        autotools_stage_all
-}
-
 PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
 
 FILES_${PN}-dev += "${bindir}/xslt-config"
diff --git a/meta/packages/loudmouth/loudmouth_1.4.0.bb b/meta/packages/loudmouth/loudmouth_1.4.0.bb
index b50ca6adbd..92bef62aa8 100644
--- a/meta/packages/loudmouth/loudmouth_1.4.0.bb
+++ b/meta/packages/loudmouth/loudmouth_1.4.0.bb
@@ -5,8 +5,4 @@ DEPENDS = "glib-2.0 gnutls check"
 
 SRC_URI = "http://ftp.imendio.com/pub/imendio/${PN}/src/${PN}-${PV}.tar.bz2"
 
-inherit autotools pkgconfig
-
-do_stage() {
-        autotools_stage_all
-}
+inherit autotools_stage pkgconfig
diff --git a/meta/packages/lzo/lzo_2.02.bb b/meta/packages/lzo/lzo_2.02.bb
index d8318a14eb..5fad10b067 100644
--- a/meta/packages/lzo/lzo_2.02.bb
+++ b/meta/packages/lzo/lzo_2.02.bb
@@ -9,14 +9,10 @@ SRC_URI = "http://www.oberhumer.com/opensource/lzo/download/lzo-${PV}.tar.gz \
            file://autofoo.patch;patch=1 \
            file://acinclude.m4"
 
-inherit autotools 
+inherit autotools_stage
 
 EXTRA_OECONF = "--enable-shared"
 
 do_configure_prepend () {
         cp ${WORKDIR}/acinclude.m4 ${S}/
 }
-
-do_stage() {
-        autotools_stage_all
-}
diff --git a/meta/packages/maemo/xpext_1.0-5.bb b/meta/packages/maemo/xpext_1.0-5.bb
index 3636551b2c..85e669c174 100644
--- a/meta/packages/maemo/xpext_1.0-5.bb
+++ b/meta/packages/maemo/xpext_1.0-5.bb
@@ -13,14 +13,10 @@ S = "${WORKDIR}/xpext-1.0"
 RDEPENDS_${PN}-dev = ""
 RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${DEBPV})"
 
-inherit autotools pkgconfig
+inherit autotools_stage pkgconfig
 
 do_configure_prepend () {
   cd ${S}
   chmod +x ./autogen.sh
   ./autogen.sh
 }
-
-do_stage() {
-        autotools_stage_all
-}
diff --git a/meta/packages/maemo/xsp_1.0.0-8.bb b/meta/packages/maemo/xsp_1.0.0-8.bb
index f4f872e57f..1e10edda14 100644
--- a/meta/packages/maemo/xsp_1.0.0-8.bb
+++ b/meta/packages/maemo/xsp_1.0.0-8.bb
@@ -1,15 +1,12 @@
-PR = "r1"
-LICENSE= "MIT"
 DESCRIPTION = "X Server Nokia 770 extensions library"
 SECTION = "x11/libs"
 PRIORITY = "optional"
+LICENSE= "MIT"
 DEPENDS = "virtual/libx11 libxext xpext"
 
+PR = "r1"
+
 SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/xsp/${PN}_${PV}.tar.gz"
 S = "${WORKDIR}/Xsp"
 
-inherit autotools pkgconfig
-
-do_stage() {
-        autotools_stage_all
-}
+inherit autotools_stage pkgconfig
diff --git a/meta/packages/matchbox-wm-2/matchbox-wm-2_svn.bb b/meta/packages/matchbox-wm-2/matchbox-wm-2_svn.bb
index 37c00e9c61..4491c937cf 100644
--- a/meta/packages/matchbox-wm-2/matchbox-wm-2_svn.bb
+++ b/meta/packages/matchbox-wm-2/matchbox-wm-2_svn.bb
@@ -11,7 +11,7 @@ SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-window-mana
 
 S = "${WORKDIR}/matchbox-window-manager-2"
 
-inherit autotools pkgconfig update-alternatives
+inherit autotools_stage pkgconfig update-alternatives
 
 # Change this to x-session-manager->matchbox-session and put in
 # matchbox-session, then change this to x-window-manager to
@@ -40,7 +40,3 @@ do_install_append () {
         cd ${D}${bindir}
         ln -s matchbox-window-manager-2-simple matchbox-window-manager
 }
-
-do_stage() {
-           autotools_stage_all
-}
diff --git a/meta/packages/mesa/mesa-common.inc b/meta/packages/mesa/mesa-common.inc
index ebfb920b87..cb112df012 100644
--- a/meta/packages/mesa/mesa-common.inc
+++ b/meta/packages/mesa/mesa-common.inc
@@ -10,15 +10,11 @@ S = "${WORKDIR}/Mesa-${PV}"
 
 PROVIDES = "virtual/libgl"
 
-inherit autotools pkgconfig
+inherit autotools_stage pkgconfig
 
 EXTRA_OECONF = "--disable-glu \
                 --disable-glw \
                 --disable-glut \
                 --enable-glx-tls"
 
-do_stage() {
-        autotools_stage_all
-}
-
 
diff --git a/meta/packages/mpfr/mpfr.inc b/meta/packages/mpfr/mpfr.inc
index cf898b62b6..938fd1c730 100644
--- a/meta/packages/mpfr/mpfr.inc
+++ b/meta/packages/mpfr/mpfr.inc
@@ -3,4 +3,4 @@ HOMEPAGE = "http://www.mpfr.org/"
 LICENSE = "LGPL"
 SECTION = "libs"
 
-inherit autotools
+inherit autotools_stage
diff --git a/meta/packages/mpfr/mpfr_2.3.1.bb b/meta/packages/mpfr/mpfr_2.3.1.bb
index 869c4227e2..746b2435ed 100644
--- a/meta/packages/mpfr/mpfr_2.3.1.bb
+++ b/meta/packages/mpfr/mpfr_2.3.1.bb
@@ -5,7 +5,3 @@ PR = "r1"
 
 SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.bz2"
 S = "${WORKDIR}/mpfr-${PV}"
-
-do_stage() {
-        autotools_stage_all
-}
diff --git a/meta/packages/musicbrainz/libmusicbrainz_2.1.3.bb b/meta/packages/musicbrainz/libmusicbrainz_2.1.3.bb
index f089dc800d..66f85f7b38 100644
--- a/meta/packages/musicbrainz/libmusicbrainz_2.1.3.bb
+++ b/meta/packages/musicbrainz/libmusicbrainz_2.1.3.bb
@@ -8,11 +8,7 @@ SRC_URI = "http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-2.1.3.tar.g
            file://gcc43_fix.patch;patch=1 \
            file://autofoo.patch;patch=1"
 
-inherit autotools pkgconfig
-
-do_stage() {
-autotools_stage_all
-}
+inherit autotools_stage pkgconfig
 
 
 
diff --git a/meta/packages/neon/neon_0.28.1.bb b/meta/packages/neon/neon_0.28.1.bb
index d99b9a64a4..997c73b46a 100644
--- a/meta/packages/neon/neon_0.28.1.bb
+++ b/meta/packages/neon/neon_0.28.1.bb
@@ -6,10 +6,6 @@ DEPENDS = "zlib libxml2 expat time gnutls"
 SRC_URI = "http://www.webdav.org/${PN}/${P}.tar.gz \
            file://pkgconfig.patch;patch=1"
 
-inherit autotools binconfig lib_package pkgconfig
+inherit autotools_stage binconfig lib_package pkgconfig
 
 EXTRA_OECONF = "--with-ssl=gnutls --with-libxml2 --with-expat --enable-shared"
-
-do_stage () {
-        autotools_stage_all
-}
diff --git a/meta/packages/networkmanager/networkmanager_svn.bb b/meta/packages/networkmanager/networkmanager_svn.bb
index 2ff20ca4b0..40438046db 100644
--- a/meta/packages/networkmanager/networkmanager_svn.bb
+++ b/meta/packages/networkmanager/networkmanager_svn.bb
@@ -23,7 +23,7 @@ EXTRA_OECONF = " \
 
 S = "${WORKDIR}/trunk"
 
-inherit autotools pkgconfig update-rc.d
+inherit autotools_stage pkgconfig update-rc.d
 
 INITSCRIPT_NAME = "NetworkManager"
 INITSCRIPT_PARAMS = "defaults 22"
@@ -37,10 +37,6 @@ do_install_append () {
         rmdir ${D}/var/run
 }
 
-do_stage () {
-        autotools_stage_all
-}
-
 pkg_postinst_${PN} () {
         if [ "x$D" != "x" ]; then
                 exit 1
diff --git a/meta/packages/opensync/libopensync_0.22.bb b/meta/packages/opensync/libopensync_0.22.bb
index be43558947..a4ffdedb6c 100644
--- a/meta/packages/opensync/libopensync_0.22.bb
+++ b/meta/packages/opensync/libopensync_0.22.bb
@@ -5,15 +5,10 @@ DEPENDS = "sqlite3 libxml2 zlib glib-2.0"
 
 SRC_URI = "http://www.opensync.org/download/releases/0.22/libopensync-0.22.tar.bz2"
 
-inherit autotools pkgconfig lib_package
+inherit autotools_stage pkgconfig lib_package
 
 EXTRA_OECONF = "--disable-python"
 LEAD_SONAME = "libopensync.so"
 
 FILES_${PN} += " ${libdir}/opensync/formats/*.so"
 FILES_${PN}-dbg += " ${libdir}/opensync/formats/.debug/*.so"
-
-do_stage() {
-        autotools_stage_all
-}
-
diff --git a/meta/packages/opkg-utils/opkg-utils_svn.bb b/meta/packages/opkg-utils/opkg-utils_svn.bb
index 4c3c0905ea..c896300642 100644
--- a/meta/packages/opkg-utils/opkg-utils_svn.bb
+++ b/meta/packages/opkg-utils/opkg-utils_svn.bb
@@ -9,10 +9,6 @@ SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http"
 
 S = "${WORKDIR}/opkg-utils"
 
-inherit autotools
+inherit autotools_stage
 
 S = "${WORKDIR}/opkg-utils"
-
-do_stage () {
-        autotools_stage_all
-}
diff --git a/meta/packages/opkg/opkg.inc b/meta/packages/opkg/opkg.inc
index d0167f6283..d131753ddb 100644
--- a/meta/packages/opkg/opkg.inc
+++ b/meta/packages/opkg/opkg.inc
@@ -11,8 +11,4 @@ SRC_URI = "svn://svn.openmoko.org/trunk/src/target/;module=opkg;proto=http \
 
 S = "${WORKDIR}/opkg"
 
-inherit autotools pkgconfig
-
-do_stage() {
-        autotools_stage_all
-}
+inherit autotools_stage pkgconfig
diff --git a/meta/packages/owl-video-widget/libowl-av_svn.bb b/meta/packages/owl-video-widget/libowl-av_svn.bb
index b8e039d3d5..fe3cb68e7b 100644
--- a/meta/packages/owl-video-widget/libowl-av_svn.bb
+++ b/meta/packages/owl-video-widget/libowl-av_svn.bb
@@ -12,8 +12,4 @@ S = "${WORKDIR}/${PN}"
 
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http"
 
-inherit autotools pkgconfig
-
-do_stage () {
-        autotools_stage_all
-}
\ No newline at end of file
+inherit autotools_stage pkgconfig
diff --git a/meta/packages/parted/parted_1.8.8.bb b/meta/packages/parted/parted_1.8.8.bb
index 0e0332b70f..2a4eb769bc 100644
--- a/meta/packages/parted/parted_1.8.8.bb
+++ b/meta/packages/parted/parted_1.8.8.bb
@@ -11,8 +11,4 @@ SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz \
            
 EXTRA_OECONF = "--disable-Werror"
 
-inherit autotools pkgconfig
-
-do_stage() {
-        autotools_stage_all
-}
+inherit autotools_stage pkgconfig
diff --git a/meta/packages/poppler/poppler.inc b/meta/packages/poppler/poppler.inc
index c33d6f0ea1..a3bce0c32e 100644
--- a/meta/packages/poppler/poppler.inc
+++ b/meta/packages/poppler/poppler.inc
@@ -5,7 +5,7 @@ PR = "r1"
 
 SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz"
 
-inherit autotools pkgconfig
+inherit autotools_stage pkgconfig
 
 EXTRA_OECONF = " --enable-xpdf-headers \
                  --disable-gtk-test \
@@ -16,8 +16,3 @@ EXTRA_OECONF = " --enable-xpdf-headers \
 #check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
 require poppler-fpu.inc
 EXTRA_OECONF += "${@get_poppler_fpu_setting(bb, d)}"
-
-
-do_stage() {
-        autotools_stage_all
-}
diff --git a/meta/packages/popt/popt_1.14.bb b/meta/packages/popt/popt_1.14.bb
index 619af42a43..1ad0e1996f 100644
--- a/meta/packages/popt/popt_1.14.bb
+++ b/meta/packages/popt/popt_1.14.bb
@@ -5,8 +5,4 @@ DEPENDS = "gettext-native"
 
 SRC_URI = "http://rpm5.org/files/popt/popt-${PV}.tar.gz"
 
-inherit autotools
-
-do_stage () {
-         autotools_stage_all
-}
+inherit autotools_stage
diff --git a/meta/packages/python/python-gst_0.10.8.bb b/meta/packages/python/python-gst_0.10.8.bb
index 224d24b59a..31d3bc94e4 100644
--- a/meta/packages/python/python-gst_0.10.8.bb
+++ b/meta/packages/python/python-gst_0.10.8.bb
@@ -8,7 +8,7 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.
            file://python-path.patch;patch=1"
 S = "${WORKDIR}/gst-python-${PV}"
 
-inherit autotools distutils-base pkgconfig
+inherit autotools_stage distutils-base pkgconfig
 
 EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
 
@@ -17,10 +17,6 @@ do_configure_prepend() {
     install -m 0644 ${S}/common/m4/*.m4 ${S}/m4/
 }
 
-do_stage() {
-        autotools_stage_all
-}
-
 FILES_${PN} += "${datadir}/gst-python"
 FILES_${PN}-dev += "${datadir}/gst-python/0.10/defs"
 FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/gst-0.10/gst/.debug/"
diff --git a/meta/packages/readline/readline_5.2.bb b/meta/packages/readline/readline_5.2.bb
index a7dc818790..daafa19c31 100644
--- a/meta/packages/readline/readline_5.2.bb
+++ b/meta/packages/readline/readline_5.2.bb
@@ -16,17 +16,13 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/readline/readline-${PV}.tar.gz \
 
 S = "${WORKDIR}/readline-${PV}"
 
-inherit autotools
+inherit autotools_stage
 
 do_configure () {
         install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
         autotools_do_configure
 }
 
-do_stage() {
-        autotools_stage_all
-}
-
 do_install () {
         autotools_do_install
         # Make install doesn't properly install these
diff --git a/meta/packages/speex/speex_1.1.12+1.2beta3.bb b/meta/packages/speex/speex_1.1.12+1.2beta3.bb
index f1445100b4..446694f55d 100644
--- a/meta/packages/speex/speex_1.1.12+1.2beta3.bb
+++ b/meta/packages/speex/speex_1.1.12+1.2beta3.bb
@@ -9,16 +9,12 @@ S = "${WORKDIR}/${PN}-1.2beta3"
 
 PARALLEL_MAKE = ""
 
-inherit autotools pkgconfig
+inherit autotools_stage pkgconfig
 
 EXTRA_OECONF = " --enable-fixed-point --with-ogg-libraries=${STAGING_LIBDIR} \
                  --disable-float-api --disable-vbr \
                  --with-ogg-includes=${STAGING_INCDIR} --disable-oggtest"
 
-do_stage() {
-    autotools_stage_all
-}
-
 PACKAGES += "${PN}-bin"
 FILES_${PN} = "${libdir}/libspeex.so.*"
 FILES_${PN}-dev += "${libdir}/libspeex.so.*"
diff --git a/meta/packages/startup-notification/startup-notification_0.9.bb b/meta/packages/startup-notification/startup-notification_0.9.bb
index 655f3c9a02..4dedd10e44 100644
--- a/meta/packages/startup-notification/startup-notification_0.9.bb
+++ b/meta/packages/startup-notification/startup-notification_0.9.bb
@@ -4,14 +4,10 @@ SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "virtual/libx11 libsm"
 
-inherit autotools pkgconfig 
+inherit autotools_stage pkgconfig 
 
 SRC_URI = "http://www.freedesktop.org/software/startup-notification/releases/${PN}-${PV}.tar.gz"
 
 do_configure_prepend () {
         export X_LIBS=" -L${STAGING_LIBDIR}"
 }
-
-do_stage () {
-        autotools_stage_all
-}
diff --git a/meta/packages/telepathy/libtelepathy_0.3.3.bb b/meta/packages/telepathy/libtelepathy_0.3.3.bb
index 4343688fba..1c9bf2a714 100644
--- a/meta/packages/telepathy/libtelepathy_0.3.3.bb
+++ b/meta/packages/telepathy/libtelepathy_0.3.3.bb
@@ -7,11 +7,7 @@ PR = "r2"
 SRC_URI = "http://telepathy.freedesktop.org/releases/libtelepathy/libtelepathy-${PV}.tar.gz \
            file://prefer_python_2.5.patch;patch=1 "
 
-inherit autotools pkgconfig
+inherit autotools_stage pkgconfig
 
 FILES_${PN} += "${datadir}/telepathy \
                 ${datadir}/dbus-1"
-
-do_stage() {
-    autotools_stage_all
-}
diff --git a/meta/packages/telepathy/telepathy-mission-control_4.61.bb b/meta/packages/telepathy/telepathy-mission-control_4.61.bb
index 1ea00312cb..18de11b568 100644
--- a/meta/packages/telepathy/telepathy-mission-control_4.61.bb
+++ b/meta/packages/telepathy/telepathy-mission-control_4.61.bb
@@ -7,7 +7,7 @@ DEPENDS = "libtelepathy dbus-glib gconf"
 SRC_URI = "${SOURCEFORGE_MIRROR}/mission-control/telepathy-mission-control-${PV}.tar.gz \
            file://pkgconfig.patch;patch=1"
 
-inherit autotools pkgconfig
+inherit autotools_stage pkgconfig
 
 PACKAGES =+ " \
         libmissioncontrol \
@@ -36,7 +36,3 @@ FILES_libmissioncontrol-server-dev = "${libdir}/libmissioncontrol-server.*"
 FILES_libmissioncontrol-dbg = "${libdir}/.debug/libmissioncontrol.so.*"
 FILES_libmissioncontrol-config-dbg = "${libdir}/.debug/libmissioncontrol-config.so.*"
 FILES_libmissioncontrol-server-dbg = "${libdir}/.debug/libmissioncontrol-server.so.*"
-
-do_stage() {
-        autotools_stage_all
-}
diff --git a/meta/packages/tremor/tremor_20041119.bb b/meta/packages/tremor/tremor_20041119.bb
index 530d6bb871..fd5ab7c58c 100644
--- a/meta/packages/tremor/tremor_20041119.bb
+++ b/meta/packages/tremor/tremor_20041119.bb
@@ -10,16 +10,8 @@ SRC_URI = "svn://svn.xiph.org/trunk;module=Tremor;rev=4573;proto=http"
 
 S = "${WORKDIR}/Tremor"
 
-inherit autotools
+inherit autotools_stage
 
 EXTRA_OECONF=" --enable-shared --disable-rpath  "
 
-#do_configure_prepend() {
-#    ./autogen.sh
-#}
-
-do_stage() {
-        autotools_stage_all
-}
-
 ARM_INSTRUCTION_SET = "arm"
diff --git a/meta/packages/tslib/tslib_1.0.bb b/meta/packages/tslib/tslib_1.0.bb
index f4c437c649..c2e732996a 100644
--- a/meta/packages/tslib/tslib_1.0.bb
+++ b/meta/packages/tslib/tslib_1.0.bb
@@ -15,14 +15,10 @@ SRC_URI = "http://download.berlios.de/tslib/tslib-1.0.tar.bz2 \
 SRC_URI_append_mnci += " file://devfs.patch;patch=1"
 SRC_URI_append_mnci += " file://event1.patch;patch=1"
 
-inherit autotools pkgconfig
+inherit autotools_stage pkgconfig
 
 EXTRA_OECONF = "--enable-shared --disable-h3600 --enable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00"
 
-do_stage() {
-        autotools_stage_all
-}
-
 do_install_prepend() {
         install -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf
 }