summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/conf-notes.txt1
-rw-r--r--meta/conf/distro/include/distro_alias.inc1
-rw-r--r--meta/conf/layer.conf2
-rw-r--r--meta/recipes-core/meta/meta-world-pkgdata.bb2
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/adt_installer420
-rw-r--r--meta/recipes-devtools/installer/adt-installer/adt_installer.conf75
-rw-r--r--meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-i686.conf6
-rw-r--r--meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-x86_64.conf6
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal312
-rw-r--r--meta/recipes-devtools/installer/adt-installer/scripts/data_define38
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/scripts/extract_rootfs67
-rw-r--r--meta/recipes-devtools/installer/adt-installer/scripts/util104
-rw-r--r--meta/recipes-devtools/installer/adt-installer_1.0.bb94
-rw-r--r--meta/recipes-devtools/installer/files/wget_cache.patch21
14 files changed, 2 insertions, 1147 deletions
diff --git a/meta/conf/conf-notes.txt b/meta/conf/conf-notes.txt
index 66e6319e7a..2f2932ba1f 100644
--- a/meta/conf/conf-notes.txt
+++ b/meta/conf/conf-notes.txt
@@ -2,7 +2,6 @@ Common targets are:
2 core-image-minimal 2 core-image-minimal
3 core-image-sato 3 core-image-sato
4 meta-toolchain 4 meta-toolchain
5 adt-installer
6 meta-ide-support 5 meta-ide-support
7 6
8You can also run generated qemu images with a command like 'runqemu qemux86' 7You can also run generated qemu images with a command like 'runqemu qemux86'
diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc
index c2ad07e285..d37aefb5ba 100644
--- a/meta/conf/distro/include/distro_alias.inc
+++ b/meta/conf/distro/include/distro_alias.inc
@@ -9,7 +9,6 @@
9# 9#
10# Please keep this list in alphabetical order. 10# Please keep this list in alphabetical order.
11# 11#
12DISTRO_PN_ALIAS_pn-adt-installer = "Intel"
13DISTRO_PN_ALIAS_pn-alsa-state = "OE-Core" 12DISTRO_PN_ALIAS_pn-alsa-state = "OE-Core"
14DISTRO_PN_ALIAS_pn-alsa-utils-alsaconf = "OE-Core" 13DISTRO_PN_ALIAS_pn-alsa-utils-alsaconf = "OE-Core"
15DISTRO_PN_ALIAS_pn-alsa-utils-scripts = "OE-Core" 14DISTRO_PN_ALIAS_pn-alsa-utils-scripts = "OE-Core"
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index a892fba65f..8ee61aa69a 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -9,7 +9,7 @@ BBFILE_PRIORITY_core = "5"
9 9
10# This should only be incremented on significant changes that will 10# This should only be incremented on significant changes that will
11# cause compatibility issues with other layers 11# cause compatibility issues with other layers
12LAYERVERSION_core = "7" 12LAYERVERSION_core = "8"
13 13
14BBLAYERS_LAYERINDEX_NAME_core = "openembedded-core" 14BBLAYERS_LAYERINDEX_NAME_core = "openembedded-core"
15 15
diff --git a/meta/recipes-core/meta/meta-world-pkgdata.bb b/meta/recipes-core/meta/meta-world-pkgdata.bb
index 48a9027215..3c5db50019 100644
--- a/meta/recipes-core/meta/meta-world-pkgdata.bb
+++ b/meta/recipes-core/meta/meta-world-pkgdata.bb
@@ -33,7 +33,7 @@ do_install[noexec] = "1"
33 33
34do_configure[deptask] = "" 34do_configure[deptask] = ""
35 35
36WORLD_PKGDATA_EXCLUDE ?= "adt-installer" 36WORLD_PKGDATA_EXCLUDE ?= ""
37 37
38python calculate_extra_depends() { 38python calculate_extra_depends() {
39 exclude = '${WORLD_PKGDATA_EXCLUDE}'.split() 39 exclude = '${WORLD_PKGDATA_EXCLUDE}'.split()
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer b/meta/recipes-devtools/installer/adt-installer/adt_installer
deleted file mode 100755
index b8cfb2e5c5..0000000000
--- a/meta/recipes-devtools/installer/adt-installer/adt_installer
+++ /dev/null
@@ -1,420 +0,0 @@
1#!/bin/bash
2# Yocto ADT Installer
3#
4# Copyright 2010-2011 by Intel Corp.
5#
6# Permission is hereby granted, free of charge, to any person obtaining a copy
7# of this software and associated documentation files (the "Software"), to deal
8# in the Software without restriction, including without limitation the rights
9# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10# copies of the Software, and to permit persons to whom the Software is
11# furnished to do so, subject to the following conditions:
12
13# The above copyright notice and this permission notice shall be included in
14# all copies or substantial portions of the Software.
15
16# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22# THE SOFTWARE.
23
24
25usage ()
26{
27
28 INST_ARCH=`uname -m`
29 INST_OS=`uname -o| tr '[A-Z]' '[a-z]'`
30 INST_KR=`uname -r| tr '[A-Z]' '[a-z]'`
31
32 echo_info "#########################################################################"
33 echo_info "# Welcome to Yocto Application Developement Tools (ADT) Installer"
34 echo_info "# "
35 echo_info "# Host Machine:\t\t\t\t"$INST_ARCH
36 echo_info "# OS info:\t\t\t\t$INST_KR"
37 echo_info "# Yocto ADT version to be installed:\t$YOCTOADT_VERSION"
38 echo_info "# supported target architectures:\t$YOCTOADT_SUPPORTED_TARGETS"
39 echo_info "# supported target root_fs images:\t$YOCTOADT_SUPPORTED_ROOTFS"
40 echo_info "#########################################################################\n"
41
42 echo_info "Systemwide installation. Installation will occur under $INSTALL_FOLDER\n"
43 echo_info "############################################################################"
44 echo_info "# Your system installation configurations from adt_installer.conf"
45 echo_info "############################################################################"
46
47 echo_info "# Cross toolchains:\t\t$YOCTOADT_TARGETS"
48 echo_info "# Install Qemu:\t\t\t$YOCTOADT_QEMU"
49 echo_info "# Install NFS utilities:\t$YOCTOADT_NFS_UTIL"
50 #echo_info "# Install bitbake + UI:\t\t$YOCTOADT_BITBAKE"
51 #echo_info "# Install metadata:\t$YOCTOADT_METADATA"
52 #echo_info "############################################################################\n"
53
54 echo_info "\n##############################################################################"
55 echo_info "# Your rootfs image(s) and target sysroot selections from adt_installer.conf"
56 echo_info "##############################################################################"
57prompt=1
58for arch_type in $YOCTOADT_TARGETS; do
59 download_images $arch_type $prompt
60done
61 echo_info "############################################################################\n"
62 select_install_type
63}
64
65validate_config()
66{
67
68 for selected_arch_type in $YOCTOADT_TARGETS; do
69 found=0
70 select_machine_var="\$YOCTOADT_TARGET_MACHINE_$selected_arch_type"
71 select_machine=`eval echo $select_machine_var`
72 show_error_banner=0
73
74 for supported_arch_type in $YOCTOADT_SUPPORTED_TARGETS; do
75 if [ "$selected_arch_type" == "$supported_arch_type" ]; then
76 found=1
77 break
78 fi
79 done
80 if [ $found == 0 ]; then
81 echo_info "[ADT_INST] Error: YOCTADT_TARGETS in adt_installer.conf contains invalid entries: $YOCTOADT_TARGETS. Valid values are: $YOCTOADT_SUPPORTED_TARGETS"
82 show_error_banner=1
83 elif [ -z "$select_machine" ]; then
84 echo_info "[ADT_INST] Error: No MACHINE was defined for $selected_arch_type architecture! This is needed to install the toolchain and the correct environment settings."
85 echo_info "[ADT_INST] To do that, in adt-installer.conf, set the following variable: YOCTOADT_TARGET_MACHINE_$selected_arch_type"
86 show_error_banner=1
87 fi
88
89 if [ $show_error_banner == 1 ]; then
90 echo -e "\n#############################################################################"
91 echo -e "# Meet error(s) when installing Yocto ADT! Please check log file for details. "
92 echo -e "#############################################################################\n"
93 exit -1
94 fi
95 done
96
97 for arch_type in $YOCTOADT_SUPPORTED_TARGETS; do
98 #select_target_var="\$YOCTOADT_TARGET_$arch_type"
99 #select_target=`eval echo $select_target_var`
100
101 #if [ "$select_target" != "Y" ] || [ "$selected_target" != "y" ]; then
102 # continue;
103 #fi
104
105 target_sysroot_image_var="\$YOCTOADT_TARGET_SYSROOT_IMAGE_$arch_type"
106 target_sysroot_image=`eval echo $target_sysroot_image_var`
107
108
109 select_rootfs_var="\$YOCTOADT_ROOTFS_$arch_type"
110 select_rootfs=`eval echo $select_rootfs_var`
111
112 if [ "$select_rootfs" == "" ] && [ "$target_sysroot_image" == "" ]; then
113 continue;
114 fi
115
116 for image_type in $select_rootfs; do
117#validate rootfs type defined in YOCTOADT_ROOTFS_{ARCH} is valid and in YOCTOADT_SUPPORTED_ROOTFS
118 found=0
119 for supported_rootfs_type in $YOCTOADT_SUPPORTED_ROOTFS; do
120 if [ "$image_type" == "$supported_rootfs_type" ]; then
121 found=1
122 break
123 fi
124 done
125 if [ $found == 0 ]; then
126#the rootfs type listed for downloading is not valid
127 echo_info "[ADT_INST] Error: Selected YOCTOADT_ROOTFS_$arch_type value: $image_type, is not valid! Valid values are: $YOCTOADT_SUPPORTED_ROOTFS "
128 echo -e "\n#############################################################################"
129 echo -e "# Meet error(s) when installing Yocto ADT! Please check log file for details. "
130 echo -e "#############################################################################\n"
131 exit -1
132 fi
133 done
134
135 found=0
136 for image_type in $select_rootfs; do
137#validate that rootfs to be extracted must be in the item: YOCTOADT_ROOTFS_${ARCH}
138 if [ "$target_sysroot_image" == "$image_type" ]; then
139 found=1
140 break
141 fi
142 done
143# the rootfs image to be extracted is not selected
144 if [ $found == 0 ]; then
145 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"
146 echo -e "\n#############################################################################"
147 echo -e "# Meet error(s) when installing Yocto ADT! Please check log file for details. "
148 echo -e "#############################################################################\n"
149 exit -1
150 fi
151 done
152}
153
154
155#detect opkg installed or not, for installing sdk, we will use
156#this installed local opkg
157install_opkg()
158{
159if [ ! -x "$LOCAL_OPKG_LOC/bin/opkg" ]; then
160 echo_info "OPKG is not setup, setting up opkg in local, which is required for installing yocto ADT...\n"
161
162 if [ -d $LOCAL_OPKG_LOC ]; then
163 echo_info "Deleting old OPKG folder, which doesn't contain executables... "
164 rm -rf $LOCAL_OPKG_LOC
165 fi
166
167 parent_folder=`pwd`
168 cd $LOCAL_OPKG_FOLDER
169 check_result
170
171 opkg_source_dir=`ls -d opkg-*`
172
173 if [ $opkg_source_dir == "" ]; then
174 echo_info "[ADT_INST] Error: OPKG source directory is not found!"
175 echo -e "\n#############################################################################"
176 echo -e "# Meet error(s) when installing Yocto ADT! Please check log file for details. "
177 echo -e "#############################################################################\n"
178 exit -1
179 fi
180
181 cd $opkg_source_dir
182 check_result
183
184 echo_info "Configure opkg ...\n"
185 autoreconf -i
186 ./configure --prefix=$parent_folder/$LOCAL_OPKG_LOC --enable-shared=no --disable-curl --disable-ssl-curl --disable-gpg >> $parent_folder/$YOCTOADT_INSTALL_LOG_FILE
187 check_result
188
189 echo_info "Make opkg ...\n"
190 make &>> $parent_folder/$YOCTOADT_INSTALL_LOG_FILE
191 check_result
192
193 echo_info "Make Install opkg ...\n"
194 make install &>> $parent_folder/$YOCTOADT_INSTALL_LOG_FILE
195 #if meet error when installing opkg, cancel the installation
196 check_result
197
198 cd $parent_folder
199 echo_info "Successfully installed OPKG.\n"
200fi
201}
202
203confirm_download()
204{
205#avoid repeated reminding
206if [ "$override_oldfile" == 1 ]; then
207 return $pre_result
208else
209 override_oldfile=1
210fi
211
212while true; do
213 #echo_info "[ADT_INST] Files [$1] already exists. If you continue downloading, old files will be overrided."
214 #echo_info "[ADT_INST] Further prompts will not be given if there're more existing files to be downloaded."
215 #echo_info "[ADT_INST] Do you want to continue downloading? Please enter Y/N:"
216 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."
217 echo_info "[ADT_INST] Do you want to continue downloading? Please enter Y/N:"
218 read YOCTOADT_INSTALL
219 YOCTOADT_INSTALL=`tr '[a-z]' '[A-Z]'<<<"$YOCTOADT_INSTALL"`
220 if [ "$YOCTOADT_INSTALL" == "Y" ]; then
221 pre_result=0
222 return 0
223 elif [ "$YOCTOADT_INSTALL" == "N" ]; then
224 pre_result=1
225 return 1
226 fi
227done
228}
229
230download_file()
231{
232local filename=`echo ${1##*/}`
233if [ -f "$LOCAL_DOWNLOAD/$filename" ]; then
234 confirm_download $filename
235 result="$?"
236 if [ ! "$result" == "0" ]; then
237 return
238 else
239 echo "Removing old file [$1]"
240 rm -rf "$LOCAL_DOWNLOAD/$filename"
241 fi
242fi
243echo_info "Downloading file: $filename..."
244wget "$YOCTOADT_REPO/rootfs/$1" -P $LOCAL_DOWNLOAD --progress=bar:force 2>&1 | tee -a "$YOCTOADT_INSTALL_LOG_FILE"
245}
246
247
248
249#Need three input params:
250# $1 arch_type(arm powerpc x86 mips)
251# $2 machine(qemuarm beagleboard)
252# $3 rootfs_image_type (a list of sdk sato minimal lsb)
253get_image()
254{
255 local machine=$2
256
257 if [ "$1" == "x86" ] || [ "$1" == "x86_64" ]; then
258 kernel="bzImage-$machine.bin"
259 elif [ "$1" == "ppc" ] || [ "$1" == "mips" ]; then
260 kernel="vmlinux-$machine.bin"
261 else
262 kernel="zImage-$machine.bin"
263 fi
264
265 #echo_info "[ADT_INST] Downloading qemu kernel binary: $qemu_kernel"
266 download_file $machine/$kernel
267 check_result
268
269 for image_type in $select_rootfs; do
270 #echo_info "[ADT_INST] Downloading rootfs file: core-image-$image_type-$machine.tar.bz2"
271 filename="core-image-$image_type-$machine.tar.bz2"
272 download_file $machine/$filename
273 check_result
274 done
275}
276
277download_images()
278{
279 select_rootfs_var="\$YOCTOADT_ROOTFS_$1"
280 select_sysroot_image_var="\$YOCTOADT_TARGET_SYSROOT_IMAGE_$1"
281 select_sysroot_var="\$YOCTOADT_TARGET_SYSROOT_LOC_$1"
282 select_machine_var="\$YOCTOADT_TARGET_MACHINE_$1"
283 select_rootfs=`eval echo $select_rootfs_var`
284 select_sysroot_image=`eval echo $select_sysroot_image_var`
285 select_sysroot=`eval echo $select_sysroot_var`
286 select_machine=`eval echo $select_machine_var`
287
288 if [ -n "$select_sysroot" ]; then
289 select_sysroot=`readlink -m $select_sysroot`
290 fi
291
292 if [ "$select_rootfs" != "" ]; then
293 if [ $2 ]; then
294 #echo_info "\n############################################################################"
295 #echo_info "# To be downloaded rootfs image details defined in adt_installer.conf"
296 #echo_info "############################################################################"
297 echo_info "# Target architecture:\t\t$1"
298 echo_info "# Target machine:\t\t$select_machine"
299 echo_info "# Root_fs images:\t\t$select_rootfs"
300 echo_info "# Target sysroot image:\t\t$select_sysroot_image"
301 echo_info "# Target sysroot loc:\t\t$select_sysroot"
302 echo_info "\n"
303 #echo_info "############################################################################\n"
304 else
305 get_image $1 $select_machine $select_rootfs
306 fi
307 fi
308}
309
310
311
312
313#Main body of installer
314
315clear
316
317run_path=`dirname $0`
318cd $run_path
319
320if [ ! -f "scripts/util" ]; then
321 echo -e "[ADT_INST] Error: Script file: util, can't be found under: $run_path!"
322 echo -e "\n#############################################################################"
323 echo -e "# Meet error(s) when installing Yocto ADT! Please check log file for details. "
324 echo -e "#############################################################################\n"
325 exit -1
326fi
327
328if [ ! -f "scripts/adt_installer_internal" ]; then
329 echo -e "[ADT_INST] Error: Script file: adt_installer_internal, can't be found under: $run_path!"
330 echo -e "\n#############################################################################"
331 echo -e "# Meet error(s) when installing Yocto ADT! Please check log file for details. "
332 echo -e "#############################################################################\n"
333 exit -1
334fi
335
336config_file="adt_installer.conf"
337if [ ! -f "$config_file" ]; then
338 echo_info "[ADT_INST] Error: Installation configuration file: adt_installer.conf is not found!\n"
339 echo_info "\n##################################################################################"
340 echo_info "# Meet error(s) when installing Yocto ADT. Please check log file for details. "
341 echo_info "##################################################################################\n"
342 exit -1
343fi
344
345. scripts/data_define
346. scripts/util
347
348
349if [ -f "$YOCTOADT_INSTALL_LOG_FILE" ]; then
350 rm $YOCTOADT_INSTALL_LOG_FILE
351fi
352
353echo -n "Please enter the install location (default: $DEFAULT_INSTALL_FOLDER): "
354read INSTALL_FOLDER
355
356if [ "$INSTALL_FOLDER" = "" ]; then
357 INSTALL_FOLDER=$DEFAULT_INSTALL_FOLDER
358fi
359
360eval INSTALL_FOLDER=$(printf "%q" "$INSTALL_FOLDER")
361if [ -d "$INSTALL_FOLDER" ]; then
362 export INSTALL_FOLDER=$(cd "$INSTALL_FOLDER"; pwd)
363else
364 export INSTALL_FOLDER=$(readlink -m "$INSTALL_FOLDER")
365fi
366
367if [ -n "$(echo $INSTALL_FOLDER|grep ' ')" ]; then
368 echo "The target directory path ($INSTALL_FOLDER) contains spaces. Abort!"
369 exit 1
370fi
371
372clear
373
374usage
375
376user_inst_type="$?"
377
378validate_config
379check_result
380
381#check adt_repo exist
382wget --spider $YOCTOADT_REPO 2>&1 | tee -a "$YOCTOADT_INSTALL_LOG_FILE"
383if grep -q "404 Not Found" $YOCTOADT_INSTALL_LOG_FILE; then
384 echo -e "[ADT_INST] Error: YOCTOADT_REPO does not exist: $YOCTOADT_REPO"
385 echo -e "\n#############################################################################"
386 echo -e "# Meet error(s) when installing Yocto ADT! Please check log file for details. "
387 echo -e "#############################################################################\n"
388 exit -1
389fi
390
391#firstly we need to install opkg host
392install_opkg
393
394#Create folders for holding rootfs/qemu images
395if [ ! -d "$LOCAL_DOWNLOAD" ]; then
396 echo_info "Creating new images downloading folder: $LOCAL_DOWNLOAD ..."
397 mkdir -p $LOCAL_DOWNLOAD
398fi
399
400#downloading required qemu images/rootfs
401if [ "$user_inst_type" == "0" ]; then
402 override_oldfile=1
403else
404 override_oldfile=0
405fi
406
407for arch_type in $YOCTOADT_TARGETS; do
408 download_images $arch_type
409done
410
411scripts/adt_installer_internal $user_inst_type
412
413result="$?"
414#echo_info "\n############################################################"
415if [ "$result" == "0" ]; then
416 echo_info "\n############################################################"
417 echo_info "# Yocto ADT has been successfully installed."
418 echo_info "############################################################\n"
419fi
420
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
deleted file mode 100644
index 867fbd107b..0000000000
--- a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
+++ /dev/null
@@ -1,75 +0,0 @@
1# Yocto ADT Installer Configuration File
2#
3# Copyright 2010-2011 by Intel Corp.
4#
5# Permission is hereby granted, free of charge, to any person obtaining a copy
6# of this software and associated documentation files (the "Software"), to deal
7# in the Software without restriction, including without limitation the rights
8# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9# copies of the Software, and to permit persons to whom the Software is
10# furnished to do so, subject to the following conditions:
11
12# The above copyright notice and this permission notice shall be included in
13# all copies or substantial portions of the Software.
14
15# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21# THE SOFTWARE.
22
23
24# Your yocto distro repository, this should include IPKG based packages and root filesystem files where the installation is based on
25
26YOCTOADT_REPO="ADTREPO"
27
28# The following are for system wide setup
29# Target architectures that you want to setup host cross dev environment for
30# valid values are: arm, x86, x86_64, ppc, mips with space separation between entries
31YOCTOADT_TARGETS="arm x86"
32# Whether install qemu or not, valid entries are: Y/N
33YOCTOADT_QEMU="Y"
34# 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
35YOCTOADT_NFS_UTIL="Y"
36
37# These 2 values will be supported in the furture installer
38#YOCTOADT_BITBAKE="Y"
39#YOCTOADT_METADATA="Y"
40
41#The followings are for setting up specific target architecture
42#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, minimal-dev, sato, sato-dev, sato-sdk,lsb, lsb-dev, lsb-sdk. If you want to download multiple images, the entries are space separated
43YOCTOADT_ROOTFS_arm="minimal sato-sdk"
44#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
45YOCTOADT_TARGET_SYSROOT_IMAGE_arm="sato-sdk"
46#The machine for which you want to download the image. Each machine might have
47#different compilation options in order to select certain hardware models or
48#configurations
49YOCTOADT_TARGET_MACHINE_arm="qemuarm"
50#The location where the target sysroot will be setup
51YOCTOADT_TARGET_SYSROOT_LOC_arm="$HOME/test-yocto/$YOCTOADT_TARGET_MACHINE_arm"
52
53
54#Here's a template for setting up target arch of x86
55YOCTOADT_ROOTFS_x86="sato-sdk"
56YOCTOADT_TARGET_SYSROOT_IMAGE_x86="sato-sdk"
57YOCTOADT_TARGET_MACHINE_x86="qemux86"
58YOCTOADT_TARGET_SYSROOT_LOC_x86="$HOME/test-yocto/$YOCTOADT_TARGET_MACHINE_x86"
59
60#Here's some template of other arches, which you need to change the value in ""
61YOCTOADT_ROOTFS_x86_64="sato-sdk"
62YOCTOADT_TARGET_SYSROOT_IMAGE_x86_64="sato-sdk"
63YOCTOADT_TARGET_MACHINE_x86_64="qemux86-64"
64YOCTOADT_TARGET_SYSROOT_LOC_x86_64="$HOME/test-yocto/$YOCTOADT_TARGET_MACHINE_x86_64"
65
66YOCTOADT_ROOTFS_ppc="sato-sdk"
67YOCTOADT_TARGET_SYSROOT_IMAGE_ppc="sato-sdk"
68YOCTOADT_TARGET_MACHINE_ppc="qemuppc"
69YOCTOADT_TARGET_SYSROOT_LOC_ppc="$HOME/test-yocto/$YOCTOADT_TARGET_MACHINE_ppc"
70
71YOCTOADT_ROOTFS_mips="sato-sdk"
72YOCTOADT_TARGET_SYSROOT_IMAGE_mips="sato-sdk"
73YOCTOADT_TARGET_MACHINE_mips="qemumips"
74YOCTOADT_TARGET_SYSROOT_LOC_mips="$HOME/test-yocto/$YOCTOADT_TARGET_MACHINE_mips"
75
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
deleted file mode 100644
index ba627b3f3a..0000000000
--- a/meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-i686.conf
+++ /dev/null
@@ -1,6 +0,0 @@
1arch all 1
2arch any 6
3arch noarch 11
4arch i686-nativesdk 16
5src yp-i686-nativesdk ADTREPO_URL/adt-ipk/i686-nativesdk
6src yp-i686-all ADTREPO_URL/adt-ipk/all
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
deleted file mode 100644
index 10504a92e9..0000000000
--- a/meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-x86_64.conf
+++ /dev/null
@@ -1,6 +0,0 @@
1arch all 1
2arch any 6
3arch noarch 11
4arch x86_64-nativesdk 16
5src yp-x86_64-nativesdk ADTREPO_URL/adt-ipk/x86_64-nativesdk
6src yp-x86_64-all ADTREPO_URL/adt-ipk/all
diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
deleted file mode 100755
index 6f5fb49990..0000000000
--- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
+++ /dev/null
@@ -1,312 +0,0 @@
1#!/bin/bash
2
3# Yocto ADT Installer
4#
5# Copyright 2010-2011 by Intel Corp.
6#
7# Permission is hereby granted, free of charge, to any person obtaining a copy
8# of this software and associated documentation files (the "Software"), to deal
9# in the Software without restriction, including without limitation the rights
10# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
11# copies of the Software, and to permit persons to whom the Software is
12# furnished to do so, subject to the following conditions:
13
14# The above copyright notice and this permission notice shall be included in
15# all copies or substantial portions of the Software.
16
17# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
20# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
22# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
23# THE SOFTWARE.
24
25parse_config()
26{
27 INST_ARCH=`uname -m`
28
29 case $INST_ARCH in
30 i[3-6]86)
31 OPKG_CONFIG_FILE=$YOCTOADT_OPKG_CONF_FILE_32
32 OECORE_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/$INST_ARCH$SDK_VENDOR-linux/"
33 ;;
34 x86_64)
35 OPKG_CONFIG_FILE=$YOCTOADT_OPKG_CONF_FILE_64
36 OECORE_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/x86_64$SDK_VENDOR-linux/"
37 ;;
38 *)
39 echo_info "[ADT_INST] Error: Installation Machine is not supported!"
40 exit -1
41 ;;
42 esac
43}
44
45get_sudo_app()
46{
47 username=$(id -nu)
48
49 # find the owner of the parent
50 dir=$1
51 while [ 1 ]; do
52 if [ -d $dir ]; then
53 owner=$(stat -c %U $dir)
54 break
55 else
56 dir=$(dirname $dir)
57 fi
58 done
59
60 if [ "$owner" = "$username" ]; then
61 true
62 else
63 echo sudo
64 fi
65}
66
67# this function accepts arch_type (x86, x86_64, arm, ppc, mips) as the first
68# argument, returning the location of the target rootfs
69get_target_rootfs_location() {
70 [ -z "$1" ] && return
71
72 arch_type=$1
73 # rootfs extraction directory
74 target_sysroot_var="\$YOCTOADT_TARGET_SYSROOT_LOC_$arch_type"
75 target_sysroot=`eval echo $target_sysroot_var`
76
77 if [ "$target_sysroot" == "" ]; then
78 return
79 else
80 echo "`readlink -m $target_sysroot`"
81 fi
82}
83
84
85#let us install a qemu-native firstly
86#installation step 2
87install_native_sdk()
88{
89
90echo_info "\nStart installing selected native ADT for archs: $YOCTOADT_TARGETS..."
91
92# where the packages are installed.
93NATIVE_INSTALL_DIR=$INSTALL_FOLDER
94
95if [ -d "$INSTALL_FOLDER" ]; then
96 echo_info "\nNative ADT installation directory \"$INSTALL_FOLDER\" already exists! Continue installation will override its contents!"
97 confirm_install $1
98fi
99
100#Now begin to install native sdk and extract qemu rootfs which needs privilege rights
101#depending on the install location
102SUDO=$(get_sudo_app $NATIVE_INSTALL_DIR)
103if [ -n "$SUDO" ]; then
104 echo_info "#######################################################################"
105 echo_info "Please note from this point on installation requires sudo password ..."
106 echo_info "#######################################################################"
107fi
108
109#we need to make this directory firstly since opkg need to use it.
110OPKG_LOCK_DIR="$NATIVE_INSTALL_DIR/$OPKG_LIBDIR/opkg"
111if [ ! -d "$OPKG_LOCK_DIR" ]; then
112 $SUDO mkdir -p $OPKG_LOCK_DIR
113 echo_info "Successfully create directory $OPKG_LOCK_DIR. "
114#if user delete /opt/xxx, while dangling folders there, report error
115elif [ ! -d "$INSTALL_FOLDER" ]; then
116 echo_info "\nDangling opkg cache folder $OPKG_LOCK_DIR detected. Continue installation will remove the folder!"
117 confirm_install $1
118 $SUDO rm -rf $OPKG_LOCK_DIR
119 $SUDO mkdir -p $OPKG_LOCK_DIR
120#if user are updating installing, just let him/her go, give her/him prompt
121else
122 echo_info "ADT has already been installed. Will update its contents..."
123fi
124
125#first update repository
126if [ "x$SUDO" = "x" ]; then
127 OPKG_CMD="$LOCAL_OPKG_LOC/bin/opkg"
128else
129 OPKG_CMD="sudo -E $LOCAL_OPKG_LOC/bin/opkg"
130fi
131
132echo_info "Updating opkg..."
133$OPKG_CMD -f $OPKG_CONFIG_FILE -o $NATIVE_INSTALL_DIR update &>> $YOCTOADT_INSTALL_LOG_FILE
134check_result
135echo_info "opkg update process ended..."
136
137#install below must sdk-host packages
138OPKG_INSTALL_CMD="$OPKG_CMD "
139OPKG_INSTALL_NATIVE_CMD="$OPKG_INSTALL_CMD --force-overwrite -f $OPKG_CONFIG_FILE -o $NATIVE_INSTALL_DIR install"
140
141BASE_HOSTSDK_PKGNAMES="pseudo opkg pkgconfig libtool autoconf automake"
142for pkg in $BASE_HOSTSDK_PKGNAMES; do
143 echo_info "Installing ${pkg} nativesdk ...\n"
144 $OPKG_INSTALL_NATIVE_CMD nativesdk-${pkg} &>> $YOCTOADT_INSTALL_LOG_FILE
145 check_result
146done
147
148for target_type in $YOCTOADT_TARGETS; do
149 machine_var="\$YOCTOADT_TARGET_MACHINE_$target_type"
150 machine=`eval echo $machine_var`
151 echo_info "Installing cross canadian packages for $machine ..."
152 $OPKG_INSTALL_NATIVE_CMD packagegroup-cross-canadian-$machine &>> $YOCTOADT_INSTALL_LOG_FILE
153 check_result
154
155 target_sysroot=`get_target_rootfs_location $target_type`
156 [ -z "$target_sysroot" ] && continue
157
158 # get the environment setup script paths: original (the one before relocation)
159 # and relocated
160 env_script_original=`$OPKG_CMD -f $OPKG_CONFIG_FILE -o $NATIVE_INSTALL_DIR files meta-environment-$machine|\
161 grep environment-setup`
162 env_script_relocated=$INSTALL_FOLDER/${env_script_original##*/}
163
164 # opkg will not install packagegroup-cross-canadian package if it was already
165 # installed. So, the environment script is in one place or the other.
166 [ -e "$INSTALL_FOLDER/$env_script_original" ] && env_script=$INSTALL_FOLDER/$env_script_original
167 [ -e "$env_script_original" ] && env_script=$env_script_original
168 [ -e "$env_script_relocated" ] && env_script=$env_script_relocated
169
170 $SUDO sed -i -e "s%SDKTARGETSYSROOT=.*%SDKTARGETSYSROOT=$target_sysroot%g" $env_script
171done
172
173if [ "$YOCTOADT_QEMU" == "Y" ] || [ "$YOCTOADT_QEMU" == "y" ]; then
174 echo_info "\nInstalling qemu native ..."
175 $OPKG_INSTALL_NATIVE_CMD nativesdk-qemu &>> $YOCTOADT_INSTALL_LOG_FILE
176 check_result
177 $OPKG_INSTALL_NATIVE_CMD nativesdk-qemu-helper &>> $YOCTOADT_INSTALL_LOG_FILE
178 check_result
179fi
180
181if [ "$YOCTOADT_NFS_UTIL" == "Y" ] || [ "$YOCTOADT_NFS_UTIL" == "y" ]; then
182 echo_info "\nInstalling unfs ..."
183 $OPKG_INSTALL_NATIVE_CMD nativesdk-unfs3 &>> $YOCTOADT_INSTALL_LOG_FILE
184 check_result
185fi
186
187# Lose the ./opt/${DISTRO}/${SDK_VERSION} part, we don't really need to keep
188# the entire directory structure. We could patch opkg to do that but it's far
189# simpler to do that here and achieve the same result.
190# This is done in two steps:
191if [ -d $NATIVE_INSTALL_DIR/$DEFAULT_INSTALL_FOLDER ]; then
192 # Step 1: copy ./opt/${DISTRO}/${SDK_VERSION} contents to $NATIVE_INSTALL_DIR.
193 # We cannot use move if $NATIVE_INSTALL_DIR is not empty (for example: contains
194 # another SDK)
195 $SUDO cp -r $NATIVE_INSTALL_DIR/$DEFAULT_INSTALL_FOLDER/* $NATIVE_INSTALL_DIR
196
197 # delete the source directory now
198 $SUDO rm -rf $NATIVE_INSTALL_DIR/$DEFAULT_INSTALL_FOLDER/*
199
200 # Step 2: Delete the ./opt/${DISTRO}/${SDK_VERSION} directories too, they should be empty
201 dir=$NATIVE_INSTALL_DIR/$DEFAULT_INSTALL_FOLDER
202 while [ "$dir" != "$NATIVE_INSTALL_DIR" ]; do
203 # if the user chose / as the install folder, then we should leave /opt in place
204 if [ "$dir" = "/opt" ]; then
205 break
206 fi
207
208 # try to delete the directory, only if it's empty
209 $SUDO rmdir $dir
210 if [ $? -ne 0 ]; then
211 break
212 fi
213
214 # go to the next directory
215 dir=$(dirname $dir)
216 done
217 # Step 3: Rewrite the *.list files to contain the correct paths
218 $SUDO find $NATIVE_INSTALL_DIR/var/lib/opkg -type f -exec sed -i -e '#^$DEFAULT_INSTALL_FOLDER#$NATIVE_INSTALL_DIR#' {} \;
219fi
220
221# Link the ld.so.cache file into the hosts filesystem
222if [ ! -f "$OECORE_NATIVE_SYSROOT/etc/ld.so.cache" ]; then
223echo_info "Link the ld.so.cache file into the host filesystem"
224$SUDO ln -s /etc/ld.so.cache $OECORE_NATIVE_SYSROOT/etc/ld.so.cache
225check_result
226fi
227
228# relocate binaries
229echo_info "\nRelocating binaries ..."
230escaped_sdkpath=$(echo $DEFAULT_INSTALL_FOLDER |sed -e "s:[\+\.]:\\\\\\\\\0:g")
231
232# We don't change the script in-place since we may want the user to re-run
233# adt-installer script
234sed -e "s:##DEFAULT_INSTALL_DIR##:$escaped_sdkpath:" scripts/relocate_sdk.py > scripts/relocate_sdk_tmp.py
235chmod +x scripts/relocate_sdk_tmp.py
236
237dl_path=$(find $OECORE_NATIVE_SYSROOT/lib -name "ld-linux*")
238executable_files=$(find $OECORE_NATIVE_SYSROOT -type f -perm /111)
239
240$SUDO scripts/relocate_sdk_tmp.py $INSTALL_FOLDER $dl_path $executable_files
241check_result
242
243# replace /opt/${DISTRO}/${SDK_VERSION} with the install folder in all configs
244env_setup_script=$(find $NATIVE_INSTALL_DIR/ -name "environment-setup-*")
245$SUDO sed -i -e "s:$DEFAULT_INSTALL_FOLDER:$NATIVE_INSTALL_DIR:g" $env_setup_script
246
247find $OECORE_NATIVE_SYSROOT -type f -exec file '{}' \; | grep ":.*\(ASCII\|script\|source\).*text" | \
248 cut -d':' -f1 | xargs $SUDO sed -i -e "s:$DEFAULT_INSTALL_FOLDER:$NATIVE_INSTALL_DIR:g"
249
250# change all symlinks pointing to /opt/${DISTRO}/${SDK_VERSION}
251for l in $(find $NATIVE_INSTALL_DIR -type l); do
252 $SUDO ln -sfn $(readlink $l|sed -e "s:$DEFAULT_INSTALL_FOLDER:$NATIVE_INSTALL_DIR:") $l
253done
254
255# find out all perl scripts in $OECORE_NATIVE_SYSROOT and modify them
256# replacing the host perl with SDK perl.
257for perl_script in $($SUDO grep -m 1 "^#!.*perl" -rl $OECORE_NATIVE_SYSROOT); do
258 $SUDO sed -i -e "s:^#! */usr/bin/perl.*:#! /usr/bin/env perl:g" -e \
259 "s: /usr/bin/perl: /usr/bin/env perl:g" $perl_script
260done
261
262echo_info "\nSuccessfully installed selected native ADT!"
263}
264
265#Need three input params, $1 -- arch_type(arm powerpc x86 mips) #2 -- user installation type
266#customer or scilent
267
268install_target()
269{
270
271target_sysroot=`get_target_rootfs_location $1`
272[ -z "$target_sysroot" ] && return 0
273
274target_sysroot_image_var="\$YOCTOADT_TARGET_SYSROOT_IMAGE_$1"
275target_sysroot_image=`eval echo $target_sysroot_image_var`
276if [ "$target_sysroot_image" == "" ]; then
277 echo_info "[ADT_INST] Error: YOCTOADT_TARGET_SYSROOT_IMAGE_$1 selection is empty, failed to create target sysroot!"
278 return 1
279fi
280
281echo_info "Installing target sysroot for arch: $1, rootfs type: $target_sysroot_image, location: $target_sysroot"
282
283target_machine_var="\$YOCTOADT_TARGET_MACHINE_$1"
284target_machine=`eval echo $target_machine_var`
285sysroot_image_name="core-image-$target_sysroot_image-$target_machine.tar.bz2"
286 #echo_info "Extracting rootfs: $sysroot_image_name, using pseudo..."
287
288# sudo password might be needed to install the target sysroot
289SUDO=$(get_sudo_app $target_sysroot)
290
291$SUDO scripts/extract_rootfs $sysroot_image_name $target_sysroot $OECORE_NATIVE_SYSROOT $user_inst_type
292check_result
293}
294
295
296#Main part
297. scripts/data_define
298. scripts/util
299
300parse_config
301
302#secondly we will start to install native tools
303user_inst_type=$1
304install_native_sdk $user_inst_type
305check_result
306
307for arch_type in $YOCTOADT_TARGETS; do
308 install_target $arch_type
309 check_result
310done
311
312
diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/data_define b/meta/recipes-devtools/installer/adt-installer/scripts/data_define
deleted file mode 100644
index cfd6716134..0000000000
--- a/meta/recipes-devtools/installer/adt-installer/scripts/data_define
+++ /dev/null
@@ -1,38 +0,0 @@
1#!/bin/bash
2
3# Yocto ADT Installer
4#
5# Copyright 2010-2011 by Intel Corp.
6#
7# Permission is hereby granted, free of charge, to any person obtaining a copy
8# of this software and associated documentation files (the "Software"), to deal
9# in the Software without restriction, including without limitation the rights
10# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
11# copies of the Software, and to permit persons to whom the Software is
12# furnished to do so, subject to the following conditions:
13
14# The above copyright notice and this permission notice shall be included in
15# all copies or substantial portions of the Software.
16
17# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
20# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
22# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
23# THE SOFTWARE.
24
25config_file="adt_installer.conf"
26source `pwd`/$config_file
27
28LOCAL_OPKG_LOC="./opkg/build/opkg"
29LOCAL_OPKG_FOLDER="./opkg/build"
30
31# List all supported root fs types and target types,
32# it will be used in user configuration validity checking
33YOCTOADT_SUPPORTED_ROOTFS="minimal minimal-dev sato sato-dev sato-sdk lsb lsb-dev lsb-sdk"
34YOCTOADT_SUPPORTED_TARGETS="x86 x86_64 arm ppc mips"
35# Different host (32 bit or 64 bit) will have different opkg
36# configuration files
37YOCTOADT_OPKG_CONF_FILE_32="./opkg/conf/opkg-sdk-i686.conf"
38YOCTOADT_OPKG_CONF_FILE_64="./opkg/conf/opkg-sdk-x86_64.conf"
diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/extract_rootfs b/meta/recipes-devtools/installer/adt-installer/scripts/extract_rootfs
deleted file mode 100755
index d1a595b268..0000000000
--- a/meta/recipes-devtools/installer/adt-installer/scripts/extract_rootfs
+++ /dev/null
@@ -1,67 +0,0 @@
1#!/bin/bash
2
3# Yocto ADT Installer
4#
5# Copyright 2010-2011 by Intel Corp.
6#
7# Permission is hereby granted, free of charge, to any person obtaining a copy
8# of this software and associated documentation files (the "Software"), to deal
9# in the Software without restriction, including without limitation the rights
10# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
11# copies of the Software, and to permit persons to whom the Software is
12# furnished to do so, subject to the following conditions:
13
14# The above copyright notice and this permission notice shall be included in
15# all copies or substantial portions of the Software.
16
17# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
20# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
22# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
23# THE SOFTWARE.
24
25extract_rootfs()
26{
27
28 native_sysroot=$3
29 target_sysroot=$2
30 PSEUDO_COMMAND="$native_sysroot/usr/bin/pseudo"
31 TAR_OPTS="-xjf"
32 PSEUDO_OPTS="-P $native_sysroot/usr"
33
34
35 rm -rf $PSEUDO_LOCALSTATEDIR
36
37 if [ -d "$target_sysroot" ]; then
38 echo_info "\nTarget sysroot location: $target_sysroot, already exists! If you continue installation, this folder will be re-created."
39 confirm_install $4
40 rm -rf "$target_sysroot"
41 fi
42
43 if [ ! -d "$target_sysroot" ]; then
44 echo_info "Creating directory $target_sysroot..."
45 mkdir -p "$target_sysroot"
46 fi
47
48 pseudo_state_dir="$target_sysroot/../$(basename "$target_sysroot").pseudo_state"
49 mkdir -p "$pseudo_state_dir"
50 touch "$pseudo_state_dir/pseudo.pid"
51 PSEUDO_LOCALSTATEDIR="$pseudo_state_dir"
52 export PSEUDO_LOCALSTATEDIR
53
54 echo_info "Extracting rootfs: $1, using pseudo..."
55 $PSEUDO_COMMAND $PSEUDO_OPTS tar -C $2 "$TAR_OPTS" $LOCAL_DOWNLOAD/$1 &>> $YOCTOADT_INSTALL_LOG_FILE
56 check_result
57}
58
59#Main part
60. scripts/util
61
62#Parameter detail is listed below:
63#Param 4: Silent install or customize install
64#Param 3: OECORE_NATIVE_SYSROOT
65#Param 2: user defined rootfs extraction directory
66#param 1: sysroot image name
67extract_rootfs $1 $2 $3 $4
diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/util b/meta/recipes-devtools/installer/adt-installer/scripts/util
deleted file mode 100644
index 9be7517272..0000000000
--- a/meta/recipes-devtools/installer/adt-installer/scripts/util
+++ /dev/null
@@ -1,104 +0,0 @@
1#!/bin/bash
2
3# Yocto ADT Installer
4#
5# Copyright 2010-2011 by Intel Corp.
6#
7# Permission is hereby granted, free of charge, to any person obtaining a copy
8# of this software and associated documentation files (the "Software"), to deal
9# in the Software without restriction, including without limitation the rights
10# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
11# copies of the Software, and to permit persons to whom the Software is
12# furnished to do so, subject to the following conditions:
13
14# The above copyright notice and this permission notice shall be included in
15# all copies or substantial portions of the Software.
16
17# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
20# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
22# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
23# THE SOFTWARE.
24
25echo_info()
26{
27 echo -e $1 | tee -a $YOCTOADT_INSTALL_LOG_FILE
28}
29
30select_install_type()
31{
32# If choosing silent install, all older installation data will be
33# overriden without user's interaction
34while true; do
35 #echo_info "[ADT_INST] Silent install means overrides all existing older"
36 #echo_info "[ADT_INST] data and the installation needs least user interaction"
37 #echo_info "[ADT_INST] If you want to use silent installation, please enter S:"
38 #echo_info "[ADT_INST] If you want to customize installation, please enter C:"
39 #echo_info "[ADT_INST} If you want to exit current installation, please enter X:"
40 echo_info "There're two ways you can do installation: silent mode or interactive mode. To choose silent mode, which means you opt for the system to override the existing data under the specified installation directories without prompting for your confirmation. Please be cautious with this selection which may trigger your losing data. With the interactive mode, you have to closely monitor the installation process, since it will prompt you each step it needs to override some existing data. To choose silent mode, please enter [S], for interactive mode, please enter [I] or [X] to exit the installation."
41 echo_info "[ADT_INST] Please enter your selections here:"
42 read YOCTOADT_SEL
43 YOCTOADT_SEL=`tr '[a-z]' '[A-Z]'<<<"$YOCTOADT_SEL"`
44 if [ "$YOCTOADT_SEL" == "S" ]; then
45 return "0"
46 elif [ "$YOCTOADT_SEL" == "I" ]; then
47 return "1"
48 elif [ "$YOCTOADT_SEL" == "X" ]; then
49 echo_info "\n############################################################"
50 echo_info "# User cancelled installation!"
51 echo_info "############################################################\n"
52 exit 1
53 fi
54done
55
56
57}
58
59confirm_install()
60{
61# below are prompt, make sure user still want to install even meet
62# some prompts
63
64#User likes to enjoy silent installation, we will not break his
65#installation process here
66if [ "$1" == "0" ]; then
67 return
68fi
69
70while true; do
71 echo_info "[ADT_INST] Do you want to continue installation? Please enter Y/N:"
72 read YOCTOADT_INSTALL
73 YOCTOADT_INSTALL=`tr '[a-z]' '[A-Z]'<<<"$YOCTOADT_INSTALL"`
74 if [ "$YOCTOADT_INSTALL" == "Y" ]; then
75 break
76 elif [ "$YOCTOADT_INSTALL" == "N" ]; then
77 echo_info "\n############################################################"
78 echo_info "# User cancelled installation!"
79 echo_info "############################################################\n"
80 exit 1
81 fi
82done
83}
84
85check_result()
86{
87 result=$?
88 if [ $result -eq 1 ]; then
89 exit -1
90 elif [ $result -ne 0 ]; then
91 echo_info "\n#############################################################################"
92 echo_info "# Meet error(s) when installing Yocto ADT! Please check log file for details. "
93 echo_info "#############################################################################\n"
94 exit -1
95 fi
96}
97
98# yocto adt installation log file
99YOCTOADT_INSTALL_LOG_FILE="adt_installer.log"
100# Temp folders holding qemu/rootfs downloaded images
101# It will be put into the installation folder
102LOCAL_DOWNLOAD="./download_image"
103
104
diff --git a/meta/recipes-devtools/installer/adt-installer_1.0.bb b/meta/recipes-devtools/installer/adt-installer_1.0.bb
deleted file mode 100644
index 4c2f0971a2..0000000000
--- a/meta/recipes-devtools/installer/adt-installer_1.0.bb
+++ /dev/null
@@ -1,94 +0,0 @@
1# Yocto ADT Installer bb file
2#
3# Copyright 2010-2012 by Intel Corp.
4#
5# Permission is hereby granted, free of charge, to any person obtaining a copy
6# of this software and associated documentation files (the "Software"), to deal
7# in the Software without restriction, including without limitation the rights
8# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9# copies of the Software, and to permit persons to whom the Software is
10# furnished to do so, subject to the following conditions:
11
12# The above copyright notice and this permission notice shall be included in
13# all copies or substantial portions of the Software.
14
15# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21# THE SOFTWARE.
22
23
24SUMMARY = "Application Development Toolkit"
25DESCRIPTION = "Creates the Application Development Toolkit (ADT) installer tarball"
26HOMEPAGE = "http://www.yoctoproject.org/tools-resources/projects/application-development-toolkit-adt"
27LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \
28 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
29LICENSE = "MIT"
30
31PACKAGES = ""
32INHIBIT_DEFAULT_DEPS = "1"
33
34PR = "r11"
35
36ADT_DEPLOY = "${DEPLOY_DIR}/sdk/"
37ADT_DIR = "${WORKDIR}/adt-installer/"
38S = "${WORKDIR}/opkg-${PV}"
39
40PV = "0.3.0"
41SRC_URI = "http://downloads.yoctoproject.org/releases/opkg/opkg-${PV}.tar.gz \
42 file://wget_cache.patch \
43 file://adt_installer \
44 file://scripts/adt_installer_internal \
45 file://scripts/util \
46 file://scripts/data_define \
47 file://scripts/extract_rootfs \
48 file://adt_installer.conf \
49 file://opkg/conf/opkg-sdk-x86_64.conf \
50 file://opkg/conf/opkg-sdk-i686.conf \
51 "
52
53SRC_URI[md5sum] = "3412cdc71d78b98facc84b19331ec64e"
54SRC_URI[sha256sum] = "7f735d1cdb8ef3718fb0f9fba44ca0d9a5c90d3a7f014f37a6d2f9474f54988f"
55
56ADTREPO ?= "http://adtrepo.yoctoproject.org/${SDK_VERSION}"
57
58# This recipe makes no sense as a multilib
59MULTILIBS = ""
60
61do_populate_adt[umask] = "022"
62
63fakeroot do_populate_adt () {
64 cd ${WORKDIR}
65 mkdir -p ${ADT_DEPLOY}
66 rm -f ${ADT_DEPLOY}/adt_installer.tar.bz2
67 rm -rf ${ADT_DIR}
68 mkdir -p ${ADT_DIR}/opkg/build
69 cp -r opkg ${ADT_DIR}/
70 sed -i -e 's#ADTREPO_URL#${ADTREPO}#' ${ADT_DIR}/opkg/conf/*.conf
71 cp -r opkg-${PV} ${ADT_DIR}/opkg/build/
72 mv ${ADT_DIR}/opkg/build/opkg-${PV} ${ADT_DIR}/opkg/build/opkg-svn
73 rm -rf ${ADT_DIR}/opkg/build/opkg-svn/patches ${ADT_DIR}/opkg/build/opkg-svn/.pc
74 cp -r scripts ${ADT_DIR}/
75 cp adt_installer ${ADT_DIR}
76 cp adt_installer.conf ${ADT_DIR}
77 sed -i -e 's#ADTREPO#${ADTREPO}#' ${ADT_DIR}/adt_installer.conf
78 echo 'SDK_VENDOR=${SDK_VENDOR}' >> ${ADT_DIR}/scripts/data_define
79 echo 'DEFAULT_INSTALL_FOLDER=${SDKPATH}' >> ${ADT_DIR}/scripts/data_define
80 cp ${COREBASE}/scripts/relocate_sdk.py ${ADT_DIR}/scripts/
81 tar cfj adt_installer.tar.bz2 adt-installer
82 cp ${WORKDIR}/adt_installer.tar.bz2 ${ADT_DEPLOY}
83}
84
85do_configure[noexec] = "1"
86do_compile[noexec] = "1"
87do_package[noexec] = "1"
88do_packagedata[noexec] = "1"
89do_package_write_ipk[noexec] = "1"
90do_package_write_rpm[noexec] = "1"
91do_package_write_deb[noexec] = "1"
92do_poplulate_sysroot[noexec] = "1"
93
94addtask populate_adt before do_build after do_install
diff --git a/meta/recipes-devtools/installer/files/wget_cache.patch b/meta/recipes-devtools/installer/files/wget_cache.patch
deleted file mode 100644
index 9117510f1f..0000000000
--- a/meta/recipes-devtools/installer/files/wget_cache.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3---
4 libopkg/opkg_download_wget.c | 1 +
5 1 file changed, 1 insertion(+)
6
7diff --git a/libopkg/opkg_download_wget.c b/libopkg/opkg_download_wget.c
8index 9001493..18ef91e 100644
9--- a/libopkg/opkg_download_wget.c
10+++ b/libopkg/opkg_download_wget.c
11@@ -50,6 +50,7 @@ int opkg_download_backend(const char *src, const char *dest,
12
13 argv[i++] = "wget";
14 argv[i++] = "-q";
15+ argv[i++] = "--no-cache";
16 if (opkg_config->http_proxy || opkg_config->ftp_proxy) {
17 argv[i++] = "-Y";
18 argv[i++] = "on";
19--
201.9.1
21
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-12 17:56:52 +0000