diff options
| author |   Rene Wagner <rw@handhelds.org> | 2005-10-05 13:18:48 +0000 |
|---|---|---|
| committer |   OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-10-05 13:18:48 +0000 |
| commit | 68d2340460441d70490cdf720c6e7ad4685df4a4 (patch) | |
| tree | c045cc9ebc3839471a9e4e055acded7ca8a923b7 | |
| parent | d3b7798ae9bcec3d4e1037c00f47af1586868429 (diff) | |
| parent | 4b6391d48f43ea0dc65734ca55f432b03e1f4f11 (diff) | |
| download | openembedded-68d2340460441d70490cdf720c6e7ad4685df4a4.tar.gz | |
merge of c009bb7a8231ab8c429364e170366207097c6c01
and f455175a8c475812470ebe3bf0c643a9b0bb30d4
| -rw-r--r-- | classes/binconfig.bbclass | 4 | ||||
| -rw-r--r-- | packages/mysql/mysql_4.1.12.bb | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass index a599dec3f2..bf15ebcdf9 100644 --- a/classes/binconfig.bbclass +++ b/classes/binconfig.bbclass @@ -24,8 +24,10 @@ def is_native(d): import bb.data return ["","-native"][bb.data.inherits_class('native', d)] +BINCONFIG_GLOB ?= "*-config" + do_stage_append() { - for config in `find ${S} -name '*-config'`; do + for config in `find ${S} -name '${BINCONFIG_GLOB}'`; do configname=`basename $config`${@is_native(d)} install -d ${STAGING_BINDIR} cat $config | sed ${@get_binconfig_mangle(d)} > ${STAGING_BINDIR}/$configname diff --git a/packages/mysql/mysql_4.1.12.bb b/packages/mysql/mysql_4.1.12.bb index 13c2cd3a3e..9d1754608f 100644 --- a/packages/mysql/mysql_4.1.12.bb +++ b/packages/mysql/mysql_4.1.12.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The MySQL Open Source Database System" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" SECTION = "libs" DEPENDS += "ncurses mysql-native" -PR = "r3" +PR = "r4" LICENSE = "GPL" SRC_URI = "http://mirrors.develooper.com/mysql/Downloads/MySQL-4.1/mysql-${PV}.tar.gz \ file://autofoo.patch;patch=1 \ @@ -11,7 +11,8 @@ S = "${WORKDIR}/mysql-${PV}" FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/mysql-${PV}', '${FILE_DIRNAME}/mysql-4.1.10a', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" -inherit autotools +BINCONFIG_GLOB = "mysql_config" +inherit autotools binconfig EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR}/gen_lex_hash'" |