summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/installer/adt-installer/adt_installer
diff options
context:
space:
mode:
authorLianhao Lu <lianhao.lu@intel.com>2012-04-09 18:32:02 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-10 13:32:01 +0100
commitaedff44a9a257ac67bfa6d18fb205ae49c1a7362 (patch)
treea4542bbbc901bd7068da6ad864743e76ff01ef9d /meta/recipes-devtools/installer/adt-installer/adt_installer
parenta0ccc1fb24f45da3688ce3cde09107e71b6de561 (diff)
downloadpoky-aedff44a9a257ac67bfa6d18fb205ae49c1a7362.tar.gz
adt-installer: Fixed ppc kernel naming.
1. Fixed the ppc kernel naming. 2. Disabled opkg shared library to avoid runtime opkg-cl launching error. 3. Adjusted the variable sequence in adt-installer.conf Fixed bug [YOCTO #2233] (From OE-Core rev: fdf65d9f12d67f4290b83253efdbb34e5551fbb2) Signed-off-by: Lianhao Lu <lianhao.lu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/installer/adt-installer/adt_installer')
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/adt_installer4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer b/meta/recipes-devtools/installer/adt-installer/adt_installer
index 1dd07b7f34..1a53eb9c54 100755
--- a/meta/recipes-devtools/installer/adt-installer/adt_installer
+++ b/meta/recipes-devtools/installer/adt-installer/adt_installer
@@ -170,7 +170,7 @@ if [ ! -x "$LOCAL_OPKG_LOC/bin/opkg-cl" ]; then
170 check_result 170 check_result
171 171
172 echo_info "Configure opkg ...\n" 172 echo_info "Configure opkg ...\n"
173 ./autogen.sh --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 173 ./autogen.sh --prefix=$parent_folder/$LOCAL_OPKG_LOC --with-opkglibdir=$OPKG_LIBDIR --enable-shared=no --disable-curl --disable-ssl-curl --disable-gpg --disable-shave >> $parent_folder/$YOCTOADT_INSTALL_LOG_FILE
174 check_result 174 check_result
175 175
176 echo_info "Make opkg ...\n" 176 echo_info "Make opkg ...\n"
@@ -241,7 +241,7 @@ get_qemu_image()
241 241
242 if [ "$1" == "x86" ] || [ "$1" == "x86_64" ]; then 242 if [ "$1" == "x86" ] || [ "$1" == "x86_64" ]; then
243 qemu_kernel="bzImage-qemu$target.bin" 243 qemu_kernel="bzImage-qemu$target.bin"
244 elif [ "$1" == "mips" ]; then 244 elif [ "$1" == "ppc" ] || [ "$1" == "mips" ]; then
245 qemu_kernel="vmlinux-qemu$target.bin" 245 qemu_kernel="vmlinux-qemu$target.bin"
246 else 246 else
247 qemu_kernel="zImage-qemu$target.bin" 247 qemu_kernel="zImage-qemu$target.bin"