diff options
| -rw-r--r-- | scripts/qemuimage-testlib | 6 | ||||
| -rw-r--r-- | scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato-sdk (renamed from scripts/qemuimage-tests/scenario/qemuarm/poky-image-sdk) | 0 | ||||
| -rw-r--r-- | scripts/qemuimage-tests/scenario/qemumips/poky-image-sato-sdk (renamed from scripts/qemuimage-tests/scenario/qemumips/poky-image-sdk) | 0 | ||||
| -rw-r--r-- | scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato-sdk (renamed from scripts/qemuimage-tests/scenario/qemuppc/poky-image-sdk) | 0 | ||||
| -rw-r--r-- | scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato-sdk (renamed from scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sdk) | 0 | ||||
| -rw-r--r-- | scripts/qemuimage-tests/scenario/qemux86/poky-image-sato-sdk (renamed from scripts/qemuimage-tests/scenario/qemux86/poky-image-sdk) | 0 |
6 files changed, 4 insertions, 2 deletions
diff --git a/scripts/qemuimage-testlib b/scripts/qemuimage-testlib index 823cbfa18b..720ee8f407 100644 --- a/scripts/qemuimage-testlib +++ b/scripts/qemuimage-testlib | |||
| @@ -305,7 +305,8 @@ Test_Find_Image() | |||
| 305 | else | 305 | else |
| 306 | for i in `dir ${where}` | 306 | for i in `dir ${where}` |
| 307 | do | 307 | do |
| 308 | echo $i | grep -q "${kernel}.*${arch}.*\.${extension}" | 308 | # Exclude qemux86-64 when target is qemux86 |
| 309 | echo $i | grep "${kernel}.*${arch}.*\.${extension}" | grep -qv "${kernel}.*${arch}-64.*\.${extension}" | ||
| 309 | if [ $? -eq 0 ]; then | 310 | if [ $? -eq 0 ]; then |
| 310 | echo ${where}/${i} | 311 | echo ${where}/${i} |
| 311 | return 0 | 312 | return 0 |
| @@ -323,7 +324,8 @@ Test_Find_Image() | |||
| 323 | else | 324 | else |
| 324 | for i in `dir ${where}` | 325 | for i in `dir ${where}` |
| 325 | do | 326 | do |
| 326 | echo $i | grep -q "${target}-${arch}.*\.${extension}" | 327 | # Exclude qemux86-64 when target is qemux86 |
| 328 | echo $i | grep "${target}-${arch}.*\.${extension}" | grep -qv "${target}-${arch}-64.*\.${extension}" | ||
| 327 | if [ $? -eq 0 ]; then | 329 | if [ $? -eq 0 ]; then |
| 328 | echo ${where}/${i} | 330 | echo ${where}/${i} |
| 329 | return 0 | 331 | return 0 |
diff --git a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sdk b/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato-sdk index 42b8e19026..42b8e19026 100644 --- a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sdk +++ b/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato-sdk | |||
diff --git a/scripts/qemuimage-tests/scenario/qemumips/poky-image-sdk b/scripts/qemuimage-tests/scenario/qemumips/poky-image-sato-sdk index 42b8e19026..42b8e19026 100644 --- a/scripts/qemuimage-tests/scenario/qemumips/poky-image-sdk +++ b/scripts/qemuimage-tests/scenario/qemumips/poky-image-sato-sdk | |||
diff --git a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sdk b/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato-sdk index 42b8e19026..42b8e19026 100644 --- a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sdk +++ b/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato-sdk | |||
diff --git a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sdk b/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato-sdk index 42b8e19026..42b8e19026 100644 --- a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sdk +++ b/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato-sdk | |||
diff --git a/scripts/qemuimage-tests/scenario/qemux86/poky-image-sdk b/scripts/qemuimage-tests/scenario/qemux86/poky-image-sato-sdk index 42b8e19026..42b8e19026 100644 --- a/scripts/qemuimage-tests/scenario/qemux86/poky-image-sdk +++ b/scripts/qemuimage-tests/scenario/qemux86/poky-image-sato-sdk | |||