summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJessica Zhang <jessica.zhang@intel.com>2011-02-08 22:30:25 -0800
committerJessica Zhang <jessica.zhang@intel.com>2011-02-08 23:10:13 -0800
commit4ed19cfd21e455d57569ce06dd51b1b0e8860c77 (patch)
treeb3017402f40760f44c5c9789971a256dcdbbde3f /meta
parent29ed2c6e9a0c3cc57c5bbaf3c53e1cff8586c51c (diff)
downloadpoky-4ed19cfd21e455d57569ce06dd51b1b0e8860c77.tar.gz
adt-installer: change to adopt the adt public repo directory layout
Signed-off-by: Jessica Zhang <jessica.zhang@intel.com>
Diffstat (limited to 'meta')
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/adt_installer8
-rw-r--r--meta/recipes-devtools/installer/adt-installer/adt_installer.conf2
-rw-r--r--meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-i586.conf7
-rw-r--r--meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-i686.conf6
-rw-r--r--meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-x86_64.conf5
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal3
-rw-r--r--meta/recipes-devtools/installer/adt-installer/scripts/data_define2
-rw-r--r--meta/recipes-devtools/installer/adt-installer_1.0.bb2
8 files changed, 17 insertions, 18 deletions
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer b/meta/recipes-devtools/installer/adt-installer/adt_installer
index d47be4123b..1f481ded61 100755
--- a/meta/recipes-devtools/installer/adt-installer/adt_installer
+++ b/meta/recipes-devtools/installer/adt-installer/adt_installer
@@ -237,20 +237,20 @@ get_qemu_image()
237{ 237{
238 if [ "$1" == "x86" ]; then 238 if [ "$1" == "x86" ]; then
239 qemu_kernel="bzImage-qemu$1.bin" 239 qemu_kernel="bzImage-qemu$1.bin"
240 elif [ "$1" == "arm" ]; then 240 elif [ "$1" == "mips" ]; then
241 qemu_kernel="zImage-qemu$1.bin" 241 qemu_kernel="vmlinux-qemu$1.bin"
242 else 242 else
243 qemu_kernel="zImage-qemu$1.bin" 243 qemu_kernel="zImage-qemu$1.bin"
244 fi 244 fi
245 245
246 #echo_info "[ADT_INST] Downloading qemu kernel binary: $qemu_kernel" 246 #echo_info "[ADT_INST] Downloading qemu kernel binary: $qemu_kernel"
247 download_file $qemu_kernel 247 download_file qemu$1/$qemu_kernel
248 check_result 248 check_result
249 249
250 for image_type in $select_rootfs; do 250 for image_type in $select_rootfs; do
251 #echo_info "[ADT_INST] Downloading rootfs file: poky-image-$image_type-qemu$1.tar.bz2" 251 #echo_info "[ADT_INST] Downloading rootfs file: poky-image-$image_type-qemu$1.tar.bz2"
252 filename="poky-image-$image_type-qemu$1.tar.bz2" 252 filename="poky-image-$image_type-qemu$1.tar.bz2"
253 download_file $filename 253 download_file qemu$1/$filename
254 check_result 254 check_result
255 done 255 done
256} 256}
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
index a31e5595d2..db602f6d6d 100644
--- a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
+++ b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf
@@ -23,7 +23,7 @@
23 23
24# Your yocto distro repository, this should include IPKG based packages and root filesystem files where the installation is based on 24# Your yocto distro repository, this should include IPKG based packages and root filesystem files where the installation is based on
25 25
26YOCTOADT_IPKG_REPO="http://" 26YOCTOADT_IPKG_REPO="http://adtrepo.yoctoproject.org/1.0/rootfs"
27 27
28# The following are for system wide setup 28# The following are for system wide setup
29# Target architectures that you want to setup host cross dev environment for 29# Target architectures that you want to setup host cross dev environment for
diff --git a/meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-i586.conf b/meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-i586.conf
deleted file mode 100644
index 36e585c4a6..0000000000
--- a/meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-i586.conf
+++ /dev/null
@@ -1,7 +0,0 @@
1arch all 1
2arch any 6
3arch noarch 11
4arch i586-nativesdk 16
5src oe http://
6src oe-all http://
7src oe-i586-nativesdk http://
diff --git a/meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-i686.conf b/meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-i686.conf
new file mode 100644
index 0000000000..1d8c89a840
--- /dev/null
+++ b/meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-i686.conf
@@ -0,0 +1,6 @@
1arch all 1
2arch any 6
3arch noarch 11
4arch i686-nativesdk 16
5src yp http://adtrepo.yoctoproject.org/1.0/adt-ipk
6src yp-i686-nativesdk http://adtrepo.yoctoproject.org/1.0/adt-ipk/i686-nativesdk
diff --git a/meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-x86_64.conf b/meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-x86_64.conf
index 3ab49309d3..6b14f98630 100644
--- a/meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-x86_64.conf
+++ b/meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-x86_64.conf
@@ -2,6 +2,5 @@ arch all 1
2arch any 6 2arch any 6
3arch noarch 11 3arch noarch 11
4arch x86_64-nativesdk 16 4arch x86_64-nativesdk 16
5src oe http:// 5src yp http://adtrepo.yoctoproject.org/1.0/adt-ipk
6src oe-all http:// 6src yp-x86_64-nativesdk http://adtrepo.yoctoproject.org/1.0/adt-ipk/x86_64-nativesdk
7src oe-x86_64-nativesdk http://
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 78e5c97436..9653284e5a 100755
--- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
+++ b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
@@ -29,7 +29,8 @@ parse_config()
29 case $INST_ARCH in 29 case $INST_ARCH in
30 i[3-6]86) 30 i[3-6]86)
31 OPKG_CONFIG_FILE=$YOCTOADT_OPKG_CONF_FILE_32 31 OPKG_CONFIG_FILE=$YOCTOADT_OPKG_CONF_FILE_32
32 POKY_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/i586-pokysdk-linux/" 32 #POKY_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/i586-pokysdk-linux/"
33 POKY_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/$INST_ARCH-pokysdk-linux/"
33 ;; 34 ;;
34 x86_64) 35 x86_64)
35 OPKG_CONFIG_FILE=$YOCTOADT_OPKG_CONF_FILE_64 36 OPKG_CONFIG_FILE=$YOCTOADT_OPKG_CONF_FILE_64
diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/data_define b/meta/recipes-devtools/installer/adt-installer/scripts/data_define
index e975077ede..2895c4f188 100644
--- a/meta/recipes-devtools/installer/adt-installer/scripts/data_define
+++ b/meta/recipes-devtools/installer/adt-installer/scripts/data_define
@@ -35,6 +35,6 @@ YOCTOADT_SUPPORTED_ROOTFS="minimal sato sdk lsb"
35YOCTOADT_SUPPORTED_TARGETS="x86 x86_64 arm powerpc mips" 35YOCTOADT_SUPPORTED_TARGETS="x86 x86_64 arm powerpc mips"
36# Different host (32 bit or 64 bit) will have different opkg 36# Different host (32 bit or 64 bit) will have different opkg
37# configuration files 37# configuration files
38YOCTOADT_OPKG_CONF_FILE_32="./opkg/conf/opkg-sdk-i586.conf" 38YOCTOADT_OPKG_CONF_FILE_32="./opkg/conf/opkg-sdk-i686.conf"
39YOCTOADT_OPKG_CONF_FILE_64="./opkg/conf/opkg-sdk-x86_64.conf" 39YOCTOADT_OPKG_CONF_FILE_64="./opkg/conf/opkg-sdk-x86_64.conf"
40INSTALL_FOLDER=/opt/poky/$YOCTOADT_VERSION 40INSTALL_FOLDER=/opt/poky/$YOCTOADT_VERSION
diff --git a/meta/recipes-devtools/installer/adt-installer_1.0.bb b/meta/recipes-devtools/installer/adt-installer_1.0.bb
index 226e375c3f..e8659716c8 100644
--- a/meta/recipes-devtools/installer/adt-installer_1.0.bb
+++ b/meta/recipes-devtools/installer/adt-installer_1.0.bb
@@ -47,7 +47,7 @@ SRC_URI = "http://opkg.googlecode.com/files/opkg-0.1.8.tar.gz \
47 file://scripts/extract_rootfs \ 47 file://scripts/extract_rootfs \
48 file://adt_installer.conf \ 48 file://adt_installer.conf \
49 file://opkg/conf/opkg-sdk-x86_64.conf \ 49 file://opkg/conf/opkg-sdk-x86_64.conf \
50 file://opkg/conf/opkg-sdk-i586.conf \ 50 file://opkg/conf/opkg-sdk-i686.conf \
51 " 51 "
52SRC_URI[md5sum] = "c714ce0e4863bf1315e3b6913ffe3299" 52SRC_URI[md5sum] = "c714ce0e4863bf1315e3b6913ffe3299"
53SRC_URI[sha256sum] = "ff94bf30bd662d49c4b5057e3a0818d062731adaa555d59abd677ec32a3c1c60" 53SRC_URI[sha256sum] = "ff94bf30bd662d49c4b5057e3a0818d062731adaa555d59abd677ec32a3c1c60"