From 58dc5da59fff32bb02ed8c0b90e61f9c36012aa5 Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Tue, 25 Nov 2014 10:08:55 +0100 Subject: [PATCH] packaging: bump to 3.14.25 Change-Id: I7984a962fc224e441b9248c538f84aec2942a04c Signed-off-by: Stephane Desneux --- packaging/README.update_kernel-profile | 5 +++-- packaging/README.update_linux-stable | 5 +++-- packaging/linux-stable.spec | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/packaging/README.update_kernel-profile b/packaging/README.update_kernel-profile index d1849aa..c151518 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 66fb25b..47e8123 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 e81bf06..d818c76 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 -- 2.7.4