db: Convert to use staging from install

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta/packages/db/db-native_4.2.52.bb b/meta/packages/db/db-native_4.2.52.bb
index 4b374e24035e74821d368824c7b2b6d7004a78a2..9dfcd1e2677ea88bed5fe6f3ba65564a0e7d1065 100644 (file)
--- a/meta/packages/db/db-native_4.2.52.bb
+++ b/meta/packages/db/db-native_4.2.52.bb
@@ -9,16 +9,3 @@ CONFLICTS = "db3-native"
 require db_${PV}.bb
 
 inherit native
-
-do_stage() {
-        # The .h files get installed read-only, the autostage
-        # function just uses cp -pPR, so do this by hand
-        rm -rf ${STAGE_TEMP}
-        mkdir -p ${STAGE_TEMP}
-        oe_runmake DESTDIR="${STAGE_TEMP}" install_include
-        cp -pPRf ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}/.
-        rm -rf ${STAGE_TEMP}
-        oe_libinstall -so -C .libs libdb-4.2 ${STAGING_LIBDIR}
-        ln -sf libdb-4.2.so ${STAGING_LIBDIR}/libdb.so
-        ln -sf libdb-4.2.a ${STAGING_LIBDIR}/libdb.a
-}

diff --git a/meta/packages/db/db_4.2.52.bb b/meta/packages/db/db_4.2.52.bb
index c9ff652e635f365ad3a03063cab57f650ce03b9f..46dd0b815a8b919516cedfedc17154e728d93ad8 100644 (file)
--- a/meta/packages/db/db_4.2.52.bb
+++ b/meta/packages/db/db_4.2.52.bb
@@ -78,19 +78,6 @@ do_configure() {
        oe_runconf
 }
 
-do_stage() {
-       # The .h files get installed read-only, the autostage
-       # function just uses cp -pPR, so do this by hand
-       rm -rf ${STAGE_TEMP}
-       mkdir -p ${STAGE_TEMP}
-       oe_runmake DESTDIR="${STAGE_TEMP}" install_include
-       cp -pPRf ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}/.
-       rm -rf ${STAGE_TEMP}
-       oe_libinstall -so -C .libs libdb-4.2 ${STAGING_LIBDIR}
-       ln -sf libdb-4.2.so ${STAGING_LIBDIR}/libdb.so
-       ln -sf libdb-4.2.a ${STAGING_LIBDIR}/libdb.a
-}
-
 do_install_append() {
        # The docs end up in /usr/docs - not right.
        if test -d "${D}/${prefix}/docs"

diff --git a/meta/packages/db/db_4.3.29.bb b/meta/packages/db/db_4.3.29.bb
index c2fc7845855613dfc7e166c46a2edb79daa16b6e..04a6680f07264950b4b9d90cedb026bbcf983d54 100644 (file)
--- a/meta/packages/db/db_4.3.29.bb
+++ b/meta/packages/db/db_4.3.29.bb
@@ -78,19 +78,6 @@ do_configure() {
        oe_runconf
 }
 
-do_stage() {
-       # The .h files get installed read-only, the autostage
-       # function just uses cp -pPR, so do this by hand
-       rm -rf ${STAGE_TEMP}
-       mkdir -p ${STAGE_TEMP}
-       oe_runmake DESTDIR="${STAGE_TEMP}" install_include
-       cp -pPRf ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}/.
-       rm -rf ${STAGE_TEMP}
-       oe_libinstall -so -C .libs libdb-4.3 ${STAGING_LIBDIR}
-       ln -sf libdb-4.3.so ${STAGING_LIBDIR}/libdb.so
-       ln -sf libdb-4.3.a ${STAGING_LIBDIR}/libdb.a
-}
-
 do_install_append() {
        # The docs end up in /usr/docs - not right.
        if test -d "${D}/${prefix}/docs"