diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-17 14:21:22 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-17 14:21:22 +0000 |
commit | 06b28b570a1dc0f24a808aee296f258c476e9d82 (patch) | |
tree | feeabc450ccf7aa18e534b1e7c543aac82937fb7 /meta | |
parent | 833152ee0bde2ef682a0854a9ca0028020382468 (diff) | |
download | poky-06b28b570a1dc0f24a808aee296f258c476e9d82.tar.gz |
db: Convert to use staging from install
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/packages/db/db-native_4.2.52.bb | 13 | ||||
-rw-r--r-- | meta/packages/db/db_4.2.52.bb | 13 | ||||
-rw-r--r-- | meta/packages/db/db_4.3.29.bb | 13 |
3 files changed, 0 insertions, 39 deletions
diff --git a/meta/packages/db/db-native_4.2.52.bb b/meta/packages/db/db-native_4.2.52.bb index 4b374e2403..9dfcd1e267 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" | |||
9 | require db_${PV}.bb | 9 | require db_${PV}.bb |
10 | 10 | ||
11 | inherit native | 11 | inherit native |
12 | |||
13 | do_stage() { | ||
14 | # The .h files get installed read-only, the autostage | ||
15 | # function just uses cp -pPR, so do this by hand | ||
16 | rm -rf ${STAGE_TEMP} | ||
17 | mkdir -p ${STAGE_TEMP} | ||
18 | oe_runmake DESTDIR="${STAGE_TEMP}" install_include | ||
19 | cp -pPRf ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}/. | ||
20 | rm -rf ${STAGE_TEMP} | ||
21 | oe_libinstall -so -C .libs libdb-4.2 ${STAGING_LIBDIR} | ||
22 | ln -sf libdb-4.2.so ${STAGING_LIBDIR}/libdb.so | ||
23 | ln -sf libdb-4.2.a ${STAGING_LIBDIR}/libdb.a | ||
24 | } | ||
diff --git a/meta/packages/db/db_4.2.52.bb b/meta/packages/db/db_4.2.52.bb index c9ff652e63..46dd0b815a 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() { | |||
78 | oe_runconf | 78 | oe_runconf |
79 | } | 79 | } |
80 | 80 | ||
81 | do_stage() { | ||
82 | # The .h files get installed read-only, the autostage | ||
83 | # function just uses cp -pPR, so do this by hand | ||
84 | rm -rf ${STAGE_TEMP} | ||
85 | mkdir -p ${STAGE_TEMP} | ||
86 | oe_runmake DESTDIR="${STAGE_TEMP}" install_include | ||
87 | cp -pPRf ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}/. | ||
88 | rm -rf ${STAGE_TEMP} | ||
89 | oe_libinstall -so -C .libs libdb-4.2 ${STAGING_LIBDIR} | ||
90 | ln -sf libdb-4.2.so ${STAGING_LIBDIR}/libdb.so | ||
91 | ln -sf libdb-4.2.a ${STAGING_LIBDIR}/libdb.a | ||
92 | } | ||
93 | |||
94 | do_install_append() { | 81 | do_install_append() { |
95 | # The docs end up in /usr/docs - not right. | 82 | # The docs end up in /usr/docs - not right. |
96 | if test -d "${D}/${prefix}/docs" | 83 | 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 c2fc784585..04a6680f07 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() { | |||
78 | oe_runconf | 78 | oe_runconf |
79 | } | 79 | } |
80 | 80 | ||
81 | do_stage() { | ||
82 | # The .h files get installed read-only, the autostage | ||
83 | # function just uses cp -pPR, so do this by hand | ||
84 | rm -rf ${STAGE_TEMP} | ||
85 | mkdir -p ${STAGE_TEMP} | ||
86 | oe_runmake DESTDIR="${STAGE_TEMP}" install_include | ||
87 | cp -pPRf ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}/. | ||
88 | rm -rf ${STAGE_TEMP} | ||
89 | oe_libinstall -so -C .libs libdb-4.3 ${STAGING_LIBDIR} | ||
90 | ln -sf libdb-4.3.so ${STAGING_LIBDIR}/libdb.so | ||
91 | ln -sf libdb-4.3.a ${STAGING_LIBDIR}/libdb.a | ||
92 | } | ||
93 | |||
94 | do_install_append() { | 81 | do_install_append() { |
95 | # The docs end up in /usr/docs - not right. | 82 | # The docs end up in /usr/docs - not right. |
96 | if test -d "${D}/${prefix}/docs" | 83 | if test -d "${D}/${prefix}/docs" |