diff options
| author | Philip Balister <philip@balister.org> | 2007-04-12 12:05:52 +0000 |
|---|---|---|
| committer | Philip Balister <philip@balister.org> | 2007-04-12 12:05:52 +0000 |
| commit | 02513c0bd3d3171ceb71d9c77fb0c078cbc70d9e (patch) | |
| tree | d4c61485b7ed3b37263376df4841f0a73cdb75af | |
| parent | 0f21dee7105b86695812c7c28e4379a503306737 (diff) | |
| parent | e2167a483dd9d48ed814422e04ca6f461dbceede (diff) | |
merge of 'd253693f9ba8535d5eb55f96bdfd2b50531cfa16'
and 'e006153174fed88db5828cf33bf4c76a78595dc5'
| -rw-r--r-- | packages/gpephone/linphone_1.5.0.bb | 3 | ||||
| -rw-r--r-- | packages/tasks/task-slugos.bb | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/packages/gpephone/linphone_1.5.0.bb b/packages/gpephone/linphone_1.5.0.bb index bef090e22a..ee59000133 100644 --- a/packages/gpephone/linphone_1.5.0.bb +++ b/packages/gpephone/linphone_1.5.0.bb @@ -41,7 +41,4 @@ do_install_append() { do_stage() { export LIBTOOL="${STAGING_BINDIR_NATIVE}/${TARGET_PREFIX}libtool" autotools_stage_all - cp ${S}/mediastreamer2/src/libquickstream.la ${STAGING_LIBDIR} - cp ${S}/mediastreamer2/src/libmediastreamer.la ${STAGING_LIBDIR} - cp ${S}/coreapi/liblinphone.la ${STAGING_LIBDIR} } diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb index 9d38763c41..acb6bcaae5 100644 --- a/packages/tasks/task-slugos.bb +++ b/packages/tasks/task-slugos.bb @@ -103,8 +103,10 @@ SLUGOS_STANDARD_RRECOMMENDS += "\ kernel-module-netconsole \ " +DISTRO_EXTRA_DEPENDS ?= "" DEPENDS += "${DISTRO_EXTRA_DEPENDS}" +DISTRO_EXTRA_RDEPENDS ?= "" RDEPENDS += "\ kernel ixp4xx-npe \ base-files base-passwd netbase \ |