From: Kitae Kim <kt920.kim@samsung.com>
Date: Fri, 2 Nov 2012 08:26:23 +0000 (+0900)
Subject: Merge branch 'develop' into release
X-Git-Tag: 2.2.1_release^2~83
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c1cde6c4afd34bbc28bda35b84749dce801fdde9;p=sdk%2Femulator%2Femulator-kernel.git

Merge branch 'develop' into release

Conflicts:
	package/changelog
	package/pkginfo.manifest
---

c1cde6c4afd34bbc28bda35b84749dce801fdde9
diff --cc package/build.ubuntu-32
index b03d8357f4a5,0bbaebcbc16d..cf150fc935bb
--- a/package/build.ubuntu-32
+++ b/package/build.ubuntu-32
@@@ -11,17 -11,31 +11,31 @@@ clean(
  # build
  build()
  {
- 	make i386_emul_defconfig
- 	make
+ 	# x86 kernel
+ 	make ARCH=i386 i386_tizen_emul_defconfig
+ 	make ARCH=i386 -j4
+ 
 -	ARM_TOOLCHAIN=`which arm-linux-gnueabi-gcc`
 -	if [ $ARM_TOOLCHAIN = "" ]
 -	then
 -		echo "There is no a toolchain for arm."
 -		exit 1
 -	fi
++#	ARM_TOOLCHAIN=`which arm-linux-gnueabi-gcc`
++#	if [ $ARM_TOOLCHAIN = "" ]
++#	then
++#		echo "There is no a toolchain for arm."
++#		exit 1
++#	fi
+ 	# arm kernel
 -	make ARCH=arm arm_tizen_emul_defconfig
 -	make -j4 ARCH=arm CROSS_COMPILE=arm-linux-gnueabi-
++#	make ARCH=arm arm_tizen_emul_defconfig
++#	make -j4 ARCH=arm CROSS_COMPILE=arm-linux-gnueabi-
  }
  
  # install
  install()
  {
- 	BIN_DIR=$SRCDIR/package/emulator-kernel-x86.package.${TARGET_OS}/data/tools/emulator/data/kernel
- 	mkdir -p $BIN_DIR
+ 	X86_BIN_DIR=$SRCDIR/package/emulator-kernel-x86.package.${TARGET_OS}/data/tools/emulator/data/kernel
 -	ARM_BIN_DIR=$SRCDIR/package/emulator-kernel-arm.package.${TARGET_OS}/data/tools/emulator/data/kernel
++#	ARM_BIN_DIR=$SRCDIR/package/emulator-kernel-arm.package.${TARGET_OS}/data/tools/emulator/data/kernel
+ 	mkdir -p $X86_BIN_DIR
 -	mkdir -p $ARM_BIN_DIR
++#	mkdir -p $ARM_BIN_DIR
  
- 	cp arch/x86/boot/bzImage $BIN_DIR/bzImage.x86
+ 	cp arch/x86/boot/bzImage $X86_BIN_DIR/bzImage.x86
 -	cp arch/arm/boot/zImage $ARM_BIN_DIR/bzImage.arm
++#	cp arch/arm/boot/zImage $ARM_BIN_DIR/bzImage.arm
  }
  
  [ "$1" = "clean" ] && clean
diff --cc package/changelog
index a7fba908f14f,83695b5c6d06..c50607a81072
--- a/package/changelog
+++ b/package/changelog
@@@ -1,4 -1,15 +1,19 @@@
++* 1.4.0
++- Merge develop into release branch.
++- Some features or bug fixes are merged from develop.
++== Kitae Kim <kt920.kim@samsung.com> 2012-11-02
+ * 1.3.24
+ - The range of brightness level has been changed.(1 ~ 24 => 0 ~ 100)
+ == Jinhyung.jo <jinhyung.jo@samsung.com> 2012-10-31
+ * 1.3.23
+ - Modify dibs build script for arm package.
+ - Since arm toolchain has been installed on build environment, kernel source can support arm package.
+ == Kitae Kim <kt920.kim@samsung.com> 2012-10-31
+ * 1.3.22
+ - Merge tizen_arm branch into develop branch.
+ - Merge arm kernel source for emulator into x86 kernel source.
+ == Kitae Kim <kt920.kim@samsung.com> 2012-10-30
 -* 1.3.21
 +* 1.3.20
  - Change kernel keycode of KEY_MENU.
  - Since X key mapping has been changed, kernel keycode has to be changed.
  == GiWoong Kim <giwoong.kim@samsung.com> 2012-10-23
diff --cc package/pkginfo.manifest
index 5fbbe46abb53,c4e474249bbc..128051ca981d
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@@ -1,7 -1,13 +1,13 @@@
 -Version: 1.3.24
++Version: 1.4.0
+ Maintainer: Yeong-Kyoon, Lee <yeongkyoon.lee@samsung.com>
+ Source: emulator-kernel
+ 
  Package: emulator-kernel-x86
- Version: 1.3.20
  OS: ubuntu-32, ubuntu-64, windows-32, windows-64, macos-64
  Build-host-os: ubuntu-32
- Maintainer: Yeong-Kyoon, Lee <yeongkyoon.lee@samsung.com>
- Source: emulator-kernel
- Description: Tizen Emulator Kernel
+ Description: Tizen x86 Emulator Kernel
+ 
 -Package: emulator-kernel-arm
 -OS: ubuntu-32, ubuntu-64, windows-32, windows-64, macos-64
 -Build-host-os: ubuntu-32
 -Description: Tizen ARM Emulator Kernel
++#Package: emulator-kernel-arm
++#OS: ubuntu-32, ubuntu-64, windows-32, windows-64, macos-64
++#Build-host-os: ubuntu-32
++#Description: Tizen ARM Emulator Kernel