summaryrefslogtreecommitdiffstats
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
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>
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/adt_installer4
-rw-r--r--meta/recipes-devtools/installer/adt-installer/adt_installer.conf20
-rw-r--r--meta/recipes-devtools/installer/adt-installer_1.0.bb2
3 files changed, 13 insertions, 13 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"
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
index 275756e187..afc69a4e7c 100644
--- a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
+++ b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
@@ -42,7 +42,7 @@ YOCTOADT_NFS_UTIL="Y"
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 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" 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 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="minimal" 45YOCTOADT_TARGET_SYSROOT_IMAGE_arm="sato-sdk"
46#The location where the target sysroot will be setup 46#The location where the target sysroot will be setup
47YOCTOADT_TARGET_SYSROOT_LOC_arm="$HOME/test-yocto/arm" 47YOCTOADT_TARGET_SYSROOT_LOC_arm="$HOME/test-yocto/arm"
48 48
@@ -52,14 +52,14 @@ YOCTOADT_TARGET_SYSROOT_LOC_arm="$HOME/test-yocto/arm"
52#YOCTOADT_TARGET_SYSROOT_LOC_x86="$HOME/test-yocto/x86" 52#YOCTOADT_TARGET_SYSROOT_LOC_x86="$HOME/test-yocto/x86"
53 53
54#Here's some template of other arches, which you need to change the value in "" 54#Here's some template of other arches, which you need to change the value in ""
55#YOCTOADT_TARGET_SYSROOT_IMAGE_x86_64="" 55#YOCTOADT_ROOTFS_x86_64="sato-sdk"
56#YOCTOADT_TARGET_SYSROOT_LOC_x86_64="" 56#YOCTOADT_TARGET_SYSROOT_IMAGE_x86_64="sato-sdk"
57#YOCTOADT_ROOTFS_x86_64="" 57#YOCTOADT_TARGET_SYSROOT_LOC_x86_64="$HOME/test-yocto/x86_64"
58 58
59#YOCTOADT_TARGET_SYSROOT_IMAGE_ppc="" 59#YOCTOADT_ROOTFS_ppc="sato-sdk"
60#YOCTOADT_TARGET_SYSROOT_LOC_ppc="" 60#YOCTOADT_TARGET_SYSROOT_IMAGE_ppc="sato-sdk"
61#YOCTOADT_ROOTFS_ppc="" 61#YOCTOADT_TARGET_SYSROOT_LOC_ppc="$HOME/test-yocto/ppc"
62 62
63#YOCTOADT_TARGET_SYSROOT_IMAGE_mips="" 63#YOCTOADT_ROOTFS_mips="sato-sdk"
64#YOCTOADT_TARGET_SYSROOT_LOC_mips="" 64#YOCTOADT_TARGET_SYSROOT_IMAGE_mips="sato-sdk"
65#YOCTOADT_ROOTFS_mips="" 65#YOCTOADT_TARGET_SYSROOT_LOC_mips="$HOME/test-yocto/mips"
diff --git a/meta/recipes-devtools/installer/adt-installer_1.0.bb b/meta/recipes-devtools/installer/adt-installer_1.0.bb
index 07bef882d8..5dc0896e5e 100644
--- a/meta/recipes-devtools/installer/adt-installer_1.0.bb
+++ b/meta/recipes-devtools/installer/adt-installer_1.0.bb
@@ -30,7 +30,7 @@ ALLOW_EMPTY = "1"
30 30
31PACKAGES = "" 31PACKAGES = ""
32 32
33PR = "r8" 33PR = "r9"
34 34
35ADT_DEPLOY = "${TMPDIR}/deploy/sdk/" 35ADT_DEPLOY = "${TMPDIR}/deploy/sdk/"
36ADT_DIR = "${WORKDIR}/adt-installer/" 36ADT_DIR = "${WORKDIR}/adt-installer/"