From patchwork Mon May 5 08:02:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koen Kooi X-Patchwork-Id: 29611 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f72.google.com (mail-pa0-f72.google.com [209.85.220.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 55679202E6 for ; Mon, 5 May 2014 08:03:07 +0000 (UTC) Received: by mail-pa0-f72.google.com with SMTP id bj1sf7712058pad.7 for ; Mon, 05 May 2014 01:03:06 -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=P2KmWqfXsHg2XGMgTfTxeNlhx9Kgnjm9d8N+MpHIdoA=; b=mPIFTd4gNEdM9RDiMTdVvamdlf5hdCr4SfV+3voZ89BQV0xuXUmKJZwHzpFHSAgN9P 58CsiCT95ucWGyqTtsIJZ4kWvNSDkBrV64cF3+N54tPXCY0opw1ok2Lt8Um66izoLAro I9OXDffoN0CaCDJvgZiNl0smmUGMpZNhLqOGSzB4WvLQoWePZZjQZaPlCbTdj/iAcela 7PtdOWDoyKDwIXWrZvuLip38KNKJLNGK9oDxXqrq03vlCcvOuDrGzQuYMZW/s48xK/Jh HGk9qmMykxV62gF3AsStc/3z79I1KLcZ/S+3xtLmMzlR0RmeEQlGVa3I33tlJoKrdx5T rQYg== X-Gm-Message-State: ALoCoQnADH3B2Zo/VlfZqWGrH8+VC632cpPaB+eecujn0LD9QkzuuVtbtk+zZ5omogWMtRe04tnN X-Received: by 10.66.141.135 with SMTP id ro7mr16293557pab.28.1399276986194; Mon, 05 May 2014 01:03:06 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.93.11 with SMTP id c11ls2135598qge.55.gmail; Mon, 05 May 2014 01:03:06 -0700 (PDT) X-Received: by 10.58.77.238 with SMTP id v14mr764527vew.27.1399276986049; Mon, 05 May 2014 01:03:06 -0700 (PDT) Received: from mail-ve0-f172.google.com (mail-ve0-f172.google.com [209.85.128.172]) by mx.google.com with ESMTPS id eb17si1397543veb.22.2014.05.05.01.03.06 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 05 May 2014 01:03:06 -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.128.172; Received: by mail-ve0-f172.google.com with SMTP id oz11so619736veb.3 for ; Mon, 05 May 2014 01:03:06 -0700 (PDT) X-Received: by 10.52.228.134 with SMTP id si6mr17845178vdc.5.1399276985807; Mon, 05 May 2014 01:03:05 -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 ib8csp121109vcb; Mon, 5 May 2014 01:03:04 -0700 (PDT) X-Received: by 10.66.160.34 with SMTP id xh2mr26353295pab.109.1399276984594; Mon, 05 May 2014 01:03:04 -0700 (PDT) Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id xf3si7649660pab.15.2014.05.05.01.03.03 for ; Mon, 05 May 2014 01:03:04 -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 C7B05609BF; Mon, 5 May 2014 08:02:39 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-wi0-f177.google.com (mail-wi0-f177.google.com [209.85.212.177]) by mail.openembedded.org (Postfix) with ESMTP id 12468609BF for ; Mon, 5 May 2014 08:02:37 +0000 (UTC) Received: by mail-wi0-f177.google.com with SMTP id f8so1284117wiw.16 for ; Mon, 05 May 2014 01:02:38 -0700 (PDT) X-Received: by 10.194.203.170 with SMTP id kr10mr26390950wjc.19.1399276958057; Mon, 05 May 2014 01:02:38 -0700 (PDT) Received: from localhost ([2001:610:612:0:5e51:4fff:fec8:7c15]) by mx.google.com with ESMTPSA id l4sm16125344wiy.0.2014.05.05.01.02.36 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 May 2014 01:02:37 -0700 (PDT) From: Koen Kooi To: openembedded-devel@lists.openembedded.org Date: Mon, 5 May 2014 10:02:24 +0200 Message-Id: <1399276944-918-1-git-send-email-koen.kooi@linaro.org> X-Mailer: git-send-email 1.9.0 Cc: Koen Kooi Subject: [oe] [meta-oe][PATCH] php: fix do_installing when S!=B 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-devtools/php/php.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc index d5e53c0..b1bf79c 100644 --- a/meta-oe/recipes-devtools/php/php.inc +++ b/meta-oe/recipes-devtools/php/php.inc @@ -85,10 +85,10 @@ do_install_append_pn-php() { install -d ${D}/${sysconfdir}/apache2/conf.d install -m 0644 ${WORKDIR}/php-fpm-apache.conf ${D}/${sysconfdir}/apache2/conf.d/php-fpm.conf install -d ${D}${sysconfdir}/init.d - sed -i 's:=/usr/sbin:=${sbindir}:g' ${S}/sapi/fpm/init.d.php-fpm - sed -i 's:=/etc:=${sysconfdir}:g' ${S}/sapi/fpm/init.d.php-fpm - sed -i 's:=/var:=${localstatedir}:g' ${S}/sapi/fpm/init.d.php-fpm - install -m 0755 ${S}/sapi/fpm/init.d.php-fpm ${D}${sysconfdir}/init.d/php-fpm + sed -i 's:=/usr/sbin:=${sbindir}:g' ${B}/sapi/fpm/init.d.php-fpm + sed -i 's:=/etc:=${sysconfdir}:g' ${B}/sapi/fpm/init.d.php-fpm + sed -i 's:=/var:=${localstatedir}:g' ${B}/sapi/fpm/init.d.php-fpm + install -m 0755 ${B}/sapi/fpm/init.d.php-fpm ${D}${sysconfdir}/init.d/php-fpm TMP=`dirname ${D}/${TMPDIR}` while test ${TMP} != ${D}; do rmdir ${TMP}