Fix several small bugs for adt installer

PATCH Applied Liping Ke 3 participants 7 messages Feb 24, 2011 – Mar 2, 2011

lore

Share & tools

lore

Liping Ke

author

2011-02-24 08:53 UTC #0 lore raw

cover Fix several small bugs for adt installer

From: Liping Ke <[email protected]>

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.
This patch is for fixing the above two bugs.

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: lke/adt-newfix
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=lke/adt-newfix

Thanks,
Liping Ke <[email protected]>
---

Liping Ke (1):
ADT: Fix several bugs for adt installer

 .../installer/adt-installer/adt_installer          |    9 +++++----
 .../installer/adt-installer/scripts/data_define    |    2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

Liping Ke

author

2011-02-24 08:53 UTC #1 lore raw

PATCH 1/1 ADT: Fix several bugs for adt installer

From: Liping Ke <[email protected]>

Signed-off-by Liping Ke <[email protected]>

---
 .../installer/adt-installer/adt_installer          |    9 +++++----
 .../installer/adt-installer/scripts/data_define    |    2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

meta/recipes-devtools/installer/adt-installer/adt_installer +5 -4

index 1f481de..cca576f 100755
@@ -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" 
 }

meta/recipes-devtools/installer/adt-installer/scripts/data_define +1 -1

index 2895c4f..f9a6a4f 100644
@@ -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"
 YOCTOADT_SUPPORTED_TARGETS="x86 x86_64 arm powerpc mips"
 # Different host (32 bit or 64 bit) will have different opkg
 # configuration files

Signature · 1 line

1.7.0.4

Ke, Liping

author

2011-02-24 08:58 UTC #2 lore raw

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

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

Quoted 74 lines

-----Original Message-----
From: [email protected] [mailto:poky- [email protected]] On Behalf Of Liping Ke
Sent: Friday, February 25, 2011 8:56 AM
To: [email protected]
Subject: [poky] [PATCH 1/1] ADT: Fix several bugs for adt installer
From: Liping Ke <[email protected]>
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 <[email protected]>
---
 .../installer/adt-installer/adt_installer          |    9 +++++----
 .../installer/adt-installer/scripts/data_define    |    2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)
(quoted diff) +0 -0
installer/adt_installer b/meta/recipes-devtools/installer/adt- installer/adt_installer
index 1f481de..cca576f 100755
meta/recipes-devtools/installer/adt-installer/adt_installer +5 -4
@@ -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"
}
(quoted diff) +0 -0
installer/scripts/data_define b/meta/recipes-devtools/installer/adt- installer/scripts/data_define
index 2895c4f..f9a6a4f 100644
meta/recipes-devtools/installer/adt-installer/scripts/data_define +1 -2
@@ -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"
 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
[email protected]
https://lists.yoctoproject.org/listinfo/poky

Zhang, Jessica

2011-02-24 19:33 UTC #3 lore raw

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

Quoted 72 lines · Liping

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
Quoted 59 lines
-----Original Message-----
From: [email protected] [mailto:poky- [email protected]] On Behalf Of Liping Ke
Sent: Friday, February 25, 2011 8:56 AM
To: [email protected]
Subject: [poky] [PATCH 1/1] ADT: Fix several bugs for adt installer
From: Liping Ke <[email protected]>
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 <[email protected]>
---
 .../installer/adt-installer/adt_installer          |    9 +++++----
 .../installer/adt-installer/scripts/data_define    |    2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)
(quoted diff) +0 -0
installer/adt_installer b/meta/recipes-devtools/installer/adt- installer/adt_installer index 1f481de..cca576f 100755
meta/recipes-devtools/installer/adt-installer/adt_installer @@ renamed from meta/recipes-devtools/installer/adt-installer/adt_installer +5 -6
-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"
 }
(quoted diff) +0 -0
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
(quoted diff) +0 -0
@@ -31,7 +31,7 @@ OPKG_LIBDIR="/var/lib"  
 

Quoted 4 lines

meta/recipes-devtools/installer/adt-installer/scripts/data_define OPKG_LIBDIR="/var/lib" · line 34
Quoted 4 lines
meta/recipes-devtools/installer/adt-installer/scripts/data_define +1 -1
 # 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

Quoted 13 lines

Quoted 9 lines
(quoted diff) +0 -0
 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
[email protected]
https://lists.yoctoproject.org/listinfo/poky
_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky

Ke, Liping

author

2011-03-01 01:30 UTC #4 lore raw

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

Hi, Jessica

Thanks for the comment. I have updated the patch and re-sent it.

Any problem, just let me know.

Thanks& Regards,
criping

Quoted 107 lines

-----Original Message-----
From: Zhang, Jessica
Sent: Friday, February 25, 2011 3:34 AM
To: Ke, Liping; Ke, Liping; [email protected]
Subject: RE: [poky] [PATCH 1/1] ADT: Fix several bugs for adt installer
Quoted 72 lines · Liping
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
Quoted 59 lines
-----Original Message-----
From: [email protected] [mailto:poky- [email protected]] On Behalf Of Liping Ke
Sent: Friday, February 25, 2011 8:56 AM
To: [email protected]
Subject: [poky] [PATCH 1/1] ADT: Fix several bugs for adt installer
From: Liping Ke <[email protected]>
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 <[email protected]>
---
 .../installer/adt-installer/adt_installer          |    9 +++++----
 .../installer/adt-installer/scripts/data_define    |    2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)
(quoted diff) +0 -0
installer/adt_installer b/meta/recipes-devtools/installer/adt- installer/adt_installer index 1f481de..cca576f 100755
meta/recipes-devtools/installer/adt-installer/adt_installer @@ renamed from meta/recipes-devtools/installer/adt-installer/adt_installer +5 -6
-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"
 }
(quoted diff) +0 -0
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
(quoted diff) +0 -0
@@ -31,7 +31,7 @@ OPKG_LIBDIR="/var/lib"
 
Quoted 4 lines
meta/recipes-devtools/installer/adt-installer/scripts/data_define OPKG_LIBDIR="/var/lib" · line 34
Quoted 4 lines
meta/recipes-devtools/installer/adt-installer/scripts/data_define +1 -1
 # 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
Quoted 13 lines
Quoted 9 lines
(quoted diff) +0 -0
 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
[email protected]
https://lists.yoctoproject.org/listinfo/poky
_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky

Saul Wold

Applied

2011-03-01 18:52 UTC #5 lore raw

In reply to Liping Ke

Quoted 22 lines · Liping Ke

From: Liping Ke<[email protected]>
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.
This patch is for fixing the above two bugs.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: lke/adt-newfix
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=lke/adt-newfix
Thanks,
Liping Ke<[email protected]>
---
Liping Ke (1):
ADT: Fix several bugs for adt installer

Quoted 9 lines

  .../installer/adt-installer/adt_installer          |    9 +++++----
  .../installer/adt-installer/scripts/data_define    |    2 +-
  2 files changed, 6 insertions(+), 5 deletions(-)
_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky

Merged into Master & Bernard

Thanks
Sau!

Saul Wold

2011-03-02 00:44 UTC #6 lore raw

In reply to Liping Ke

Quoted 9 lines · Liping Ke

From: Liping Ke<[email protected]>
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.
This patch is for fixing the above two bugs.

Are there bug numbers for these? In the future, please reference the bugs with [BUGID #XXXX]

Thanks
Sau!

Quoted 22 lines

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: lke/adt-newfix
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=lke/adt-newfix
Thanks,
Liping Ke<[email protected]>
---
Liping Ke (1):
ADT: Fix several bugs for adt installer
  .../installer/adt-installer/adt_installer          |    9 +++++----
  .../installer/adt-installer/scripts/data_define    |    2 +-
  2 files changed, 6 insertions(+), 5 deletions(-)
_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky