* 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 <[email protected]>
---
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
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
