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/scripts | |
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/scripts')
-rwxr-xr-x | meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal index 462199c563..abed90d241 100755 --- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal +++ b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal | |||
@@ -121,23 +121,12 @@ for pkg in $BASE_HOSTSDK_PKGNAMES; do | |||
121 | check_result | 121 | check_result |
122 | done | 122 | done |
123 | 123 | ||
124 | for native_target_type in $YOCTOADT_TARGETS; do | 124 | for target_type in $YOCTOADT_TARGETS; do |
125 | native_target_type=`echo "$native_target_type" | sed -e 's/x86_64/x86-64/' -e 's/ppc/powerpc/' -e 's/x86$/i586/'` | 125 | machine_var="\$YOCTOADT_TARGET_MACHINE_$target_type" |
126 | echo_info "Installing cross toolchain for $native_target_type ..." | 126 | machine=`eval echo $machine_var` |
127 | echo_info "Installing binutils for $native_target_type ..." | 127 | echo_info "Installing cross canadian packages for $machine ..." |
128 | $OPKG_INSTALL_NATIVE_CMD binutils-cross-canadian-$native_target_type &>> $YOCTOADT_INSTALL_LOG_FILE | 128 | $OPKG_INSTALL_NATIVE_CMD packagegroup-cross-canadian-$machine &>> $YOCTOADT_INSTALL_LOG_FILE |
129 | check_result | 129 | check_result |
130 | echo_info "Installing gcc for $native_target_type ..." | ||
131 | $OPKG_INSTALL_NATIVE_CMD gcc-cross-canadian-$native_target_type &>> $YOCTOADT_INSTALL_LOG_FILE | ||
132 | check_result | ||
133 | echo_info "Installing gdb for $native_target_type ..." | ||
134 | $OPKG_INSTALL_NATIVE_CMD gdb-cross-canadian-$native_target_type &>> $YOCTOADT_INSTALL_LOG_FILE | ||
135 | check_result | ||
136 | |||
137 | echo_info "Installing environment file for $native_target_type ..." | ||
138 | $OPKG_INSTALL_NATIVE_CMD meta-environment-$native_target_type &>> $YOCTOADT_INSTALL_LOG_FILE | ||
139 | check_result | ||
140 | |||
141 | done | 130 | done |
142 | 131 | ||
143 | if [ "$YOCTOADT_QEMU" == "Y" ] || [ "$YOCTOADT_QEMU" = "y" ]; then | 132 | if [ "$YOCTOADT_QEMU" == "Y" ] || [ "$YOCTOADT_QEMU" = "y" ]; then |
@@ -255,9 +244,9 @@ fi | |||
255 | 244 | ||
256 | echo_info "Installing target sysroot for arch: $1, rootfs type: $target_sysroot_image, location: $target_sysroot" | 245 | echo_info "Installing target sysroot for arch: $1, rootfs type: $target_sysroot_image, location: $target_sysroot" |
257 | 246 | ||
258 | 247 | target_machine_var="\$YOCTOADT_TARGET_MACHINE_$1" | |
259 | qemu_type=`echo "$1" | sed -e 's/x86_64/x86-64/'` | 248 | target_machine=`eval echo $target_machine_var` |
260 | sysroot_image_name="core-image-$target_sysroot_image-qemu$qemu_type.tar.bz2" | 249 | sysroot_image_name="core-image-$target_sysroot_image-$target_machine.tar.bz2" |
261 | #echo_info "Extracting rootfs: $sysroot_image_name, using pseudo..." | 250 | #echo_info "Extracting rootfs: $sysroot_image_name, using pseudo..." |
262 | 251 | ||
263 | $SUDO scripts/extract_rootfs $sysroot_image_name $target_sysroot $OECORE_NATIVE_SYSROOT $user_inst_type | 252 | $SUDO scripts/extract_rootfs $sysroot_image_name $target_sysroot $OECORE_NATIVE_SYSROOT $user_inst_type |