summaryrefslogtreecommitdiff
path: root/packages/linux-kernel/patches/kernel/0003-Perf-is-shipped-in-debian-in-linux-tools-version-pac.patch
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-12-14 16:35:56 +0100
committerChristian Poessinger <christian@poessinger.com>2020-12-14 16:35:56 +0100
commit4d1f145cb19d8e14ad7f0f1cd96214ee424bebb5 (patch)
tree46b2e2bd2d14eadf23ded0a71da3edffb8d1ad01 /packages/linux-kernel/patches/kernel/0003-Perf-is-shipped-in-debian-in-linux-tools-version-pac.patch
parent1efea42f805d27c5bc6a97b072a201113c5fccab (diff)
parent3939384aff842cc3fb6c5d24d3d2af17ecf0fab9 (diff)
downloadvyos-build-4d1f145cb19d8e14ad7f0f1cd96214ee424bebb5.tar.gz
vyos-build-4d1f145cb19d8e14ad7f0f1cd96214ee424bebb5.zip
Merge branch 'kernel-5.4' of github.com:c-po/vyos-build into current
* 'kernel-5.4' of github.com:c-po/vyos-build: Kernel: T3129: update Linux Kernel to v5.4.83
Diffstat (limited to 'packages/linux-kernel/patches/kernel/0003-Perf-is-shipped-in-debian-in-linux-tools-version-pac.patch')
-rw-r--r--packages/linux-kernel/patches/kernel/0003-Perf-is-shipped-in-debian-in-linux-tools-version-pac.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/packages/linux-kernel/patches/kernel/0003-Perf-is-shipped-in-debian-in-linux-tools-version-pac.patch b/packages/linux-kernel/patches/kernel/0003-Perf-is-shipped-in-debian-in-linux-tools-version-pac.patch
index de0487f6..9e8378bc 100644
--- a/packages/linux-kernel/patches/kernel/0003-Perf-is-shipped-in-debian-in-linux-tools-version-pac.patch
+++ b/packages/linux-kernel/patches/kernel/0003-Perf-is-shipped-in-debian-in-linux-tools-version-pac.patch
@@ -33,10 +33,10 @@ 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..517a54e64509 100755
+index c4c580f547ef..9a4caabef7dc 100755
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
-@@ -39,10 +39,12 @@ tmpdir="$objtree/debian/tmp"
+@@ -51,10 +51,12 @@ tmpdir="$objtree/debian/tmp"
kernel_headers_dir="$objtree/debian/hdrtmp"
libc_headers_dir="$objtree/debian/headertmp"
dbg_dir="$objtree/debian/dbgtmp"
@@ -49,8 +49,8 @@ index 0b31f4f1f92c..517a54e64509 100755
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)"
+@@ -77,7 +79,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
@@ -58,7 +58,7 @@ index 0b31f4f1f92c..517a54e64509 100755
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
+@@ -205,4 +207,31 @@ if [ -n "$BUILD_DEBUG" ] ; then
create_package "$dbg_packagename" "$dbg_dir"
fi