Merge branch 'develop' into tizen_2.3.2

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

diff --cc package/build.linux
index 0000000000000000000000000000000000000000,7ded1320a0634f37441c084cb272f3cc2bdea8f7..71b6cf154af1511050e5255cbfab85e3a2e6fb04
mode 000000,100755..100755
--- /dev/null
--- 2/package/build.linux
+++ b/package/build.linux
@@@ -1,0 -1,35 +1,35 @@@
 -      KERNEL_DIR=$SRCDIR/package/3.0-emulator-kernel-x86.package.${TARGET_OS}/data/platforms/tizen-3.0/common/emulator/data/kernel
+ #!/bin/sh -xe
+ # clean
+ clean()
+ {
+       if ["${TARGET_OS}" != "ubuntu-32" ] && ["${TARGET_OS}" != "ubuntu-64" ]
+       then
+               exit 1
+       fi
+ 
+       rm -rf .git
+ }
+ 
+ # build
+ build()
+ {
+       # for i386 (32bit) kernel
+       ./build-i386.sh
+       mv arch/x86/boot/bzImage ./bzImage.i386
+ 
+       make distclean
+ 
+       # for x86-64 (64bit) kernel
+       ./build-x86_64.sh
+       mv arch/x86/boot/bzImage ./bzImage.x86_64
+ }
+ 
+ # install
+ install()
+ {
++      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
+ }

diff --cc package/changelog
index 31b9d5112f1351dad4bbc2dede8cc25c9d8d02ae,39d863098a83d65655cce6a24247a11e7eb9e966..de0815b47421312cf9a23dc0e1e591dac9d16551
--- 1/package/changelog
--- 2/package/changelog
+++ b/package/changelog
@@@ -1,14 -1,26 +1,37 @@@
+ * 3.14.18
+ - apply missing smack patch
+ == SeokYeon Hwang <syeon.hwang@samsung.com> 2016-06-06
+ * 3.14.17
+ - apply smack patches
+ == Sooyoung Ha <yoosah.ha@samsung.com> 2016-05-24
+ * 3.14.16
+ - maru-inputs: fix unexpected termination using maru-input devices
+ == Jinhyung Jo <jinhyung.jo@samsung.com> 2016-03-08
+ * 3.14.15
+ - smack: apply patches for socket fd passing
+ == Jinhyung Jo <jinhyung.jo@samsung.com> 2016-03-02
+ * 3.14.14
+ - PAT: apply PAT features for W/A
+ - sensor: modify the proximity value appropriately
++- VIGS: set correct DPI value
++- YaGL: Bump version with the device and platform
+ == Sooyoung Ha <yoosah.ha@samsung.com> 2016-01-27
  * 3.14.13
 +- solve problem tablet device die unexpectedly
 +- support PAT(Page Attribute Table)
 +== Jinhyung Jo <jinhyung.jo@samsung.com> 2016-03-03
 +* 3.14.12
  - VIGS: set correct DPI value
 -- YaGL: Bump version with the device and platform
 +== Jinhyung Jo <jinhyung.jo@samsung.com> 2015-11-20
 +* 3.14.11
 +- packaging: change platform version
 +== Jinhyung Jo <jinhyung.jo@samsung.com> 2015-11-09
 +* 3.14.10
++* 3.14.13
+ == Jinhyung Jo <jinhyung.jo@samsung.com> 2015-11-23
+ * 3.14.12
+ == Jinhyung Jo <jinhyung.jo@samsung.com> 2015-11-06
+ * 3.14.11
  - tablet: added input buffer to virtqueue
  - VIGS: Temporary W/A for the extension
  - tuner: separate dvb_frontend build for tv extension

diff --cc package/pkginfo.manifest
index 13d3be0aeeef77d4c4eb5b7fec0c990c33b29f5d,21f45b1c9f909be060b727e6d9178cd8d91c4e05..11389e81f3f0e6ea5cdc5309e0ee57e0a2809d1c
--- 1/package/pkginfo.manifest
--- 2/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@@ -1,8 -1,13 +1,8 @@@
  Source: emulator-kernel
- Version: 3.14.13
+ Version: 3.14.18
  Maintainer: SeokYeon Hwang <syeon.hwang@samsung.com>
  
 -Package: 3.0-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-32
+ Build-host-os: ubuntu-64
  Description: Tizen x86 Emulator Kernel
 -
 -#Package: 3.0-emulator-kernel-arm
 -#OS: ubuntu-32, ubuntu-64, windows-32, windows-64, macos-64
 -#Build-host-os: ubuntu-64
 -#Description: Tizen ARM Emulator Kernel