Resend pull request for ADT installer with fixed for MIT Lic and repo entry
cover Resend pull request for ADT installer with fixed for MIT Lic and repo entry
Fix the MIT License issues and leave ipkg repo entry empty before it's setup
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: jzhang/installer-feature
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jzhang/installer-feature
Thanks,
Jessica Zhang <[email protected]>
---
Jessica Zhang (1):
Fix MIT Lic issues and leave references to adt repo entry empty
before it's setup
Liping Ke (1):
adt-intaller feature implementation, including the bitbake recipe
file for creating the intaller tar file under /tmp/deploy/sdk, and the adt-installer script files and config files
.../installer/adt-installer/adt_installer | 367 ++++++++++++++++++++ .../installer/adt-installer/adt_installer.conf | 52 +++ .../adt-installer/opkg/conf/opkg-sdk-i586.conf | 7 + .../adt-installer/opkg/conf/opkg-sdk-x86_64.conf | 7 + .../adt-installer/scripts/adt_installer_internal | 209 +++++++++++ .../installer/adt-installer/scripts/data_define | 40 +++ .../installer/adt-installer/scripts/extract_rootfs | 67 ++++ .../installer/adt-installer/scripts/util | 104 ++++++ .../installer/adt-installer_1.0.bb | 84 +++++ 9 files changed, 937 insertions(+), 0 deletions(-) create mode 100755 meta/recipes-devtools/installer/adt-installer/adt_installer create mode 100644 meta/recipes-devtools/installer/adt-installer/adt_installer.conf create mode 100644 meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-i586.conf create mode 100644 meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-x86_64.conf create mode 100755 meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal create mode 100644 meta/recipes-devtools/installer/adt-installer/scripts/data_define create mode 100755 meta/recipes-devtools/installer/adt-installer/scripts/extract_rootfs create mode 100644 meta/recipes-devtools/installer/adt-installer/scripts/util create mode 100644 meta/recipes-devtools/installer/adt-installer_1.0.bb
PATCH 2/2 Fix MIT Lic issues and leave references to adt repo entry empty before it's setup
--- .../installer/adt-installer/adt_installer | 30 +++++++++++-------- .../installer/adt-installer/adt_installer.conf | 25 +++++++++++++++- .../adt-installer/opkg/conf/opkg-sdk-i586.conf | 6 ++-- .../adt-installer/opkg/conf/opkg-sdk-x86_64.conf | 6 ++-- .../adt-installer/scripts/adt_installer_internal | 30 ++++++++++--------- .../installer/adt-installer/scripts/data_define | 31 +++++++++++-------- .../installer/adt-installer/scripts/extract_rootfs | 30 +++++++++++-------- .../installer/adt-installer/scripts/util | 31 +++++++++++-------- .../installer/adt-installer_1.0.bb | 23 ++++++++++++++ 9 files changed, 139 insertions(+), 73 deletions(-)
meta/recipes-devtools/installer/adt-installer/adt_installer +18 -14
@@ -1,21 +1,25 @@ #/bin/bash # Yocto ADT Installer # -# Copyright (C) 2010 Intel Corp. +# Copyright 2010-2011 by Intel Corp. # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. usage ()
meta/recipes-devtools/installer/adt-installer/adt_installer.conf +24 -1
@@ -1,6 +1,29 @@ +# Yocto ADT Installer Configuration File +# +# Copyright 2010-2011 by Intel Corp. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + + # Your yocto distro repository, this should include IPKG based packages and root filesystem files where the installation is based on -YOCTOADT_IPKG_REPO="http://llu-piketon.sh.intel.com/rootfs" +YOCTOADT_IPKG_REPO="http://" # The following are for system wide setup # Target architectures that you want to setup host cross dev environment for
meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-i586.conf +3 -3
@@ -2,6 +2,6 @@ arch all 1 arch any 6 arch noarch 11 arch i586-nativesdk 16 -src oe http://llu-piketon.sh.intel.com/ipk_sdknew -src oe-all http://llu-piketon.sh.intel.com/ipk_sdknew/all -src oe-i586-nativesdk http://llu-piketon.sh.intel.com/ipk_sdknew/i586-nativesdk +src oe http:// +src oe-all http:// +src oe-i586-nativesdk http://
meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-x86_64.conf +3 -3
@@ -2,6 +2,6 @@ arch all 1 arch any 6 arch noarch 11 arch x86_64-nativesdk 16 -src oe http://llu-piketon.sh.intel.com/ipk_sdknew -src oe-all http://llu-piketon.sh.intel.com/ipk_sdknew/all -src oe-x86_64-nativesdk http://llu-piketon.sh.intel.com/ipk_sdknew/x86_64-nativesdk +src oe http:// +src oe-all http:// +src oe-x86_64-nativesdk http://
meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal +18 -16
@@ -2,23 +2,25 @@ # Yocto ADT Installer # -# Copyright (C) 2010 Intel Corp. +# Copyright 2010-2011 by Intel Corp. # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - - +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. parse_config() {
meta/recipes-devtools/installer/adt-installer/scripts/data_define +18 -13
@@ -2,20 +2,25 @@ # Yocto ADT Installer # -# Copyright (C) 2010 Intel Corp. +# Copyright 2010-2011 by Intel Corp. # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. config_file="adt_installer.conf" source $config_file
meta/recipes-devtools/installer/adt-installer/scripts/extract_rootfs +17 -13
@@ -2,21 +2,25 @@ # Yocto ADT Installer # -# Copyright (C) 2010 Intel Corp. +# Copyright 2010-2011 by Intel Corp. # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. extract_rootfs() {
meta/recipes-devtools/installer/adt-installer/scripts/util +18 -13
@@ -2,20 +2,25 @@ # Yocto ADT Installer # -# Copyright (C) 2010 Intel Corp. +# Copyright 2010-2011 by Intel Corp. # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. echo_info() {
meta/recipes-devtools/installer/adt-installer_1.0.bb +23 -0
@@ -1,3 +1,26 @@ +# Yocto ADT Installer bb file +# +# Copyright 2010-2011 by Intel Corp. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + + DESCRIPTION = "Meta package for creating sdk installer tarball" LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
Signature · 1 line
1.7.0.4
PATCH 1/2 adt-intaller feature implementation, including the bitbake recipe file for creating the intaller tar file under /tmp/deploy/sdk, and the adt-installer script files and config files
In reply to Jessica Zhang--- .../installer/adt-installer/adt_installer | 363 ++++++++++++++++++++ .../installer/adt-installer/adt_installer.conf | 29 ++ .../adt-installer/opkg/conf/opkg-sdk-i586.conf | 7 + .../adt-installer/opkg/conf/opkg-sdk-x86_64.conf | 7 + .../adt-installer/scripts/adt_installer_internal | 207 +++++++++++ .../installer/adt-installer/scripts/data_define | 35 ++ .../installer/adt-installer/scripts/extract_rootfs | 63 ++++ .../installer/adt-installer/scripts/util | 99 ++++++ .../installer/adt-installer_1.0.bb | 61 ++++ 9 files changed, 871 insertions(+), 0 deletions(-) create mode 100755 meta/recipes-devtools/installer/adt-installer/adt_installer create mode 100644 meta/recipes-devtools/installer/adt-installer/adt_installer.conf create mode 100644 meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-i586.conf create mode 100644 meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-x86_64.conf create mode 100755 meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal create mode 100644 meta/recipes-devtools/installer/adt-installer/scripts/data_define create mode 100755 meta/recipes-devtools/installer/adt-installer/scripts/extract_rootfs create mode 100644 meta/recipes-devtools/installer/adt-installer/scripts/util create mode 100644 meta/recipes-devtools/installer/adt-installer_1.0.bb
meta/recipes-devtools/installer/adt-installer/adt_installer new file +363 -0
@@ -0,0 +1,363 @@ +#/bin/bash +# Yocto ADT Installer +# +# Copyright (C) 2010 Intel Corp. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + + +usage () +{ + + INST_ARCH=`uname -m` + INST_OS=`uname -o| tr '[A-Z]' '[a-z]'` + INST_KR=`uname -r| tr '[A-Z]' '[a-z]'` + + echo_info "#########################################################################" + echo_info "# Welcome to Yocto Application Developement Tools (ADT) Installer" + echo_info "# " + echo_info "# Host Machine:\t\t\t\t"$INST_ARCH + echo_info "# OS info:\t\t\t\t$INST_KR" + echo_info "# Yocto ADT version to be installed:\t$YOCTOADT_VERSION" + echo_info "# supported target architectures:\t$YOCTOADT_SUPPORTED_TARGETS" + echo_info "# supported target root_fs images:\t$YOCTOADT_SUPPORTED_ROOTFS" + echo_info "#########################################################################\n" + + echo_info "Systemwide installation. Installation will occur under $INSTALL_FOLDER\n" + echo_info "############################################################################" + echo_info "# Your system installation configurations from adt_installer.conf" + echo_info "############################################################################" + + echo_info "# Cross toolchains:\t\t$YOCTOADT_TARGETS" + 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 "############################################################################\n" + + echo_info "\n##############################################################################" + echo_info "# Your rootfs image(s) and target sysroot selections from adt_installer.conf" + echo_info "##############################################################################" +prompt=1 +for arch_type in $YOCTOADT_SUPPORTED_TARGETS; do + download_images $arch_type $prompt +done + echo_info "############################################################################\n" + select_install_type +} + +validate_config() +{ + + for selected_arch_type in $YOCTOADT_TARGETS; do + found=0 + for supported_arch_type in $YOCTOADT_SUPPORTED_TARGETS; do + if [ "$selected_arch_type" == "$supported_arch_type" ]; then + found=1 + break + fi + done + if [ $found == 0 ]; then + echo_info "[ADT_INST] Error: YOCTADT_TARGETS in adt_installer.conf contains invalid entries: $YOCTOADT_TARGETS. Valid values are: $YOCTOADT_SUPPORTED_TARGETS" + echo -e "\n#############################################################################" + echo -e "# Meet error(s) when installing Yocto ADT! Please check log file for details. " + echo -e "#############################################################################\n" + exit -1 + fi + done + + for arch_type in $YOCTOADT_SUPPORTED_TARGETS; do + #select_target_var="\$YOCTOADT_TARGET_$arch_type" + #select_target=`eval echo $select_target_var` + + #if [ "$select_target" != "Y" ] || [ "$selected_target" != "y" ]; then + # continue; + #fi + + target_sysroot_image_var="\$YOCTOADT_TARGET_SYSROOT_IMAGE_$arch_type" + target_sysroot_image=`eval echo $target_sysroot_image_var` + + + select_rootfs_var="\$YOCTOADT_ROOTFS_$arch_type" + select_rootfs=`eval echo $select_rootfs_var` + + if [ "$select_rootfs" == "" ] && [ "$target_sysroot_image" == "" ]; then + continue; + fi + + for image_type in $select_rootfs; do +#validate rootfs type defined in YOCTOADT_ROOTFS_{ARCH} is valid and in YOCTOADT_SUPPORTED_ROOTFS + found=0 + for supported_rootfs_type in $YOCTOADT_SUPPORTED_ROOTFS; do + if [ "$image_type" == "$supported_rootfs_type" ]; then + found=1 + break + fi + done + if [ $found == 0 ]; then +#the rootfs type listed for downloading is not valid + echo_info "[ADT_INST] Error: Selected YOCTOADT_ROOTFS_$arch_type value: $image_type, is not valid! Valid values are: $YOCTOADT_SUPPORTED_ROOTFS " + echo -e "\n#############################################################################" + echo -e "# Meet error(s) when installing Yocto ADT! Please check log file for details. " + echo -e "#############################################################################\n" + exit -1 + fi + done + + found=0 + for image_type in $select_rootfs; do +#validate that rootfs to be extracted must be in the item: YOCTOADT_ROOTFS_${ARCH} + if [ "$target_sysroot_image" == "$image_type" ]; then + found=1 + break + fi + done +# the rootfs image to be extracted is not selected + if [ $found == 0 ]; then + echo_info "[ADT_INST] Error: YOCTOADT_TARGET_SYSROOT_IMAGE_$arch_type selection: $target_sysroot_image is not included in YOCTOADT_ROOTFS_$arch_type selections: $select_rootfs" + echo -e "\n#############################################################################" + echo -e "# Meet error(s) when installing Yocto ADT! Please check log file for details. " + echo -e "#############################################################################\n" + exit -1 + fi + done +} + + +#detect opkg installed or not, for installing sdk, we will use +#this installed local opkg +install_opkg() +{ +if [ ! -x "$LOCAL_OPKG_LOC/bin/opkg-cl" ]; then + echo_info "OPKG is not setup, setting up opkg in local, which is required for installing yocto ADT...\n" + + if [ -d $LOCAL_OPKG_LOC ]; then + echo_info "Deleting old OPKG folder, which doesn't contain executables... " + rm -rf $LOCAL_OPKG_LOC + fi + + parent_folder=`eval echo $PWD` + cd $LOCAL_OPKG_FOLDER + check_result + + opkg_source_dir=`ls -d opkg-*` + + if [ $opkg_source_dir == "" ]; then + echo_info "[ADT_INST] Error: OPKG source directory is not found!" + echo -e "\n#############################################################################" + echo -e "# Meet error(s) when installing Yocto ADT! Please check log file for details. " + echo -e "#############################################################################\n" + exit -1 + fi + + cd $opkg_source_dir + check_result + + echo_info "Configure opkg ...\n" + ./configure --prefix=$parent_folder/$LOCAL_OPKG_LOC --with-opkglibdir=$OPKG_LIBDIR --disable-curl --disable-ssl-curl --disable-gpg --disable-shave >> $parent_folder/$YOCTOADT_INSTALL_LOG_FILE + check_result + + echo_info "Make opkg ...\n" + make &>> $parent_folder/$YOCTOADT_INSTALL_LOG_FILE + check_result + + echo_info "Make Install opkg ...\n" + make install &>> $parent_folder/$YOCTOADT_INSTALL_LOG_FILE + #if meet error when installing opkg, cancel the installation + check_result + + cd $parent_folder + echo_info "Successfully installed OPKG.\n" +fi +} + +confirm_download() +{ +#avoid repeated reminding +if [ "$override_oldfile" == 1 ]; then + return $pre_result +else + override_oldfile=1 +fi + +while true; do + #echo_info "[ADT_INST] Files [$1] already exists. If you continue downloading, old files will be overrided." + #echo_info "[ADT_INST] Further prompts will not be given if there're more existing files to be downloaded." + #echo_info "[ADT_INST] Do you want to continue downloading? Please enter Y/N:" + echo_info "\nFile [$1] already exists, which means you've downloaded the qemu kernel and rootfs file(s) before. If you choose continue downloading, old files will be overridden." + echo_info "[ADT_INST] Do you want to continue downloading? Please enter Y/N:" + read YOCTOADT_INSTALL + YOCTOADT_INSTALL=`tr '[a-z]' '[A-Z]'<<<"$YOCTOADT_INSTALL"` + if [ "$YOCTOADT_INSTALL" == "Y" ]; then + pre_result=0 + return 0 + elif [ "$YOCTOADT_INSTALL" == "N" ]; then + pre_result=1 + return 1 + fi +done +} + +download_file() +{ +if [ -f "$LOCAL_DOWNLOAD/$1" ]; then + confirm_download $1 + result="$?" + if [ ! "$result" == "0" ]; then + return + else + echo "Removing old file [$1]" + rm -rf "$LOCAL_DOWNLOAD/$1" + fi +fi +echo_info "Downloading file: $1..." +wget "$YOCTOADT_IPKG_REPO/$1" -P $LOCAL_DOWNLOAD --progress=bar:force 2>&1 | tee -a "$YOCTOADT_INSTALL_LOG_FILE" +} + + + +#Need two input params, $1 -- arch_type(arm powerpc x86 mips) $2 rootfs_image_type (a list of sdk sato minimal lsb) +get_qemu_image() +{ + if [ "$1" == "x86" ]; then + qemu_kernel="bzImage-qemu$1.bin" + elif [ "$1" == "arm" ]; then + qemu_kernel="zImage-qemu$1.bin" + else + qemu_kernel="zImage-qemu$1.bin" + fi + + #echo_info "[ADT_INST] Downloading qemu kernel binary: $qemu_kernel" + download_file $qemu_kernel + check_result + + for image_type in $select_rootfs; do + #echo_info "[ADT_INST] Downloading rootfs file: poky-image-$image_type-qemu$1.tar.bz2" + filename="poky-image-$image_type-qemu$1.tar.bz2" + download_file $filename + check_result + done +} + +download_images() +{ + #select_target_var="\$YOCTOADT_TARGET_$1" + #select_target=`eval echo $select_target_var` + + #if [ "$select_target" == "Y" ]; then + select_rootfs_var="\$YOCTOADT_ROOTFS_$1" + select_sysroot_image_var="\$YOCTOADT_TARGET_SYSROOT_IMAGE_$1" + select_sysroot_var="\$YOCTOADT_TARGET_SYSROOT_LOC_$1" + select_rootfs=`eval echo $select_rootfs_var` + select_sysroot_image=`eval echo $select_sysroot_image_var` + select_sysroot=`eval echo $select_sysroot_var` + + if [ "$select_rootfs" != "" ]; then + if [ $2 ]; then + #echo_info "\n############################################################################" + #echo_info "# To be downloaded rootfs image details defined in adt_installer.conf" + #echo_info "############################################################################" + echo_info "# Target architecture:\t\t$1" + echo_info "# Root_fs images:\t\t$select_rootfs" + echo_info "# Target sysroot image:\t\t$select_sysroot_image" + echo_info "# Target sysroot loc:\t\t$select_sysroot" + echo_info "\n" + #echo_info "############################################################################\n" + else + get_qemu_image $1 $select_rootfs + fi + fi +} + + + + +#Main body of installer + +clear + +run_path=`dirname $0` +cd $run_path + +if [ ! -f "scripts/util" ]; then + echo -e "[ADT_INST] Error: Script file: util, can't be found under: $run_path!" + echo -e "\n#############################################################################" + echo -e "# Meet error(s) when installing Yocto ADT! Please check log file for details. " + echo -e "#############################################################################\n" + exit -1 +fi + +if [ ! -f "scripts/adt_installer_internal" ]; then + echo -e "[ADT_INST] Error: Script file: adt_installer_internal, can't be found under: $run_path!" + echo -e "\n#############################################################################" + echo -e "# Meet error(s) when installing Yocto ADT! Please check log file for details. " + echo -e "#############################################################################\n" + exit -1 +fi + +config_file="adt_installer.conf" +if [ ! -f "$config_file" ]; then + echo_info "[ADT_INST] Error: Installation configuration file: adt_installer.conf is not found!\n" + echo_info "\n##################################################################################" + echo_info "# Meet error(s) when installing Yocto ADT. Please check log file for details. " + echo_info "##################################################################################\n" + exit -1 +fi + +. scripts/data_define +. scripts/util + + +if [ -f "$YOCTOADT_INSTALL_LOG_FILE" ]; then + rm $YOCTOADT_INSTALL_LOG_FILE +fi + + +usage + +user_inst_type="$?" + +validate_config +check_result +#firstly we need to install opkg host +install_opkg + +#Create folders for holding rootfs/qemu images +if [ ! -d "$LOCAL_DOWNLOAD" ]; then + echo_info "Creating new images downloading folder: $LOCAL_DOWNLOAD ..." + mkdir -p $LOCAL_DOWNLOAD +fi + +#downloading required qemu images/rootfs +if [ "$user_inst_type" == "0" ]; then + override_oldfile=1 +else + override_oldfile=0 +fi + +for arch_type in $YOCTOADT_SUPPORTED_TARGETS; do + download_images $arch_type +done + +scripts/adt_installer_internal $user_inst_type + +result="$?" +#echo_info "\n############################################################" +if [ "$result" == "0" ]; then + echo_info "\n############################################################" + echo_info "# Yocto ADT has been successfully installed." + echo_info "############################################################\n" +fi +
meta/recipes-devtools/installer/adt-installer/adt_installer.conf new file +29 -0
@@ -0,0 +1,29 @@ +# Your yocto distro repository, this should include IPKG based packages and root filesystem files where the installation is based on + +YOCTOADT_IPKG_REPO="http://llu-piketon.sh.intel.com/rootfs" + +# The following are for system wide setup +# Target architectures that you want to setup host cross dev environment for +# valid values are: powerpc, mips, arm, x86, x86_64 with space separation between entries +YOCTOADT_TARGETS="arm x86" +# Whether install qemu or not, valid entries are: Y/N +YOCTOADT_QEMU="Y" +# Whether install user-mode nfs or not, valid entries are: Y/N. If you want to use Yocto Eclipse plug-in as your dev IDE, you need to select both qemu and NFS +YOCTOADT_NFS_UTIL="Y" + +# These 2 values will be supported in the furture installer +#YOCTOADT_BITBAKE="Y" +#YOCTOADT_METADATA="Y" + +#The followings are for setting up specific target architecture +#YOCTOADT_ROOTFS_$arch is for specifying what root filesystem image files you want to download from the repository. The valid values to replace $arch are: arm, x86, x86_64, powerpc, mips. The valid image files are: minimal, sato, sdk and lsb. If you want to download multiple images, the entries are space separated +YOCTOADT_ROOTFS_arm="minimal sato" +#Specify which root filesystem file to use to extract as target sysroot. Please ensure the entry is in the list of downloaded root filesystem files that specified above in YOCTOADT_ROOTFS_$arch +YOCTOADT_TARGET_SYSROOT_IMAGE_arm="minimal" +#The location where the target sysroot will be setup +YOCTOADT_TARGET_SYSROOT_LOC_arm="$HOME/test-yocto/arm" + +#Here's another example for setting up target arch of x86, by uncommenting it will trigger the installer to download and setup 2 sysroot environment for 2 target arches: arm and x86. If you want to add more target arch support, you can append more entries by following these samples +#YOCTOADT_ROOTFS_x86="sdk" +#YOCTOADT_TARGET_SYSROOT_IMAGE_x86="sdk" +#YOCTOADT_TARGET_SYSROOT_LOC_x86="$HOME/test-yocto/x86"
meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-i586.conf new file +7 -0
@@ -0,0 +1,7 @@ +arch all 1 +arch any 6 +arch noarch 11 +arch i586-nativesdk 16 +src oe http://llu-piketon.sh.intel.com/ipk_sdknew +src oe-all http://llu-piketon.sh.intel.com/ipk_sdknew/all +src oe-i586-nativesdk http://llu-piketon.sh.intel.com/ipk_sdknew/i586-nativesdk
meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-x86_64.conf new file +7 -0
@@ -0,0 +1,7 @@ +arch all 1 +arch any 6 +arch noarch 11 +arch x86_64-nativesdk 16 +src oe http://llu-piketon.sh.intel.com/ipk_sdknew +src oe-all http://llu-piketon.sh.intel.com/ipk_sdknew/all +src oe-x86_64-nativesdk http://llu-piketon.sh.intel.com/ipk_sdknew/x86_64-nativesdk
meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal new file +207 -0
207 lines not on this page · raw message
meta/recipes-devtools/installer/adt-installer/scripts/data_define new file +35 -0
@@ -0,0 +1,35 @@ +#!/bin/bash + +# Yocto ADT Installer +# +# Copyright (C) 2010 Intel Corp. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +config_file="adt_installer.conf" +source $config_file + +LOCAL_OPKG_LOC="./opkg/build/opkg" +LOCAL_OPKG_FOLDER="./opkg/build" +OPKG_LIBDIR="/var/lib" + +# List all supported root fs types and target types, +# it will be used in user configuration validity checking +YOCTOADT_SUPPORTED_ROOTFS="minimal sato sdk lsb" +YOCTOADT_SUPPORTED_TARGETS="x86 x86_64 arm powerpc mips" +# Different host (32 bit or 64 bit) will have different opkg +# configuration files +YOCTOADT_OPKG_CONF_FILE_32="./opkg/conf/opkg-sdk-i586.conf" +YOCTOADT_OPKG_CONF_FILE_64="./opkg/conf/opkg-sdk-x86_64.conf" +INSTALL_FOLDER=/opt/poky/$YOCTOADT_VERSION
meta/recipes-devtools/installer/adt-installer/scripts/extract_rootfs new file +63 -0
63 lines not on this page · raw message
meta/recipes-devtools/installer/adt-installer/scripts/util new file +99 -0
99 lines not on this page · raw message
meta/recipes-devtools/installer/adt-installer_1.0.bb new file +61 -0
61 lines not on this page · raw message
Signature · 1 line
1.7.0.4