Skip to contentSkip to conversation

Remove the hard coded url in adt-installer

PATCH Applied Lianhao Lu 2 participants 3 messages Aug 19, 2011 – Aug 24, 2011

lore
Share & tools
lore

Lianhao Lu

author
#0 lore raw

cover Remove the hard coded url in adt-installer

This patch fixed the bug #1380. It removed the hard coded url in the opkg configuration files included in the adt-installer.

The following changes since commit 2e83e6755441cb14bd907d306974338c15173189:
Darren Hart (1):
kernel: restore crtsavres.o to enable building external modules on powerpc

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib llu/bug1380
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=llu/bug1380

Lianhao Lu (1):
adt-installer: Removed the hard coded repo url.

 .../adt-installer/opkg/conf/opkg-sdk-i686.conf     |    2 +-
 .../adt-installer/opkg/conf/opkg-sdk-x86_64.conf   |    2 +-
 .../installer/adt-installer_1.0.bb                 |    5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)
author
#1 lore raw

PATCH 1/1 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 <[email protected]>
---
 .../adt-installer/opkg/conf/opkg-sdk-i686.conf     |    2 +-
 .../adt-installer/opkg/conf/opkg-sdk-x86_64.conf   |    2 +-
 .../installer/adt-installer_1.0.bb                 |    5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)
meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-i686.conf +1 -1
index 9c93a72..71c62e8 100644
@@ -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
meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-x86_64.conf +1 -1
index 3e70aac..f0d0634 100644
@@ -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
meta/recipes-devtools/installer/adt-installer_1.0.bb +4 -1
index 0537440..74e1b9f 100644
@@ -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}/
Signature · 1 line
1.7.0.4
Applied
#2 lore raw
In reply to Lianhao Lu
Quoted 20 lines · Lianhao Lu

This patch fixed the bug #1380. It removed the hard coded url in the opkg configuration files included in the adt-installer.

The following changes since commit 2e83e6755441cb14bd907d306974338c15173189:
Darren Hart (1):
kernel: restore crtsavres.o to enable building external modules on powerpc

are available in the git repository at:

   git://git.yoctoproject.org/poky-contrib llu/bug1380
   http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=llu/bug1380

Lianhao Lu (1):
adt-installer: Removed the hard coded repo url.

  .../adt-installer/opkg/conf/opkg-sdk-i686.conf     |    2 +-
  .../adt-installer/opkg/conf/opkg-sdk-x86_64.conf   |    2 +-
  .../installer/adt-installer_1.0.bb                 |    5 ++++-
  3 files changed, 6 insertions(+), 3 deletions(-)
Quoted 5 lines

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Merged into OE-Core

Thanks
Sau!