Patchwork qemuimage-testlib: rename qemuppc image

login
mail settings
Submitter Saul Wold
Date Jan. 24, 2012, 1:43 a.m.
Message ID <1327369415-15572-1-git-send-email-sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/20053/
State Accepted
Commit f11f03b27bd0bf41bcb45d0589d9982d006474d2
Headers show

Comments

Saul Wold - Jan. 24, 2012, 1:43 a.m.
A recent set of changes changed the kernel name from bzImage to vmlinux,
this test needs to change also.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 scripts/qemuimage-testlib |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Richard Purdie - Jan. 24, 2012, 11:01 a.m.
On Mon, 2012-01-23 at 17:43 -0800, Saul Wold wrote:
> A recent set of changes changed the kernel name from bzImage to vmlinux,
> this test needs to change also.
> 
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>  scripts/qemuimage-testlib |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)

Merged to master, thanks.

Richard

Patch

diff --git a/scripts/qemuimage-testlib b/scripts/qemuimage-testlib
index d0d1b74..222e363 100755
--- a/scripts/qemuimage-testlib
+++ b/scripts/qemuimage-testlib
@@ -440,9 +440,9 @@  Test_Create_Qemu()
 	
 	if [ "$QEMUARCH" = "qemux86" -o "$QEMUARCH" = "qemux86-64" ]; then
 		KERNEL=$(Test_Find_Image -l ${DEPLOY_DIR}/images -k bzImage -a ${QEMUARCH})
-	elif [ "$QEMUARCH" = "qemuarm" -o "$QEMUARCH" = "spitz" -o "$QEMUARCH" = "borzoi" -o "$QEMUARCH" = "akita" -o "$QEMUARCH" = "nokia800" -o "$QEMUARCH" = "qemuppc" ]; then
+	elif [ "$QEMUARCH" = "qemuarm" -o "$QEMUARCH" = "spitz" -o "$QEMUARCH" = "borzoi" -o "$QEMUARCH" = "akita" -o "$QEMUARCH" = "nokia800" ]; then
 		KERNEL=$(Test_Find_Image -l ${DEPLOY_DIR}/images -k zImage -a ${QEMUARCH})
-	elif [ "$QEMUARCH" = "qemumips" ]; then
+	elif [ "$QEMUARCH" = "qemumips" -o "$QEMUARCH" = "qemuppc" ]; then
 		KERNEL=$(Test_Find_Image -l ${DEPLOY_DIR}/images -k vmlinux -a ${QEMUARCH})
 	fi