From: Jinhyung Jo Date: Tue, 7 Mar 2017 02:12:16 +0000 (+0900) Subject: Merge branch 'develop' into tizen_studio_1.2_p3.0 X-Git-Tag: Tizen_Studio_1.3_Release_p3.0~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e68b6cef0af578d2dd2e0e21024a5afc4a581bb2;p=sdk%2Femulator%2Femulator-kernel.git Merge branch 'develop' into tizen_studio_1.2_p3.0 Change-Id: I7594a8a7e33a21e0c4ee42f56f7ab2dac952eb4e Signed-off-by: Jinhyung Jo --- e68b6cef0af578d2dd2e0e21024a5afc4a581bb2 diff --cc package/build.linux index 9c7e5ab74218,b16e111009ee..f63ce6317a6d --- a/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="3.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 index f38e220b321b,44ae74b54555..28e626e65f97 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@@ -1,7 -1,17 +1,7 @@@ Source: emulator-kernel - Version: 4.4.35.0 + Version: 4.4.35.2 Maintainer: SeokYeon Hwang -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: 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 - Package: 3.0-emulator-kernel-x86 OS: ubuntu-32, ubuntu-64, windows-32, windows-64, macos-64 Build-host-os: ubuntu-64