From de5be32935090f8b9cd305cbb7e031c105d03463 Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Thu, 23 May 2013 18:05:55 +0200 Subject: [PATCH] Distro configuration: Allow to use the standard Yocto ADT installer. The ADT installer compiled from "bitbake adt-installer" needs qemu images available at adtrepo.yoctoproject.org/$VERSION. To avoid having to deploy an adtrepo ourselves, we need to change the distro version to the upstream version. There are further problems with the ADT installation that need to change the SDK_VENDOR to the poky default of pokysdk and to have the SDKPATH also with the default value. With this change the adt-installer is installed without errors. https://jira.digi.com/browse/DEL-478 Signed-off-by: Alex Gonzalez --- meta-digi-dbl/conf/distro/dbl.conf | 7 ++++--- meta-digi-del/conf/distro/del.conf | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/meta-digi-dbl/conf/distro/dbl.conf b/meta-digi-dbl/conf/distro/dbl.conf index 5c6a9a2f8..25a0f8107 100644 --- a/meta-digi-dbl/conf/distro/dbl.conf +++ b/meta-digi-dbl/conf/distro/dbl.conf @@ -1,7 +1,8 @@ DISTRO = "dbl" +SDK_DISTRO="poky" DISTRO_NAME = "Digi Boxed Linux" -DISTRO_VERSION = "1.0.0" -SDK_VENDOR = "-dbl" +DISTRO_VERSION = "1.3.2" +SDK_VENDOR = "-pokysdk" SDK_VERSION := "${DISTRO_VERSION}" MAINTAINER = "Digi Support " @@ -33,7 +34,7 @@ PREFERRED_VERSION_linux-yocto_qemumips ?= "3.4%" PREFERRED_VERSION_linux-yocto_qemuppc ?= "3.4%" SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${TARGET_ARCH}" -SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}" +SDKPATH = "/opt/${SDK_DISTRO}/${SDK_VERSION}" EXTRAOPKGCONFIG = "poky-feed-config-opkg" diff --git a/meta-digi-del/conf/distro/del.conf b/meta-digi-del/conf/distro/del.conf index 7304053f1..8400fc532 100644 --- a/meta-digi-del/conf/distro/del.conf +++ b/meta-digi-del/conf/distro/del.conf @@ -1,7 +1,8 @@ DISTRO = "del" +SDK_DISTRO="poky" DISTRO_NAME = "Digi Embedded Linux" -DISTRO_VERSION = "1.0.0" -SDK_VENDOR = "-del" +DISTRO_VERSION = "1.3.2" +SDK_VENDOR = "-pokysdk" SDK_VERSION := "${DISTRO_VERSION}" MAINTAINER = "Digi Support " @@ -38,7 +39,7 @@ PREFERRED_VERSION_linux-yocto_qemumips ?= "3.4%" PREFERRED_VERSION_linux-yocto_qemuppc ?= "3.4%" SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${TARGET_ARCH}" -SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}" +SDKPATH = "/opt/${SDK_DISTRO}/${SDK_VERSION}" EXTRAOPKGCONFIG = "poky-feed-config-opkg"