From patchwork Fri May 2 08:36:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koen Kooi X-Patchwork-Id: 29534 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f199.google.com (mail-ob0-f199.google.com [209.85.214.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D694D203F3 for ; Fri, 2 May 2014 08:37:27 +0000 (UTC) Received: by mail-ob0-f199.google.com with SMTP id gq1sf22370366obb.2 for ; Fri, 02 May 2014 01:37:27 -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=G53nkmMkEXKVe+TpSjVIsakFCzohqVnLjmFS8Jc+m1A=; b=f2zfG4daHAlojvhnl+Kr02f1tpQqiYI+BPTBX587Z2fGy9zqCkWDaj57PFw3+hyKWA JHVI2CwHei01GjzD7/N02ln29uVZbeNbHuhhQRGr7AHv4KdOoj/eqCpG9Aixr28f0HIF ogV8bvWIj1E1TS3WQZJJLJQGpYQNn1WxNehLnE/YbTqtgKdspsk6FvQHh0ygr8Q7Y3gf FFLG/2i+m98Xgc85DciUUX2g3JANEqmREv0OykyukliqxqfghlLg/8ZgrN5PRWIwFZ5j 0pCRMkV0b0gzMsdxtSp9/qbRfm+u0HWA4GbrzqBFR9jfQuVeEJ1ybOg3rIlFny7AHmiL hyWg== X-Gm-Message-State: ALoCoQknTyjwEzIgXcrT5QpaVc3mDNtKttSSU/aHMDRe4USZy1AmczgQ7bSvKWCUClP0DGa/5D7S X-Received: by 10.50.70.66 with SMTP id k2mr1204841igu.7.1399019846987; Fri, 02 May 2014 01:37:26 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.36.33 with SMTP id o30ls1352078qgo.23.gmail; Fri, 02 May 2014 01:37:26 -0700 (PDT) X-Received: by 10.221.20.199 with SMTP id qp7mr12609568vcb.24.1399019846859; Fri, 02 May 2014 01:37:26 -0700 (PDT) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id sc12si6588645veb.79.2014.05.02.01.37.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 02 May 2014 01:37:26 -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.180; Received: by mail-vc0-f180.google.com with SMTP id hq16so5145150vcb.11 for ; Fri, 02 May 2014 01:37:26 -0700 (PDT) X-Received: by 10.52.189.193 with SMTP id gk1mr10498531vdc.12.1399019846788; Fri, 02 May 2014 01:37:26 -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 ib8csp86096vcb; Fri, 2 May 2014 01:37:26 -0700 (PDT) X-Received: by 10.66.254.234 with SMTP id al10mr31758076pad.137.1399019845918; Fri, 02 May 2014 01:37:25 -0700 (PDT) Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id ck1si23503610pad.40.2014.05.02.01.37.25 for ; Fri, 02 May 2014 01:37:25 -0700 (PDT) Received-SPF: none (google.com: openembedded-core-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 EF8AA60781; Fri, 2 May 2014 08:37:11 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-we0-f175.google.com (mail-we0-f175.google.com [74.125.82.175]) by mail.openembedded.org (Postfix) with ESMTP id 43113606E0 for ; Fri, 2 May 2014 08:37:08 +0000 (UTC) Received: by mail-we0-f175.google.com with SMTP id q58so4172934wes.20 for ; Fri, 02 May 2014 01:37:09 -0700 (PDT) X-Received: by 10.194.24.194 with SMTP id w2mr12714000wjf.25.1399019829429; Fri, 02 May 2014 01:37:09 -0700 (PDT) Received: from localhost ([2001:610:612:0:5e51:4fff:fec8:7c15]) by mx.google.com with ESMTPSA id gi8sm2357502wib.8.2014.05.02.01.37.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 May 2014 01:37:08 -0700 (PDT) From: Koen Kooi To: openembedded-core@lists.openembedded.org Date: Fri, 2 May 2014 10:36:58 +0200 Message-Id: <1399019818-4767-1-git-send-email-koen.kooi@linaro.org> X-Mailer: git-send-email 1.9.0 Cc: Koen Kooi Subject: [OE-core] [PATCHv4] 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: 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"