Re: [PATCH] unshallow-repositories: Fix for 64-bit nativesdk

From: Denys Dmytriyenko <denys@ti.com>
To: Jacob Stiffler <j-stiffler@ti.com>
Cc: meta-arago@arago-project.org
Subject: Re: [PATCH] unshallow-repositories: Fix for 64-bit nativesdk
Date: Wed, 14 Oct 2015 13:30:35 -0400	[thread overview]
Message-ID: <20151014173035.GN28164@edge> (raw)
In-Reply-To: <561D4C13.80700@ti.com>

On Tue, Oct 13, 2015 at 02:23:15PM -0400, Jacob Stiffler wrote:
> 
> 
> On 10/13/2015 1:21 PM, Denys Dmytriyenko wrote:
> >On Fri, Oct 09, 2015 at 09:47:00AM -0400, Jacob Stiffler wrote:
> >>* Use SDKMACHINE to obtain the location of the nativesdk git
> >>   executable.
> >>
> >>Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
> >>---
> >>  .../unshallow-repositories/unshallow-repositories.sh                 | 2 +-
> >>  .../unshallow-repositories/unshallow-repositories_1.0.bb             | 5 ++++-
> >>  2 files changed, 5 insertions(+), 2 deletions(-)
> >>
> >>diff --git a/meta-arago-distro/recipes-tisdk/unshallow-repositories/unshallow-repositories/unshallow-repositories.sh b/meta-arago-distro/recipes-tisdk/unshallow-repositories/unshallow-repositories/unshallow-repositories.sh
> >>index f20a9b5..61bdb88 100755
> >>--- a/meta-arago-distro/recipes-tisdk/unshallow-repositories/unshallow-repositories/unshallow-repositories.sh
> >>+++ b/meta-arago-distro/recipes-tisdk/unshallow-repositories/unshallow-repositories/unshallow-repositories.sh
> >>@@ -35,7 +35,7 @@
> >>  install_dir="__SDK_INSTALL_DIR__"
> >>  # Find git binary within the host native bin directory
> >>-sdk_git_bin="$install_dir/linux-devkit/sysroots/i*/usr/bin/git"
> >.../linux-devkit/sysroots/*86*-linux/usr/bin/git ?
> 
> That should work too. If that method is preferred, I'll send out a v2.

It's not that it's preferred, but that is what tisdk-image.bbclass uses now. 
Either way is fine - your way is more robust, but is limited to a specific 
devkit sysroot. If that's fine with you, I can push it as is.

> >>+sdk_git_bin="$install_dir/linux-devkit/sysroots/__SDKMACHINE__*/usr/bin/git"
> >>  sdk_git_bin=`which $sdk_git_bin`
> >>  if [ "$sdk_git_bin" = "" ]
> >>diff --git a/meta-arago-distro/recipes-tisdk/unshallow-repositories/unshallow-repositories_1.0.bb b/meta-arago-distro/recipes-tisdk/unshallow-repositories/unshallow-repositories_1.0.bb
> >>index f1ea414..12fd4f2 100644
> >>--- a/meta-arago-distro/recipes-tisdk/unshallow-repositories/unshallow-repositories_1.0.bb
> >>+++ b/meta-arago-distro/recipes-tisdk/unshallow-repositories/unshallow-repositories_1.0.bb
> >>@@ -4,12 +4,15 @@ LIC_FILES_CHKSUM = "file://../unshallow-repositories.sh;beginline=3;endline=19;m
> >>  SRC_URI = "file://unshallow-repositories.sh"
> >>-PR = "r0"
> >>+PR = "r1"
> >>  do_install () {
> >>      install -d ${D}/
> >>      install -d ${D}/bin
> >>      install -m 0755 ${WORKDIR}/unshallow-repositories.sh ${D}/bin
> >>+
> >>+    sed -i -e "s|__SDKMACHINE__|${SDKMACHINE}|g" \
> >>+        ${D}/bin/unshallow-repositories.sh
> >>  }
> >>  FILES_${PN} = "/*"
> >>-- 
> >>1.9.1
> >>
> >>_______________________________________________
> >>meta-arago mailing list
> >>meta-arago@arago-project.org
> >>http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> 