* [PATCH 0/1] Remove the hard coded url in adt-installer
@ 2011-08-19 5:21 Lianhao Lu
2011-08-19 5:21 ` [PATCH 1/1] adt-installer: Removed the hard coded repo url Lianhao Lu
2011-08-24 3:44 ` [PATCH 0/1] Remove the hard coded url in adt-installer Saul Wold
0 siblings, 2 replies; 3+ messages in thread
From: Lianhao Lu @ 2011-08-19 5:21 UTC (permalink / raw)
To: openembedded-core
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(-)
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH 1/1] adt-installer: Removed the hard coded repo url.
2011-08-19 5:21 [PATCH 0/1] Remove the hard coded url in adt-installer Lianhao Lu
@ 2011-08-19 5:21 ` Lianhao Lu
2011-08-24 3:44 ` [PATCH 0/1] Remove the hard coded url in adt-installer Saul Wold
1 sibling, 0 replies; 3+ messages in thread
From: Lianhao Lu @ 2011-08-19 5:21 UTC (permalink / raw)
To: openembedded-core
[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.0.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 0/1] Remove the hard coded url in adt-installer
2011-08-19 5:21 [PATCH 0/1] Remove the hard coded url in adt-installer Lianhao Lu
2011-08-19 5:21 ` [PATCH 1/1] adt-installer: Removed the hard coded repo url Lianhao Lu
@ 2011-08-24 3:44 ` Saul Wold
1 sibling, 0 replies; 3+ messages in thread
From: Saul Wold @ 2011-08-24 3:44 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 08/18/2011 10:21 PM, Lianhao Lu wrote:
> 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(-)
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
Merged into OE-Core
Thanks
Sau!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-08-24 3:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-19 5:21 [PATCH 0/1] Remove the hard coded url in adt-installer Lianhao Lu
2011-08-19 5:21 ` [PATCH 1/1] adt-installer: Removed the hard coded repo url Lianhao Lu
2011-08-24 3:44 ` [PATCH 0/1] Remove the hard coded url in adt-installer Saul Wold
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox