Merge branch 'develop' into tizen_studio_p4.0

Change-Id: I34cfc0edd13fc6833562b23514e184663bc0b47f
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>

diff --cc package/build.linux
index 9c7e5ab74218f49d679f12440eb9a3ca679e8c51,b16e111009ee1d63d67826d12f4b216c594f58e7..3426f01d8f7356cbfd8416edd5c8b9a08d51ce00
--- 1/package/build.linux
--- 2/package/build.linux
+++ b/package/build.linux
@@@ -27,9 -27,12 +27,12 @@@ build(
  # install
  install()
  {
-       KERNEL_DIR=$SRCDIR/package/3.0-emulator-kernel-x86.package.${TARGET_OS}/data/platforms/tizen-3.0/common/emulator/data/kernel
-       mkdir -p $KERNEL_DIR
 -      TIZEN_VERSIONS="4.0 3.0"
++      TIZEN_VERSIONS="4.0"
+       for VER in ${TIZEN_VERSIONS} ; do
+               KERNEL_DIR=$SRCDIR/package/${VER}-emulator-kernel-x86.package.${TARGET_OS}/data/platforms/tizen-${VER}/common/emulator/data/kernel
+               mkdir -p $KERNEL_DIR
  
-       cp ./bzImage.x86 $KERNEL_DIR/
-       cp ./bzImage.x86_64 $KERNEL_DIR/
+               cp ./bzImage.x86 $KERNEL_DIR/
+               cp ./bzImage.x86_64 $KERNEL_DIR/
+       done
  }

diff --cc package/pkginfo.manifest
Simple merge