diff options
author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2013-09-10 18:10:50 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-10 22:58:33 +0100 |
commit | 5992830145c55f5103b4ba24f98eeeae13c604fc (patch) | |
tree | ec1616b3571c63b7bb5c9c4832097368ed4af866 /meta/recipes-devtools/installer/adt-installer/adt_installer | |
parent | 32090b6ea0bf7d49a6c8bfb271535c644fe612d6 (diff) | |
download | poky-5992830145c55f5103b4ba24f98eeeae13c604fc.tar.gz |
adt-installer: allow installation of other machines
Currently, adt-installer allows only the installation of qemu target
sysroots.
The changes in this patch do the following:
* add a new setting in adt-installer.conf (YOCTOADT_TARGET_MACHINE) for
each target architecture. For example, for arm we can choose to use a
qemuarm sysroot or a beagleboard sysroot. By default, only the qemu
target sysroots are selected (current behavior);
* change adt_installer scripts to allow installing the correct
meta-environment package for the selected machine;
* remove some left-over commented lines;
* use packagegroup-cross-canadian-${MACHINE} when installing the cross
canadian packages instead of doing it separately for each package;
* change the opkg config files in order to be able to find the
packagegroup package, which is allarch;
[YOCTO #4783]
(From OE-Core rev: 02085d410bf734e833d45293f4d5b06bb9536a60)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/installer/adt-installer/adt_installer')
-rwxr-xr-x | meta/recipes-devtools/installer/adt-installer/adt_installer | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer b/meta/recipes-devtools/installer/adt-installer/adt_installer index a6042b9c2d..76afcf36ed 100755 --- a/meta/recipes-devtools/installer/adt-installer/adt_installer +++ b/meta/recipes-devtools/installer/adt-installer/adt_installer | |||
@@ -233,44 +233,44 @@ wget "$YOCTOADT_REPO/rootfs/$1" -P $LOCAL_DOWNLOAD --progress=bar:force 2>&1 | t | |||
233 | 233 | ||
234 | 234 | ||
235 | 235 | ||
236 | #Need two input params, $1 -- arch_type(arm powerpc x86 mips) $2 rootfs_image_type (a list of sdk sato minimal lsb) | 236 | #Need three input params: |
237 | get_qemu_image() | 237 | # $1 arch_type(arm powerpc x86 mips) |
238 | # $2 machine(qemuarm beagleboard) | ||
239 | # $3 rootfs_image_type (a list of sdk sato minimal lsb) | ||
240 | get_image() | ||
238 | { | 241 | { |
242 | local machine=$2 | ||
239 | 243 | ||
240 | local target=`echo "$1" | sed -e 's/x86_64/x86-64/'` | ||
241 | |||
242 | if [ "$1" == "x86" ] || [ "$1" == "x86_64" ]; then | 244 | if [ "$1" == "x86" ] || [ "$1" == "x86_64" ]; then |
243 | qemu_kernel="bzImage-qemu$target.bin" | 245 | kernel="bzImage-$machine.bin" |
244 | elif [ "$1" == "ppc" ] || [ "$1" == "mips" ]; then | 246 | elif [ "$1" == "ppc" ] || [ "$1" == "mips" ]; then |
245 | qemu_kernel="vmlinux-qemu$target.bin" | 247 | kernel="vmlinux-$machine.bin" |
246 | else | 248 | else |
247 | qemu_kernel="zImage-qemu$target.bin" | 249 | kernel="zImage-$machine.bin" |
248 | fi | 250 | fi |
249 | 251 | ||
250 | #echo_info "[ADT_INST] Downloading qemu kernel binary: $qemu_kernel" | 252 | #echo_info "[ADT_INST] Downloading qemu kernel binary: $qemu_kernel" |
251 | download_file qemu$1/$qemu_kernel | 253 | download_file $machine/$kernel |
252 | check_result | 254 | check_result |
253 | 255 | ||
254 | for image_type in $select_rootfs; do | 256 | for image_type in $select_rootfs; do |
255 | #echo_info "[ADT_INST] Downloading rootfs file: core-image-$image_type-qemu$1.tar.bz2" | 257 | #echo_info "[ADT_INST] Downloading rootfs file: core-image-$image_type-$machine.tar.bz2" |
256 | filename="core-image-$image_type-qemu$target.tar.bz2" | 258 | filename="core-image-$image_type-$machine.tar.bz2" |
257 | download_file qemu$1/$filename | 259 | download_file $machine/$filename |
258 | check_result | 260 | check_result |
259 | done | 261 | done |
260 | } | 262 | } |
261 | 263 | ||
262 | download_images() | 264 | download_images() |
263 | { | 265 | { |
264 | #select_target_var="\$YOCTOADT_TARGET_$1" | ||
265 | #select_target=`eval echo $select_target_var` | ||
266 | |||
267 | #if [ "$select_target" == "Y" ]; then | ||
268 | select_rootfs_var="\$YOCTOADT_ROOTFS_$1" | 266 | select_rootfs_var="\$YOCTOADT_ROOTFS_$1" |
269 | select_sysroot_image_var="\$YOCTOADT_TARGET_SYSROOT_IMAGE_$1" | 267 | select_sysroot_image_var="\$YOCTOADT_TARGET_SYSROOT_IMAGE_$1" |
270 | select_sysroot_var="\$YOCTOADT_TARGET_SYSROOT_LOC_$1" | 268 | select_sysroot_var="\$YOCTOADT_TARGET_SYSROOT_LOC_$1" |
269 | select_machine_var="\$YOCTOADT_TARGET_MACHINE_$1" | ||
271 | select_rootfs=`eval echo $select_rootfs_var` | 270 | select_rootfs=`eval echo $select_rootfs_var` |
272 | select_sysroot_image=`eval echo $select_sysroot_image_var` | 271 | select_sysroot_image=`eval echo $select_sysroot_image_var` |
273 | select_sysroot=`eval echo $select_sysroot_var` | 272 | select_sysroot=`eval echo $select_sysroot_var` |
273 | select_machine=`eval echo $select_machine_var` | ||
274 | 274 | ||
275 | if [ -n "$select_sysroot" ]; then | 275 | if [ -n "$select_sysroot" ]; then |
276 | select_sysroot=`readlink -m $select_sysroot` | 276 | select_sysroot=`readlink -m $select_sysroot` |
@@ -282,13 +282,14 @@ download_images() | |||
282 | #echo_info "# To be downloaded rootfs image details defined in adt_installer.conf" | 282 | #echo_info "# To be downloaded rootfs image details defined in adt_installer.conf" |
283 | #echo_info "############################################################################" | 283 | #echo_info "############################################################################" |
284 | echo_info "# Target architecture:\t\t$1" | 284 | echo_info "# Target architecture:\t\t$1" |
285 | echo_info "# Target machine:\t\t$select_machine" | ||
285 | echo_info "# Root_fs images:\t\t$select_rootfs" | 286 | echo_info "# Root_fs images:\t\t$select_rootfs" |
286 | echo_info "# Target sysroot image:\t\t$select_sysroot_image" | 287 | echo_info "# Target sysroot image:\t\t$select_sysroot_image" |
287 | echo_info "# Target sysroot loc:\t\t$select_sysroot" | 288 | echo_info "# Target sysroot loc:\t\t$select_sysroot" |
288 | echo_info "\n" | 289 | echo_info "\n" |
289 | #echo_info "############################################################################\n" | 290 | #echo_info "############################################################################\n" |
290 | else | 291 | else |
291 | get_qemu_image $1 $select_rootfs | 292 | get_image $1 $select_machine $select_rootfs |
292 | fi | 293 | fi |
293 | fi | 294 | fi |
294 | } | 295 | } |