Bump kernel to 3.14.14 (LTS)

Change-Id: I3b504688ddc913995382751a46c5800386d2567b
Signed-off-by: Stephane Desneux <stephane.desneux@open.eurogiciel.org>

diff --git a/packaging/README.update b/packaging/README.update
index 8fee102..aaf4553 100644 (file)
--- a/packaging/README.update
+++ b/packaging/README.update
@@ -1,4 +1,45 @@
-To bump kernel version:
+How to bump kernel version
+==========================
+
+Parameters:
+-----------
+* branch to upgrade to (example: linux-3.14.y as defined on git.kernel.org)
+* tag to upgrade to (example: v3.14.14)
+* kernel version
+
+Define variables:
+# linux_branch=linux-3.14.y
+# linux_tag=v3.14.14
+
+1. Clone kernel-common
+----------------------
+
+# git clone review.tizen.org:profile/common/kernel-common
+# cd kernel-common
+
+2. add kernel.org as new origin and fetch it
+--------------------------------------------
+
+# git remote add linux_stable git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
+# git fetch linux_stable
+
+3. import on upstream branch until given revision and push to tizen.org
+-----------------------------------------------------------------------
+
+# git fetch origin
+# git checkout upstream
+# git rebase linux_stable/${linux_branch}
+# git push origin HEAD:upstream
+# git push --tags origin HEAD:upstream
+
+4. rebase tizen branch
+----------------------
+
+# git checkout -B tizen origin/tizen
+# git rebase -i ${linux_tag}
+
+5. update kernel config
+-----------------------
 
 # make ARCH=i386 common_x86_defconfig
 # make ARCH=i386 menuconfig
@@ -12,4 +53,7 @@ To bump kernel version:
 # make ARCH=x86_64 savedefconfig
 # mv defconfig arch/x86/configs/common_x86_64_defconfig
 
+6. Bump the kernel version in the spec file
+-------------------------------------------
 
+# sed -ri "s/^(%define upstream_version).*$/\1 $(make kernelversion)/" packaging/*.spec

diff --git a/packaging/kernel-x86-common.changes b/packaging/kernel-common.changes
similarity index 100%
rename from packaging/kernel-x86-common.changes
rename to packaging/kernel-common.changes

diff --git a/packaging/kernel-x86-common.spec b/packaging/kernel-common.spec
similarity index 96%
rename from packaging/kernel-x86-common.spec
rename to packaging/kernel-common.spec
index ab10fd9..8036d5c 100644 (file)
--- a/packaging/kernel-x86-common.spec
+++ b/packaging/kernel-common.spec
@@ -3,37 +3,36 @@
 # from MeeGo/Moblin/Fedora
 #
 
-%define upstream_version 3.14.4
-%define variant x86-common
+%define upstream_version 3.14.14
+%define variant %{profile}-%{arch}
 %define kernel_version %{version}-%{release}
 %define kernel_full_version %{version}-%{release}-%{variant}
 %define arch_32bits i386 i586 i686 %{ix86}
 
 # Default arch config for tizen per arch (unless overiden after)
-%define defconfig tizen_defconfig
-
-# Default features
-%define vdso_supported 1
-%define modules_supported 1
-
-
 %ifarch %{arch_32bits}
 %define kernel_arch i386
-%define defconfig common_x86_defconfig
+%define kernel_arch_subdir arch/x86
+%define kernel_image bzImage
+%define defconfig %{profile}_x86_defconfig
+%define vdso_supported 1
+%define modules_supported 1
 %endif
 
 %ifarch x86_64
 %define kernel_arch x86_64
-%define defconfig common_%{kernel_arch}_defconfig
-%endif
-
 %define kernel_arch_subdir arch/x86
 %define kernel_image bzImage
+%define defconfig %{profile}_%{kernel_arch}_defconfig
+%define vdso_supported 1
+%define modules_supported 1
+%endif
 
 %ifarch %arm
 %define kernel_arch arm
 %define kernel_arch_subdir arch/%{kernel_arch}
 %define kernel_image zImage
+%define defconfig tizen_defconfig
 %define vdso_supported 0
 %define modules_supported 0
 %endif
@@ -96,8 +95,7 @@ Source0: %{name}-%{version}.tar.bz2
 
 
 %description
-This package contains the Tizen Common Linux kernel
-
+This package contains the Linux kernel for Tizen (%{profile} profile)
 
 %package devel
 Summary: Development package for building kernel modules to match the %{variant} kernel