From cc04a75932345ba37e4e18f82ae3f85330cedf68 Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Wed, 3 Jan 2024 00:02:14 +0100 Subject: Kernel: T5887: update Linux Kernel to v6.6.9 --- .../kernel/0003-ship-perf-debian-package.patch | 92 ---------------------- 1 file changed, 92 deletions(-) delete mode 100644 packages/linux-kernel/patches/kernel/0003-ship-perf-debian-package.patch (limited to 'packages/linux-kernel/patches/kernel/0003-ship-perf-debian-package.patch') diff --git a/packages/linux-kernel/patches/kernel/0003-ship-perf-debian-package.patch b/packages/linux-kernel/patches/kernel/0003-ship-perf-debian-package.patch deleted file mode 100644 index 30219961..00000000 --- a/packages/linux-kernel/patches/kernel/0003-ship-perf-debian-package.patch +++ /dev/null @@ -1,92 +0,0 @@ -From: Riku Voipio - -Perf is shipped in debian in linux-tools-$version package. Extend -the existing to builddeb script to build perf if BUILD_TOOLS=y -is added the make deb-pkg line - -Some features of this patch I'm uncomfortable with: - -1. Relative paths are resoved to absolute ones - Especially with separate O= buildd, perf build from tools/perf dir - fail. - -2. Unsetting LDFLAGS - make -> shell (builddeb) -> make expands variables. The LDFLAGS as - set by toplevel makefile are for kernel, so we just unset the flag - here. - -3. Replaces ubuntu/debian packages instead attempting to fit to - the linux-base/linux-tools-common frameworks. I think people who - want to run "make deb-pkg" for their kernels would rather keep this - simple. - -4. More tools than just perf could be built - unfortunately most - tools fail to have a working "install" target and/or else have - build process inconsistent with other tools. A topic for another - patch series. - -Signed-off-by: Riku Voipio - ---- - scripts/package/builddeb | 31 ++++++++++++++++++++++++++++++- - 1 file changed, 30 insertions(+), 1 deletion(-) - -diff --git a/scripts/package/builddeb b/scripts/package/builddeb -index 91a502bb97e8..79987641bed5 100755 ---- a/scripts/package/builddeb -+++ b/scripts/package/builddeb -@@ -109,8 +109,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 - dbg_packagename=$packagename-dbg -+tools_packagename=linux-tools-$version - - if [ "$ARCH" = "um" ] ; then - packagename=user-mode-linux-$version -@@ -133,7 +135,7 @@ esac - BUILD_DEBUG=$(if_enabled_echo CONFIG_DEBUG_INFO Yes) - - # Setup the directory structure --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" - -@@ -234,4 +236,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 <> debian/control -+ -+Package: $tools_packagename -+Architecture: any -+Replaces: linux-base, linux-tools-common -+Depends: \${shlibs:Depends} -+Description: Performance analysis tools for Linux $version -+ This package contains the 'perf' performance analysis tools for Linux -+ kernel version $version . -+EOF -+ -+ dpkg-shlibdeps $tools_dest/usr/bin/* $tools_dest/usr/lib*/traceevent/plugins/* -+ create_package "$tools_packagename" "$tools_dir" -+fi -+ - exit 0 --- -2.20.1 - -- cgit v1.2.3