[Angstrom-devel] [REVIEW] db SRC_URI fix
Koen Kooi
koen at dominion.kabel.utwente.nl
Mon Mar 24 23:42:38 CET 2008
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Junqian Gordon Xu schreef:
| basically fix db SRC_URI, with some unification of the db4 recipes. No
| other changes.
I'm actually more concerned with the fact that the fetcher doesn't
fallback to the angstrom source mirror :(
| .dev committed revision 848c6e3f16104e7b87568edf06d0d9cc79b5e860
|
| Regards
| Gordon
|
| #
| # old_revision [e60db6ca0d9d6a0b3b02507a6068c2d803af4d6c]
| #
| # add_file "packages/db/db4-native.inc"
| # content [d9b9ccd6925ca57231ad3f1e281972378ca83be6]
| #
| # add_file "packages/db/db4.inc"
| # content [e7bdabc82bbe6d1c172d1ee155e0024792de676a]
| #
| # patch "packages/db/db-native_4.2.52.bb"
| # from [5c0fba9adce096fef14fb5d04f1d361ca27d602e]
| # to [f5954aaccdc1a79e66f41abe40553c04eb9790d8]
| #
| # patch "packages/db/db-native_4.3.29.bb"
| # from [5b85626af5db30b2e76c61a4f42f2b8894647dcc]
| # to [f5954aaccdc1a79e66f41abe40553c04eb9790d8]
| #
| # patch "packages/db/db3_3.2.9.bb"
| # from [160e0e47ee411a288806fb7a98681e9824e90f19]
| # to [edda3a971c8f4ec1512f8625e93548438152e661]
| #
| # patch "packages/db/db_4.2.52.bb"
| # from [1a8760b7fc8cc0392968b1042a6f1f4ad8942c90]
| # to [10f8a7c33de2cb7e627c1fc0081456e03ce9b6a6]
| #
| # patch "packages/db/db_4.3.29.bb"
| # from [66709e9d9588794467ceb39b685bde44ab5bf724]
| # to [41ed5118580382354ff82f6b91aef47cf361cd98]
| #
| ============================================================
| --- packages/db/db4-native.inc d9b9ccd6925ca57231ad3f1e281972378ca83be6
| +++ packages/db/db4-native.inc d9b9ccd6925ca57231ad3f1e281972378ca83be6
| @@ -0,0 +1,28 @@
| +# This wrapper builds a native version of the Oracal
| +# Berkeley DB for those packages which need it (e.g.
| +# perl).
| +
| +VIRTUAL_NAME = "virtual/db-native"
| +CONFLICTS = "db3-native"
| +#PR tracks the non-native package
| +
| +inherit native
| +
| +do_package() {
| +:
| +}
| +
| +PACKAGES = ""
| +
| +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-${PVM} ${STAGING_LIBDIR}
| + ln -sf libdb-${PVM}.so ${STAGING_LIBDIR}/libdb.so
| + ln -sf libdb-${PVM}.a ${STAGING_LIBDIR}/libdb.a
| +}
| ============================================================
| --- packages/db/db4.inc e7bdabc82bbe6d1c172d1ee155e0024792de676a
| +++ packages/db/db4.inc e7bdabc82bbe6d1c172d1ee155e0024792de676a
| @@ -0,0 +1,96 @@
| +# Version 4 of the Berkeley DB from Oracle
| +#
| +# 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.
| +
| +
| +DESCRIPTION = "Berkeley DB v4."
| +HOMEPAGE =
| "http://www.oracle.com/technology/products/berkeley-db/db/index.html"
| +SECTION = "libs"
| +LICENSE = "BSD"
| +VIRTUAL_NAME ?= "virtual/db"
| +CONFLICTS = "db3"
| +
| +SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz"
| +
| +inherit autotools
| +
| +# Put virtual/db in any appropriate provider of a
| +# relational database, use it as a dependency in
| +# place of a specific db and use:
| +#
| +# PREFERRED_PROVIDER_virtual/db
| +#
| +# to select the correct db in the build (distro) .conf
| +PROVIDES += "${VIRTUAL_NAME}"
| +
| +# bitbake isn't quite clever enough to deal with db,
| +# 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}/db-${PV}/dist"
| +B = "${WORKDIR}/db-${PV}/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}/*"
| +
| +EXTRA_OECONF = "${DB4_CONFIG}"
| +
| +# Override the MUTEX setting here, the POSIX library is
| +# the default - "POSIX/pthreads/library".
| +# Don't ignore the nice SWP instruction on the ARM:
| +# These enable the ARM assembler mutex code, this won't
| +# work with thumb compilation...
| +ARM_MUTEX = "--with-mutex=ARM/gcc-assembly"
| +MUTEX = ""
| +MUTEX_arm = "${ARM_MUTEX}"
| +MUTEX_armeb = "${ARM_MUTEX}"
| +EXTRA_OECONF += "${MUTEX}"
| +
| +# Cancel the site stuff - it's set for db3 and destroys the
| +# configure.
| +CONFIG_SITE = ""
| +do_configure() {
| + ( cd ${WORKDIR}/db-${PV}/dist ; gnu-configize )
| + oe_runconf
| +}
| +
| +
| +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}" || rm -rf "${D}/${docdir}"
| + mv "${D}/${prefix}/docs" "${D}/${docdir}"
| + fi
| +}
| +
| +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-${PVM} ${STAGING_LIBDIR}
| + ln -sf libdb-${PVM}.so ${STAGING_LIBDIR}/libdb.so
| + ln -sf libdb-${PVM}.a ${STAGING_LIBDIR}/libdb.a
| +}
| ============================================================
| --- packages/db/db-native_4.2.52.bb
5c0fba9adce096fef14fb5d04f1d361ca27d602e
| +++ packages/db/db-native_4.2.52.bb
f5954aaccdc1a79e66f41abe40553c04eb9790d8
| @@ -1,27 +1,2 @@
| -# This wrapper builds a native version of the SleepyCat
| -# Berkeley DB for those packages which need it (e.g.
| -# perl).
| -SECTION = "libs"
| -VIRTUAL_NAME = "virtual/db-native"
| -CONFLICTS = "db3-native"
| -#PR tracks the non-native package
| -
| -inherit native
| -
| require db_${PV}.bb
| +require db4-native.inc
| -
| -PACKAGES = ""
| -
| -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
| -}
| -
| ============================================================
| --- packages/db/db-native_4.3.29.bb
5b85626af5db30b2e76c61a4f42f2b8894647dcc
| +++ packages/db/db-native_4.3.29.bb
f5954aaccdc1a79e66f41abe40553c04eb9790d8
| @@ -1,17 +1,2 @@
| -# This wrapper builds a native version of the SleepyCat
| -# Berkeley DB for those packages which need it (e.g.
| -# perl).
| -SECTION = "libs"
| -VIRTUAL_NAME = "virtual/db-native"
| -CONFLICTS = "db3-native"
| -#PR tracks the non-native package
| -
| -inherit native
| -
| require db_${PV}.bb
| +require db4-native.inc
| -
| -do_package() {
| -:
| -}
| -
| -PACKAGES = ""
| ============================================================
| --- packages/db/db3_3.2.9.bb 160e0e47ee411a288806fb7a98681e9824e90f19
| +++ packages/db/db3_3.2.9.bb edda3a971c8f4ec1512f8625e93548438152e661
| @@ -1,8 +1,8 @@ DESCRIPTION = "Berkeley DB v3."
| SECTION = "libs"
| DESCRIPTION = "Berkeley DB v3."
| -HOMEPAGE = "http://www.sleepycat.com"
| -LICENSE = "BSD Sleepycat"
| -PR = "r2"
| +HOMEPAGE =
| "http://www.oracle.com/technology/products/berkeley-db/db/index.html"
| +LICENSE = "BSD"
| +PR = "r3"
| VIRTUAL_NAME ?= "virtual/db"
| CONFLICTS = "db"
|
| @@ -11,7 +11,7 @@ PROVIDES += "${VIRTUAL_NAME}"
| # a build to select the desired one.
| PROVIDES += "${VIRTUAL_NAME}"
|
| -SRC_URI = "http://download-west.oracle.com/berkeley-db/db-${PV}.tar.gz \
| +SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz \
| file://autofoo.patch;patch=1"
| S = "${WORKDIR}/db-${PV}/dist"
| B = "${WORKDIR}/db-${PV}/build_unix"
| ============================================================
| --- packages/db/db_4.2.52.bb 1a8760b7fc8cc0392968b1042a6f1f4ad8942c90
| +++ packages/db/db_4.2.52.bb 10f8a7c33de2cb7e627c1fc0081456e03ce9b6a6
| @@ -1,97 +1,11 @@
| -# 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"
| -VIRTUAL_NAME ?= "virtual/db"
| -CONFLICTS = "db3"
| -PR = "r7"
| +PR = "r8"
|
| -SRC_URI = "http://downloads.sleepycat.com/db-${PV}.tar.gz"
| -#SRC_URI_MD5 = "http://downloads.sleepycat.com/db-${PV}.tar.gz.md5"
| -#TODO SRC_URI += "file://arm-thumb-mutex.patch;patch=1"
| +#major version number
| +PVM = "4.2"
|
| -inherit autotools
| +require db4.inc
|
| -# Put virtual/db in any appropriate provider of a
| -# relational database, use it as a dependency in
| -# place of a specific db and use:
| -#
| -# PREFERRED_PROVIDER_virtual/db
| -#
| -# to select the correct db in the build (distro) .conf
| -PROVIDES += "${VIRTUAL_NAME}"
| +#TODO SRC_URI += "file://arm-thumb-mutex.patch;patch=1"
|
| -# 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}/db-${PV}/dist"
| -B = "${WORKDIR}/db-${PV}/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 ?= " --disable-cryptography --disable-queue
| --disable-replication --disable-verify --enable-hash"
| -EXTRA_OECONF = "${DB4_CONFIG}"
| -
| -# Override the MUTEX setting here, the POSIX library is
| -# the default - "POSIX/pthreads/library".
| -# Don't ignore the nice SWP instruction on the ARM:
| -# These enable the ARM assembler mutex code, this won't
| -# work with thumb compilation...
| -ARM_MUTEX = "--with-mutex=ARM/gcc-assembly"
| -MUTEX = ""
| -MUTEX_arm = "${ARM_MUTEX}"
| -MUTEX_armeb = "${ARM_MUTEX}"
| -EXTRA_OECONF += "${MUTEX}"
| -
| -# Cancel the site stuff - it's set for db3 and destroys the
| -# configure.
| -CONFIG_SITE = ""
| -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"
| - then
| - mkdir -p "${D}/${datadir}"
| - test ! -d "${D}/${docdir}" || rm -rf "${D}/${docdir}"
| - mv "${D}/${prefix}/docs" "${D}/${docdir}"
| - fi
| -}
| ============================================================
| --- packages/db/db_4.3.29.bb 66709e9d9588794467ceb39b685bde44ab5bf724
| +++ packages/db/db_4.3.29.bb 41ed5118580382354ff82f6b91aef47cf361cd98
| @@ -1,99 +1,12 @@
| -# 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"
| -VIRTUAL_NAME ?= "virtual/db"
| -CONFLICTS = "db3"
| -PR = "r9"
| +PR = "r10"
|
| -SRC_URI = "http://downloads.sleepycat.com/db-${PV}.tar.gz"
| -#SRC_URI_MD5 = "http://downloads.sleepycat.com/db-${PV}.tar.gz.md5"
| -SRC_URI += "file://arm-thumb-mutex.patch;patch=1"
| +# major version number
| +PVM = "4.3"
|
| -inherit autotools
| +require db4.inc
|
| -# Put virtual/db in any appropriate provider of a
| -# relational database, use it as a dependency in
| -# place of a specific db and use:
| -#
| -# PREFERRED_PROVIDER_virtual/db
| -#
| -# to select the correct db in the build (distro) .conf
| -PROVIDES += "${VIRTUAL_NAME}"
| +SRC_URI += "file://arm-thumb-mutex.patch;patch=1"
|
| -# 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}/db-${PV}/dist"
| -B = "${WORKDIR}/db-${PV}/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
| # All the --disable-* options replace --enable-smallbuild, which
| breaks a bunch of stuff (eg. postfix)
| DB4_CONFIG ?= "--enable-o_direct --disable-cryptography
| --disable-queue --disable-replication --disable-statistics
| --disable-verify --enable-compat185"
| -EXTRA_OECONF = "${DB4_CONFIG}"
| -
| -# Override the MUTEX setting here, the POSIX library is
| -# the default - "POSIX/pthreads/library".
| -# Don't ignore the nice SWP instruction on the ARM:
| -# These enable the ARM assembler mutex code, this won't
| -# work with thumb compilation...
| -ARM_MUTEX = "--with-mutex=ARM/gcc-assembly"
| -MUTEX = ""
| -MUTEX_arm = "${ARM_MUTEX}"
| -MUTEX_armeb = "${ARM_MUTEX}"
| -EXTRA_OECONF += "${MUTEX}"
| -
| -# Cancel the site stuff - it's set for db3 and destroys the
| -# configure.
| -CONFIG_SITE = ""
| -do_configure() {
| - ( cd ${WORKDIR}/db-${PV}/dist ; gnu-configize )
| - 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"
| - then
| - mkdir -p "${D}/${datadir}"
| - test ! -d "${D}/${docdir}" || rm -rf "${D}/${docdir}"
| - mv "${D}/${prefix}/docs" "${D}/${docdir}"
| - fi
| -}
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFH6C5eMkyGM64RGpERAl4mAJ9leBKgOKAx3SLX8G3QteQjPSieIgCgipXg
LVllNHMkNsJEtz7oL11ApS8=
=e92P
-----END PGP SIGNATURE-----
More information about the Angstrom-distro-devel
mailing list