mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-07 05:10:20 +00:00
Code Issues Projects Releases Wiki Activity

kpatch: upgrade 0.61 -> 0.71

Browse Source 
-Refresh the following patch:
	kpatch/0001-kpatch-build-add-cross-compilation-support.patch
	kpatch/0002-kpatch-build-allow-overriding-of-distro-name.patch

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Zang Ruochen
2019-08-09 16:34:56 +08:00
committed by Khem Raj
parent 493aa5b896
commit ff074c9bfd
3 changed files with 43 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-kernel/kpatch/kpatch/0001-kpatch-build-add-cross-compilation-support.patch
+28 -24
View File
@@ -1,6 +1,6 @@
From 70de3fecbc551907c4fd504cfff385c73be8db75 Mon Sep 17 00:00:00 2001 From 21909e3f9096fa8e4825df8c65114ee92ab3d532 Mon Sep 17 00:00:00 2001
From: Ruslan Bilovol <rbilovol@cisco.com> From: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Date: Tue, 19 Dec 2017 15:59:04 +0200 Date: Wed, 7 Aug 2019 02:57:35 +0900
Subject: [PATCH] kpatch-build: add cross-compilation support Subject: [PATCH] kpatch-build: add cross-compilation support
This patch introduces new option for kpatch-build This patch introduces new option for kpatch-build
@@ -17,44 +17,45 @@ possible to pass multy-component strings like
Upstream-Status: Pending Upstream-Status: Pending
Signed-off-by: Ruslan Bilovol <rbilovol@cisco.com> Signed-off-by: Ruslan Bilovol <rbilovol@cisco.com>
--- ---
kpatch-build/kpatch-build | 13 +++++++++++-- kpatch-build/kpatch-build | 13 +++++++++++--
kpatch-build/kpatch-gcc | 4 ++-- kpatch-build/kpatch-gcc | 4 ++--
2 files changed, 13 insertions(+), 4 deletions(-) 2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/kpatch-build/kpatch-build b/kpatch-build/kpatch-build diff --git a/kpatch-build/kpatch-build b/kpatch-build/kpatch-build
index a76913f..4a011aa 100755 index 9ef3809..463dab1 100755
--- a/kpatch-build/kpatch-build --- a/kpatch-build/kpatch-build
+++ b/kpatch-build/kpatch-build +++ b/kpatch-build/kpatch-build
@@ -197,7 +197,7 @@ gcc_version_check() { @@ -198,7 +198,7 @@ gcc_version_check() {
# gcc --version varies between distributions therefore extract version # gcc --version varies between distributions therefore extract version
# by compiling a test file and compare it to vmlinux's version. # by compiling a test file and compare it to vmlinux's version.
echo 'void main(void) {}' > "$c" echo 'void main(void) {}' > "$c"
- out="$(gcc -c -pg -ffunction-sections -o "$o" "$c" 2>&1)" - out="$(gcc -c -pg -ffunction-sections -o "$o" "$c" 2>&1)"
+ out="$(${KPATCH_CROSS_COMPILE}gcc -c -pg -ffunction-sections -o "$o" "$c" 2>&1)" + out="$(${KPATCH_CROSS_COMPILE}gcc -c -pg -ffunction-sections -o "$o" "$c" 2>&1)"
gccver="$(gcc_version_from_file "$o")" gccver="$(gcc_version_from_file "$o")"
kgccver="$(gcc_version_from_file "$VMLINUX")" if [[ -n "$OOT_MODULE" ]]; then
rm -f "$c" "$o" kgccver="$(gcc_version_from_file "$OOT_MODULE")"
@@ -392,12 +392,14 @@ usage() { @@ -411,6 +411,8 @@ usage() {
echo " -d, --debug Enable 'xtrace' and keep scratch files" >&2
echo " in <CACHEDIR>/tmp" >&2
echo " (can be specified multiple times)" >&2 echo " (can be specified multiple times)" >&2
echo " -e, --oot-module Enable patching out-of-tree module," >&2
echo " specify current version of module" >&2
+ echo " --cross-compile Specify the prefix used for all executables" >&2 + echo " --cross-compile Specify the prefix used for all executables" >&2
+ echo " used during compilation" >&2 + echo " used during compilation" >&2
echo " --skip-cleanup Skip post-build cleanup" >&2 echo " --skip-cleanup Skip post-build cleanup" >&2
echo " --skip-gcc-check Skip gcc version matching check" >&2 echo " --skip-gcc-check Skip gcc version matching check" >&2
echo " (not recommended)" >&2
@@ -416,7 +418,7 @@ usage() {
echo " (not recommended)" >&2 echo " (not recommended)" >&2
} }
-options="$(getopt -o ha:r:s:c:v:j:t:n:o:d -l "help,archversion:,sourcerpm:,sourcedir:,config:,vmlinux:,jobs:,target:,name:,output:,debug,skip-gcc-check,skip-cleanup" -- "$@")" || die "getopt failed" -options="$(getopt -o ha:r:s:c:v:j:t:n:o:de: -l "help,archversion:,sourcerpm:,sourcedir:,config:,vmlinux:,jobs:,target:,name:,output:,oot-module:,debug,skip-gcc-check,skip-cleanup" -- "$@")" || die "getopt failed"
+options="$(getopt -o ha:r:s:c:v:j:t:n:o:d -l "help,archversion:,sourcerpm:,sourcedir:,config:,vmlinux:,jobs:,target:,name:,output:,debug,cross-compile:,skip-gcc-check,skip-cleanup" -- "$@")" || die "getopt failed" +options="$(getopt -o ha:r:s:c:v:j:t:n:o:de: -l "help,archversion:,sourcerpm:,sourcedir:,config:,vmlinux:,jobs:,target:,name:,output:,oot-module:,debug,cross-compile:,skip-gcc-check,skip-cleanup" -- "$@")" || die "getopt failed"
eval set -- "$options" eval set -- "$options"
@@ -455,6 +457,10 @@ while [[ $# -gt 0 ]]; do @@ -479,6 +481,10 @@ while [[ $# -gt 0 ]]; do
echo "DEBUG mode enabled" OOT_MODULE="$(readlink -f "$2")"
fi shift
;; ;;
+ --cross-compile) + --cross-compile)
+ KPATCH_CROSS_COMPILE="$2" + KPATCH_CROSS_COMPILE="$2"
@@ -63,17 +64,17 @@ index a76913f..4a011aa 100755
--skip-cleanup) --skip-cleanup)
echo "Skipping cleanup" echo "Skipping cleanup"
SKIPCLEANUP=1 SKIPCLEANUP=1
@@ -710,6 +716,8 @@ if [[ $DEBUG -ge 4 ]]; then @@ -757,6 +763,8 @@ if [[ $DEBUG -ge 4 ]]; then
export KPATCH_GCC_DEBUG=1 export KPATCH_GCC_DEBUG=1
fi fi
+export KPATCH_CROSS_COMPILE +export KPATCH_CROSS_COMPILE
+ +
echo "Building original kernel" echo "Building original source"
./scripts/setlocalversion --save-scmversion || die [[ -n "$OOT_MODULE" ]] || ./scripts/setlocalversion --save-scmversion || die
unset KPATCH_GCC_TEMPDIR unset KPATCH_GCC_TEMPDIR
@@ -874,6 +882,7 @@ cd "$TEMPDIR/patch" || die @@ -940,6 +948,7 @@ fi
KPATCH_BUILD="$SRCDIR" KPATCH_NAME="$MODNAME" \ KPATCH_BUILD="$KPATCH_BUILD" KPATCH_NAME="$MODNAME" \
KBUILD_EXTRA_SYMBOLS="$KBUILD_EXTRA_SYMBOLS" \ KBUILD_EXTRA_SYMBOLS="$KBUILD_EXTRA_SYMBOLS" \
KPATCH_LDFLAGS="$KPATCH_LDFLAGS" \ KPATCH_LDFLAGS="$KPATCH_LDFLAGS" \
+CROSS_COMPILE="$KPATCH_CROSS_COMPILE" \ +CROSS_COMPILE="$KPATCH_CROSS_COMPILE" \
@@ -81,7 +82,7 @@ index a76913f..4a011aa 100755
if ! "$KPATCH_MODULE"; then if ! "$KPATCH_MODULE"; then
diff --git a/kpatch-build/kpatch-gcc b/kpatch-build/kpatch-gcc diff --git a/kpatch-build/kpatch-gcc b/kpatch-build/kpatch-gcc
index 2d56da1..59a4255 100755 index 9663290..56e6c8f 100755
--- a/kpatch-build/kpatch-gcc --- a/kpatch-build/kpatch-gcc
+++ b/kpatch-build/kpatch-gcc +++ b/kpatch-build/kpatch-gcc
@@ -8,7 +8,7 @@ TOOLCHAINCMD="$1" @@ -8,7 +8,7 @@ TOOLCHAINCMD="$1"
@@ -93,9 +94,12 @@ index 2d56da1..59a4255 100755
fi fi
declare -a args=("$@") declare -a args=("$@")
@@ -82,4 +82,4 @@ elif [[ "$TOOLCHAINCMD" = "ld" ]] ; then @@ -84,4 +84,4 @@ elif [[ "$TOOLCHAINCMD" = "ld" ]] ; then
done done
fi fi
-exec "$TOOLCHAINCMD" "${args[@]}" -exec "$TOOLCHAINCMD" "${args[@]}"
+exec ${KPATCH_CROSS_COMPILE}${TOOLCHAINCMD} "${args[@]}" +exec ${KPATCH_CROSS_COMPILE}${TOOLCHAINCMD} "${args[@]}"
--
2.7.4
meta-oe/recipes-kernel/kpatch/kpatch/0002-kpatch-build-allow-overriding-of-distro-name.patch
+13 -11
View File
@@ -1,6 +1,6 @@
From 15838a86d5ea94fa05976ea32fd847b18261b403 Mon Sep 17 00:00:00 2001 From 4143fa0092fe4cafee10b24a97d3ad0b41ab7a30 Mon Sep 17 00:00:00 2001
From: Ruslan Bilovol <rbilovol@cisco.com> From: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Date: Tue, 2 Jan 2018 14:50:03 +0200 Date: Wed, 7 Aug 2019 03:24:39 +0900
Subject: [PATCH] kpatch-build: allow overriding of distro name Subject: [PATCH] kpatch-build: allow overriding of distro name
It is sometimes useful to have ability to override It is sometimes useful to have ability to override
@@ -14,17 +14,16 @@ implements all needed functionality
Upstream-Status: Pending Upstream-Status: Pending
Signed-off-by: Ruslan Bilovol <rbilovol@cisco.com> Signed-off-by: Ruslan Bilovol <rbilovol@cisco.com>
--- ---
kpatch-build/kpatch-build | 9 +++++++-- kpatch-build/kpatch-build | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-) 1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/kpatch-build/kpatch-build b/kpatch-build/kpatch-build diff --git a/kpatch-build/kpatch-build b/kpatch-build/kpatch-build
index 4a011aa..eb6cd64 100755 index 39933fc..c0258a2 100755
--- a/kpatch-build/kpatch-build --- a/kpatch-build/kpatch-build
+++ b/kpatch-build/kpatch-build +++ b/kpatch-build/kpatch-build
@@ -394,12 +394,13 @@ usage() { @@ -413,12 +413,13 @@ usage() {
echo " (can be specified multiple times)" >&2 echo " specify current version of module" >&2
echo " --cross-compile Specify the prefix used for all executables" >&2 echo " --cross-compile Specify the prefix used for all executables" >&2
echo " used during compilation" >&2 echo " used during compilation" >&2
+ echo " --distro Override distro name" >&2 + echo " --distro Override distro name" >&2
@@ -33,12 +32,12 @@ index 4a011aa..eb6cd64 100755
echo " (not recommended)" >&2 echo " (not recommended)" >&2
} }
-options="$(getopt -o ha:r:s:c:v:j:t:n:o:d -l "help,archversion:,sourcerpm:,sourcedir:,config:,vmlinux:,jobs:,target:,name:,output:,debug,cross-compile:,skip-gcc-check,skip-cleanup" -- "$@")" || die "getopt failed" -options="$(getopt -o ha:r:s:c:v:j:t:n:o:de: -l "help,archversion:,sourcerpm:,sourcedir:,config:,vmlinux:,jobs:,target:,name:,output:,oot-module:,debug,cross-compile:,skip-gcc-check,skip-cleanup" -- "$@")" || die "getopt failed"
+options="$(getopt -o ha:r:s:c:v:j:t:n:o:d -l "help,archversion:,sourcerpm:,sourcedir:,config:,vmlinux:,jobs:,target:,name:,output:,debug,cross-compile:,distro:,skip-gcc-check,skip-cleanup" -- "$@")" || die "getopt failed" +options="$(getopt -o ha:r:s:c:v:j:t:n:o:de: -l "help,archversion:,sourcerpm:,sourcedir:,config:,vmlinux:,jobs:,target:,name:,output:,oot-module:,debug,cross-compile:,distro:,skip-gcc-check,skip-cleanup" -- "$@")" || die "getopt failed"
eval set -- "$options" eval set -- "$options"
@@ -461,6 +462,10 @@ while [[ $# -gt 0 ]]; do @@ -485,6 +486,10 @@ while [[ $# -gt 0 ]]; do
KPATCH_CROSS_COMPILE="$2" KPATCH_CROSS_COMPILE="$2"
shift shift
;; ;;
@@ -49,7 +48,7 @@ index 4a011aa..eb6cd64 100755
--skip-cleanup) --skip-cleanup)
echo "Skipping cleanup" echo "Skipping cleanup"
SKIPCLEANUP=1 SKIPCLEANUP=1
@@ -539,7 +544,7 @@ fi @@ -571,7 +576,7 @@ fi
# Don't check external file. # Don't check external file.
# shellcheck disable=SC1091 # shellcheck disable=SC1091
source /etc/os-release source /etc/os-release
@@ -58,3 +57,6 @@ index 4a011aa..eb6cd64 100755
if [[ "$DISTRO" = fedora ]] || [[ "$DISTRO" = rhel ]] || [[ "$DISTRO" = ol ]] || [[ "$DISTRO" = centos ]]; then if [[ "$DISTRO" = fedora ]] || [[ "$DISTRO" = rhel ]] || [[ "$DISTRO" = ol ]] || [[ "$DISTRO" = centos ]]; then
[[ -z "$VMLINUX" ]] && VMLINUX="/usr/lib/debug/lib/modules/$ARCHVERSION/vmlinux" [[ -z "$VMLINUX" ]] && VMLINUX="/usr/lib/debug/lib/modules/$ARCHVERSION/vmlinux"
[[ -e "$VMLINUX" ]] || die "kernel-debuginfo-$ARCHVERSION not installed" [[ -e "$VMLINUX" ]] || die "kernel-debuginfo-$ARCHVERSION not installed"
--
2.7.4
meta-oe/recipes-kernel/kpatch/kpatch_git.bb
+2 -2
View File
@@ -2,9 +2,9 @@ require kpatch.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SRCREV = "7f550f01bd308cf058ae782327d29c8916cc5602" SRCREV = "d7c5810e2a6acacfa5fec1e38d2f75af8e8c818c"
PV = "0.6.1+git${SRCPV}" PV = "0.7.1+git${SRCPV}"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"