diff options
3 files changed, 10 insertions, 9 deletions
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer b/meta/recipes-devtools/installer/adt-installer/adt_installer index 1f481ded61..cca576f7ef 100755 --- a/meta/recipes-devtools/installer/adt-installer/adt_installer +++ b/meta/recipes-devtools/installer/adt-installer/adt_installer | |||
@@ -216,17 +216,18 @@ done | |||
216 | 216 | ||
217 | download_file() | 217 | download_file() |
218 | { | 218 | { |
219 | if [ -f "$LOCAL_DOWNLOAD/$1" ]; then | 219 | local filename=`echo ${1##*/}` |
220 | confirm_download $1 | 220 | if [ -f "$LOCAL_DOWNLOAD/$filename" ]; then |
221 | confirm_download $filename | ||
221 | result="$?" | 222 | result="$?" |
222 | if [ ! "$result" == "0" ]; then | 223 | if [ ! "$result" == "0" ]; then |
223 | return | 224 | return |
224 | else | 225 | else |
225 | echo "Removing old file [$1]" | 226 | echo "Removing old file [$1]" |
226 | rm -rf "$LOCAL_DOWNLOAD/$1" | 227 | rm -rf "$LOCAL_DOWNLOAD/$filename" |
227 | fi | 228 | fi |
228 | fi | 229 | fi |
229 | echo_info "Downloading file: $1..." | 230 | echo_info "Downloading file: $filename..." |
230 | wget "$YOCTOADT_IPKG_REPO/$1" -P $LOCAL_DOWNLOAD --progress=bar:force 2>&1 | tee -a "$YOCTOADT_INSTALL_LOG_FILE" | 231 | wget "$YOCTOADT_IPKG_REPO/$1" -P $LOCAL_DOWNLOAD --progress=bar:force 2>&1 | tee -a "$YOCTOADT_INSTALL_LOG_FILE" |
231 | } | 232 | } |
232 | 233 | ||
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf index db602f6d6d..d2af70dd0f 100644 --- a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf +++ b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf | |||
@@ -39,14 +39,14 @@ YOCTOADT_NFS_UTIL="Y" | |||
39 | #YOCTOADT_METADATA="Y" | 39 | #YOCTOADT_METADATA="Y" |
40 | 40 | ||
41 | #The followings are for setting up specific target architecture | 41 | #The followings are for setting up specific target architecture |
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, sato, sdk and lsb. 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 |
43 | YOCTOADT_ROOTFS_arm="minimal sato" | 43 | YOCTOADT_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 |
45 | YOCTOADT_TARGET_SYSROOT_IMAGE_arm="minimal" | 45 | YOCTOADT_TARGET_SYSROOT_IMAGE_arm="minimal" |
46 | #The location where the target sysroot will be setup | 46 | #The location where the target sysroot will be setup |
47 | YOCTOADT_TARGET_SYSROOT_LOC_arm="$HOME/test-yocto/arm" | 47 | YOCTOADT_TARGET_SYSROOT_LOC_arm="$HOME/test-yocto/arm" |
48 | 48 | ||
49 | #Here's another example for setting up target arch of x86, by uncommenting it will trigger the installer to download and setup 2 sysroot environment for 2 target arches: arm and x86. If you want to add more target arch support, you can append more entries by following these samples | 49 | #Here's another example for setting up target arch of x86, by uncommenting it will trigger the installer to download and setup 2 sysroot environment for 2 target arches: arm and x86. If you want to add more target arch support, you can append more entries by following these samples |
50 | #YOCTOADT_ROOTFS_x86="sdk" | 50 | #YOCTOADT_ROOTFS_x86="sato-sdk" |
51 | #YOCTOADT_TARGET_SYSROOT_IMAGE_x86="sdk" | 51 | #YOCTOADT_TARGET_SYSROOT_IMAGE_x86="sato-sdk" |
52 | #YOCTOADT_TARGET_SYSROOT_LOC_x86="$HOME/test-yocto/x86" | 52 | #YOCTOADT_TARGET_SYSROOT_LOC_x86="$HOME/test-yocto/x86" |
diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/data_define b/meta/recipes-devtools/installer/adt-installer/scripts/data_define index 2895c4f188..77f8b383f2 100644 --- a/meta/recipes-devtools/installer/adt-installer/scripts/data_define +++ b/meta/recipes-devtools/installer/adt-installer/scripts/data_define | |||
@@ -31,7 +31,7 @@ OPKG_LIBDIR="/var/lib" | |||
31 | 31 | ||
32 | # List all supported root fs types and target types, | 32 | # List all supported root fs types and target types, |
33 | # it will be used in user configuration validity checking | 33 | # it will be used in user configuration validity checking |
34 | YOCTOADT_SUPPORTED_ROOTFS="minimal sato sdk lsb" | 34 | YOCTOADT_SUPPORTED_ROOTFS="minimal minimal-dev sato sato-dev sato-sdk lsb lsb-dev lsb-sdk" |
35 | YOCTOADT_SUPPORTED_TARGETS="x86 x86_64 arm powerpc mips" | 35 | YOCTOADT_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 |