From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga02.intel.com ([134.134.136.20]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1TQapE-0001Xj-Vj for openembedded-devel@lists.openembedded.org; Tue, 23 Oct 2012 11:31:05 +0200 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 23 Oct 2012 02:17:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,634,1344236400"; d="scan'208";a="209391419" Received: from unknown (HELO helios.ger.corp.intel.com) ([10.252.122.83]) by orsmga001.jf.intel.com with ESMTP; 23 Oct 2012 02:17:36 -0700 From: Paul Eggleton To: openembedded-devel@lists.openembedded.org Date: Tue, 23 Oct 2012 10:17:08 +0100 Message-Id: <1350983828-5569-1-git-send-email-paul.eggleton@linux.intel.com> X-Mailer: git-send-email 1.7.9.5 Subject: [meta-oe][PATCH] mysql: always replace paths in mysql_config script X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Oct 2012 09:31:05 -0000 Path replacement was not happening on some machines if the MySQL build scripts set a different path in the produced mysql_config script, resulting in host paths being left in. Original patch by Joe Slater . Signed-off-by: Paul Eggleton --- meta-oe/recipes-support/mysql/mysql5_5.1.40.inc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc b/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc index 72e9ef8..3867a12 100644 --- a/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc +++ b/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc @@ -5,7 +5,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=477ab0a4c8ca64b482b3f2a365d0fdfa" DEPENDS = "ncurses" -PR = "r9" +PR = "r10" SRC_URI = "http://downloads.mysql.com/archives/mysql-5.1/mysql-${PV}.tar.gz \ file://configure.in.patch \ @@ -41,9 +41,13 @@ do_configure_append() { SYSROOT_PREPROCESS_FUNCS += "mysql5_sysroot_preprocess" # We need to append this so it runs *after* binconfig's preprocess function +# +# We really don't care exactly what the directories were set to originally. +# plugindir is not fixed, but we don't create any plugins. +# mysql5_sysroot_preprocess () { - sed -i -es,^pkgincludedir=\'/usr/include/mysql\',pkgincludedir=\'${STAGING_INCDIR}/mysql\', ${SYSROOT_DESTDIR}${bindir_crossscripts}/mysql_config - sed -i -es,^pkglibdir=\'/usr/lib/mysql\',pkglibdir=\'${STAGING_LIBDIR}\', ${SYSROOT_DESTDIR}${bindir_crossscripts}/mysql_config + sed -i -es,^pkgincludedir=.*,pkgincludedir=\'${STAGING_INCDIR}/mysql\', ${SYSROOT_DESTDIR}${bindir_crossscripts}/mysql_config + sed -i -es,^pkglibdir=.*,pkglibdir=\'${STAGING_LIBDIR}\', ${SYSROOT_DESTDIR}${bindir_crossscripts}/mysql_config } do_install() { -- 1.7.9.5