From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga01.intel.com ([192.55.52.88]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1QvcUM-0006ye-EJ for openembedded-core@lists.openembedded.org; Mon, 22 Aug 2011 23:56:58 +0200 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 22 Aug 2011 14:52:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.68,265,1312182000"; d="scan'208";a="43970266" Received: from unknown (HELO swold-MOBL.lan) ([10.255.13.234]) by fmsmga001.fm.intel.com with ESMTP; 22 Aug 2011 14:52:11 -0700 From: Saul Wold To: openembedded-core@lists.openembedded.org Date: Mon, 22 Aug 2011 14:51:53 -0700 Message-Id: <1435f5d0261dd085c911c9964e16a3ba2f4e459a.1314043945.git.sgw@linux.intel.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: References: In-Reply-To: References: Subject: [CONSOLIDATED PULL 08/19] adt-installer: Removed the hard coded repo url. X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Aug 2011 21:56:59 -0000 From: Lianhao Lu [YOCTO #1380] Removed the hard coded repo url in opkg configuration files. Signed-off-by: Lianhao Lu --- .../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