[poky] [PATCH 1/1] ADT: Fix several bugs for adt installer

[Zhang, Jessica]

Ke, Liping wrote:
> Hi, Jessica
> 
> Since SDK image is now changed, if we want to extract sdk unfs, we
> should So in configuration file, I set below lines:
> 
> YOCTOADT_ROOTFS_arm="minimal sato-sdk"
> YOCTOADT_TARGET_SYSROOT_IMAGE_arm="sato-sdk"
> 
> 
> Thanks& Regards,
> criping
> 
> 
>> -----Original Message-----
>> From: poky-bounces at yoctoproject.org [mailto:poky-
>> bounces at yoctoproject.org] On Behalf Of Liping Ke
>> Sent: Friday, February 25, 2011 8:56 AM
>> To: poky at yoctoproject.org
>> Subject: [poky] [PATCH 1/1] ADT: Fix several bugs for adt installer
>> 
>> From: Liping Ke <liping.ke at intel.com>
>> 
>> Two bugs are found
>> 1) image download file path is not correct. So even if file is
>>    downloaded already, it can't be detected.
>> 2) sdk image now is renamed as sato-sdk, we need to change the name 
>> accordingly. 
>> 
>> Signed-off-by: Liping Ke <liping.ke at intel.com>
>> ---
>>  .../installer/adt-installer/adt_installer          |    9 +++++----
>>  .../installer/adt-installer/scripts/data_define    |    2 +-
>>  2 files changed, 6 insertions(+), 5 deletions(-)
>> 
>> diff --git a/meta/recipes-devtools/installer/adt-
>> installer/adt_installer b/meta/recipes-devtools/installer/adt-
>> installer/adt_installer index 1f481de..cca576f 100755
>> --- a/meta/recipes-devtools/installer/adt-installer/adt_installer
>> +++ b/meta/recipes-devtools/installer/adt-installer/adt_installer @@
>> -216,17 +216,18 @@ done 
>> 
>>  download_file()
>>  {
>> -if [ -f "$LOCAL_DOWNLOAD/$1" ]; then
>> -  confirm_download $1
>> +local filename=`echo ${1##*/}`
>> +if [ -f "$LOCAL_DOWNLOAD/$filename" ]; then
>> +  confirm_download $filename
>>    result="$?"
>>    if [ ! "$result" == "0" ]; then
>>      return
>>    else
>>      echo "Removing old file [$1]"
>> -    rm -rf "$LOCAL_DOWNLOAD/$1"
>> +    rm -rf "$LOCAL_DOWNLOAD/$filename"
>>    fi
>>  fi
>> -echo_info "Downloading file: $1..."
>> +echo_info "Downloading file: $filename..."
>>  wget "$YOCTOADT_IPKG_REPO/$1" -P $LOCAL_DOWNLOAD
>> --progress=bar:force 2>&1 | tee -a "$YOCTOADT_INSTALL_LOG_FILE"
>>  }
>> 
>> diff --git a/meta/recipes-devtools/installer/adt-
>> installer/scripts/data_define b/meta/recipes-devtools/installer/adt-
>> installer/scripts/data_define index 2895c4f..f9a6a4f 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"  
>> 
>>  # List all supported root fs types and target types,
>>  # it will be used in user configuration validity checking
>> -YOCTOADT_SUPPORTED_ROOTFS="minimal sato sdk lsb"
>> +YOCTOADT_SUPPORTED_ROOTFS="minimal sato sato-sdk lsb"

Liping,

The full list of supported ROOTFS are: minimal, minimal-dev, sato, sato-dev,
sato-sdk, lsb, lsb-dev, lsb-sdk.  Also, can you update the list in the
comment in the adt_installer.conf as well?

Thanks,
Jessica

>>  YOCTOADT_SUPPORTED_TARGETS="x86 x86_64 arm powerpc mips"
>>  # Different host (32 bit or 64 bit) will have different opkg  #
>> configuration files --
>> 1.7.0.4
>> 
>> _______________________________________________
>> poky mailing list
>> poky at yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/poky
> _______________________________________________
> poky mailing list
> poky at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/poky
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/x-pkcs7-signature
Size: 8455 bytes
Desc: not available
URL: <http://lists.yoctoproject.org/pipermail/poky/attachments/20110224/538fe541/attachment.bin>