From 3e29e00a3a31511e4343d91579902eff57ffeb26 Mon Sep 17 00:00:00 2001 From: Ruslan Bilovol Date: Tue, 19 Dec 2017 15:59:04 +0200 Subject: [PATCH 1/2] kpatch-build: add cross-compilation support This patch introduces new option for kpatch-build script "--cross-compile" which can be used for specifying cross-complier prefix. It allows to build live patches not only on target system, but also on hosts for a target other than the one on which the compiler is running Also removed quotes in exec lines, so it is possible to pass multy-component strings like "ccache x86_64-xelinux-linux-" as cross-compiler Signed-off-by: Ruslan Bilovol --- kpatch-build/kpatch-build | 13 +++++++++++-- kpatch-build/kpatch-gcc | 4 ++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/kpatch-build/kpatch-build b/kpatch-build/kpatch-build index 8e2c18e10..cf43a3bb8 100755 --- a/kpatch-build/kpatch-build +++ b/kpatch-build/kpatch-build @@ -198,7 +198,7 @@ gcc_version_check() { # gcc --version varies between distributions therefore extract version # by compiling a test file and compare it to vmlinux's version. echo 'void main(void) {}' > "$c" - 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)" gccver="$(gcc_version_from_file "$o")" kgccver="$(gcc_version_from_file "$VMLINUX")" rm -f "$c" "$o" @@ -385,12 +385,14 @@ usage() { echo " -d, --debug Enable 'xtrace' and keep scratch files" >&2 echo " in /tmp" >&2 echo " (can be specified multiple times)" >&2 + echo " --cross-compile Specify the prefix used for all executables" >&2 + echo " used during compilation" >&2 echo " --skip-cleanup Skip post-build cleanup" >&2 echo " --skip-gcc-check Skip gcc version matching check" >&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:d -l "help,archversion:,sourcerpm:,sourcedir:,config:,vmlinux:,jobs:,target:,name:,output:,debug,cross-compile:,skip-gcc-check,skip-cleanup" -- "$@")" || die "getopt failed" eval set -- "$options" @@ -448,6 +450,10 @@ while [[ $# -gt 0 ]]; do echo "DEBUG mode enabled" fi ;; + --cross-compile) + KPATCH_CROSS_COMPILE="$2" + shift + ;; --skip-cleanup) echo "Skipping cleanup" SKIPCLEANUP=1 @@ -694,6 +700,8 @@ if [[ $DEBUG -ge 4 ]]; then export KPATCH_GCC_DEBUG=1 fi +export KPATCH_CROSS_COMPILE + echo "Building original kernel" ./scripts/setlocalversion --save-scmversion || die make mrproper 2>&1 | logger || die @@ -848,6 +856,7 @@ cd "$TEMPDIR/patch" || die KPATCH_BUILD="$SRCDIR" KPATCH_NAME="$MODNAME" \ KBUILD_EXTRA_SYMBOLS="$KBUILD_EXTRA_SYMBOLS" \ KPATCH_LDFLAGS="$KPATCH_LDFLAGS" \ +CROSS_COMPILE="$KPATCH_CROSS_COMPILE" \ make 2>&1 | logger || die if ! "$KPATCH_MODULE"; then diff --git a/kpatch-build/kpatch-gcc b/kpatch-build/kpatch-gcc index ab6094b67..dab671e76 100755 --- a/kpatch-build/kpatch-gcc +++ b/kpatch-build/kpatch-gcc @@ -8,7 +8,7 @@ TOOLCHAINCMD="$1" shift if [[ -z "$KPATCH_GCC_TEMPDIR" ]]; then - exec "$TOOLCHAINCMD" "$@" + exec ${KPATCH_CROSS_COMPILE}${TOOLCHAINCMD} "$@" fi declare -a args=("$@") @@ -81,4 +81,4 @@ elif [[ "$TOOLCHAINCMD" = "ld" ]] ; then done fi -exec "$TOOLCHAINCMD" "${args[@]}" +exec ${KPATCH_CROSS_COMPILE}${TOOLCHAINCMD} "${args[@]}" From 86ae892a563aa897d66ba36b7281cbff0a80b9a8 Mon Sep 17 00:00:00 2001 From: Ruslan Bilovol Date: Tue, 2 Jan 2018 14:50:03 +0200 Subject: [PATCH 2/2] kpatch-build: allow overriding of distro name It is sometimes useful to have ability to override distro name, for example during cross-compilation build when livepatch modules will be ran on the target which differs from host. This patch adds a new --distro option which implements all needed functionality Signed-off-by: Ruslan Bilovol --- kpatch-build/kpatch-build | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/kpatch-build/kpatch-build b/kpatch-build/kpatch-build index cf43a3bb8..189ae70ee 100755 --- a/kpatch-build/kpatch-build +++ b/kpatch-build/kpatch-build @@ -387,12 +387,13 @@ usage() { echo " (can be specified multiple times)" >&2 echo " --cross-compile Specify the prefix used for all executables" >&2 echo " used during compilation" >&2 + echo " --distro Override distro name" >&2 echo " --skip-cleanup Skip post-build cleanup" >&2 echo " --skip-gcc-check Skip gcc version matching check" >&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:d -l "help,archversion:,sourcerpm:,sourcedir:,config:,vmlinux:,jobs:,target:,name:,output:,debug,cross-compile:,distro:,skip-gcc-check,skip-cleanup" -- "$@")" || die "getopt failed" eval set -- "$options" @@ -454,6 +455,10 @@ while [[ $# -gt 0 ]]; do KPATCH_CROSS_COMPILE="$2" shift ;; + --distro) + DISTRO="$2" + shift + ;; --skip-cleanup) echo "Skipping cleanup" SKIPCLEANUP=1 @@ -530,7 +535,7 @@ fi # Don't check external file. # shellcheck disable=SC1091 source /etc/os-release -DISTRO="$ID" +DISTRO="${DISTRO:-${ID}}" if [[ "$DISTRO" = fedora ]] || [[ "$DISTRO" = rhel ]] || [[ "$DISTRO" = ol ]] || [[ "$DISTRO" = centos ]]; then [[ -z "$VMLINUX" ]] && VMLINUX="/usr/lib/debug/lib/modules/$ARCHVERSION/vmlinux" [[ -e "$VMLINUX" ]] || die "kernel-debuginfo-$ARCHVERSION not installed"