3 files changed, 3 insertions, 90 deletions

diff --git a/meta/packages/elfutils/elfutils_0.108.bb b/meta/packages/elfutils/elfutils_0.108.bb
index 701279fa50..37e5fbd14f 100644
--- 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
+inherit autotools_stage
 
 # Package binaries that overlap with binutils separately
 PACKAGES =+ "${PN}-binutils"
@@ -21,32 +21,5 @@ FILES_${PN}-binutils = "\
 # Fix library issues
 FILES_${PN} =+ "${libdir}/*-${PV}.so"
 
-SOV = "${PV}"
-do_stage () {
-        install -m 0644 libelf/libelf.a ${STAGING_LIBDIR}/libelf.a
-        install -m 0755 libelf/libelf.so.1 ${STAGING_LIBDIR}/libelf-${SOV}.so
-        ln -sf libelf-${SOV}.so ${STAGING_LIBDIR}/libelf.so.1
-        ln -sf libelf.so.1 ${STAGING_LIBDIR}/libelf.so
-        install -m 0644 libasm/libasm.a ${STAGING_LIBDIR}/libasm.a
-        install -m 0755 libasm/libasm.so.1 ${STAGING_LIBDIR}/libasm-${SOV}.so
-        ln -sf libasm-${SOV}.so ${STAGING_LIBDIR}/libasm.so.1
-        ln -sf libasm.so.1 ${STAGING_LIBDIR}/libasm.so
-        install -m 0644 libdw/libdw.a ${STAGING_LIBDIR}/libdw.a
-        install -m 0755 libdw/libdw.so.1 ${STAGING_LIBDIR}/libdw-${SOV}.so
-        ln -sf libdw-${SOV}.so ${STAGING_LIBDIR}/libdw.so.1
-        ln -sf libdw.so.1 ${STAGING_LIBDIR}/libdw.so
-        install -m 0644 libebl/libebl.a ${STAGING_LIBDIR}/libebl.a
-        install -d ${STAGING_LIBDIR}/elfutils/
-        install -m 0755 libebl/libebl_*.so ${STAGING_LIBDIR}/elfutils/
-
-        install -m 0644 ${S}/libelf/libelf.h ${STAGING_INCDIR}/
-        install -m 0644 ${S}/libelf/gelf.h ${STAGING_INCDIR}/
-        install -m 0644 ${S}/libelf/nlist.h ${STAGING_INCDIR}/
-        install -d ${STAGING_INCDIR}/elfutils
-        install -m 0644 ${S}/libebl/libebl.h ${STAGING_INCDIR}/elfutils/
-        install -m 0644 ${S}/libdw/libdw.h ${STAGING_INCDIR}/elfutils/
-        install -m 0644 ${S}/libasm/libasm.h ${STAGING_INCDIR}/elfutils/
-}
-
 # The elfutils package contains symlinks that trip up insane
 INSANE_SKIP_elfutils = "1"
diff --git a/meta/packages/elfutils/elfutils_0.131.bb b/meta/packages/elfutils/elfutils_0.131.bb
index 3385ae0c27..8bb3c8925f 100644
--- 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
+inherit autotools_stage
 
 # Package binaries that overlap with binutils separately
 PACKAGES =+ "${PN}-binutils"
@@ -22,32 +22,5 @@ FILES_${PN}-binutils = "\
 # Fix library issues
 FILES_${PN} =+ "${libdir}/*-${PV}.so"
 
-SOV = "${PV}"
-do_stage () {
-        install -m 0644 libelf/libelf.a ${STAGING_LIBDIR}/libelf.a
-        install -m 0755 libelf/libelf.so.1 ${STAGING_LIBDIR}/libelf-${SOV}.so
-        ln -sf libelf-${SOV}.so ${STAGING_LIBDIR}/libelf.so.1
-        ln -sf libelf.so.1 ${STAGING_LIBDIR}/libelf.so
-        install -m 0644 libasm/libasm.a ${STAGING_LIBDIR}/libasm.a
-        install -m 0755 libasm/libasm.so.1 ${STAGING_LIBDIR}/libasm-${SOV}.so
-        ln -sf libasm-${SOV}.so ${STAGING_LIBDIR}/libasm.so.1
-        ln -sf libasm.so.1 ${STAGING_LIBDIR}/libasm.so
-        install -m 0644 libdw/libdw.a ${STAGING_LIBDIR}/libdw.a
-        install -m 0755 libdw/libdw.so.1 ${STAGING_LIBDIR}/libdw-${SOV}.so
-        ln -sf libdw-${SOV}.so ${STAGING_LIBDIR}/libdw.so.1
-        ln -sf libdw.so.1 ${STAGING_LIBDIR}/libdw.so
-        install -m 0644 libebl/libebl.a ${STAGING_LIBDIR}/libebl.a
-        install -d ${STAGING_LIBDIR}/elfutils/
-        install -m 0755 backends/libebl_*.so ${STAGING_LIBDIR}/elfutils/
-
-        install -m 0644 ${S}/libelf/libelf.h ${STAGING_INCDIR}/
-        install -m 0644 ${S}/libelf/gelf.h ${STAGING_INCDIR}/
-        install -m 0644 ${S}/libelf/nlist.h ${STAGING_INCDIR}/
-        install -d ${STAGING_INCDIR}/elfutils
-        install -m 0644 ${S}/libebl/libebl.h ${STAGING_INCDIR}/elfutils/
-        install -m 0644 ${S}/libdw/libdw.h ${STAGING_INCDIR}/elfutils/
-        install -m 0644 ${S}/libasm/libasm.h ${STAGING_INCDIR}/elfutils/
-}
-
 # The elfutils package contains symlinks that trip up insane
 INSANE_SKIP_elfutils = "1"
diff --git a/meta/packages/elfutils/elfutils_0.89.bb b/meta/packages/elfutils/elfutils_0.89.bb
index aad2275ef9..b59c33e8c9 100644
--- a/meta/packages/elfutils/elfutils_0.89.bb
+++ b/meta/packages/elfutils/elfutils_0.89.bb
@@ -6,38 +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
+inherit autotools_stage
 
-SOV = "${PV}"
-do_stage () {
-        install -m 0644 libelf/libelf.a ${STAGING_LIBDIR}/libelf.a
-        install -m 0755 libelf/libelf.so.1 ${STAGING_LIBDIR}/libelf-${SOV}.so
-        ln -sf libelf-${SOV}.so ${STAGING_LIBDIR}/libelf.so.1
-        ln -sf libelf.so.1 ${STAGING_LIBDIR}/libelf.so
-        install -m 0644 libasm/libasm.a ${STAGING_LIBDIR}/libasm.a
-        install -m 0755 libasm/libasm.so.1 ${STAGING_LIBDIR}/libasm-${SOV}.so
-        ln -sf libasm-${SOV}.so ${STAGING_LIBDIR}/libasm.so.1
-        ln -sf libasm.so.1 ${STAGING_LIBDIR}/libasm.so
-        install -m 0644 libdw/libdw.a ${STAGING_LIBDIR}/libdw.a
-        install -m 0755 libdw/libdw.so.1 ${STAGING_LIBDIR}/libdw-${SOV}.so
-        ln -sf libdw-${SOV}.so ${STAGING_LIBDIR}/libdw.so.1
-        ln -sf libdw.so.1 ${STAGING_LIBDIR}/libdw.so
-        install -m 0644 libebl/libebl.a ${STAGING_LIBDIR}/libebl.a
-        install -d ${STAGING_LIBDIR}/elfutils/
-        install -m 0755 libebl/libebl_*.so ${STAGING_LIBDIR}/elfutils/
-        install -m 0644 libdwarf/libdwarf.a ${STAGING_LIBDIR}/libdwarf.a
-        install -m 0755 libdwarf/libdwarf.so.1 ${STAGING_LIBDIR}/libdwarf-${SOV}.so
-        ln -sf libdwarf-${SOV}.so ${STAGING_LIBDIR}/libdwarf.so.1
-        ln -sf libdwarf.so.1 ${STAGING_LIBDIR}/libdwarf.so
-
-        install -m 0644 ${S}/libelf/libelf.h ${STAGING_INCDIR}/
-        install -m 0644 ${S}/libelf/gelf.h ${STAGING_INCDIR}/
-        install -m 0644 ${S}/libelf/nlist.h ${STAGING_INCDIR}/
-        install -m 0644 ${S}/libdwarf/dwarf.h ${STAGING_INCDIR}/
-        install -d ${STAGING_INCDIR}/elfutils
-        install -m 0644 ${S}/libebl/libebl.h ${STAGING_INCDIR}/elfutils/
-        install -m 0644 ${S}/libebl/elf-knowledge.h ${STAGING_INCDIR}/elfutils/
-        install -m 0644 ${S}/libdwarf/libdwarf.h ${STAGING_INCDIR}/elfutils/
-        install -m 0644 ${S}/libdw/libdw.h ${STAGING_INCDIR}/elfutils/
-        install -m 0644 ${S}/libasm/libasm.h ${STAGING_INCDIR}/elfutils/
-}