summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLianhao Lu <lianhao.lu@intel.com>2011-08-19 13:14:27 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-23 18:23:32 -0700
commit44038166253b9be43748ba2dded7edadd9d1e4f9 (patch)
tree02b4cd5bdfec00bcfe1d6dcbae4b4e7923c4fb3f
parent67f5a955b0cba8e2ddb5c8b6f81f9532a4eeedf5 (diff)
downloadpoky-44038166253b9be43748ba2dded7edadd9d1e4f9.tar.gz
adt-installer: Removed the hard coded repo url.
[YOCTO #1380] Removed the hard coded repo url in opkg configuration files. (From OE-Core rev: 125eae393a3448e1ff5f3c2cf782ed7b3aa23920) Signed-off-by: Lianhao Lu <lianhao.lu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-i686.conf2
-rw-r--r--meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-x86_64.conf2
-rw-r--r--meta/recipes-devtools/installer/adt-installer_1.0.bb5
3 files changed, 6 insertions, 3 deletions
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 9c93a72a87..71c62e882e 100644
--- 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
2arch any 6 2arch any 6
3arch noarch 11 3arch noarch 11
4arch i686-nativesdk 16 4arch i686-nativesdk 16
5src yp-i686-nativesdk http://adtrepo.yoctoproject.org/1.0/adt-ipk/i686-nativesdk 5src 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 3e70aac9f0..f0d0634ab4 100644
--- 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
2arch any 6 2arch any 6
3arch noarch 11 3arch noarch 11
4arch x86_64-nativesdk 16 4arch x86_64-nativesdk 16
5src yp-x86_64-nativesdk http://adtrepo.yoctoproject.org/1.0/adt-ipk/x86_64-nativesdk 5src 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 0537440a6f..74e1b9f2ba 100644
--- 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"
31PACKAGES = "" 31PACKAGES = ""
32PACKAGE_ARCH = "all" 32PACKAGE_ARCH = "all"
33 33
34PR = "r3" 34PR = "r4"
35 35
36ADT_DEPLOY = "${TMPDIR}/deploy/sdk/" 36ADT_DEPLOY = "${TMPDIR}/deploy/sdk/"
37ADT_DIR = "${WORKDIR}/adt-installer/" 37ADT_DIR = "${WORKDIR}/adt-installer/"
@@ -54,6 +54,8 @@ SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \
54 file://opkg/conf/opkg-sdk-i686.conf \ 54 file://opkg/conf/opkg-sdk-i686.conf \
55 " 55 "
56 56
57ADTREPO = "http://adtrepo.yoctoproject.org/${SDK_VERSION}"
58
57do_deploy[umask] = 022 59do_deploy[umask] = 022
58 60
59fakeroot do_deploy () { 61fakeroot do_deploy () {
@@ -63,6 +65,7 @@ fakeroot do_deploy () {
63 rm -rf ${ADT_DIR} 65 rm -rf ${ADT_DIR}
64 mkdir -p ${ADT_DIR}/opkg/build 66 mkdir -p ${ADT_DIR}/opkg/build
65 cp -r opkg ${ADT_DIR}/ 67 cp -r opkg ${ADT_DIR}/
68 sed -i -e 's#ADTREPO_URL#${ADTREPO}#' ${ADT_DIR}/opkg/conf/*.conf
66 cp -r trunk ${ADT_DIR}/opkg/build/ 69 cp -r trunk ${ADT_DIR}/opkg/build/
67 mv ${ADT_DIR}/opkg/build/trunk ${ADT_DIR}/opkg/build/opkg-svn 70 mv ${ADT_DIR}/opkg/build/trunk ${ADT_DIR}/opkg/build/opkg-svn
68 cp -r scripts ${ADT_DIR}/ 71 cp -r scripts ${ADT_DIR}/