diff options
| author | Jinhyung Jo <jinhyung.jo@samsung.com> | 2017-03-07 10:59:47 +0900 |
|---|---|---|
| committer | Jinhyung Jo <jinhyung.jo@samsung.com> | 2017-03-07 11:08:59 +0900 |
| commit | 5861eaa1fafabd160c70ecb721e6588999560cf1 (patch) | |
| tree | 1bd22be09dfd032196e88d7f0b38aab90aa372da | |
| parent | 3b0762e4cbbf32ed0be38a26a2adb1bd6f928fc3 (diff) | |
| parent | b07dd0103027d0ff8c5680dc947f76c074879e8c (diff) | |
| download | emulator-kernel-5861eaa1fafabd160c70ecb721e6588999560cf1.tar.gz emulator-kernel-5861eaa1fafabd160c70ecb721e6588999560cf1.tar.bz2 emulator-kernel-5861eaa1fafabd160c70ecb721e6588999560cf1.zip | |
Merge branch 'develop' into tizen_studio_p4.0
Change-Id: I34cfc0edd13fc6833562b23514e184663bc0b47f
Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
| -rw-r--r-- | arch/x86/configs/tizen_emul_defconfig | 2 | ||||
| -rwxr-xr-x | package/build.linux | 11 | ||||
| -rw-r--r-- | package/changelog | 6 | ||||
| -rw-r--r-- | package/pkginfo.manifest | 6 |
4 files changed, 17 insertions, 8 deletions
diff --git a/arch/x86/configs/tizen_emul_defconfig b/arch/x86/configs/tizen_emul_defconfig index e42775fad6ed..f0f84900ea0c 100644 --- a/arch/x86/configs/tizen_emul_defconfig +++ b/arch/x86/configs/tizen_emul_defconfig @@ -3383,7 +3383,7 @@ CONFIG_NLS_CODEPAGE_949=y # CONFIG_NLS_CODEPAGE_1250 is not set # CONFIG_NLS_CODEPAGE_1251 is not set CONFIG_NLS_ASCII=y -# CONFIG_NLS_ISO8859_1 is not set +CONFIG_NLS_ISO8859_1=y # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set diff --git a/package/build.linux b/package/build.linux index 9c7e5ab74218..3426f01d8f73 100755 --- a/package/build.linux +++ b/package/build.linux @@ -27,9 +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" + 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 --git a/package/changelog b/package/changelog index 40e9853ac411..df5ea3cbe7b9 100644 --- a/package/changelog +++ b/package/changelog @@ -1,3 +1,9 @@ +* 4.4.35.2 +- unify packaging regardless of version +== Jinhyung Jo <jinhyung.jo@samsung.com> 2017-03-06 +* 4.4.35.1 +- enable CONFIG_NLS_ISO8859_1 +== Jinhyung Choi <jinh0.choi@samsung.com> 2017-01-18 * 4.4.16 - add pedometer sensor device driver - fix keyboard input issue on 64bit guest diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest index f38e220b321b..1ee6a47586fa 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -1,13 +1,13 @@ Source: emulator-kernel -Version: 4.4.35.0 +Version: 4.4.35.2 Maintainer: SeokYeon Hwang <syeon.hwang@samsung.com> -Package: 3.0-emulator-kernel-x86 +Package: 4.0-emulator-kernel-x86 OS: ubuntu-32, ubuntu-64, windows-32, windows-64, macos-64 Build-host-os: ubuntu-64 Description: Tizen x86 Emulator Kernel -#Package: 3.0-emulator-kernel-arm +#Package: 4.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 |