* [PATCH] tisdk-image: Use "TOOLCHAIN_SUFFIX" to find devkit
@ 2015-08-14 11:45 Jacob Stiffler
2015-08-18 20:57 ` Denys Dmytriyenko
0 siblings, 1 reply; 5+ messages in thread
From: Jacob Stiffler @ 2015-08-14 11:45 UTC (permalink / raw)
To: meta-arago
* Previously, the suffix was hard-coded to "-tisdk".
* keystone machines use "meta-arago-toolchain" for the devkit which
uses the suffix "-sdk"
* This caused one of the following to occur:
- In multi-machine builds, the SDK would use the devkit from another
machine
- For keystone-only builds, the SDK would fail as it could not find
the devkit.
Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
---
meta-arago-distro/classes/tisdk-image.bbclass | 7 ++++---
meta-arago-distro/recipes-core/images/arago-core-tisdk-image.inc | 2 ++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/meta-arago-distro/classes/tisdk-image.bbclass b/meta-arago-distro/classes/tisdk-image.bbclass
index 081040e..e5640bf 100644
--- a/meta-arago-distro/classes/tisdk-image.bbclass
+++ b/meta-arago-distro/classes/tisdk-image.bbclass
@@ -35,6 +35,7 @@ TISDK_TOOLCHAIN_PATH ?= "linux-devkit"
# meta toolchain recipe to build and package as part of the tisdk image
TISDK_TOOLCHAIN ?= "meta-toolchain-arago"
+TOOLCHAIN_SUFFIX ?= "-sdk"
# List of the type of target file system images we want to include
TARGET_IMAGE_TYPES ?= "tar.bz2 tar.gz ubi"
@@ -666,10 +667,10 @@ tisdk_image_setup () {
mkdir -p ${IMAGE_ROOTFS}/var/lib/opkg
mkdir -p ${IMAGE_ROOTFS}/lib
- chmod 755 ${DEPLOY_DIR}/sdk/${SDK_NAME}-${ARMPKGARCH}-${TARGET_OS}-tisdk*.sh
+ chmod 755 ${DEPLOY_DIR}/sdk/${SDK_NAME}-${ARMPKGARCH}-${TARGET_OS}${TOOLCHAIN_SUFFIX}*.sh
# Temporarily extract the toolchain sdk so we can read license information from it.
- echo "${IMAGE_ROOTFS}/${TISDK_TOOLCHAIN_PATH}" | ${DEPLOY_DIR}/sdk/${SDK_NAME}-${ARMPKGARCH}-${TARGET_OS}-tisdk*.sh
+ echo "${IMAGE_ROOTFS}/${TISDK_TOOLCHAIN_PATH}" | ${DEPLOY_DIR}/sdk/${SDK_NAME}-${ARMPKGARCH}-${TARGET_OS}${TOOLCHAIN_SUFFIX}*.sh
}
tisdk_image_build () {
@@ -787,7 +788,7 @@ tisdk_image_build () {
# Copy over the toolchain sdk installer an give it a simple name which
# matches the traditional name within the SDK.
- cp ${DEPLOY_DIR}/sdk/${SDK_NAME}-${ARMPKGARCH}-${TARGET_OS}-tisdk*.sh ${IMAGE_ROOTFS}/linux-devkit.sh
+ cp ${DEPLOY_DIR}/sdk/${SDK_NAME}-${ARMPKGARCH}-${TARGET_OS}${TOOLCHAIN_SUFFIX}*.sh ${IMAGE_ROOTFS}/linux-devkit.sh
# Copy the opkg.conf used by the image to allow for future updates
cp ${WORKDIR}/opkg.conf ${IMAGE_ROOTFS}/etc/
diff --git a/meta-arago-distro/recipes-core/images/arago-core-tisdk-image.inc b/meta-arago-distro/recipes-core/images/arago-core-tisdk-image.inc
index df6265d..aede390 100644
--- a/meta-arago-distro/recipes-core/images/arago-core-tisdk-image.inc
+++ b/meta-arago-distro/recipes-core/images/arago-core-tisdk-image.inc
@@ -31,8 +31,10 @@ TARGET_IMAGES = "arago-base-tisdk-image tisdk-rootfs-image"
TARGET_IMAGES_keystone = "arago-base-tisdk-image tisdk-server-rootfs-image"
TISDK_TOOLCHAIN = "meta-toolchain-arago-tisdk"
+TOOLCHAIN_SUFFIX = "-tisdk"
TISDK_TOOLCHAIN_keystone = "meta-toolchain-arago"
+TOOLCHAIN_SUFFIX_keystone = "-sdk"
IMAGE_INSTALL_QT = "\
packagegroup-arago-tisdk-qte-sdk-host \
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] tisdk-image: Use "TOOLCHAIN_SUFFIX" to find devkit
2015-08-14 11:45 [PATCH] tisdk-image: Use "TOOLCHAIN_SUFFIX" to find devkit Jacob Stiffler
@ 2015-08-18 20:57 ` Denys Dmytriyenko
2015-08-19 10:52 ` Jacob Stiffler
0 siblings, 1 reply; 5+ messages in thread
From: Denys Dmytriyenko @ 2015-08-18 20:57 UTC (permalink / raw)
To: Jacob Stiffler; +Cc: meta-arago
Jake,
This one didn't apply even on daisy - I didn't have much time to look at the
issue, but maybe you have an idea what's wrong?
--
Denys
On Fri, Aug 14, 2015 at 07:45:40AM -0400, Jacob Stiffler wrote:
> * Previously, the suffix was hard-coded to "-tisdk".
> * keystone machines use "meta-arago-toolchain" for the devkit which
> uses the suffix "-sdk"
> * This caused one of the following to occur:
> - In multi-machine builds, the SDK would use the devkit from another
> machine
> - For keystone-only builds, the SDK would fail as it could not find
> the devkit.
>
> Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
> ---
> meta-arago-distro/classes/tisdk-image.bbclass | 7 ++++---
> meta-arago-distro/recipes-core/images/arago-core-tisdk-image.inc | 2 ++
> 2 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/meta-arago-distro/classes/tisdk-image.bbclass b/meta-arago-distro/classes/tisdk-image.bbclass
> index 081040e..e5640bf 100644
> --- a/meta-arago-distro/classes/tisdk-image.bbclass
> +++ b/meta-arago-distro/classes/tisdk-image.bbclass
> @@ -35,6 +35,7 @@ TISDK_TOOLCHAIN_PATH ?= "linux-devkit"
>
> # meta toolchain recipe to build and package as part of the tisdk image
> TISDK_TOOLCHAIN ?= "meta-toolchain-arago"
> +TOOLCHAIN_SUFFIX ?= "-sdk"
>
> # List of the type of target file system images we want to include
> TARGET_IMAGE_TYPES ?= "tar.bz2 tar.gz ubi"
> @@ -666,10 +667,10 @@ tisdk_image_setup () {
> mkdir -p ${IMAGE_ROOTFS}/var/lib/opkg
> mkdir -p ${IMAGE_ROOTFS}/lib
>
> - chmod 755 ${DEPLOY_DIR}/sdk/${SDK_NAME}-${ARMPKGARCH}-${TARGET_OS}-tisdk*.sh
> + chmod 755 ${DEPLOY_DIR}/sdk/${SDK_NAME}-${ARMPKGARCH}-${TARGET_OS}${TOOLCHAIN_SUFFIX}*.sh
>
> # Temporarily extract the toolchain sdk so we can read license information from it.
> - echo "${IMAGE_ROOTFS}/${TISDK_TOOLCHAIN_PATH}" | ${DEPLOY_DIR}/sdk/${SDK_NAME}-${ARMPKGARCH}-${TARGET_OS}-tisdk*.sh
> + echo "${IMAGE_ROOTFS}/${TISDK_TOOLCHAIN_PATH}" | ${DEPLOY_DIR}/sdk/${SDK_NAME}-${ARMPKGARCH}-${TARGET_OS}${TOOLCHAIN_SUFFIX}*.sh
> }
>
> tisdk_image_build () {
> @@ -787,7 +788,7 @@ tisdk_image_build () {
>
> # Copy over the toolchain sdk installer an give it a simple name which
> # matches the traditional name within the SDK.
> - cp ${DEPLOY_DIR}/sdk/${SDK_NAME}-${ARMPKGARCH}-${TARGET_OS}-tisdk*.sh ${IMAGE_ROOTFS}/linux-devkit.sh
> + cp ${DEPLOY_DIR}/sdk/${SDK_NAME}-${ARMPKGARCH}-${TARGET_OS}${TOOLCHAIN_SUFFIX}*.sh ${IMAGE_ROOTFS}/linux-devkit.sh
>
> # Copy the opkg.conf used by the image to allow for future updates
> cp ${WORKDIR}/opkg.conf ${IMAGE_ROOTFS}/etc/
> diff --git a/meta-arago-distro/recipes-core/images/arago-core-tisdk-image.inc b/meta-arago-distro/recipes-core/images/arago-core-tisdk-image.inc
> index df6265d..aede390 100644
> --- a/meta-arago-distro/recipes-core/images/arago-core-tisdk-image.inc
> +++ b/meta-arago-distro/recipes-core/images/arago-core-tisdk-image.inc
> @@ -31,8 +31,10 @@ TARGET_IMAGES = "arago-base-tisdk-image tisdk-rootfs-image"
> TARGET_IMAGES_keystone = "arago-base-tisdk-image tisdk-server-rootfs-image"
>
> TISDK_TOOLCHAIN = "meta-toolchain-arago-tisdk"
> +TOOLCHAIN_SUFFIX = "-tisdk"
>
> TISDK_TOOLCHAIN_keystone = "meta-toolchain-arago"
> +TOOLCHAIN_SUFFIX_keystone = "-sdk"
>
> IMAGE_INSTALL_QT = "\
> packagegroup-arago-tisdk-qte-sdk-host \
> --
> 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] tisdk-image: Use "TOOLCHAIN_SUFFIX" to find devkit
2015-08-18 20:57 ` Denys Dmytriyenko
@ 2015-08-19 10:52 ` Jacob Stiffler
2015-08-19 17:19 ` Denys Dmytriyenko
0 siblings, 1 reply; 5+ messages in thread
From: Jacob Stiffler @ 2015-08-19 10:52 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: meta-arago
On 8/18/2015 4:57 PM, Denys Dmytriyenko wrote:
> Jake,
>
> This one didn't apply even on daisy - I didn't have much time to look at the
> issue, but maybe you have an idea what's wrong?
>
Denys,
I developed this patch in the fido context, and should apply cleanly on
the master branch.
On fido, there is the commit 1ed881223402fdb1ab7f4ffe444d8b4e7f67cb34 to
make the SDK filter stricter. This has not been implemented on daisy,
and causes the patch to fail.
- Jake
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] tisdk-image: Use "TOOLCHAIN_SUFFIX" to find devkit
2015-08-19 10:52 ` Jacob Stiffler
@ 2015-08-19 17:19 ` Denys Dmytriyenko
2015-08-19 18:45 ` Jacob Stiffler
0 siblings, 1 reply; 5+ messages in thread
From: Denys Dmytriyenko @ 2015-08-19 17:19 UTC (permalink / raw)
To: Jacob Stiffler; +Cc: meta-arago
On Wed, Aug 19, 2015 at 06:52:00AM -0400, Jacob Stiffler wrote:
>
>
> On 8/18/2015 4:57 PM, Denys Dmytriyenko wrote:
> >Jake,
> >
> >This one didn't apply even on daisy - I didn't have much time to look at the
> >issue, but maybe you have an idea what's wrong?
> >
>
>
> Denys,
>
> I developed this patch in the fido context, and should apply cleanly
> on the master branch.
>
> On fido, there is the commit
> 1ed881223402fdb1ab7f4ffe444d8b4e7f67cb34 to make the SDK filter
> stricter. This has not been implemented on daisy, and causes the
> patch to fail.
Do you need this fixed in daisy?
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] tisdk-image: Use "TOOLCHAIN_SUFFIX" to find devkit
2015-08-19 17:19 ` Denys Dmytriyenko
@ 2015-08-19 18:45 ` Jacob Stiffler
0 siblings, 0 replies; 5+ messages in thread
From: Jacob Stiffler @ 2015-08-19 18:45 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: meta-arago
On 8/19/2015 1:19 PM, Denys Dmytriyenko wrote:
> On Wed, Aug 19, 2015 at 06:52:00AM -0400, Jacob Stiffler wrote:
>>
>> On 8/18/2015 4:57 PM, Denys Dmytriyenko wrote:
>>> Jake,
>>>
>>> This one didn't apply even on daisy - I didn't have much time to look at the
>>> issue, but maybe you have an idea what's wrong?
>>>
>>
>> Denys,
>>
>> I developed this patch in the fido context, and should apply cleanly
>> on the master branch.
>>
>> On fido, there is the commit
>> 1ed881223402fdb1ab7f4ffe444d8b4e7f67cb34 to make the SDK filter
>> stricter. This has not been implemented on daisy, and causes the
>> patch to fail.
> Do you need this fixed in daisy?
No, though it shouldn't be hard to adapt this to daisy.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-08-19 18:45 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-14 11:45 [PATCH] tisdk-image: Use "TOOLCHAIN_SUFFIX" to find devkit Jacob Stiffler
2015-08-18 20:57 ` Denys Dmytriyenko
2015-08-19 10:52 ` Jacob Stiffler
2015-08-19 17:19 ` Denys Dmytriyenko
2015-08-19 18:45 ` 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.