From 04c8925dede9a28f71ff1b8d87c1927dccca6f91 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 2 Oct 2014 18:29:41 +0200 Subject: [PATCH] meta-digi-dey: remove poky references from DEY distro We used to have these poky references to make 'adt-installer' happy when built using DISTRO=dey. But this has side effects on the standalone toolchain created with 'populate_sdk'. The standalone toolchain installer has: * default install path referring to poky instead of dey * default toolchain version not matching our DEY version This is misleading for customers, so rework the distro config file prioritizing the standalone toolchain over the adt-installer. https://jira.digi.com/browse/DEL-1003 Signed-off-by: Javier Viguera --- meta-digi-dey/conf/distro/dey.conf | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta-digi-dey/conf/distro/dey.conf b/meta-digi-dey/conf/distro/dey.conf index 15c4df8b7..ccfb6bc54 100644 --- a/meta-digi-dey/conf/distro/dey.conf +++ b/meta-digi-dey/conf/distro/dey.conf @@ -2,9 +2,8 @@ DISTRO = "dey" DISTRO_NAME = "Digi Embedded for Yocto" DISTRO_VERSION = "1.6.2" DISTRO_CODENAME = "daisy" -SDK_DISTRO = "poky" -SDK_VENDOR = "-pokysdk" -SDK_VERSION := "1.6" +SDK_VENDOR = "-deysdk" +SDK_VERSION := "${@'${DISTRO_VERSION}'}" MAINTAINER = "Digi Support " @@ -51,7 +50,7 @@ PREFERRED_VERSION_linux-yocto_qemumips64 ?= "3.14%" PREFERRED_VERSION_linux-yocto_qemuppc ?= "3.14%" SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${IMAGE_BASENAME}-${TUNE_PKGARCH}" -SDKPATH = "/opt/${SDK_DISTRO}/${SDK_VERSION}" +SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}" EXTRAOPKGCONFIG = "poky-feed-config-opkg"