diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-08-30 20:02:14 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-08-30 20:02:14 +0200 |
| commit | 78c43c2078e292ac9b53d2d6a41a47466d283914 (patch) | |
| tree | 10de8cde8fb468aff16e8f2f31c2a1f19188f15f /packages/linux-kernel/patches/kernel/0003-RFC-builddeb-add-linux-tools-package-with-perf.patch | |
| parent | 1175a62b346475174e0527c8d7c6d32ce30e5e87 (diff) | |
| download | vyos-build-78c43c2078e292ac9b53d2d6a41a47466d283914.tar.gz vyos-build-78c43c2078e292ac9b53d2d6a41a47466d283914.zip | |
Kernel: T2843: upgrade Kernel to v5.8.5
Note: Intel does not provide a compatible QAT version. There is a custom patch
which make QAT compile for the specified Kernel version. This patch will change
the source to a non backwards-compatible version - this is fine as we run 5.8
anyways.
Diffstat (limited to 'packages/linux-kernel/patches/kernel/0003-RFC-builddeb-add-linux-tools-package-with-perf.patch')
| -rw-r--r-- | packages/linux-kernel/patches/kernel/0003-RFC-builddeb-add-linux-tools-package-with-perf.patch | 50 |
1 files changed, 24 insertions, 26 deletions
diff --git a/packages/linux-kernel/patches/kernel/0003-RFC-builddeb-add-linux-tools-package-with-perf.patch b/packages/linux-kernel/patches/kernel/0003-RFC-builddeb-add-linux-tools-package-with-perf.patch index 38d5b980..f7fbc90b 100644 --- a/packages/linux-kernel/patches/kernel/0003-RFC-builddeb-add-linux-tools-package-with-perf.patch +++ b/packages/linux-kernel/patches/kernel/0003-RFC-builddeb-add-linux-tools-package-with-perf.patch @@ -31,48 +31,46 @@ Signed-off-by: Riku Voipio <riku.voipio@linaro.org> 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/scripts/package/builddeb b/scripts/package/builddeb -index 0b31f4f1f92c..629144b4226b 100755 +index 6df3c9f8b2da..a38cfc984134 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb -@@ -39,10 +39,12 @@ tmpdir="$objtree/debian/tmp" - kernel_headers_dir="$objtree/debian/hdrtmp" - libc_headers_dir="$objtree/debian/headertmp" - dbg_dir="$objtree/debian/dbgtmp" +@@ -102,8 +102,10 @@ deploy_libc_headers () { + version=$KERNELRELEASE + tmpdir=debian/linux-image + dbg_dir=debian/linux-image-dbg +tools_dir="$objtree/debian/toolstmp" packagename=linux-image-$version - kernel_headers_packagename=linux-headers-$version - libc_headers_packagename=linux-libc-dev dbg_packagename=$packagename-dbg +tools_packagename=linux-tools-$version if [ "$ARCH" = "um" ] ; then packagename=user-mode-linux-$version -@@ -65,7 +67,7 @@ esac - BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $KCONFIG_CONFIG || true)" +@@ -126,7 +128,7 @@ esac + BUILD_DEBUG=$(if_enabled_echo CONFIG_DEBUG_INFO Yes) # Setup the directory structure --rm -rf "$tmpdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" $objtree/debian/files -+rm -rf "$tmpdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" "$tools_dir" $objtree/debian/files +-rm -rf "$tmpdir" "$dbg_dir" debian/files ++rm -rf "$tmpdir" "$dbg_dir" "$tools_dir" debian/files mkdir -m 755 -p "$tmpdir/DEBIAN" mkdir -p "$tmpdir/lib" "$tmpdir/boot" - mkdir -p "$kernel_headers_dir/lib/modules/$version/" -@@ -194,4 +196,31 @@ if [ -n "$BUILD_DEBUG" ] ; then + +@@ -225,4 +227,31 @@ if [ -n "$BUILD_DEBUG" ] ; then create_package "$dbg_packagename" "$dbg_dir" fi +if [ -n "$BUILD_TOOLS" ] +then -+ # HACK - change output dir from relative to absolute -+ mkdir -p $tools_dir -+ tools_dest=`readlink -f $tools_dir` -+ if [ -n "$O" ] -+ then -+ output=`readlink -f $objtree` -+ mkdir -p $output/tools/perf -+ output="O=$output/tools/perf" -+ fi -+ $MAKE -C $srctree/tools/perf $output LDFLAGS= srctree=$KBUILD_SRC prefix=$tools_dest/usr install -+ cat <<EOF >> debian/control ++ # HACK - change output dir from relative to absolute ++ mkdir -p $tools_dir ++ tools_dest=`readlink -f $tools_dir` ++ if [ -n "$O" ] ++ then ++ output=`readlink -f $objtree` ++ mkdir -p $output/tools/perf ++ output="O=$output/tools/perf" ++ fi ++ $MAKE -C $srctree/tools/perf $output LDFLAGS= srctree=$KBUILD_SRC prefix=$tools_dest/usr install ++ cat <<EOF >> debian/control + +Package: $tools_packagename +Architecture: any @@ -83,8 +81,8 @@ index 0b31f4f1f92c..629144b4226b 100755 + kernel version $version . +EOF + -+ dpkg-shlibdeps $tools_dest/usr/bin/* $tools_dest/usr/lib*/traceevent/plugins/* -+ create_package "$tools_packagename" "$tools_dir" ++ dpkg-shlibdeps $tools_dest/usr/bin/* $tools_dest/usr/lib*/traceevent/plugins/* ++ create_package "$tools_packagename" "$tools_dir" +fi + exit 0 |