24 files changed, 29 insertions, 29 deletions

diff --git a/scripts/creat-lsb-image b/scripts/creat-lsb-image
index 1dc48dd54c..657784cba4 100755
--- a/scripts/creat-lsb-image
+++ b/scripts/creat-lsb-image
@@ -60,14 +60,14 @@ ECHO "Enter directory $IMAGE_PATH"
 cd $IMAGE_PATH
 
 #get architecture
-PN=`find . -name poky-image-lsb-${MACHINE_ARCH}\*.rootfs.tar.bz2 -type f | awk -F- 'BEGIN{ max=0;} {if( NR!=0 && $5>max ) max=$5 }END{ printf "%d" ,max ;}'`
+PN=`find . -name core-image-lsb-${MACHINE_ARCH}\*.rootfs.tar.bz2 -type f | awk -F- 'BEGIN{ max=0;} {if( NR!=0 && $5>max ) max=$5 }END{ printf "%d" ,max ;}'`
 if [ "XPN" == "X" ];then
-   ECHO "${red}Don't find lsb image on platform, Please run \"poky-image-lsb\" to generate lsb image"
+   ECHO "${red}Don't find lsb image on platform, Please run \"core-image-lsb\" to generate lsb image"
    exit 1
 fi
 
 if [ $PN -eq 0 ];then
-        ECHO "${red}Can't ${MACHINE_ARCH} rootfs.tar.gz,Please run poky-image-lsb to get lsb image"
+        ECHO "${red}Can't ${MACHINE_ARCH} rootfs.tar.gz,Please run core-image-lsb to get lsb image"
         exit 1
 fi
 #set varible ARCH
@@ -125,25 +125,25 @@ else
         ECHO "Can't find lsb test suite for ${MACHINE_ARCH}"
 fi
 cd ..
-if [ -L poky-image-lsb-${MACHINE_ARCH}.ext3 ];then
-    /bin/rm poky-image-lsb-${MACHINE_ARCH}.ext3
+if [ -L core-image-lsb-${MACHINE_ARCH}.ext3 ];then
+    /bin/rm core-image-lsb-${MACHINE_ARCH}.ext3
     exit_check
 fi
 
 #creat lsb image
-if [ -f poky-image-lsb-${MACHINE_ARCH}-test.ext3 ];then
+if [ -f core-image-lsb-${MACHINE_ARCH}-test.ext3 ];then
         if [ -d lsbtmp ];then
         sudo umount lsbtmp
         fi
         ECHO "Remove old lsb image..."
-        /bin/rm poky-image-lsb-${MACHINE_ARCH}-test.ext3
+        /bin/rm core-image-lsb-${MACHINE_ARCH}-test.ext3
 fi      
 ECHO "creat a big ext3 file for lsb image with 5G..."
-dd if=/dev/zero of=poky-image-lsb-${MACHINE_ARCH}-test.ext3 bs=1M count=5000
+dd if=/dev/zero of=core-image-lsb-${MACHINE_ARCH}-test.ext3 bs=1M count=5000
 exit_check
 ECHO "Format ext3 image,please input \"y\""
-mkfs.ext3 poky-image-lsb-${MACHINE_ARCH}-test.ext3
-tune2fs -j  poky-image-lsb-${MACHINE_ARCH}-test.ext3
+mkfs.ext3 core-image-lsb-${MACHINE_ARCH}-test.ext3
+tune2fs -j  core-image-lsb-${MACHINE_ARCH}-test.ext3
 
 
 ECHO "get a lsb image with lsb test suite"
@@ -153,11 +153,11 @@ fi
 
 
 #install file system and lsb test suite to lsb image
-sudo mount -o loop poky-image-lsb-${MACHINE_ARCH}-test.ext3 lsbtmp
+sudo mount -o loop core-image-lsb-${MACHINE_ARCH}-test.ext3 lsbtmp
 exit_check
 
 ECHO "  ->Install file system..."
-sudo tar jxf poky-image-lsb-${MACHINE_ARCH}-${PN}.rootfs.tar.bz2 -C lsbtmp
+sudo tar jxf core-image-lsb-${MACHINE_ARCH}-${PN}.rootfs.tar.bz2 -C lsbtmp
 exit_check
 
 ECHO "  ->Install lsb test suite..."
@@ -181,18 +181,18 @@ exit_check
 sudo rm -rf lsbtmp
 
 #change file attribute
-sudo chown ${USER}:${USER} poky-image-lsb-${MACHINE_ARCH}-test.ext3 
+sudo chown ${USER}:${USER} core-image-lsb-${MACHINE_ARCH}-test.ext3 
 exit_check
-sudo chmod 755 poky-image-lsb-${MACHINE_ARCH}-test.ext3
+sudo chmod 755 core-image-lsb-${MACHINE_ARCH}-test.ext3
 exit_check
 
 #set up link
-if [ -L poky-image-lsb-${MACHINE_ARCH}.ext3 ];then
+if [ -L core-image-lsb-${MACHINE_ARCH}.ext3 ];then
 ECHO "Set up link"
-    /bin/rm poky-image-lsb-${MACHINE_ARCH}.ext3
+    /bin/rm core-image-lsb-${MACHINE_ARCH}.ext3
     exit_check
 fi
-ln -s poky-image-lsb-${MACHINE_ARCH}-test.ext3 poky-image-lsb-${MACHINE_ARCH}.ext3
+ln -s core-image-lsb-${MACHINE_ARCH}-test.ext3 core-image-lsb-${MACHINE_ARCH}.ext3
 
 ECHO "LSB test environment is set successfully, Please run this image on platform ${MACHINE_ARCH}"
 
diff --git a/scripts/poky-setup-builddir b/scripts/poky-setup-builddir
index aabf358e13..c900d0e0cb 100755
--- a/scripts/poky-setup-builddir
+++ b/scripts/poky-setup-builddir
@@ -103,8 +103,8 @@ cat <<EOM
 You can now run 'bitbake <target>'
 
 Common targets are:
-    poky-image-minimal
-    poky-image-sato
+    core-image-minimal
+    core-image-sato
     meta-toolchain
     meta-toolchain-sdk
 
diff --git a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemuarm/core-image-lsb
index 4fa6068768..4fa6068768 100644
--- a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-lsb
+++ b/scripts/qemuimage-tests/scenario/qemuarm/core-image-lsb
diff --git a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-minimal b/scripts/qemuimage-tests/scenario/qemuarm/core-image-minimal
index 0fcc7bba84..0fcc7bba84 100644
--- a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-minimal
+++ b/scripts/qemuimage-tests/scenario/qemuarm/core-image-minimal
diff --git a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato b/scripts/qemuimage-tests/scenario/qemuarm/core-image-sato
index 7a6353e1af..7a6353e1af 100644
--- a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato
+++ b/scripts/qemuimage-tests/scenario/qemuarm/core-image-sato
diff --git a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato-sdk b/scripts/qemuimage-tests/scenario/qemuarm/core-image-sato-sdk
index 42b8e19026..42b8e19026 100644
--- a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato-sdk
+++ b/scripts/qemuimage-tests/scenario/qemuarm/core-image-sato-sdk
diff --git a/scripts/qemuimage-tests/scenario/qemumips/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemumips/core-image-lsb
index 4fa6068768..4fa6068768 100644
--- a/scripts/qemuimage-tests/scenario/qemumips/poky-image-lsb
+++ b/scripts/qemuimage-tests/scenario/qemumips/core-image-lsb
diff --git a/scripts/qemuimage-tests/scenario/qemumips/poky-image-minimal b/scripts/qemuimage-tests/scenario/qemumips/core-image-minimal
index 0fcc7bba84..0fcc7bba84 100644
--- a/scripts/qemuimage-tests/scenario/qemumips/poky-image-minimal
+++ b/scripts/qemuimage-tests/scenario/qemumips/core-image-minimal
diff --git a/scripts/qemuimage-tests/scenario/qemumips/poky-image-sato b/scripts/qemuimage-tests/scenario/qemumips/core-image-sato
index 7a6353e1af..7a6353e1af 100644
--- a/scripts/qemuimage-tests/scenario/qemumips/poky-image-sato
+++ b/scripts/qemuimage-tests/scenario/qemumips/core-image-sato
diff --git a/scripts/qemuimage-tests/scenario/qemumips/poky-image-sato-sdk b/scripts/qemuimage-tests/scenario/qemumips/core-image-sato-sdk
index 42b8e19026..42b8e19026 100644
--- a/scripts/qemuimage-tests/scenario/qemumips/poky-image-sato-sdk
+++ b/scripts/qemuimage-tests/scenario/qemumips/core-image-sato-sdk
diff --git a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemuppc/core-image-lsb
index 4fa6068768..4fa6068768 100644
--- a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-lsb
+++ b/scripts/qemuimage-tests/scenario/qemuppc/core-image-lsb
diff --git a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-minimal b/scripts/qemuimage-tests/scenario/qemuppc/core-image-minimal
index 0fcc7bba84..0fcc7bba84 100644
--- a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-minimal
+++ b/scripts/qemuimage-tests/scenario/qemuppc/core-image-minimal
diff --git a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato b/scripts/qemuimage-tests/scenario/qemuppc/core-image-sato
index 7a6353e1af..7a6353e1af 100644
--- a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato
+++ b/scripts/qemuimage-tests/scenario/qemuppc/core-image-sato
diff --git a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato-sdk b/scripts/qemuimage-tests/scenario/qemuppc/core-image-sato-sdk
index 42b8e19026..42b8e19026 100644
--- a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato-sdk
+++ b/scripts/qemuimage-tests/scenario/qemuppc/core-image-sato-sdk
diff --git a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemux86-64/core-image-lsb
index 4fa6068768..4fa6068768 100644
--- a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-lsb
+++ b/scripts/qemuimage-tests/scenario/qemux86-64/core-image-lsb
diff --git a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-minimal b/scripts/qemuimage-tests/scenario/qemux86-64/core-image-minimal
index 0fcc7bba84..0fcc7bba84 100644
--- a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-minimal
+++ b/scripts/qemuimage-tests/scenario/qemux86-64/core-image-minimal
diff --git a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato b/scripts/qemuimage-tests/scenario/qemux86-64/core-image-sato
index 7a6353e1af..7a6353e1af 100644
--- a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato
+++ b/scripts/qemuimage-tests/scenario/qemux86-64/core-image-sato
diff --git a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato-sdk b/scripts/qemuimage-tests/scenario/qemux86-64/core-image-sato-sdk
index 42b8e19026..42b8e19026 100644
--- a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato-sdk
+++ b/scripts/qemuimage-tests/scenario/qemux86-64/core-image-sato-sdk
diff --git a/scripts/qemuimage-tests/scenario/qemux86/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemux86/core-image-lsb
index 4fa6068768..4fa6068768 100644
--- a/scripts/qemuimage-tests/scenario/qemux86/poky-image-lsb
+++ b/scripts/qemuimage-tests/scenario/qemux86/core-image-lsb
diff --git a/scripts/qemuimage-tests/scenario/qemux86/poky-image-minimal b/scripts/qemuimage-tests/scenario/qemux86/core-image-minimal
index 0fcc7bba84..0fcc7bba84 100644
--- a/scripts/qemuimage-tests/scenario/qemux86/poky-image-minimal
+++ b/scripts/qemuimage-tests/scenario/qemux86/core-image-minimal
diff --git a/scripts/qemuimage-tests/scenario/qemux86/poky-image-sato b/scripts/qemuimage-tests/scenario/qemux86/core-image-sato
index 7a6353e1af..7a6353e1af 100644
--- a/scripts/qemuimage-tests/scenario/qemux86/poky-image-sato
+++ b/scripts/qemuimage-tests/scenario/qemux86/core-image-sato
diff --git a/scripts/qemuimage-tests/scenario/qemux86/poky-image-sato-sdk b/scripts/qemuimage-tests/scenario/qemux86/core-image-sato-sdk
index 42b8e19026..42b8e19026 100644
--- a/scripts/qemuimage-tests/scenario/qemux86/poky-image-sato-sdk
+++ b/scripts/qemuimage-tests/scenario/qemux86/core-image-sato-sdk
diff --git a/scripts/runqemu b/scripts/runqemu
index d155b561f1..894a296e1c 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -34,7 +34,7 @@ usage() {
     echo ""
     echo "Examples:"
     echo "  $MYNAME qemuarm"
-    echo "  $MYNAME qemux86-64 poky-image-sato ext3"
+    echo "  $MYNAME qemux86-64 core-image-sato ext3"
     echo "  $MYNAME path/to/bzImage-qemux86.bin path/to/nfsrootdir/ serial"
     echo "  $MYNAME qemux86 \"<-m 256>\""
     exit 1
@@ -234,31 +234,31 @@ machine2=`echo $MACHINE | tr 'a-z' 'A-Z' | sed 's/-/_/'`
 # Defaults used when these vars need to be inferred
 QEMUX86_DEFAULT_KERNEL=bzImage-qemux86.bin
 QEMUX86_DEFAULT_FSTYPE=ext3
-QEMUX86_DEFAULT_ROOTFS="poky-image-sato-sdk poky-image-sato poky-image-lsb poky-image-basic poky-image-minimal"
+QEMUX86_DEFAULT_ROOTFS="core-image-sato-sdk core-image-sato core-image-lsb core-image-basic core-image-minimal"
 
 QEMUX86_64_DEFAULT_KERNEL=bzImage-qemux86-64.bin
 QEMUX86_64_DEFAULT_FSTYPE=ext3
-QEMUX86_64_DEFAULT_ROOTFS="poky-image-sato-sdk poky-image-sato poky-image-lsb poky-image-basic poky-image-minimal"
+QEMUX86_64_DEFAULT_ROOTFS="core-image-sato-sdk core-image-sato core-image-lsb core-image-basic core-image-minimal"
 
 QEMUARM_DEFAULT_KERNEL=zImage-qemuarm.bin
 QEMUARM_DEFAULT_FSTYPE=ext3
-QEMUARM_DEFAULT_ROOTFS="poky-image-sato-sdk poky-image-sato poky-image-lsb poky-image-basic poky-image-minimal"
+QEMUARM_DEFAULT_ROOTFS="core-image-sato-sdk core-image-sato core-image-lsb core-image-basic core-image-minimal"
 
 QEMUMIPS_DEFAULT_KERNEL=vmlinux-qemumips.bin
 QEMUMIPS_DEFAULT_FSTYPE=ext3
-QEMUMIPS_DEFAULT_ROOTFS="poky-image-sato-sdk poky-image-sato poky-image-lsb poky-image-basic poky-image-minimal"
+QEMUMIPS_DEFAULT_ROOTFS="core-image-sato-sdk core-image-sato core-image-lsb core-image-basic core-image-minimal"
 
 QEMUPPC_DEFAULT_KERNEL=zImage-qemuppc.bin
 QEMUPPC_DEFAULT_FSTYPE=ext3
-QEMUPPC_DEFAULT_ROOTFS="poky-image-sato-sdk poky-image-sato poky-image-lsb poky-image-basic poky-image-minimal"
+QEMUPPC_DEFAULT_ROOTFS="core-image-sato-sdk core-image-sato core-image-lsb core-image-basic core-image-minimal"
 
 AKITA_DEFAULT_KERNEL=zImage-akita.bin
 AKITA_DEFAULT_FSTYPE=jffs2
-AKITA_DEFAULT_ROOTFS="poky-image-sato"
+AKITA_DEFAULT_ROOTFS="core-image-sato"
 
 SPITZ_DEFAULT_KERNEL=zImage-spitz.bin
 SPITZ_DEFAULT_FSTYPE=ext3
-SPITZ_DEFAULT_ROOTFS="poky-image-sato"
+SPITZ_DEFAULT_ROOTFS="core-image-sato"
 
 setup_tmpdir() {
     if [ -z "$TMPDIR" ]; then
@@ -353,7 +353,7 @@ fi
 # FSTYPE is now set for all cases
 
 # Handle cases where a ROOTFS type is given instead of a filename, e.g.
-# poky-image-sato
+# core-image-sato
 if [ "$LAZY_ROOTFS" = "true" ]; then
     setup_tmpdir
     echo "Assuming $ROOTFS really means $TMPDIR/deploy/images/$ROOTFS-$MACHINE.$FSTYPE"
diff --git a/scripts/runqemu.README b/scripts/runqemu.README
index 12f1191ab7..38f9306381 100644
--- a/scripts/runqemu.README
+++ b/scripts/runqemu.README
@@ -39,7 +39,7 @@ where:
    <zimage> is the path to a kernel (e.g. zimage-qemuarm.bin)
    <filesystem> is the path to the image (e.g. filesystem-qemuarm.ext2)
 
-It will default to the qemuarm, ext2 and the last kernel and poky-image-sdk 
+It will default to the qemuarm, ext2 and the last kernel and core-image-sdk 
 image built by poky.