* [PATCH] unshallow-repositories: Fix for 64-bit nativesdk
@ 2015-10-09 13:47 Jacob Stiffler
2015-10-13 17:21 ` Denys Dmytriyenko
0 siblings, 1 reply; 5+ messages in thread
From: Jacob Stiffler @ 2015-10-09 13:47 UTC (permalink / raw)
To: meta-arago
* 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"
+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
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] unshallow-repositories: Fix for 64-bit nativesdk
2015-10-09 13:47 [PATCH] unshallow-repositories: Fix for 64-bit nativesdk Jacob Stiffler
@ 2015-10-13 17:21 ` Denys Dmytriyenko
2015-10-13 18:23 ` Jacob Stiffler
0 siblings, 1 reply; 5+ messages in thread
From: Denys Dmytriyenko @ 2015-10-13 17:21 UTC (permalink / raw)
To: Jacob Stiffler; +Cc: meta-arago
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 ?
> +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
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] unshallow-repositories: Fix for 64-bit nativesdk
2015-10-13 17:21 ` Denys Dmytriyenko
@ 2015-10-13 18:23 ` Jacob Stiffler
2015-10-14 17:30 ` Denys Dmytriyenko
0 siblings, 1 reply; 5+ messages in thread
From: Jacob Stiffler @ 2015-10-13 18:23 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: meta-arago
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.
>
>> +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
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] unshallow-repositories: Fix for 64-bit nativesdk
2015-10-13 18:23 ` Jacob Stiffler
@ 2015-10-14 17:30 ` Denys Dmytriyenko
2015-10-15 12:31 ` Jacob Stiffler
0 siblings, 1 reply; 5+ messages in thread
From: Denys Dmytriyenko @ 2015-10-14 17:30 UTC (permalink / raw)
To: Jacob Stiffler; +Cc: meta-arago
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
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] unshallow-repositories: Fix for 64-bit nativesdk
2015-10-14 17:30 ` Denys Dmytriyenko
@ 2015-10-15 12:31 ` Jacob Stiffler
0 siblings, 0 replies; 5+ messages in thread
From: Jacob Stiffler @ 2015-10-15 12:31 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: meta-arago
On 10/14/2015 1:30 PM, Denys Dmytriyenko wrote:
> 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.
I'll take your suggestion so that the script does not need to be updated
within the recipe.
>
>>>> +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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-10-15 12:31 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-09 13:47 [PATCH] unshallow-repositories: Fix for 64-bit nativesdk Jacob Stiffler
2015-10-13 17:21 ` Denys Dmytriyenko
2015-10-13 18:23 ` Jacob Stiffler
2015-10-14 17:30 ` Denys Dmytriyenko
2015-10-15 12:31 ` Jacob Stiffler
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.