From: SeokYeon Hwang <syeon.hwang@samsung.com>
Date: Tue, 22 Nov 2016 11:19:33 +0000 (+0900)
Subject: Merge branch 'develop_linux_3.14' into tizen_studio_1.1_p2.3.2
X-Git-Tag: TizenStudio_2.0_p2.3.2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f1a5f505d5e52d05b26fadbac84e57c9293965f5;p=sdk%2Femulator%2Femulator-kernel.git

Merge branch 'develop_linux_3.14' into tizen_studio_1.1_p2.3.2

Change-Id: Ie69083f141ddd48fbb6cba07f1f1542acee59800
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
---

f1a5f505d5e52d05b26fadbac84e57c9293965f5
diff --cc package/build.linux
index 71b6cf154af1,d3418ee07618..c2fabf10c8aa
--- a/package/build.linux
+++ b/package/build.linux
@@@ -27,9 -27,9 +27,9 @@@ build(
  # install
  install()
  {
 -	KERNEL_DIR=$SRCDIR/package/2.4-emulator-kernel-x86.package.${TARGET_OS}/data/platforms/tizen-2.4/common/emulator/data/kernel
 +	KERNEL_DIR=$SRCDIR/package/2.3.2-emulator-kernel-x86.package.${TARGET_OS}/data/platforms/tizen-2.3.2/common/emulator/data/kernel
  	mkdir -p $KERNEL_DIR
  
- 	cp ./bzImage.i386 $KERNEL_DIR/bzImage.i386
- 	cp ./bzImage.x86_64 $KERNEL_DIR/bzImage.x86_64
+ 	cp ./bzImage.x86 $KERNEL_DIR/
+ 	cp ./bzImage.x86_64 $KERNEL_DIR/
  }
diff --cc package/pkginfo.manifest
index a23726735856,9c0a6b37b675..4e29414d7fb8
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@@ -1,8 -1,8 +1,8 @@@
  Source: emulator-kernel
- Version: 3.14.25
+ Version: 3.14.26
  Maintainer: SeokYeon Hwang <syeon.hwang@samsung.com>
  
 -Package: 2.4-emulator-kernel-x86
 +Package: 2.3.2-emulator-kernel-x86
  OS: ubuntu-32, ubuntu-64, windows-32, windows-64, macos-64
  Build-host-os: ubuntu-64
  Description: Tizen x86 Emulator Kernel