From: Saul Wold <sgw@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [CONSOLIDATED PULL 08/19] adt-installer: Removed the hard coded repo url.
Date: Mon, 22 Aug 2011 14:51:53 -0700 [thread overview]
Message-ID: <1435f5d0261dd085c911c9964e16a3ba2f4e459a.1314043945.git.sgw@linux.intel.com> (raw)
In-Reply-To: <cover.1314043945.git.sgw@linux.intel.com>
In-Reply-To: <cover.1314043945.git.sgw@linux.intel.com>
From: Lianhao Lu <lianhao.lu@intel.com>
[YOCTO #1380] Removed the hard coded repo url in opkg configuration
files.
Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
---
.../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(-)
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 9c93a72..71c62e8 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
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 3e70aac..f0d0634 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
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 0537440..74e1b9f 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"
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}/
--
1.7.6
next prev parent reply other threads:[~2011-08-22 21:56 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-22 21:51 [CONSOLIDATED PULL 00/19] various fixes and updates Saul Wold
2011-08-22 21:51 ` [CONSOLIDATED PULL 01/19] tune: add missing closing quote to arch-armv7a.inc for AVAILTUNES Saul Wold
2011-08-22 21:51 ` [CONSOLIDATED PULL 02/19] tune: remove thumb flag from non-thumb cortexa8 tune variables Saul Wold
2011-08-22 21:51 ` [CONSOLIDATED PULL 03/19] tune: Add hard floating point variants of cortexa8 tunes Saul Wold
2011-08-23 9:30 ` Phil Blundell
2011-08-23 18:19 ` Darren Hart
2011-08-24 10:46 ` Phil Blundell
2011-08-22 21:51 ` [CONSOLIDATED PULL 04/19] recipes: Delete patch=1, its default and replace pnum with striplevel Saul Wold
2011-08-22 21:51 ` [CONSOLIDATED PULL 05/19] libpcre: the generated libtool uses HOST_SYS Saul Wold
2011-08-22 21:51 ` [CONSOLIDATED PULL 06/19] rpm: be certain we don't prefix our binaries Saul Wold
2011-08-22 21:51 ` [CONSOLIDATED PULL 07/19] image_types_uboot: add uboot mkimage fs types Saul Wold
2011-08-22 21:51 ` Saul Wold [this message]
2011-08-22 21:51 ` [CONSOLIDATED PULL 09/19] at: fix RDEPENDS -> RDEPENDS_${PN} Saul Wold
2011-08-22 21:51 ` [CONSOLIDATED PULL 10/19] linux-yocto: move more default values into linux-yocto.inc Saul Wold
2011-08-22 21:51 ` [CONSOLIDATED PULL 11/19] linux-yocto: update SRCREVs for 3.0.3 Saul Wold
2011-08-22 21:51 ` [CONSOLIDATED PULL 12/19] bitbake meta-toolchain with gcc 4.5.1 failed Saul Wold
2011-08-22 21:51 ` [CONSOLIDATED PULL 13/19] Use OECORE_DISTRO_VERSION instead of POKY_DISTRO_VERSION Saul Wold
2011-08-22 21:51 ` [CONSOLIDATED PULL 14/19] kernel.bbclass: save kernel image name into $kerneldir Saul Wold
2011-08-22 21:52 ` [CONSOLIDATED PULL 15/19] scripts/runqemu: add support to pass bootparams to kernel Saul Wold
2011-08-22 21:52 ` [CONSOLIDATED PULL 16/19] scripts/combo-layer: fix configuration file handling Saul Wold
2011-08-22 21:52 ` [CONSOLIDATED PULL 17/19] libsdl: do not inherit nativesdk Saul Wold
2011-08-22 21:52 ` [CONSOLIDATED PULL 18/19] task-core-x11-sato: add libsdl into sato image Saul Wold
2011-08-22 21:52 ` [CONSOLIDATED PULL 19/19] utils.bbclass: skip empty paths when handling FILESEXTRAPATHS Saul Wold
2011-08-24 1:26 ` [CONSOLIDATED PULL 00/19] various fixes and updates Richard Purdie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1435f5d0261dd085c911c9964e16a3ba2f4e459a.1314043945.git.sgw@linux.intel.com \
--to=sgw@linux.intel.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox