From patchwork Thu Apr 17 09:07:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koen Kooi X-Patchwork-Id: 28512 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f200.google.com (mail-ie0-f200.google.com [209.85.223.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2DC81206A6 for ; Thu, 17 Apr 2014 09:08:31 +0000 (UTC) Received: by mail-ie0-f200.google.com with SMTP id lx4sf867072iec.3 for ; Thu, 17 Apr 2014 02:08:31 -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: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=MfBvXy17/NFu5u2uhVkpS1TaOm+foTklq/W+b43Izqk=; b=Yjg1kEs2CQjUlZ1/s0CGMcy/uexs3yjc5TlO/CN+UXta3g5Et54TsJLslHx0IjICrW bKMFuSmxKAQ7zkOh3PWM8rCCzBq3SaTiaXo+J8mHawdbeXxQZF/CxxYgXoXFW3lvM+nS 6aD2S6M7yrm+HSndDRsCSLBJsMsXXfDrithrG6+buNt5qQtCUUFlctu6XW7fQMGvVGZe qeEJjrr+clLN+7Nwer4E4zsLEpBJgVFxF+OOOh3wy4SfpV1LQ52HJbbM39uzmpGJDdGP O1WzY1CEKBFLr2ZTxf4q6mVDSxVAMUfiwmddSk6KlhoPPtejrzeNZqeVrWMhkpf0R4rM pG+Q== X-Gm-Message-State: ALoCoQkEH3E38pdMRDhzQqBNyKhU9tZFe6gjs5XyeCkxGrOPTRwQdQpJYPSDggYF/3qHUpPc7n8P X-Received: by 10.182.97.136 with SMTP id ea8mr6816120obb.3.1397725711333; Thu, 17 Apr 2014 02:08:31 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.20.138 with SMTP id 10ls929796qgj.92.gmail; Thu, 17 Apr 2014 02:08:31 -0700 (PDT) X-Received: by 10.58.55.170 with SMTP id t10mr726181vep.29.1397725711200; Thu, 17 Apr 2014 02:08:31 -0700 (PDT) Received: from mail-ve0-f169.google.com (mail-ve0-f169.google.com [209.85.128.169]) by mx.google.com with ESMTPS id v2si4342329vet.196.2014.04.17.02.08.31 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 17 Apr 2014 02:08:31 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.169; Received: by mail-ve0-f169.google.com with SMTP id pa12so182318veb.14 for ; Thu, 17 Apr 2014 02:08:31 -0700 (PDT) X-Received: by 10.58.187.78 with SMTP id fq14mr10626387vec.9.1397725711090; Thu, 17 Apr 2014 02:08:31 -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 ib8csp19340vcb; Thu, 17 Apr 2014 02:08:30 -0700 (PDT) X-Received: by 10.66.141.12 with SMTP id rk12mr14100882pab.152.1397725710276; Thu, 17 Apr 2014 02:08:30 -0700 (PDT) Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id ov9si12902791pbc.514.2014.04.17.02.08.29 for ; Thu, 17 Apr 2014 02:08:30 -0700 (PDT) Received-SPF: pass (google.com: domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Received: from mail.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id ABD0765E84; Thu, 17 Apr 2014 09:08:27 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by mail.openembedded.org (Postfix) with ESMTP id F127365D11 for ; Thu, 17 Apr 2014 09:08:23 +0000 (UTC) Received: by mail-wi0-f172.google.com with SMTP id hi2so2600609wib.17 for ; Thu, 17 Apr 2014 02:08:24 -0700 (PDT) X-Received: by 10.194.174.42 with SMTP id bp10mr1120491wjc.57.1397725704149; Thu, 17 Apr 2014 02:08:24 -0700 (PDT) Received: from localhost ([2001:610:612:0:2ad2:44ff:fe4b:bc17]) by mx.google.com with ESMTPSA id wl6sm38146825wjb.3.2014.04.17.02.08.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Apr 2014 02:08:23 -0700 (PDT) From: Koen Kooi To: openembedded-core@lists.openembedded.org Date: Thu, 17 Apr 2014 11:07:37 +0200 Message-Id: <1397725659-9004-1-git-send-email-koen.kooi@linaro.org> X-Mailer: git-send-email 1.9.0 Cc: Koen Kooi Subject: [OE-core] [PATCH 1/3] git: fix perl binding installation X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-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: 209.85.128.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) 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. Fix the problem at the source so that Git.pm ends up in the correct dir *and* doesn't get deleted. The perl.mak file gets updated during the regular do_install, so add an extra make install step to install the *.pm files to the correct directory. This is the first step in making git-perltools actually work. Signed-off-by: Koen Kooi --- meta/recipes-devtools/git/git.inc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc index f5013f1..888b2a5 100644 --- a/meta/recipes-devtools/git/git.inc +++ b/meta/recipes-devtools/git/git.inc @@ -28,10 +28,16 @@ do_install () { template_dir=${datadir}/git-core/templates \ GIT_PYTHON_DIR=${D}${datadir}/git-core/python + sed -i -e 's#${STAGING_BINDIR_NATIVE}/perl-native/#${bindir}/#' \ + -e 's#${STAGING_LIBDIR_NATIVE}/#${libdir}/#' \ + -e 's#/lib/perl-native#/lib#g' \ + ${S}/perl/perl.mak + + cd ${S}/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. rm -rf ${D}${exec_prefix}/lib/perl-native - rmdir ${D}${exec_prefix}/lib || true } PERLSEDFIXUP = " \ @@ -75,6 +81,7 @@ PERLTOOLS = " \ PACKAGES =+ "${PN}-perltools" FILES_${PN}-perltools += " \ ${PERLTOOLS} \ + ${prefix}/lib/perl \ ${datadir}/perl \ " RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path findutils"