adt-installer: Removed the hard coded repo url.

[YOCTO #1380] Removed the hard coded repo url in opkg configuration
files.

Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>

diff --git a/meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-i686.conf b/meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-i686.conf
index 9c93a72a87bf8011e6d58e03edf1e422ccb05e83..71c62e882e8a092ae71888edc1aeb0e040c533d6 100644 (file)
--- a/meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-i686.conf
+++ b/meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-i686.conf
@@ -2,4 +2,4 @@ arch all 1
 arch any 6
 arch noarch 11
 arch i686-nativesdk 16
-src yp-i686-nativesdk http://adtrepo.yoctoproject.org/1.0/adt-ipk/i686-nativesdk
+src yp-i686-nativesdk ADTREPO_URL/adt-ipk/i686-nativesdk

diff --git a/meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-x86_64.conf b/meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-x86_64.conf
index 3e70aac9f0c7240b3265aea7e6db7cfb6a630cfa..f0d0634ab4e549b69bd385c4e7934b16d2261e0f 100644 (file)
--- a/meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-x86_64.conf
+++ b/meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-x86_64.conf
@@ -2,4 +2,4 @@ arch all 1
 arch any 6
 arch noarch 11
 arch x86_64-nativesdk 16
-src yp-x86_64-nativesdk http://adtrepo.yoctoproject.org/1.0/adt-ipk/x86_64-nativesdk
+src yp-x86_64-nativesdk ADTREPO_URL/adt-ipk/x86_64-nativesdk

diff --git a/meta/recipes-devtools/installer/adt-installer_1.0.bb b/meta/recipes-devtools/installer/adt-installer_1.0.bb
index 0537440a6fedc393730b3503ff75615a42c4db4b..74e1b9f2ba1157bd82030f88fd8dbfdb9b76b30d 100644 (file)
--- a/meta/recipes-devtools/installer/adt-installer_1.0.bb
+++ b/meta/recipes-devtools/installer/adt-installer_1.0.bb
@@ -31,7 +31,7 @@ ALLOW_EMPTY = "1"
 PACKAGES = ""
 PACKAGE_ARCH = "all"
 
-PR = "r3"
+PR = "r4"
 
 ADT_DEPLOY = "${TMPDIR}/deploy/sdk/"
 ADT_DIR = "${WORKDIR}/adt-installer/"
@@ -54,6 +54,8 @@ SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \
            file://opkg/conf/opkg-sdk-i686.conf \
          "
 
+ADTREPO = "http://adtrepo.yoctoproject.org/${SDK_VERSION}"
+
 do_deploy[umask] = 022
 
 fakeroot do_deploy () {
@@ -63,6 +65,7 @@ fakeroot do_deploy () {
        rm -rf ${ADT_DIR}
        mkdir -p ${ADT_DIR}/opkg/build
        cp -r opkg ${ADT_DIR}/
+       sed -i -e 's#ADTREPO_URL#${ADTREPO}#' ${ADT_DIR}/opkg/conf/*.conf
        cp -r trunk ${ADT_DIR}/opkg/build/
        mv ${ADT_DIR}/opkg/build/trunk ${ADT_DIR}/opkg/build/opkg-svn
        cp -r scripts ${ADT_DIR}/