From patchwork Tue Apr 29 13:32:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koen Kooi X-Patchwork-Id: 29354 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f197.google.com (mail-qc0-f197.google.com [209.85.216.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7FC1A202DD for ; Tue, 29 Apr 2014 13:33:09 +0000 (UTC) Received: by mail-qc0-f197.google.com with SMTP id i8sf634296qcq.8 for ; Tue, 29 Apr 2014 06:33:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:from:to:date :message-id:cc:subject:precedence:reply-to:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=EBDbx27DXXvQEqbNuXZtYfI9F4c9I6avl4zt4CIww9o=; b=DXDf+tirAr6PmTsXppm9hdZuY+Uq2oJfCH20SBRe2ddI7tDp1edjShEl6/qAz5QuxF XXlYC238XGX2eoWyydXOZGbISCpcIlIqwKY90NlIhFRjKc7rkzcACnS3swBjuzRdZdsZ K+8290XOKJJszltddUFDwbe20Is2UltJIIF+n77GxXDfuyHQyUuquQBrnPGJ3myqDMsH ekc3ZN2TBNXbD9n9QtQRKmmA5LtcSnSt1kvKvqVy+oGNBQXh3qIUItBjSQWr6xCvBJ0F Czb6ksfVh0d/SbrbZXnx1pJiF07RYNbGVTWAR2WEaSBL2rEuceGw3lP5hBgIgao2dCuf 7mkQ== X-Gm-Message-State: ALoCoQl2RiEtiTWQTsO0KWFMem5E8jrscSckQpfFSbuquQAWXeG9J7JeezT63hmhX0ZsvF+8/p4q X-Received: by 10.58.41.39 with SMTP id c7mr16562026vel.25.1398778389203; Tue, 29 Apr 2014 06:33:09 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.26.182 with SMTP id 51ls97414qgv.38.gmail; Tue, 29 Apr 2014 06:33:09 -0700 (PDT) X-Received: by 10.221.29.137 with SMTP id ry9mr29630014vcb.6.1398778388970; Tue, 29 Apr 2014 06:33:08 -0700 (PDT) Received: from mail-vc0-f177.google.com (mail-vc0-f177.google.com [209.85.220.177]) by mx.google.com with ESMTPS id 2si2401206vcb.124.2014.04.29.06.33.08 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 29 Apr 2014 06:33:08 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.220.177; Received: by mail-vc0-f177.google.com with SMTP id if11so254010vcb.22 for ; Tue, 29 Apr 2014 06:33:08 -0700 (PDT) X-Received: by 10.221.26.10 with SMTP id rk10mr29672898vcb.0.1398778388899; Tue, 29 Apr 2014 06:33:08 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp197789vcb; Tue, 29 Apr 2014 06:33:08 -0700 (PDT) X-Received: by 10.66.252.69 with SMTP id zq5mr31913203pac.54.1398778387909; Tue, 29 Apr 2014 06:33:07 -0700 (PDT) Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id hi3si12951951pac.451.2014.04.29.06.33.05 for ; Tue, 29 Apr 2014 06:33:06 -0700 (PDT) Received-SPF: none (google.com: openembedded-devel-bounces@lists.openembedded.org does not designate permitted sender hosts) client-ip=140.211.169.62; Received: from mail.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id A2DC861F16; Tue, 29 Apr 2014 13:32:47 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-wi0-f182.google.com (mail-wi0-f182.google.com [209.85.212.182]) by mail.openembedded.org (Postfix) with ESMTP id 738DE60E24 for ; Tue, 29 Apr 2014 13:32:40 +0000 (UTC) Received: by mail-wi0-f182.google.com with SMTP id d1so430962wiv.15 for ; Tue, 29 Apr 2014 06:32:41 -0700 (PDT) X-Received: by 10.180.76.116 with SMTP id j20mr20355734wiw.21.1398778361767; Tue, 29 Apr 2014 06:32:41 -0700 (PDT) Received: from localhost ([2001:610:612:0:5e51:4fff:fec8:7c15]) by mx.google.com with ESMTPSA id b1sm31121789wjb.37.2014.04.29.06.32.40 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Apr 2014 06:32:40 -0700 (PDT) From: Koen Kooi To: openembedded-devel@lists.openembedded.org Date: Tue, 29 Apr 2014 15:32:36 +0200 Message-Id: <1398778356-14565-1-git-send-email-koen.kooi@linaro.org> X-Mailer: git-send-email 1.9.0 Cc: Koen Kooi Subject: [oe] [meta-oe][PATCHv2] mariadb: handle seperate builddir X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: koen.kooi@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Signed-off-by: Koen Kooi --- meta-oe/recipes-support/mysql/mariadb_5.1.67.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/mysql/mariadb_5.1.67.inc b/meta-oe/recipes-support/mysql/mariadb_5.1.67.inc index 37a0f0c..df0b1b5 100644 --- a/meta-oe/recipes-support/mysql/mariadb_5.1.67.inc +++ b/meta-oe/recipes-support/mysql/mariadb_5.1.67.inc @@ -28,7 +28,7 @@ S = "${WORKDIR}/mariadb-${PV}" BINCONFIG_GLOB = "mysql_config" -inherit autotools binconfig update-rc.d useradd +inherit autotools-brokensep binconfig update-rc.d useradd INITSCRIPT_PACKAGES = "${PN}-server" INITSCRIPT_NAME = "mysqld" @@ -59,7 +59,7 @@ EXTRA_OECONF = "--with-atomic-ops=up \ " do_configure_append() { - sed -i /comp_err/d ${S}/sql/share/Makefile + sed -i /comp_err/d ${B}/sql/share/Makefile # handle distros with different values of ${libexecdir} libexecdir2=`echo ${libexecdir} | sed -e 's+/usr/++g'`