From 5b5b4e544cbcf6730b3c205628244142742da721 Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Tue, 25 Nov 2014 17:48:07 +0100 Subject: [PATCH] packaging: adjusted upgrade procedure (documentation) Change-Id: I938f164f4c046426f5cacc6bb12abaa7ef262109 Signed-off-by: Stephane Desneux --- packaging/README.update_kernel-profile | 46 +++++++++++++++++++------- packaging/README.update_linux-stable | 43 ++++++++++++++++++------ 2 files changed, 66 insertions(+), 23 deletions(-) diff --git a/packaging/README.update_kernel-profile b/packaging/README.update_kernel-profile index c151518ebe9c..9592ea3dd498 100644 --- a/packaging/README.update_kernel-profile +++ b/packaging/README.update_kernel-profile @@ -29,7 +29,7 @@ or # git checkout -B upstream linux_stable/upstream # git push --tags origin HEAD:upstream # git checkout -B tizen linux_stable/tizen -# git push --tags origin HEAD:tizen +# git push --tags origin +HEAD:tizen 4. rebase tizen_ branch -------------------------------- @@ -42,18 +42,40 @@ or -------------------------------------------- # function adjustconfig() { - arch=$1 - platform=$2 - - rm -f .config* - make ARCH=$arch ${platform}_defconfig || return $? - make ARCH=$arch menuconfig || return $? - make ARCH=$arch savedefconfig || return $? - mv -v defconfig arch/$arch/configs/${platform}_defconfig + arch=$1 + + case $arch in + i386|i486|i586|i686|x86) + cfgpath=arch/x86/configs + arch=i386 + platform=i386 + ;; + x86_64) + cfgpath=arch/x86/configs + arch=x86_64 + platform=x86_64 + ;; + arm|vexpress) + cfgpath=arch/arm/configs + arch=arm + platform=vexpress + ;; + *) + echo "Unknown arch" + return 1 + ;; + esac + + rm -f .config + make ARCH=$arch ${platform}_defconfig || return $? + make ARCH=$arch menuconfig || return $? + make ARCH=$arch savedefconfig || return $? + mv -v defconfig $cfgpath/${platform}_defconfig } -# adjustconfig x86 i386 -# adjustconfig x86 x86_64 -# adjustconfig arm vexpress +# adjustconfig x86 +# adjustconfig x86_64 +# adjustconfig arm + diff --git a/packaging/README.update_linux-stable b/packaging/README.update_linux-stable index 47e8123d6dfd..9c85735327f8 100644 --- a/packaging/README.update_linux-stable +++ b/packaging/README.update_linux-stable @@ -58,18 +58,39 @@ Define variables: -------------------------------------------- # function adjustconfig() { - arch=$1 - platform=$2 - - rm -f .config - make ARCH=$arch ${platform}_defconfig || return $? - make ARCH=$arch menuconfig || return $? - make ARCH=$arch savedefconfig || return $? - mv -v defconfig arch/$arch/configs/${platform}_defconfig + arch=$1 + + case $arch in + i386|i486|i586|i686|x86) + cfgpath=arch/x86/configs + arch=i386 + platform=i386 + ;; + x86_64) + cfgpath=arch/x86/configs + arch=x86_64 + platform=x86_64 + ;; + arm|vexpress) + cfgpath=arch/arm/configs + arch=arm + platform=vexpress + ;; + *) + echo "Unknown arch" + return 1 + ;; + esac + + rm -f .config + make ARCH=$arch ${platform}_defconfig || return $? + make ARCH=$arch menuconfig || return $? + make ARCH=$arch savedefconfig || return $? + mv -v defconfig $cfgpath/${platform}_defconfig } -# adjustconfig x86 i386 -# adjustconfig x86 x86_64 -# adjustconfig arm vexpress +# adjustconfig x86 +# adjustconfig x86_64 +# adjustconfig arm -- 2.34.1