From patchwork Fri May 2 08:26:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koen Kooi X-Patchwork-Id: 29533 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f199.google.com (mail-ig0-f199.google.com [209.85.213.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6E155203F3 for ; Fri, 2 May 2014 08:26:34 +0000 (UTC) Received: by mail-ig0-f199.google.com with SMTP id c1sf4467029igq.6 for ; Fri, 02 May 2014 01:26:33 -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=QBz5gNXhZNhm6vHQG6yXHrp1f7EcKLqIVyI3ht0JR3I=; b=II2JLGudUiUXX4IHnEmWfV2o9RBKyIbFGnkGic/9in8B6J6C0H8hrLsk1HkqvfN/wP s6XiPEmPueOJTWhdmNGELOlblZaTnB5jbVUylkqd7er/ssVry02EL1Tkn9NNUjvUD3xz Fvpb/Qesw2IbX+A34GRc7JqQGv0U2I9ilG+Oj8ejvHV79S6fP5xf0alHToOpnDtja1j9 GyLeLJf28KnORRgVhdD5ZhVkTFsiDjGvA+ZHAI2N+ofuK59RFhHdSThsWyldDo8MR5kF R3T0Y6iCJfKHofNrznYADjYT4+mPjL+r/d8LKJoDGMsw2CQhnFsD8MA45sdfVOoqAF+l UknA== X-Gm-Message-State: ALoCoQlzGMKeQRnKIiKiBKnLmVQJMyg1ZEAFc9S9dqB1ioKrgHZShUdAxpoemzDGW0BQnQ8gty/7 X-Received: by 10.43.161.202 with SMTP id mh10mr6762025icc.23.1399019193928; Fri, 02 May 2014 01:26:33 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.81.81 with SMTP id e75ls1431229qgd.29.gmail; Fri, 02 May 2014 01:26:33 -0700 (PDT) X-Received: by 10.58.154.10 with SMTP id vk10mr12612964veb.18.1399019193706; Fri, 02 May 2014 01:26:33 -0700 (PDT) Received: from mail-ve0-f179.google.com (mail-ve0-f179.google.com [209.85.128.179]) by mx.google.com with ESMTPS id sw4si6566958vdc.138.2014.05.02.01.26.33 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 02 May 2014 01:26:33 -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.179; Received: by mail-ve0-f179.google.com with SMTP id oy12so2116294veb.24 for ; Fri, 02 May 2014 01:26:33 -0700 (PDT) X-Received: by 10.58.122.164 with SMTP id lt4mr12564704veb.2.1399019193623; Fri, 02 May 2014 01:26:33 -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 ib8csp85513vcb; Fri, 2 May 2014 01:26:33 -0700 (PDT) X-Received: by 10.66.66.135 with SMTP id f7mr32122693pat.22.1399019192862; Fri, 02 May 2014 01:26:32 -0700 (PDT) Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id ug9si23476020pab.171.2014.05.02.01.26.32 for ; Fri, 02 May 2014 01:26:32 -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 6DDE260703; Fri, 2 May 2014 08:26:30 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com [74.125.82.45]) by mail.openembedded.org (Postfix) with ESMTP id D12E6605B2 for ; Fri, 2 May 2014 08:26:29 +0000 (UTC) Received: by mail-wg0-f45.google.com with SMTP id m15so671439wgh.28 for ; Fri, 02 May 2014 01:26:30 -0700 (PDT) X-Received: by 10.194.188.68 with SMTP id fy4mr12610142wjc.30.1399019190135; Fri, 02 May 2014 01:26:30 -0700 (PDT) Received: from localhost ([2001:610:612:0:5e51:4fff:fec8:7c15]) by mx.google.com with ESMTPSA id q2sm3317214wix.5.2014.05.02.01.26.29 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 May 2014 01:26:29 -0700 (PDT) From: Koen Kooi To: openembedded-devel@lists.openembedded.org Date: Fri, 2 May 2014 10:26:26 +0200 Message-Id: <1399019186-19483-1-git-send-email-koen.kooi@linaro.org> X-Mailer: git-send-email 1.9.0 Cc: Koen Kooi Subject: [oe] [meta-oe][PATCHv4] git: fix perl binding installation 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 Git.pm wasn't ending up in the package because do_install removed it with a misleading comment about multilib. Workaround the problem so that Git.pm ends up in the correct dir *and* doesn't get deleted. Signed-off-by: Koen Kooi --- meta/recipes-devtools/git/git.inc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc index 73e11eb..178b768 100644 --- a/meta/recipes-devtools/git/git.inc +++ b/meta/recipes-devtools/git/git.inc @@ -28,10 +28,14 @@ do_install () { template_dir=${datadir}/git-core/templates \ GIT_PYTHON_DIR=${D}${datadir}/git-core/python + cd ${B}/perl && oe_runmake install DESTDIR="${D}" bindir=${bindir} + # ${libdir} is not applicable here, perl-native files are always # installed to /usr/lib on both 32/64 bits targets. + # Fix up build paths and point to target locations. + mv ${D}${exec_prefix}/lib/perl-native/perl ${D}${exec_prefix}/lib/perl + sed -i -e s:${D}::g ${D}${exec_prefix}/lib/perl/*/auto/Git/.packlist rm -rf ${D}${exec_prefix}/lib/perl-native - rmdir ${D}${exec_prefix}/lib || true } PERLSEDFIXUP = " \ @@ -75,6 +79,7 @@ PERLTOOLS = " \ PACKAGES =+ "${PN}-perltools" FILES_${PN}-perltools += " \ ${PERLTOOLS} \ + ${prefix}/lib/perl \ ${datadir}/perl \ " RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path liberror-perl findutils"