From aedff44a9a257ac67bfa6d18fb205ae49c1a7362 Mon Sep 17 00:00:00 2001 From: Lianhao Lu Date: Mon, 9 Apr 2012 18:32:02 +0800 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-devtools/installer/adt-installer/adt_installer | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/recipes-devtools/installer/adt-installer/adt_installer') 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 check_result echo_info "Configure opkg ...\n" - ./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 + ./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 check_result echo_info "Make opkg ...\n" @@ -241,7 +241,7 @@ get_qemu_image() if [ "$1" == "x86" ] || [ "$1" == "x86_64" ]; then qemu_kernel="bzImage-qemu$target.bin" - elif [ "$1" == "mips" ]; then + elif [ "$1" == "ppc" ] || [ "$1" == "mips" ]; then qemu_kernel="vmlinux-qemu$target.bin" else qemu_kernel="zImage-qemu$target.bin" -- cgit v1.2.3-54-g00ecf