* [PATCH 0/2] adt-installer cleanup for latest oecore changes
@ 2011-05-18 4:36 Jessica Zhang
2011-05-18 4:36 ` [PATCH 2/2] Add adt repo checking Jessica Zhang
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Jessica Zhang @ 2011-05-18 4:36 UTC (permalink / raw)
To: openembedded-core
From: Jessica Zhang <jessica.zhang@intel.com>
The change set includes extract bitbake config setting into data_define,
use config setting variables replace hardcode values, and add adt repo checking
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: jzhang/oe-rename
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jzhang/oe-rename
Thanks,
Jessica Zhang <jessica.zhang@intel.com>
---
Jessica Zhang (2):
extract bitbake config setting into data_define, use more variables
replacing hardcoded values
Add adt repo checking
.../installer/adt-installer/adt_installer | 15 +++++++++++++--
.../installer/adt-installer/adt_installer.conf | 2 +-
.../adt-installer/scripts/adt_installer_internal | 4 ++--
.../installer/adt-installer/scripts/data_define | 1 -
.../installer/adt-installer_1.0.bb | 4 +++-
5 files changed, 19 insertions(+), 7 deletions(-)
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH 2/2] Add adt repo checking
2011-05-18 4:36 [PATCH 0/2] adt-installer cleanup for latest oecore changes Jessica Zhang
@ 2011-05-18 4:36 ` Jessica Zhang
2011-05-18 4:36 ` [PATCH 1/2] extract bitbake config setting into data_define, use more variables replacing hardcoded values Jessica Zhang
2011-05-20 0:52 ` [PATCH 0/2] adt-installer cleanup for latest oecore changes Saul Wold
2 siblings, 0 replies; 4+ messages in thread
From: Jessica Zhang @ 2011-05-18 4:36 UTC (permalink / raw)
To: openembedded-core
From: Jessica Zhang <jessica.zhang@intel.com>
Signed-off-by: Jessica Zhang <jessica.zhang@intel.com>
---
.../installer/adt-installer/adt_installer | 13 ++++++++++++-
.../installer/adt-installer/adt_installer.conf | 2 +-
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer b/meta/recipes-devtools/installer/adt-installer/adt_installer
index 9336b9e..1dd07b7 100755
--- a/meta/recipes-devtools/installer/adt-installer/adt_installer
+++ b/meta/recipes-devtools/installer/adt-installer/adt_installer
@@ -228,7 +228,7 @@ if [ -f "$LOCAL_DOWNLOAD/$filename" ]; then
fi
fi
echo_info "Downloading file: $filename..."
-wget "$YOCTOADT_IPKG_REPO/$1" -P $LOCAL_DOWNLOAD --progress=bar:force 2>&1 | tee -a "$YOCTOADT_INSTALL_LOG_FILE"
+wget "$YOCTOADT_REPO/rootfs/$1" -P $LOCAL_DOWNLOAD --progress=bar:force 2>&1 | tee -a "$YOCTOADT_INSTALL_LOG_FILE"
}
@@ -339,6 +339,17 @@ user_inst_type="$?"
validate_config
check_result
+
+#check adt_repo exist
+wget $YOCTOADT_REPO 2>&1 | tee -a "$YOCTOADT_INSTALL_LOG_FILE"
+if grep -q "ERROR 404: Not Found" $YOCTOADT_INSTALL_LOG_FILE; then
+ echo -e "[ADT_INST] Error: YOCTOADT_REPO does not exist: $YOCTOADT_REPO"
+ echo -e "\n#############################################################################"
+ echo -e "# Meet error(s) when installing Yocto ADT! Please check log file for details. "
+ echo -e "#############################################################################\n"
+ exit -1
+fi
+
#firstly we need to install opkg host
install_opkg
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
index b518c53..0c93237 100644
--- a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
+++ b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
@@ -23,7 +23,7 @@
# Your yocto distro repository, this should include IPKG based packages and root filesystem files where the installation is based on
-YOCTOADT_IPKG_REPO="http://adtrepo.yoctoproject.org/$YOCTOADT_VERSION/rootfs"
+YOCTOADT_REPO="http://adtrepo.yoctoproject.org/$YOCTOADT_VERSION"
# The following are for system wide setup
# Target architectures that you want to setup host cross dev environment for
--
1.7.0.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 1/2] extract bitbake config setting into data_define, use more variables replacing hardcoded values
2011-05-18 4:36 [PATCH 0/2] adt-installer cleanup for latest oecore changes Jessica Zhang
2011-05-18 4:36 ` [PATCH 2/2] Add adt repo checking Jessica Zhang
@ 2011-05-18 4:36 ` Jessica Zhang
2011-05-20 0:52 ` [PATCH 0/2] adt-installer cleanup for latest oecore changes Saul Wold
2 siblings, 0 replies; 4+ messages in thread
From: Jessica Zhang @ 2011-05-18 4:36 UTC (permalink / raw)
To: openembedded-core
From: Jessica Zhang <jessica.zhang@intel.com>
Signed-off-by: Jessica Zhang <jessica.zhang@intel.com>
---
.../installer/adt-installer/adt_installer | 2 +-
.../installer/adt-installer/adt_installer.conf | 2 +-
.../adt-installer/scripts/adt_installer_internal | 4 ++--
.../installer/adt-installer/scripts/data_define | 1 -
.../installer/adt-installer_1.0.bb | 4 +++-
5 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer b/meta/recipes-devtools/installer/adt-installer/adt_installer
index ea36674..9336b9e 100755
--- a/meta/recipes-devtools/installer/adt-installer/adt_installer
+++ b/meta/recipes-devtools/installer/adt-installer/adt_installer
@@ -48,7 +48,7 @@ usage ()
echo_info "# Install Qemu:\t\t\t$YOCTOADT_QEMU"
echo_info "# Install NFS utilities:\t$YOCTOADT_NFS_UTIL"
#echo_info "# Install bitbake + UI:\t\t$YOCTOADT_BITBAKE"
- #echo_info "# Install poky metadata:\t$YOCTOADT_METADATA"
+ #echo_info "# Install metadata:\t$YOCTOADT_METADATA"
#echo_info "############################################################################\n"
echo_info "\n##############################################################################"
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
index d2af70d..b518c53 100644
--- a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
+++ b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
@@ -23,7 +23,7 @@
# Your yocto distro repository, this should include IPKG based packages and root filesystem files where the installation is based on
-YOCTOADT_IPKG_REPO="http://adtrepo.yoctoproject.org/1.0/rootfs"
+YOCTOADT_IPKG_REPO="http://adtrepo.yoctoproject.org/$YOCTOADT_VERSION/rootfs"
# The following are for system wide setup
# Target architectures that you want to setup host cross dev environment for
diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
index 8d4e01b..870931e 100755
--- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
+++ b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
@@ -29,11 +29,11 @@ parse_config()
case $INST_ARCH in
i[3-6]86)
OPKG_CONFIG_FILE=$YOCTOADT_OPKG_CONF_FILE_32
- OECORE_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/$INST_ARCH-${SDK_VENDOR}-linux/"
+ OECORE_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/$INST_ARCH$SDK_VENDOR-linux/"
;;
x86_64)
OPKG_CONFIG_FILE=$YOCTOADT_OPKG_CONF_FILE_64
- OECORE_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/x86_64-${SDK_VENDOR}-linux/"
+ OECORE_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/x86_64$SDK_VENDOR-linux/"
;;
*)
echo_info "[ADT_INST] Error: Installation Machine is not supported!"
diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/data_define b/meta/recipes-devtools/installer/adt-installer/scripts/data_define
index ca1d47c..2781e77 100644
--- a/meta/recipes-devtools/installer/adt-installer/scripts/data_define
+++ b/meta/recipes-devtools/installer/adt-installer/scripts/data_define
@@ -37,4 +37,3 @@ YOCTOADT_SUPPORTED_TARGETS="x86 x86_64 arm ppc mips"
# configuration files
YOCTOADT_OPKG_CONF_FILE_32="./opkg/conf/opkg-sdk-i686.conf"
YOCTOADT_OPKG_CONF_FILE_64="./opkg/conf/opkg-sdk-x86_64.conf"
-INSTALL_FOLDER=/opt/poky/$YOCTOADT_VERSION
diff --git a/meta/recipes-devtools/installer/adt-installer_1.0.bb b/meta/recipes-devtools/installer/adt-installer_1.0.bb
index 4a3e4de..8f6e91f 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 = "r0"
+PR = "r3"
ADT_DEPLOY = "${TMPDIR}/deploy/sdk/"
ADT_DIR = "${WORKDIR}/adt-installer/"
@@ -69,6 +69,8 @@ fakeroot do_deploy () {
echo 'YOCTOADT_VERSION=${SDK_VERSION}' > ${ADT_DIR}/temp.conf
cat ${ADT_DIR}/adt_installer.conf >> ${ADT_DIR}/temp.conf
mv ${ADT_DIR}/temp.conf ${ADT_DIR}/adt_installer.conf
+ echo 'SDK_VENDOR=${SDK_VENDOR}' >> ${ADT_DIR}/scripts/data_define
+ echo 'INSTALL_FOLDER=${SDKPATH}' >> ${ADT_DIR}/scripts/data_define
tar cfj adt_installer.tar.bz2 adt-installer
cp ${WORKDIR}/adt_installer.tar.bz2 ${ADT_DEPLOY}
}
--
1.7.0.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 0/2] adt-installer cleanup for latest oecore changes
2011-05-18 4:36 [PATCH 0/2] adt-installer cleanup for latest oecore changes Jessica Zhang
2011-05-18 4:36 ` [PATCH 2/2] Add adt repo checking Jessica Zhang
2011-05-18 4:36 ` [PATCH 1/2] extract bitbake config setting into data_define, use more variables replacing hardcoded values Jessica Zhang
@ 2011-05-20 0:52 ` Saul Wold
2 siblings, 0 replies; 4+ messages in thread
From: Saul Wold @ 2011-05-20 0:52 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 05/17/2011 09:36 PM, Jessica Zhang wrote:
> From: Jessica Zhang<jessica.zhang@intel.com>
>
> The change set includes extract bitbake config setting into data_define,
> use config setting variables replace hardcode values, and add adt repo checking
>
> Pull URL: git://git.pokylinux.org/poky-contrib.git
> Branch: jzhang/oe-rename
> Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jzhang/oe-rename
>
> Thanks,
> Jessica Zhang<jessica.zhang@intel.com>
> ---
>
>
> Jessica Zhang (2):
> extract bitbake config setting into data_define, use more variables
> replacing hardcoded values
> Add adt repo checking
>
> .../installer/adt-installer/adt_installer | 15 +++++++++++++--
> .../installer/adt-installer/adt_installer.conf | 2 +-
> .../adt-installer/scripts/adt_installer_internal | 4 ++--
> .../installer/adt-installer/scripts/data_define | 1 -
> .../installer/adt-installer_1.0.bb | 4 +++-
> 5 files changed, 19 insertions(+), 7 deletions(-)
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
Merged into oe-core and poky
Thanks
Sau!
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-05-20 0:55 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-18 4:36 [PATCH 0/2] adt-installer cleanup for latest oecore changes Jessica Zhang
2011-05-18 4:36 ` [PATCH 2/2] Add adt repo checking Jessica Zhang
2011-05-18 4:36 ` [PATCH 1/2] extract bitbake config setting into data_define, use more variables replacing hardcoded values Jessica Zhang
2011-05-20 0:52 ` [PATCH 0/2] adt-installer cleanup for latest oecore changes Saul Wold
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox