From 06b28b570a1dc0f24a808aee296f258c476e9d82 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 17 Nov 2009 14:21:22 +0000 Subject: db: Convert to use staging from install Signed-off-by: Richard Purdie --- meta/packages/db/db-native_4.2.52.bb | 13 ------------- meta/packages/db/db_4.2.52.bb | 13 ------------- meta/packages/db/db_4.3.29.bb | 13 ------------- 3 files changed, 39 deletions(-) (limited to 'meta/packages') diff --git a/meta/packages/db/db-native_4.2.52.bb b/meta/packages/db/db-native_4.2.52.bb index 4b374e240..9dfcd1e26 100644 --- 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 c9ff652e6..46dd0b815 100644 --- 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 c2fc78458..04a6680f0 100644 --- 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" -- cgit v1.2.3