From fbf2ef9840e6b241d05651d8f8a26b7c0f11aa6d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 30 Sep 2005 17:25:47 +0000 Subject: Change db to 4.1.25, update PR's across the board git-svn-id: https://svn.o-hand.com/repos/poky@89 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- openembedded/packages/contacts/contacts_0.0.bb | 2 + openembedded/packages/dates/dates_svn.bb | 2 + openembedded/packages/db/db_4.1.25.bb | 97 ++++++++++++++++++++++ openembedded/packages/db/db_4.3.27.bb | 94 --------------------- .../packages/eds/eds-dbus/external_libdb.patch | 6 +- openembedded/packages/eds/eds-dbus_svn.bb | 4 +- openembedded/packages/meta/meta-oh.bb | 2 +- openembedded/packages/meta/oh-image.bb | 2 +- 8 files changed, 108 insertions(+), 101 deletions(-) create mode 100644 openembedded/packages/db/db_4.1.25.bb delete mode 100644 openembedded/packages/db/db_4.3.27.bb (limited to 'openembedded') diff --git a/openembedded/packages/contacts/contacts_0.0.bb b/openembedded/packages/contacts/contacts_0.0.bb index c855997343..02a8903206 100755 --- a/openembedded/packages/contacts/contacts_0.0.bb +++ b/openembedded/packages/contacts/contacts_0.0.bb @@ -3,6 +3,8 @@ SECTION = "x11" DEPENDS = "glib-2.0 gtk+ libglade eds-dbus" MAINTAINER = "Chris Lord " DESCRIPTION = "Contacts is an address-book application." +PR = "r1" + SRC_URI = "file:///tmp/${PN}-${PV}.tar.gz" diff --git a/openembedded/packages/dates/dates_svn.bb b/openembedded/packages/dates/dates_svn.bb index be8e40d368..eea555c949 100755 --- a/openembedded/packages/dates/dates_svn.bb +++ b/openembedded/packages/dates/dates_svn.bb @@ -4,6 +4,8 @@ DEPENDS = "glib-2.0 gtk+ libglade eds-dbus" MAINTAINER = "Chris Lord " DESCRIPTION = "Dates is a calendar application." +PR = "r1" + PV = "0.0cvs${CVSDATE}" S = "${WORKDIR}/${PN}" diff --git a/openembedded/packages/db/db_4.1.25.bb b/openembedded/packages/db/db_4.1.25.bb new file mode 100644 index 0000000000..168dde478d --- /dev/null +++ b/openembedded/packages/db/db_4.1.25.bb @@ -0,0 +1,97 @@ +# Version 4 of the Berkeley DB from Sleepycat +# +# At present this package only installs the DB code +# itself (shared libraries, .a in the dev package), +# documentation and headers. +# +# The headers have the same names as those as v3 +# of the DB, only one version can be used *for dev* +# at once - DB3 and DB4 can both be installed on the +# same system at the same time if really necessary. +SECTION = "libs" +DESCRIPTION = "Berkeley DB v4." +HOMEPAGE = "http://www.sleepycat.com" +LICENSE = "BSD Sleepycat" +PR = "r1" + +SRC_URI = "http://downloads.sleepycat.com/${P}.tar.gz" + +inherit autotools + +# At present virtual/db is only in the db4 file, but it +# should probably be in the other candidates (db3, gdbm) +# because it doesn't make any sense to have multiple +# relational databases on an embedded machine... +PROVIDES += " db4 virtual/db" + +# bitbake isn't quite clever enough to deal with sleepycat, +# the distribution sits in the expected directory, but all +# the builds must occur from a sub-directory. The following +# persuades bitbake to go to the right place +S = "${WORKDIR}/${P}/build_unix" + +# The executables go in a separate package - typically there +# is no need to install these unless doing real database +# management on the system. +PACKAGES += " ${PN}-bin" + +# Package contents +FILES_${PN} = "${libdir}/libdb-4*so*" +FILES_${PN}-bin = "${bindir}" +# The dev package has the .so link (as in db3) and the .a's - +# it is therefore incompatible (cannot be installed at the +# same time) as the db3 package +FILES_${PN}-dev = "${includedir} ${libdir}" + +#configuration - set in local.conf to override +DB4_CONFIG ?= "--enable-o_direct --enable-smallbuild" +# Override the MUTEX setting here, the POSIX library is +# the default - "POSIX/pthreads/library". +# Don't ignore the nice SWP instruction on the ARM: +EXTRA_OECONF = "${DB4_CONFIG}" +# These enable the ARM assembler mutex code, this won't +# work with thumb compilation... +ARM_MUTEX = "--with-mutex=ARM/gcc-assembly" +ARM_MUTEX_thumb = "" +# NOTE: only tested on nslu2, should probably be _armeb +EXTRA_OECONF_nslu2 = "${DB4_CONFIG} ${ARM_MUTEX}" + +# Cancel the site stuff - it's set for db3 and destroys the +# configure. +CONFIG_SITE = "" +do_configure() { + echo '#!/bin/sh' >${S}/configure + echo 'rm ${S}/configure' >>${S}/configure + echo 'exec ../dist/configure "$@"' >>${S}/configure + chmod a+x ${S}/configure + oe_runconf +} + +do_stage() { + # The .h files get installed read-only, the autostage + # function just uses cp -pPR, so do this by hand + # Install, for the moment, into include/db4 to avoid + # interfering with the db3 headers (which have the same + # name). -I${STAGING_INCDIR}/db4 to use db4, as opposed + # to db3 + + rm -rf ${STAGE_TEMP} + mkdir -p ${STAGE_TEMP} + oe_runmake DESTDIR="${STAGE_TEMP}" includedir="${STAGE_TEMP}${includedir}" install_include + mkdir -p ${STAGING_INCDIR}/db4 + cp -pPRf ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}/db4 + rm -rf ${STAGE_TEMP} + oe_libinstall -so -C .libs libdb-4.1 ${STAGING_LIBDIR} +} + +do_install() { + oe_runmake includedir="${D}${includedir}" libdir="${D}${libdir}" bindir="${D}${bindir}" docdir="${D}${docdir}" install + + # The docs end up in /usr/docs - not right. + if test -d "${D}/${prefix}/docs" + then + mkdir -p "${D}/${datadir}" + test ! -d "${D}/${docdir}" || rmdir "${D}/${docdir}" + mv "${D}/${prefix}/docs" "${D}/${docdir}" + fi +} diff --git a/openembedded/packages/db/db_4.3.27.bb b/openembedded/packages/db/db_4.3.27.bb deleted file mode 100644 index 518fddee9f..0000000000 --- a/openembedded/packages/db/db_4.3.27.bb +++ /dev/null @@ -1,94 +0,0 @@ -# Version 4 of the Berkeley DB from Sleepycat -# -# At present this package only installs the DB code -# itself (shared libraries, .a in the dev package), -# documentation and headers. -# -# The headers have the same names as those as v3 -# of the DB, only one version can be used *for dev* -# at once - DB3 and DB4 can both be installed on the -# same system at the same time if really necessary. -SECTION = "libs" -DESCRIPTION = "Berkeley DB v4." -HOMEPAGE = "http://www.sleepycat.com" -LICENSE = "BSD Sleepycat" -PR = "r1" - -SRC_URI = "http://downloads.sleepycat.com/${P}.tar.gz" - -inherit autotools - -# At present virtual/db is only in the db4 file, but it -# should probably be in the other candidates (db3, gdbm) -# because it doesn't make any sense to have multiple -# relational databases on an embedded machine... -PROVIDES += " db4 virtual/db" - -# bitbake isn't quite clever enough to deal with sleepycat, -# the distribution sits in the expected directory, but all -# the builds must occur from a sub-directory. The following -# persuades bitbake to go to the right place -S = "${WORKDIR}/${P}/build_unix" - -# The executables go in a separate package - typically there -# is no need to install these unless doing real database -# management on the system. -PACKAGES += " ${PN}-bin" - -# Package contents -FILES_${PN} = "${libdir}/libdb-4*so*" -FILES_${PN}-bin = "${bindir}" -# The dev package has the .so link (as in db3) and the .a's - -# it is therefore incompatible (cannot be installed at the -# same time) as the db3 package -FILES_${PN}-dev = "${includedir} ${libdir}" - -#configuration - set in local.conf to override -DB4_CONFIG ?= "--enable-o_direct --enable-smallbuild" -# Override the MUTEX setting here, the POSIX library is -# the default - "POSIX/pthreads/library". -# Don't ignore the nice SWP instruction on the ARM: -EXTRA_OECONF = "${DB4_CONFIG}" -# These enable the ARM assembler mutex code, this won't -# work with thumb compilation... -ARM_MUTEX = "--with-mutex=ARM/gcc-assembly" -ARM_MUTEX_thumb = "" -# NOTE: only tested on nslu2, should probably be _armeb -EXTRA_OECONF_nslu2 = "${DB4_CONFIG} ${ARM_MUTEX}" - -# Cancel the site stuff - it's set for db3 and destroys the -# configure. -CONFIG_SITE = "" -do_configure() { - echo '#!/bin/sh' >${S}/configure - echo 'rm ${S}/configure' >>${S}/configure - echo 'exec ../dist/configure "$@"' >>${S}/configure - chmod a+x ${S}/configure - oe_runconf -} - -do_stage() { - # The .h files get installed read-only, the autostage - # function just uses cp -pPR, so do this by hand - # Install, for the moment, into include/db4 to avoid - # interfering with the db3 headers (which have the same - # name). -I${STAGING_INCDIR}/db4 to use db4, as opposed - # to db3. - rm -rf ${STAGE_TEMP} - mkdir -p ${STAGE_TEMP} - oe_runmake DESTDIR="${STAGE_TEMP}" install_include - mkdir -p ${STAGING_INCDIR}/db4 - cp -pPRf ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}/db4 - rm -rf ${STAGE_TEMP} - oe_libinstall -so -C .libs libdb-4.3 ${STAGING_LIBDIR} -} - -do_install_append() { - # The docs end up in /usr/docs - not right. - if test -d "${D}/${prefix}/docs" - then - mkdir -p "${D}/${datadir}" - test ! -d "${D}/${docdir}" || rmdir "${D}/${docdir}" - mv "${D}/${prefix}/docs" "${D}/${docdir}" - fi -} diff --git a/openembedded/packages/eds/eds-dbus/external_libdb.patch b/openembedded/packages/eds/eds-dbus/external_libdb.patch index ebb32403e8..50b9e9b48a 100644 --- a/openembedded/packages/eds/eds-dbus/external_libdb.patch +++ b/openembedded/packages/eds/eds-dbus/external_libdb.patch @@ -36,14 +36,14 @@ Index: trunk/configure.in AC_SUBST(REGEX_LIBS) dnl ****************************** -+dnl * db-4.3 checking ++dnl * db-4.1 checking +dnl ****************************** + -+AC_ARG_WITH(libdb43, [ --with-libdb43 Prefix where libdb 4.3 is installed]) ++AC_ARG_WITH(libdb41, [ --with-libdb41 Prefix where libdb 4.1 is installed]) +case $withval in +/*) + DB_CFLAGS="-I$withval/include/db4" -+ DB_LIBS="-L$withval/lib -ldb-4.3" ++ DB_LIBS="-L$withval/lib -ldb-4.1" + ;; +esac + diff --git a/openembedded/packages/eds/eds-dbus_svn.bb b/openembedded/packages/eds/eds-dbus_svn.bb index 2ffa363fe2..77ea4141da 100755 --- a/openembedded/packages/eds/eds-dbus_svn.bb +++ b/openembedded/packages/eds/eds-dbus_svn.bb @@ -4,7 +4,7 @@ RDEPENDS = "gtk+ gconf db libiconv" MAINTAINER = "Chris Lord " DESCRIPTION = "Evolution database backend server" PV = "1.4.0cvs${CVSDATE}" -PR = "r4" +PR = "r5" SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \ file://external_libdb.patch;patch=1 \ @@ -17,7 +17,7 @@ S = "${WORKDIR}/trunk" inherit autotools pkgconfig -EXTRA_OECONF = "--without-openldap --disable-nntp --disable-gtk-doc --with-dbus=yes --with-libgnome=no --enable-soup=no --with-libdb43=${STAGING_DIR}/${HOST_SYS} --enable-smime=no --enable-nss=no --disable-camel" +EXTRA_OECONF = "--without-openldap --disable-nntp --disable-gtk-doc --with-dbus=yes --with-libgnome=no --enable-soup=no --with-libdb41=${STAGING_DIR}/${HOST_SYS} --enable-smime=no --enable-nss=no --disable-camel" acpaths = " -I ${STAGING_DATADIR}/aclocal/gnome-macros " diff --git a/openembedded/packages/meta/meta-oh.bb b/openembedded/packages/meta/meta-oh.bb index 7a82a69e30..c2d3110af6 100644 --- a/openembedded/packages/meta/meta-oh.bb +++ b/openembedded/packages/meta/meta-oh.bb @@ -2,7 +2,7 @@ PACKAGES = "oh-base-depends oh-task-base" # oh-task-base DESCRIPTION = "Meta-package for OpenHand Palmtop Environment" MAINTAINER = "Richard Purdie " -PR = "r11" +PR = "r14" ALLOW_EMPTY = "1" diff --git a/openembedded/packages/meta/oh-image.bb b/openembedded/packages/meta/oh-image.bb index 20dd7a6096..c4a0f84571 100644 --- a/openembedded/packages/meta/oh-image.bb +++ b/openembedded/packages/meta/oh-image.bb @@ -1,4 +1,4 @@ -PR = "r6" +PR = "r8" export IMAGE_BASENAME = "oh-image" -- cgit v1.2.3