diff options
| author | Elizabeth Flanagan <elizabeth.flanagan@intel.com> | 2012-09-05 21:35:31 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-05 23:27:31 +0100 |
| commit | 610f8c0c0cab8e258919689fd641faec28b58caf (patch) | |
| tree | 9dd10d10506f3fe61e4f6024c927ca0f7460c6f1 | |
| parent | 15a089fdc55faa0e2b14bb6ba019732e6608e2a5 (diff) | |
| download | openembedded-core-610f8c0c0cab8e258919689fd641faec28b58caf.tar.gz openembedded-core-610f8c0c0cab8e258919689fd641faec28b58caf.tar.bz2 openembedded-core-610f8c0c0cab8e258919689fd641faec28b58caf.zip | |
adt-installer: Allow changing YOCTOADT_REPO
YOCTOADT_REPO within adt-installer.conf was hardcoded to
http://adtrepo.yoctoproject.org/${SDK_VERSION}
This allows it to be overriden in local.conf by setting
ADTREPO = "http://adtrepo.yoctoproject.org/${SDK_VERSION}"
I'm also fixing a bad rm in do_populate_adt. The file name
that is being rm'd is wrong.
Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/installer/adt-installer/adt_installer.conf | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/installer/adt-installer_1.0.bb | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf index afc69a4e7c..171d2acc45 100644 --- a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf +++ b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf @@ -23,7 +23,7 @@ # Your yocto distro repository, this should include IPKG based packages and root filesystem files where the installation is based on -YOCTOADT_REPO="http://adtrepo.yoctoproject.org/YOCTOADT_VERSION" +YOCTOADT_REPO="ADTREPO" # The following are for system wide setup # Target architectures that you want to setup host cross dev environment for diff --git a/meta/recipes-devtools/installer/adt-installer_1.0.bb b/meta/recipes-devtools/installer/adt-installer_1.0.bb index becdef6274..3624dbc5d4 100644 --- a/meta/recipes-devtools/installer/adt-installer_1.0.bb +++ b/meta/recipes-devtools/installer/adt-installer_1.0.bb @@ -1,6 +1,6 @@ # Yocto ADT Installer bb file # -# Copyright 2010-2011 by Intel Corp. +# Copyright 2010-2012 by Intel Corp. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -30,7 +30,7 @@ ALLOW_EMPTY = "1" PACKAGES = "" -PR = "r10" +PR = "r11" ADT_DEPLOY = "${TMPDIR}/deploy/sdk/" ADT_DIR = "${WORKDIR}/adt-installer/" @@ -51,14 +51,14 @@ SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;protocol=http \ file://opkg/conf/opkg-sdk-i686.conf \ " -ADTREPO = "http://adtrepo.yoctoproject.org/${SDK_VERSION}" +ADTREPO ?= "http://adtrepo.yoctoproject.org/${SDK_VERSION}" do_populate_adt[umask] = "022" fakeroot do_populate_adt () { cd ${WORKDIR} mkdir -p ${ADT_DEPLOY} - rm -f ${ADT_DEPLOY}/adt-installer.tar.bz2 + rm -f ${ADT_DEPLOY}/adt_installer.tar.bz2 rm -rf ${ADT_DIR} mkdir -p ${ADT_DIR}/opkg/build cp -r opkg ${ADT_DIR}/ @@ -69,6 +69,7 @@ fakeroot do_populate_adt () { cp adt_installer ${ADT_DIR} cp adt_installer.conf ${ADT_DIR} sed -i -e 's#YOCTOADT_VERSION#${SDK_VERSION}#' ${ADT_DIR}/adt_installer.conf + sed -i -e 's#ADTREPO#${ADTREPO}#' ${ADT_DIR}/adt_installer.conf echo 'SDK_VENDOR=${SDK_VENDOR}' >> ${ADT_DIR}/scripts/data_define echo 'DEFAULT_INSTALL_FOLDER=${SDKPATH}' >> ${ADT_DIR}/scripts/data_define cp ${COREBASE}/scripts/relocate_sdk.py ${ADT_DIR}/scripts/ |