autotools: deprecate autotools_stage class

Move the functionality into autotools and ensure all our Poky recipes are no longer using it. Keep the autools_stage class around for OE compatability but just have it inherit autools. Signed-off-by: Joshua Lock <josh@linux.intel.com>
2026-09-13 00:49:33 +02:00 · 2010-04-26 17:41:05 +01:00
parent 95f2dd7dc8
commit 4d1f39af75
222 changed files with 224 additions and 224 deletions
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -204,5 +204,8 @@ autotools_stage_all() {
 	rm -rf ${STAGE_TEMP}
 }

-EXPORT_FUNCTIONS do_configure do_install
+do_stage () {
+	autotools_stage_all
+}

+EXPORT_FUNCTIONS do_configure do_install
--- a/meta/classes/autotools_stage.bbclass
+++ b/meta/classes/autotools_stage.bbclass
@@ -1,5 +1,2 @@
 inherit autotools

-do_stage () {
-	autotools_stage_all
-}
--- a/meta/packages/alsa/alsa-lib_1.0.20.bb
+++ b/meta/packages/alsa/alsa-lib_1.0.20.bb
@@ -13,7 +13,7 @@ ARM_INSTRUCTION_SET = "arm"
 SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \
           file://fix-tstamp-declaration.patch;patch=1"

-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig

 require alsa-fpu.inc
 EXTRA_OECONF += "${@get_alsa_fpu_setting(bb, d)} "
--- a/meta/packages/alsa/alsa-oss_1.0.17.bb
+++ b/meta/packages/alsa/alsa-oss_1.0.17.bb
@@ -5,7 +5,7 @@ DEPENDS = "alsa-lib"

 SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2"

-inherit autotools_stage
+inherit autotools

 do_configure_prepend () {
 	touch NEWS README AUTHORS ChangeLog
--- a/meta/packages/apr/apr-util_1.3.4.bb
+++ b/meta/packages/apr/apr-util_1.3.4.bb
@@ -17,7 +17,7 @@ EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \
 		--with-expat=${STAGING_DIR_HOST}${prefix}"


-inherit autotools_stage lib_package binconfig
+inherit autotools lib_package binconfig

 OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"

--- a/meta/packages/atk/atk.inc
+++ b/meta/packages/atk/atk.inc
@@ -5,6 +5,6 @@ LICENSE = "LGPL"

 DEPENDS = "glib-2.0 gtk-doc-native"

-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig

 EXTRA_OECONF = "--disable-glibtest"
--- a/meta/packages/avahi/avahi.inc
+++ b/meta/packages/avahi/avahi.inc
@@ -13,7 +13,7 @@ SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
        file://99avahi-autoipd \
        file://initscript.patch;patch=1"

-inherit autotools_stage pkgconfig update-rc.d gettext
+inherit autotools pkgconfig update-rc.d gettext

 EXTRA_OECONF = "--with-distro=debian \
             --with-avahi-priv-access-group=adm \
--- a/meta/packages/beecrypt/beecrypt_3.1.0.bb
+++ b/meta/packages/beecrypt/beecrypt_3.1.0.bb
@@ -9,7 +9,7 @@ SRC_URI="${SOURCEFORGE_MIRROR}/beecrypt/beecrypt-${PV}.tar.gz \

 PR = "r1"

-inherit autotools_stage
+inherit autotools
 acpaths=""

 EXTRA_OECONF="--with-arch=${TARGET_ARCH} --enable-shared --enable-static"
--- a/meta/packages/bluez/bluez4_4.56.bb
+++ b/meta/packages/bluez/bluez4_4.56.bb
@@ -18,7 +18,7 @@ SRC_URI = "\
 "
 S = "${WORKDIR}/bluez-${PV}"

-inherit autotools_stage
+inherit autotools
 AUTOTOOLS_STAGE_PKGCONFIG = "1"

 EXTRA_OECONF = "\
--- a/meta/packages/cairo/cairo.inc
+++ b/meta/packages/cairo/cairo.inc
@@ -8,4 +8,4 @@ LICENSE = "MPL LGPL"
 require cairo-fpu.inc
 EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)}"

-inherit autotools_stage pkgconfig 
+inherit autotools pkgconfig
--- a/meta/packages/clutter/aaina.inc
+++ b/meta/packages/clutter/aaina.inc
@@ -4,4 +4,4 @@ LICENSE = "GPL"

 DEPENDS = "clutter-0.6 libxml2 gtk+ neon"

-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig
--- a/meta/packages/clutter/clutter-box2d.inc
+++ b/meta/packages/clutter/clutter-box2d.inc
@@ -7,7 +7,7 @@ DEPENDS = "clutter-0.8"
 # The main clutter lib is machine specific so we need to be too
 PACKAGE_ARCH = "${MACHINE_ARCH}"

-inherit autotools_stage pkgconfig gtk-doc
+inherit autotools pkgconfig gtk-doc

 do_install_append () {
 	install -d ${D}${bindir}
--- a/meta/packages/clutter/clutter-cairo.inc
+++ b/meta/packages/clutter/clutter-cairo.inc
@@ -9,5 +9,5 @@ FILESPATH = "${FILE_DIRNAME}/clutter-cairo"
 PACKAGES =+ "${PN}-examples"
 FILES_${PN}-examples = "${bindir}/flowers ${bindir}/clock"

-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig

--- a/meta/packages/clutter/clutter-gst.inc
+++ b/meta/packages/clutter/clutter-gst.inc
@@ -9,5 +9,5 @@ FILESPATH = "${FILE_DIRNAME}/clutter-gst"
 PACKAGES =+ "${PN}-examples"
 FILES_${PN}-examples = "${bindir}/video-player ${bindir}/video-sink ${bindir}/audio"

-inherit autotools_stage pkgconfig gtk-doc
+inherit autotools pkgconfig gtk-doc

--- a/meta/packages/clutter/clutter-gtk.inc
+++ b/meta/packages/clutter/clutter-gtk.inc
@@ -9,5 +9,5 @@ FILESPATH = "${FILE_DIRNAME}/clutter-gtk"
 PACKAGES =+ "${PN}-examples"
 FILES_${PN}-examples = "${bindir}/gtk-clutter-test ${bindir}/gtk-clutter-events ${bindir}/gtk-clutter-multistage"

-inherit autotools_stage pkgconfig gtk-doc
+inherit autotools pkgconfig gtk-doc

--- a/meta/packages/clutter/clutter-helix.inc
+++ b/meta/packages/clutter/clutter-helix.inc
@@ -11,5 +11,5 @@ COMPATIBLE_HOST = '(x86_64|i.86.*)-linux'
 PACKAGES =+ "${PN}-examples"
 FILES_${PN}-examples = "${bindir}/video-player ${bindir}/audio-player"

-inherit autotools_stage pkgconfig gtk-doc
+inherit autotools pkgconfig gtk-doc

--- a/meta/packages/clutter/clutter-mozembed.inc
+++ b/meta/packages/clutter/clutter-mozembed.inc
@@ -10,5 +10,5 @@ FILES_${PN} =+ "${datadir}/cluttermozembed/chrome/"

 EXTRA_OECONF = "--enable-plugins"

-inherit autotools_stage pkgconfig gtk-doc
+inherit autotools pkgconfig gtk-doc

--- a/meta/packages/clutter/clutter.inc
+++ b/meta/packages/clutter/clutter.inc
@@ -45,7 +45,7 @@ PACKAGE_ARCH_menlow = "${MACHINE_ARCH}"

 FILESPATH = "${FILE_DIRNAME}/clutter"

-inherit autotools_stage pkgconfig gtk-doc
+inherit autotools pkgconfig gtk-doc

 #check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
 require clutter-fpu.inc
--- a/meta/packages/clutter/table.inc
+++ b/meta/packages/clutter/table.inc
@@ -4,7 +4,7 @@ LICENSE = "LGPL"

 DEPENDS = "clutter-gst-0.6 gnome-vfs"

-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig

 do_install() {
 	install -d ${D}${bindir}
--- a/meta/packages/clutter/tidy.inc
+++ b/meta/packages/clutter/tidy.inc
@@ -8,7 +8,7 @@ BASE_CONF = "--disable-gtk-doc"
 DEPENDS = "${STDDEPENDS}"
 EXTRA_OECONF = "${BASE_CONF}"

-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig

 PACKAGES =+ "tidy-examples"
 FILES_tidy-examples = "${bindir}/test-*"
--- a/meta/packages/connman/connman-gnome_git.bb
+++ b/meta/packages/connman/connman-gnome_git.bb
@@ -6,4 +6,4 @@ PR = "r0"

 S = "${WORKDIR}/git"

-inherit autotools_stage
+inherit autotools
--- a/meta/packages/connman/connman.inc
+++ b/meta/packages/connman/connman.inc
@@ -16,7 +16,7 @@ EXTRA_OECONF += " \
 INITSCRIPT_NAME = "connman"
 INITSCRIPT_PARAMS = "start 05 5 2 . stop 22 0 1 6 ."

-inherit autotools_stage pkgconfig update-rc.d
+inherit autotools pkgconfig update-rc.d

 do_install_append() {
    install -d ${D}${sysconfdir}/init.d/
--- a/meta/packages/curl/curl_7.20.0.bb
+++ b/meta/packages/curl/curl_7.20.0.bb
@@ -9,7 +9,7 @@ PR = "r1"
 SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
           file://pkgconfig_fix.patch;patch=1"

-inherit autotools_stage pkgconfig binconfig
+inherit autotools pkgconfig binconfig

 EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
                --with-gnutls=${STAGING_BINDIR_CROSS}/ \
--- a/meta/packages/dbus/dbus-glib.inc
+++ b/meta/packages/dbus/dbus-glib.inc
@@ -8,7 +8,7 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz
           file://fix_asneeded.patch;patch=1 \
           file://no-examples.patch;patch=1"

-inherit autotools_stage pkgconfig gettext
+inherit autotools pkgconfig gettext

 EXTRA_OECONF = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml"

--- a/meta/packages/devicekit/devicekit-power_014.bb
+++ b/meta/packages/devicekit/devicekit-power_014.bb
@@ -5,7 +5,7 @@ DEPENDS = "devicekit glib-2.0 dbus-glib polkit"
 SRC_URI = "http://hal.freedesktop.org/releases/DeviceKit-power-${PV}.tar.gz"
 S = "${WORKDIR}/DeviceKit-power-${PV}"

-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig

 do_configure_prepend() {
 	sed -i -e s:-nonet:\:g ${S}/doc/man/Makefile.am
--- a/meta/packages/devicekit/devicekit_003.bb
+++ b/meta/packages/devicekit/devicekit_003.bb
@@ -11,6 +11,6 @@ do_configure_prepend() {
 	sed -i -e s:-nonet:\:g ${S}/doc/man/Makefile.am
 }	

-inherit autotools_stage
+inherit autotools

 FILES_${PN} += "${datadir}/dbus-1/"
--- a/meta/packages/drm/libdrm.inc
+++ b/meta/packages/drm/libdrm.inc
@@ -9,4 +9,4 @@ FILES_libdrm-tests = "${bindir}/dr* ${bindir}/mode*"

 LEAD_SONAME = "libdrm.so"

-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig
--- a/meta/packages/eds/eds-dbus_2.20.0.bb
+++ b/meta/packages/eds/eds-dbus_2.20.0.bb
@@ -11,7 +11,7 @@ SRC_URI = "http://ftp.gnome.org/pub/GNOME/mobile/2.23/2.23.92/sources/evolution-

 S = "${WORKDIR}/evolution-data-server-dbus-${PV}"

-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig

 # -ldb needs this on some platforms
 LDFLAGS += "-lpthread"
--- a/meta/packages/eds/eds-dbus_git.bb
+++ b/meta/packages/eds/eds-dbus_git.bb
@@ -13,7 +13,7 @@ SRC_URI = "git://git.gnome.org/evolution-data-server;protocol=git \

 S = "${WORKDIR}/git"

-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig

 # -ldb needs this on some platforms
 LDFLAGS += "-lpthread"
--- a/meta/packages/elfutils/elfutils_0.108.bb
+++ b/meta/packages/elfutils/elfutils_0.108.bb
@@ -7,7 +7,7 @@ PR = "r2"
 SRC_URI = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles/elfutils-${PV}.tar.gz \
 	   file://warnings.patch;patch=1"

-inherit autotools_stage
+inherit autotools

 # Package binaries that overlap with binutils separately
 PACKAGES =+ "${PN}-binutils"
--- a/meta/packages/elfutils/elfutils_0.131.bb
+++ b/meta/packages/elfutils/elfutils_0.131.bb
@@ -8,7 +8,7 @@ SRC_URI = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles/el
 	   file://gcc-4.3_support.diff;patch=1 \
 	   file://gnu_inline.diff;patch=1"

-inherit autotools_stage
+inherit autotools

 # Package binaries that overlap with binutils separately
 PACKAGES =+ "${PN}-binutils"
--- a/meta/packages/elfutils/elfutils_0.89.bb
+++ b/meta/packages/elfutils/elfutils_0.89.bb
@@ -6,5 +6,5 @@ DEPENDS = "libtool"
 SRC_URI = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles/elfutils-${PV}.tar.gz \
 	   file://warnings.patch;patch=1"

-inherit autotools_stage
+inherit autotools

--- a/meta/packages/expat/expat.inc
+++ b/meta/packages/expat/expat.inc
@@ -7,5 +7,5 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz \
 	  "
 export LTCC = "${CC}"

-inherit autotools_stage
+inherit autotools

--- a/meta/packages/fakeroot/fakeroot_1.9.4.bb
+++ b/meta/packages/fakeroot/fakeroot_1.9.4.bb
@@ -11,7 +11,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.tar.gz \
           file://configure-libtool.patch;patch=1 \
           file://absolutepaths.patch;patch=1 "
 	    
-inherit autotools_stage
+inherit autotools

 do_install_append() {
 	install -d ${D}${STAGING_INCDIR}/fakeroot/
--- a/meta/packages/farsight/farsight2_0.0.9.bb
+++ b/meta/packages/farsight/farsight2_0.0.9.bb
@@ -4,7 +4,7 @@ SRC_URI = "http://farsight.freedesktop.org/releases/farsight2/${P}.tar.gz"

 DEPENDS = "libnice glib-2.0 libxml2 zlib dbus gstreamer gst-plugins-base"

-inherit autotools_stage
+inherit autotools
 AUTOTOOLS_STAGE_PKGCONFIG = "1"

 PR = "r1"
--- a/meta/packages/farsight/libnice_0.0.6.bb
+++ b/meta/packages/farsight/libnice_0.0.6.bb
@@ -5,7 +5,7 @@ SRC_URI = "http://nice.freedesktop.org/releases/libnice-${PV}.tar.gz"
 LICENSE = "LGPL/MPL"
 DEPENDS = "glib-2.0 gstreamer"

-inherit autotools_stage
+inherit autotools
 AUTOTOOLS_STAGE_PKGCONFIG = "1"

 FILES_${PN} += "${libdir}/gstreamer-0.10/*.so"
--- a/meta/packages/file/file_4.18.bb
+++ b/meta/packages/file/file_4.18.bb
@@ -8,7 +8,7 @@ SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \
           file://dump \
           file://filesystems"

-inherit autotools_stage
+inherit autotools

 do_configure_prepend() {
 	sed -i -e 's,$(top_builddir)/src/file,file,' ${S}/magic/Makefile.am
--- a/meta/packages/flac/flac_1.1.2.bb
+++ b/meta/packages/flac/flac_1.1.2.bb
@@ -10,7 +10,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/flac/flac-${PV}.tar.gz \

 S = "${WORKDIR}/flac-${PV}"

-inherit autotools_stage
+inherit autotools

 EXTRA_OECONF = "--disable-oggtest --disable-id3libtest \
 		--with-ogg-libraries=${STAGING_LIBDIR} \
--- a/meta/packages/flex/flex.inc
+++ b/meta/packages/flex/flex.inc
@@ -7,5 +7,5 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/flex/flex-2.5.31.tar.bz2 \
           file://flex-lvalue.diff;patch=1 \
           file://fix-gen.patch;patch=1"

-inherit autotools_stage
+inherit autotools

--- a/meta/packages/fontconfig/fontconfig_2.6.0.bb
+++ b/meta/packages/fontconfig/fontconfig_2.6.0.bb
@@ -21,7 +21,7 @@ DEBIAN_NOAUTONAME_fontconfig-utils = "1"

 PARALLEL_MAKE = ""

-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig

 export HASDOCBOOK="no"

--- a/meta/packages/galago/libgalago_0.5.2.bb
+++ b/meta/packages/galago/libgalago_0.5.2.bb
@@ -8,6 +8,6 @@ SRC_URI =	"http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz
                 file://pkgconfig.patch;patch=1 "
 PR = "r2"

-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig

 EXTRA_OECONF = "--disable-tests --disable-check"
--- a/meta/packages/gettext/gettext_0.17.bb
+++ b/meta/packages/gettext/gettext_0.17.bb
@@ -20,7 +20,7 @@ SRC_URI_append_linux-uclibcgnueabi = " file://gettext-error_print_progname.patch

 PARALLEL_MAKE = ""

-inherit autotools_stage
+inherit autotools

 EXTRA_OECONF += "--without-lispdir \
 		 --disable-csharp \
--- a/meta/packages/glib-2.0/glib.inc
+++ b/meta/packages/glib-2.0/glib.inc
@@ -17,7 +17,7 @@ EXTRA_OECONF = "--enable-included-printf=no"

 S = "${WORKDIR}/glib-${PV}"

-inherit autotools_stage pkgconfig gettext
+inherit autotools pkgconfig gettext

 require glib-2.0.inc

--- a/meta/packages/gmp/gmp.inc
+++ b/meta/packages/gmp/gmp.inc
@@ -7,7 +7,7 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/gmp/gmp-${PV}.tar.bz2 \
 	   file://configure.patch;patch=1 \
 	   file://amd64.patch;patch=1"

-inherit autotools_stage
+inherit autotools

 ARM_INSTRUCTION_SET = "arm"

--- a/meta/packages/gnome/gconf-dbus_svn.bb
+++ b/meta/packages/gnome/gconf-dbus_svn.bb
@@ -10,7 +10,7 @@ PV = "2.16.0+svnr${SRCREV}"

 SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http"

-inherit pkgconfig autotools_stage
+inherit pkgconfig autotools
 S = "${WORKDIR}/trunk"

 PARALLEL_MAKE = ""
--- a/meta/packages/gnome/gnome-keyring_2.26.1.bb
+++ b/meta/packages/gnome/gnome-keyring_2.26.1.bb
@@ -3,7 +3,7 @@ SECTION = "x11/gnome"

 PR = "r1"

-inherit autotools_stage gnome pkgconfig
+inherit autotools gnome pkgconfig

 DEPENDS = "gtk+ libgcrypt libtasn1 libtasn1-native"

--- a/meta/packages/gnome/gnome-mime-data_2.18.0.bb
+++ b/meta/packages/gnome/gnome-mime-data_2.18.0.bb
@@ -1,6 +1,6 @@
 LICENSE = "GPL"
 inherit gnome
-inherit autotools_stage
+inherit autotools
 PR = "r2"

 SRC_URI += "file://pkgconfig.patch;patch=1"
--- a/meta/packages/gnome/gobject-introspection_git.bb
+++ b/meta/packages/gnome/gobject-introspection_git.bb
@@ -13,7 +13,7 @@ S = "${WORKDIR}/git"
 DEPENDS = "libffi python-native gobject-introspection-native"
 DEPENDS_virtclass-native = "libffi-native python-native"

-inherit autotools_stage
+inherit autotools

 TARGET_CFLAGS += "-I${STAGING_INCDIR_NATIVE}/python2.5"

--- a/meta/packages/gnome/libart-lgpl_2.3.19.bb
+++ b/meta/packages/gnome/libart-lgpl_2.3.19.bb
@@ -10,7 +10,7 @@ SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/libart_lgpl-${
       file://${ART_CONFIG} \
       file://Makefile.am.patch;patch=1"

-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig

 DEPENDS = ""

--- a/meta/packages/gnutls/gnutls.inc
+++ b/meta/packages/gnutls/gnutls.inc
@@ -6,7 +6,7 @@ LICENSE = "LGPL"

 SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2"

-inherit autotools_stage binconfig pkgconfig pkgconfig
+inherit autotools binconfig pkgconfig pkgconfig

 EXTRA_OECONF="--with-included-opencdk --with-included-libtasn1 --with-included-libcfg --with-libz-prefix=${STAGING_DIR_HOST}${prefix} --with-lzo --disable-guile"

--- a/meta/packages/gnutls/libtasn1_1.7.bb
+++ b/meta/packages/gnutls/libtasn1_1.7.bb
@@ -5,7 +5,7 @@ PR = "r1"

 SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/libtasn1/libtasn1-${PV}.tar.gz"

-inherit autotools_stage binconfig
+inherit autotools binconfig

 AUTOTOOLS_STAGE_PKGCONFIG = "1"

--- a/meta/packages/gperf/gperf_3.0.3.bb
+++ b/meta/packages/gperf/gperf_3.0.3.bb
@@ -5,7 +5,7 @@ SUMMARY  = "Generate a perfect hash function from a set of keywords"
 SRC_URI  = "${GNU_MIRROR}/gperf/gperf-${PV}.tar.gz \
            file://autoreconf.patch;patch=1"

-inherit autotools_stage
+inherit autotools

 PR = "r1"

--- a/meta/packages/gpgme/gpgme_1.1.4.bb
+++ b/meta/packages/gpgme/gpgme_1.1.4.bb
@@ -7,7 +7,7 @@ PR = "r4"
 EXTRA_OECONF = "--with-pth=${STAGING_DIR_HOST} --without-pth-test \
                --with-gpg=${bindir}/gpg --without-gpgsm"

-inherit autotools_stage binconfig
+inherit autotools binconfig

 PACKAGES =+ "${PN}-pth ${PN}-pthread"
 FILES_${PN}-pth = "${libdir}/libgpgme-pth.so.*"
--- a/meta/packages/gsm/gsmd.inc
+++ b/meta/packages/gsm/gsmd.inc
@@ -13,7 +13,7 @@ SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
           file://default"
 S = "${WORKDIR}/gsm"

-inherit autotools_stage pkgconfig update-rc.d
+inherit autotools pkgconfig update-rc.d
 # handle update-rc.d RDEPENDS manually, we don't need it on
 # anything but gsmd
 RDEPENDS_append = ""
--- a/meta/packages/gstreamer/gst-plugins.inc
+++ b/meta/packages/gstreamer/gst-plugins.inc
@@ -3,7 +3,7 @@ SECTION = "multimedia"
 PRIORITY = "optional"
 DEPENDS = "gstreamer"

-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig

 SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2"

--- a/meta/packages/gstreamer/gstreamer_0.10.22.bb
+++ b/meta/packages/gstreamer/gstreamer_0.10.22.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "http://www.gstreamer.net/"
 DEPENDS = "glib-2.0 gettext libxml2 bison-native flex-native"
 PR = "r1"

-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig

 SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \
           file://check_fix.patch;patch=1 \
--- a/meta/packages/gtkhtml2/gtkhtml2_svn.bb
+++ b/meta/packages/gtkhtml2/gtkhtml2_svn.bb
@@ -15,6 +15,6 @@ SRC_URI = "svn://anonymous@svn.gnome.org/svn/gtkhtml2/;module=trunk \

 S = "${WORKDIR}/trunk"

-inherit pkgconfig autotools_stage
+inherit pkgconfig autotools

 EXTRA_OECONF = " --disable-accessibility"
--- a/meta/packages/gupnp/gssdp_0.7.1.bb
+++ b/meta/packages/gupnp/gssdp_0.7.1.bb
@@ -3,7 +3,7 @@ DEPENDS = "glib-2.0 libsoup-2.4 libglade"

 SRC_URI = "http://gupnp.org/sources/${PN}/${PN}-${PV}.tar.gz"

-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig

 PACKAGES =+ "gssdp-tools"

--- a/meta/packages/gupnp/gupnp-av_0.4.bb
+++ b/meta/packages/gupnp/gupnp-av_0.4.bb
@@ -3,4 +3,4 @@ DEPENDS = "gupnp"

 SRC_URI = "http://gupnp.org/sources/${PN}/${PN}-${PV}.tar.gz"

-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig
--- a/meta/packages/gupnp/gupnp-av_0.5.2.bb
+++ b/meta/packages/gupnp/gupnp-av_0.5.2.bb
@@ -3,4 +3,4 @@ DEPENDS = "gupnp"

 SRC_URI = "http://gupnp.org/sources/${PN}/${PN}-${PV}.tar.gz"

-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig
--- a/meta/packages/gupnp/gupnp_0.13.2.bb
+++ b/meta/packages/gupnp/gupnp_0.13.2.bb
@@ -4,7 +4,7 @@ DEPENDS = "e2fsprogs gssdp libsoup-2.4 libxml2"
 SRC_URI = "http://gupnp.org/sources/${PN}/${PN}-${PV}.tar.gz"
 PR = "r1"

-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig

 FILES_${PN} = "${libdir}/*.so.*"
 FILES_${PN}-dev += "${bindir}/gupnp-binding-tool"
--- a/meta/packages/gypsy/gypsy.inc
+++ b/meta/packages/gypsy/gypsy.inc
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 SECTION = "x11"
 DEPENDS = "glib-2.0 dbus bluez4 dbus-glib"

-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig

 EXTRA_OECONF += "--with-distro=debian"

--- a/meta/packages/gypsy/gypsy_0.6.bb
+++ b/meta/packages/gypsy/gypsy_0.6.bb
@@ -5,6 +5,6 @@ DEPENDS = "glib-2.0 dbus bluez4 dbus-glib libxslt"

 SRC_URI = "http://gypsy.freedesktop.org/gypsy-releases/gypsy-${PV}.tar.gz" 

-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig

 FILES_${PN} += "/usr/share/dbus-1/services/"
--- a/meta/packages/hal/hal.inc
+++ b/meta/packages/hal/hal.inc
@@ -7,7 +7,7 @@ SRC_URI = "http://hal.freedesktop.org/releases/hal-${PV}.tar.gz"

 S = "${WORKDIR}/hal-${PV}"

-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig

 DEPENDS = "virtual/kernel dbus-glib udev intltool intltool-native expat libusb gperf-native"
 RDEPENDS += "udev hal-info"
--- a/meta/packages/hal/hal_git.bb
+++ b/meta/packages/hal/hal_git.bb
@@ -16,7 +16,7 @@ PR = "r4"

 S = "${WORKDIR}/git"

-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig

 EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \
                --with-expat=${STAGING_DIR_HOST}${prefix} \
--- a/meta/packages/icu/icu-3.6.inc
+++ b/meta/packages/icu/icu-3.6.inc
@@ -11,7 +11,7 @@ S = "${WORKDIR}/icu/source"
 PARALLEL_MAKE = ""
 FULL_OPTIMIZATION_arm = "-Os"

-inherit autotools_stage pkgconfig binconfig
+inherit autotools pkgconfig binconfig

 do_configure() {
 	libtoolize --force
--- a/meta/packages/intltool/intltool.inc
+++ b/meta/packages/intltool/intltool.inc
@@ -13,7 +13,7 @@ DEPENDS = "libxml-parser-perl-native"
 #RDEPENDS = "libxml-parser-perl"
 RRECOMMENDS = "perl-modules"

-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig

 export PERL_virtclass-native = "/usr/bin/env perl"
 BBCLASSEXTEND = "native"
--- a/meta/packages/iso-codes/iso-codes_3.3.bb
+++ b/meta/packages/iso-codes/iso-codes_3.3.bb
@@ -7,7 +7,7 @@ PACKAGE_ARCH = "all"

 SRC_URI = "ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/iso-codes-${PV}.tar.gz"

-inherit autotools_stage
+inherit autotools

 FILES_${PN}-dev="${datadir}/pkgconfig/iso-codes.pc"
 FILES_${PN}="${datadir}/xml/iso-codes/ \
--- a/meta/packages/lame/lame_3.96.1.bb
+++ b/meta/packages/lame/lame_3.96.1.bb
@@ -7,7 +7,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lame/lame-${PV}.tar.gz \
 	file://no-gtk1.patch;patch=1 \
 	file://Makefile-lm.patch;patch=1"

-inherit autotools_stage
+inherit autotools

 PACKAGES += "libmp3lame libmp3lame-dev"
 FILES_${PN} = "${bindir}/lame"
--- a/meta/packages/libassuan/libassuan_0.6.9.bb
+++ b/meta/packages/libassuan/libassuan_0.6.9.bb
@@ -2,4 +2,4 @@ LICENSE = "GPL"

 SRC_URI = "ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-${PV}.tar.gz"

-inherit autotools_stage binconfig
+inherit autotools binconfig
--- a/meta/packages/libcroco/libcroco_0.6.1.bb
+++ b/meta/packages/libcroco/libcroco_0.6.1.bb
@@ -4,6 +4,6 @@ DEPENDS = "glib-2.0 libxml2 zlib"
 LICENSE = "LGPL"
 PR = "r3"

-inherit autotools_stage pkgconfig gnome
+inherit autotools pkgconfig gnome

 SRC_URI_append = " file://croco.patch;patch=1 "
--- a/meta/packages/libdaemon/libdaemon_0.12.bb
+++ b/meta/packages/libdaemon/libdaemon_0.12.bb
@@ -7,6 +7,6 @@ PR = "r1"

 SRC_URI = "http://0pointer.de/lennart/projects/libdaemon/libdaemon-${PV}.tar.gz"

-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig

 EXTRA_OECONF = "--disable-lynx --disable-doxygen"
--- a/meta/packages/libetpan/libetpan_0.54.bb
+++ b/meta/packages/libetpan/libetpan_0.54.bb
@@ -9,7 +9,7 @@ PR = "r1"
 SRC_URI = "${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz \
           file://cxx-is-here.patch;patch=1"

-inherit autotools_stage pkgconfig gettext binconfig
+inherit autotools pkgconfig gettext binconfig

 EXTRA_OECONF = "--without-openssl --with-gnutls --disable-db"

--- a/meta/packages/libexif/libexif_0.6.16.bb
+++ b/meta/packages/libexif/libexif_0.6.16.bb
@@ -6,7 +6,7 @@ DEPENDS = "gettext"

 SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.bz2"

-inherit autotools_stage
+inherit autotools

 do_configure_append() {
 	sed -i s:doc\ binary:binary:g Makefile
--- a/meta/packages/libfakekey/libfakekey_svn.bb
+++ b/meta/packages/libfakekey/libfakekey_svn.bb
@@ -9,4 +9,4 @@ SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"

 S = "${WORKDIR}/${PN}"

-inherit autotools_stage pkgconfig gettext
+inherit autotools pkgconfig gettext
--- a/meta/packages/libffi/libffi_3.0.8.bb
+++ b/meta/packages/libffi/libffi_3.0.8.bb
@@ -1,5 +1,5 @@
 SRC_URI = "ftp://sourceware.org/pub/libffi/libffi-3.0.8.tar.gz"

-inherit autotools_stage
+inherit autotools

 BBCLASSEXTEND = "native"
--- a/meta/packages/libgcrypt/libgcrypt.inc
+++ b/meta/packages/libgcrypt/libgcrypt.inc
@@ -7,7 +7,7 @@ DEPENDS = "libgpg-error"
 SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz \
           file://add-pkgconfig-support.patch;patch=1"

-inherit autotools_stage binconfig pkgconfig pkgconfig_stage
+inherit autotools binconfig pkgconfig pkgconfig_stage

 EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities"

--- a/meta/packages/libgdbus/libgdbus_git.bb
+++ b/meta/packages/libgdbus/libgdbus_git.bb
@@ -7,4 +7,4 @@ S        = "${WORKDIR}/git"

 SRC_URI  = "git://git.kernel.org/pub/scm/bluetooth/libgdbus.git;protocol=git"

-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig
--- 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_stage pkgconfig gnome
+inherit autotools pkgconfig gnome

 SRC_URI += "file://glade-cruft.patch;patch=1 file://no-xml2.patch;patch=1"

--- a/meta/packages/libgpg-error/libgpg-error_1.6.bb
+++ b/meta/packages/libgpg-error/libgpg-error_1.6.bb
@@ -11,4 +11,4 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.bz2 \
 FILES_${PN} = "${libdir}/lib*.so.*"
 FILES_${PN}-dev += "${bindir}/*"

-inherit autotools_stage binconfig pkgconfig
+inherit autotools binconfig pkgconfig
--- a/meta/packages/libgsf/libgsf_1.14.5.bb
+++ b/meta/packages/libgsf/libgsf_1.14.5.bb
@@ -11,7 +11,7 @@ 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_stage pkgconfig gnome gconf
+inherit autotools pkgconfig gnome gconf

 EXTRA_OECONF = "\
 		--without-python \
--- a/meta/packages/libical/libical_0.44.bb
+++ b/meta/packages/libical/libical_0.44.bb
@@ -5,4 +5,4 @@ LICENSE = "LGPL / MPL"

 SRC_URI = "${SOURCEFORGE_MIRROR}/freeassociation/${P}.tar.gz"

-inherit autotools_stage
+inherit autotools
--- a/meta/packages/libiconv/libiconv_1.9.2.bb
+++ b/meta/packages/libiconv/libiconv_1.9.2.bb
@@ -11,7 +11,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-${PV}.tar.gz"

 S = "${WORKDIR}/libiconv-${PV}"

-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig

 EXTRA_OECONF += "--enable-shared --enable-static"

--- a/meta/packages/libid3tag/libid3tag_0.15.1b.bb
+++ b/meta/packages/libid3tag/libid3tag_0.15.1b.bb
@@ -10,6 +10,6 @@ SRC_URI = "ftp://ftp.mars.org/pub/mpeg/libid3tag-${PV}.tar.gz \

 S = "${WORKDIR}/libid3tag-${PV}"

-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig

 EXTRA_OECONF = "-enable-speed"
--- a/meta/packages/libidl/libidl_0.8.12.bb
+++ b/meta/packages/libidl/libidl_0.8.12.bb
@@ -8,7 +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_stage pkgconfig binconfig
+inherit autotools pkgconfig binconfig

 FILES_${PN} = "${libdir}/*.so.*"
 FILES_${PN}-dev += " ${bindir}" 
--- a/meta/packages/libmad/libmad_0.15.1b.bb
+++ b/meta/packages/libmad/libmad_0.15.1b.bb
@@ -11,7 +11,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/mad/libmad-${PV}.tar.gz \

 S = "${WORKDIR}/libmad-${PV}"

-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig

 EXTRA_OECONF = "-enable-speed --enable-shared"
 # The ASO's don't take any account of thumb...
--- a/meta/packages/libmatchbox/libmatchbox.inc
+++ b/meta/packages/libmatchbox/libmatchbox.inc
@@ -3,7 +3,7 @@ DESCRIPTION = "Matchbox window manager core library"
 LICENSE = "GPL"
 DEPENDS = "virtual/libx11 libxext expat libxft jpeg libpng zlib libxsettings-client startup-notification"

-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig

 EXTRA_OECONF = "--enable-jpeg --enable-expat --enable-xsettings --enable-startup-notification"

--- a/meta/packages/libnl/libnl_1.1.bb
+++ b/meta/packages/libnl/libnl_1.1.bb
@@ -4,7 +4,7 @@ LICENSE = "LGPL"
 HOMEPAGE = "http://people.suug.ch/~tgr/libnl/"
 PRIORITY = "optional"

-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig

 PR = "r1"

--- a/meta/packages/libogg/libogg_1.1.bb
+++ b/meta/packages/libogg/libogg_1.1.bb
@@ -8,4 +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_stage pkgconfig
+inherit autotools pkgconfig
--- a/meta/packages/liboil/liboil_0.3.17.bb
+++ b/meta/packages/liboil/liboil_0.3.17.bb
@@ -7,6 +7,6 @@ PR = "r2"
 SRC_URI = "http://liboil.freedesktop.org/download/${P}.tar.gz \
           file://no-tests.patch;patch=1"

-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig

 ARM_INSTRUCTION_SET = "arm"
--- a/meta/packages/libowl/libowl_svn.bb
+++ b/meta/packages/libowl/libowl_svn.bb
@@ -10,4 +10,4 @@ SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http"

 S = "${WORKDIR}/${PN}"

-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig
--- a/meta/packages/libproxy/libproxy_0.2.3.bb
+++ b/meta/packages/libproxy/libproxy_0.2.3.bb
@@ -9,7 +9,7 @@ SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz \
           file://asneededfix.patch;patch=1"
 S = "${WORKDIR}/libproxy-${PV}"

-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig

 EXTRA_OECONF = "--without-kde --with-gnome --without-webkit --without-python --without-mozjs --without-networkmanager"

--- a/meta/packages/librds/librds_0.0.1.bb
+++ b/meta/packages/librds/librds_0.0.1.bb
@@ -8,4 +8,4 @@ PR = "r1"

 SRC_URI = "http://download.berlios.de/rdsd/librds-${PV}.tar.gz"

-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig
--- 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_stage pkgconfig gnome
+inherit autotools pkgconfig gnome

 PACKAGES =+ "librsvg-gtk librsvg-gtk-dbg librsvg-gtk-dev rsvg"
 FILES_${PN} = "${libdir}/*.so.*"
--- 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_stage pkgconfig gnome
+inherit autotools pkgconfig gnome

 PACKAGES =+ "librsvg-gtk librsvg-gtk-dbg librsvg-gtk-dev rsvg"
 FILES_${PN} = "${libdir}/*.so.*"
--- 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_stage pkgconfig gnome
+inherit autotools pkgconfig gnome

 SRC_URI = "svn://svn.gnome.org/svn/${PN};module=trunk"
 PV = "2.22.3+svnr${SRCREV}"
--- a/meta/packages/libsdl/libsdl-nativesdk_1.2.11.bb
+++ b/meta/packages/libsdl/libsdl-nativesdk_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_stage binconfig pkgconfig nativesdk
+inherit autotools binconfig pkgconfig nativesdk

 EXTRA_OECONF = "--disable-static --disable-debug --disable-cdrom --enable-threads --enable-timers --enable-endian \
                --enable-file --disable-oss --disable-alsa --disable-esd --disable-arts \
--- a/meta/packages/libsoup/libsoup-2.4_2.25.91.bb
+++ b/meta/packages/libsoup/libsoup-2.4_2.25.91.bb
@@ -7,7 +7,7 @@ DEPENDS = "glib-2.0 gnutls libxml2 libproxy sqlite3"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.25/libsoup-${PV}.tar.bz2"
 S = "${WORKDIR}/libsoup-${PV}"

-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig

 do_stage() {
 	autotools_stage_all
--- 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_stage pkgconfig
+inherit autotools pkgconfig

 do_stage() {
 	autotools_stage_all
--- a/meta/packages/libsoup/libsoup_2.2.100.bb
+++ b/meta/packages/libsoup/libsoup_2.2.100.bb
@@ -7,7 +7,7 @@ DEPENDS = "glib-2.0 gnutls libxml2"

 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.2/${PN}-${PV}.tar.bz2"

-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig

 FILES_${PN} = "${libdir}/lib*.so.*"
 FILES_${PN}-dev = "${includedir}/ ${libdir}/"
--- a/Show More
+++ b/Show More