summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephane Desneux <stephane.desneux@open.eurogiciel.org>2014-11-25 10:08:55 +0100
committerStephane Desneux <stephane.desneux@open.eurogiciel.org>2015-02-04 11:23:29 +0100
commit58dc5da59fff32bb02ed8c0b90e61f9c36012aa5 (patch)
tree3d2b31752432c86aecb7330a0c95a1f583e45420
parent97cd09470469311d234c3e9912eb84c76aeeee9d (diff)
downloadkernel-common-58dc5da59fff32bb02ed8c0b90e61f9c36012aa5.tar.gz
kernel-common-58dc5da59fff32bb02ed8c0b90e61f9c36012aa5.tar.bz2
kernel-common-58dc5da59fff32bb02ed8c0b90e61f9c36012aa5.zip
packaging: bump to 3.14.25
Change-Id: I7984a962fc224e441b9248c538f84aec2942a04c Signed-off-by: Stephane Desneux <stephane.desneux@open.eurogiciel.org>
-rw-r--r--packaging/README.update_kernel-profile5
-rw-r--r--packaging/README.update_linux-stable5
-rw-r--r--packaging/linux-stable.spec2
3 files changed, 7 insertions, 5 deletions
diff --git a/packaging/README.update_kernel-profile b/packaging/README.update_kernel-profile
index d1849aaf8c44..c151518ebe9c 100644
--- a/packaging/README.update_kernel-profile
+++ b/packaging/README.update_kernel-profile
@@ -36,7 +36,7 @@ or
# git checkout tizen_${profile}
# git rebase origin/tizen
-# git push origin HEAD:tizen_${profile}
+# git push origin +HEAD:tizen_${profile}
5. Updating kernel configurations (optional)
--------------------------------------------
@@ -45,8 +45,9 @@ or
arch=$1
platform=$2
+ rm -f .config*
make ARCH=$arch ${platform}_defconfig || return $?
- make menuconfig || return $?
+ make ARCH=$arch menuconfig || return $?
make ARCH=$arch savedefconfig || return $?
mv -v defconfig arch/$arch/configs/${platform}_defconfig
}
diff --git a/packaging/README.update_linux-stable b/packaging/README.update_linux-stable
index 66fb25b588e2..47e8123d6dfd 100644
--- a/packaging/README.update_linux-stable
+++ b/packaging/README.update_linux-stable
@@ -51,7 +51,7 @@ Define variables:
6. Push the tizen branch
------------------------
-# git push origin HEAD:tizen
+# git push origin +HEAD:tizen
7. Updating kernel configurations (optional)
@@ -61,8 +61,9 @@ Define variables:
arch=$1
platform=$2
+ rm -f .config
make ARCH=$arch ${platform}_defconfig || return $?
- make menuconfig || return $?
+ make ARCH=$arch menuconfig || return $?
make ARCH=$arch savedefconfig || return $?
mv -v defconfig arch/$arch/configs/${platform}_defconfig
}
diff --git a/packaging/linux-stable.spec b/packaging/linux-stable.spec
index e81bf061e555..d818c76cb705 100644
--- a/packaging/linux-stable.spec
+++ b/packaging/linux-stable.spec
@@ -3,7 +3,7 @@
# from MeeGo/Moblin/Fedora
#
-%define upstream_version 3.14.24
+%define upstream_version 3.14.25
%if !%{defined platform}
%define platform default