Merge branch 'current' into T8542-SBOM-current

3 files changed, 110 insertions, 369 deletions

diff --git a/scripts/package-build/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch b/scripts/package-build/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch
index 56694532..ff0bc955 100644
--- a/scripts/package-build/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch
+++ b/scripts/package-build/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch
@@ -1,4 +1,3 @@
-From 81d38c4a32e059ad7835f7dc254e7627642afbe9 Mon Sep 17 00:00:00 2001
 From: Stephen Hemminger <stephen@networkplumber.org>
 Date: Mon, 29 Apr 2013 18:50:15 -0700
 Subject: [PATCH] VyOS: Add linkstate IP device attribute
@@ -7,6 +6,15 @@ Backport of earlier Vyatta patch.
 
 (cherry picked from commit 7c5a851086686be14ae937c80d6cee34814dbefc)
 
+Refreshed against Linux 6.18.x:
+  * include/uapi/linux/ipv6.h gained DEVCONF_FORCE_FORWARDING; insert
+    DEVCONF_LINK_FILTER after it so the new sentinel keeps a stable value.
+  * include/linux/ipv6.h grew ra_honor_pio_life / ra_honor_pio_pflag
+    members before sysctl_header.
+  * net/ipv6/addrconf.c::ipv6_store_devconf() now uses READ_ONCE() and
+    publishes DEVCONF_FORCE_FORWARDING; use READ_ONCE() for link_filter
+    and append after force_forwarding.
+  * net/ipv6/route.c context shifted; rt6_link_filter() unchanged.
 ---
  Documentation/networking/ip-sysctl.rst | 11 +++++++++++
  include/linux/inetdevice.h             |  1 +
@@ -19,10 +27,9 @@ Backport of earlier Vyatta patch.
  8 files changed, 34 insertions(+)
 
 diff --git a/Documentation/networking/ip-sysctl.rst b/Documentation/networking/ip-sysctl.rst
-index 531a070df2a6..d455a01b91e9 100644
 --- a/Documentation/networking/ip-sysctl.rst
 +++ b/Documentation/networking/ip-sysctl.rst
-@@ -1754,6 +1754,17 @@ src_valid_mark - BOOLEAN
+@@ -2042,6 +2042,17 @@ src_valid_mark - BOOLEAN
  
  	Default value is 0.
  
@@ -41,34 +48,31 @@ index 531a070df2a6..d455a01b91e9 100644
  	- 1 - Allows you to have multiple network interfaces on the same
  	  subnet, and have the ARPs for each interface be answered
 diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h
-index b157ff4f727f..0cbab4c57b8b 100644
 --- a/include/linux/inetdevice.h
 +++ b/include/linux/inetdevice.h
-@@ -137,6 +137,7 @@ static inline void ipv4_devconf_setall(struct in_device *in_dev)
+@@ -139,6 +139,7 @@ static inline void ipv4_devconf_setall(struct in_device *in_dev)
  #define IN_DEV_ARP_NOTIFY(in_dev)	IN_DEV_MAXCONF((in_dev), ARP_NOTIFY)
  #define IN_DEV_ARP_EVICT_NOCARRIER(in_dev) IN_DEV_ANDCONF((in_dev), \
  							  ARP_EVICT_NOCARRIER)
 +#define IN_DEV_LINKFILTER(in_dev)	IN_DEV_MAXCONF((in_dev), LINKFILTER)
  
  struct in_ifaddr {
- 	struct hlist_node	hash;
+ 	struct hlist_node	addr_lst;
 diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
-index af8a771a053c..ece8ac89d317 100644
 --- a/include/linux/ipv6.h
 +++ b/include/linux/ipv6.h
-@@ -84,6 +84,7 @@ struct ipv6_devconf {
+@@ -91,6 +91,7 @@ struct ipv6_devconf {
  	__u8		ndisc_evict_nocarrier;
+ 	__u8		ra_honor_pio_life;
+ 	__u8		ra_honor_pio_pflag;
++	__s32		link_filter;
  
  	struct ctl_table_header *sysctl_header;
-+	__s32           link_filter;
  };
- 
- struct ipv6_params {
 diff --git a/include/uapi/linux/ip.h b/include/uapi/linux/ip.h
-index 283dec7e3645..8067941a635e 100644
 --- a/include/uapi/linux/ip.h
 +++ b/include/uapi/linux/ip.h
-@@ -173,6 +173,7 @@ enum
+@@ -189,6 +189,7 @@ enum
  	IPV4_DEVCONF_DROP_GRATUITOUS_ARP,
  	IPV4_DEVCONF_BC_FORWARDING,
  	IPV4_DEVCONF_ARP_EVICT_NOCARRIER,
@@ -77,22 +81,20 @@ index 283dec7e3645..8067941a635e 100644
  };
  
 diff --git a/include/uapi/linux/ipv6.h b/include/uapi/linux/ipv6.h
-index cf592d7b630f..e8915701aa73 100644
 --- a/include/uapi/linux/ipv6.h
 +++ b/include/uapi/linux/ipv6.h
-@@ -199,6 +199,7 @@ enum {
- 	DEVCONF_NDISC_EVICT_NOCARRIER,
+@@ -200,6 +200,7 @@ enum {
  	DEVCONF_ACCEPT_UNTRACKED_NA,
  	DEVCONF_ACCEPT_RA_MIN_LFT,
+ 	DEVCONF_FORCE_FORWARDING,
 +	DEVCONF_LINK_FILTER,
  	DEVCONF_MAX
  };
  
 diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
-index 798497c8b192..0b4510b06ab5 100644
 --- a/net/ipv4/devinet.c
 +++ b/net/ipv4/devinet.c
-@@ -2608,6 +2608,7 @@ static struct devinet_sysctl_table {
+@@ -2652,6 +2652,7 @@ static struct devinet_sysctl_table {
  					      "route_localnet"),
  		DEVINET_SYSCTL_FLUSHING_ENTRY(DROP_UNICAST_IN_L2_MULTICAST,
  					      "drop_unicast_in_l2_multicast"),
@@ -101,18 +103,17 @@ index 798497c8b192..0b4510b06ab5 100644
  };
  
 diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
-index 4958452cd332..608ad0b164e3 100644
 --- a/net/ipv6/addrconf.c
 +++ b/net/ipv6/addrconf.c
-@@ -5699,6 +5699,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf,
- 	array[DEVCONF_NDISC_EVICT_NOCARRIER] = cnf->ndisc_evict_nocarrier;
- 	array[DEVCONF_ACCEPT_UNTRACKED_NA] = cnf->accept_untracked_na;
- 	array[DEVCONF_ACCEPT_RA_MIN_LFT] = cnf->accept_ra_min_lft;
-+	array[DEVCONF_LINK_FILTER] = cnf->link_filter;
+@@ -5716,6 +5716,7 @@ static void ipv6_store_devconf(const struct ipv6_devconf *cnf,
+ 		READ_ONCE(cnf->accept_untracked_na);
+ 	array[DEVCONF_ACCEPT_RA_MIN_LFT] = READ_ONCE(cnf->accept_ra_min_lft);
+ 	array[DEVCONF_FORCE_FORWARDING] = READ_ONCE(cnf->force_forwarding);
++	array[DEVCONF_LINK_FILTER] = READ_ONCE(cnf->link_filter);
  }
  
  static inline size_t inet6_ifla6_size(void)
-@@ -7143,6 +7144,13 @@ static const struct ctl_table addrconf_sysctl[] = {
+@@ -7251,6 +7252,13 @@ static const struct ctl_table addrconf_sysctl[] = {
  		.extra1		= (void *)SYSCTL_ZERO,
  		.extra2		= (void *)SYSCTL_ONE,
  	},
@@ -127,10 +128,9 @@ index 4958452cd332..608ad0b164e3 100644
  		.procname	= "ioam6_id",
  		.data		= &ipv6_devconf.ioam6_id,
 diff --git a/net/ipv6/route.c b/net/ipv6/route.c
-index 5a6cc828855d..00f98d4f3860 100644
 --- a/net/ipv6/route.c
 +++ b/net/ipv6/route.c
-@@ -716,6 +716,14 @@ static inline void rt6_probe(struct fib6_nh *fib6_nh)
+@@ -714,6 +714,14 @@ static inline void rt6_probe(struct fib6_nh *fib6_nh)
  }
  #endif
  
@@ -145,7 +145,7 @@ index 5a6cc828855d..00f98d4f3860 100644
  /*
   * Default Router Selection (RFC 2461 6.3.6)
   */
-@@ -757,6 +765,8 @@ static int rt6_score_route(const struct fib6_nh *nh, u32 fib6_flags, int oif,
+@@ -755,6 +763,8 @@ static int rt6_score_route(const struct fib6_nh *nh, u32 fib6_flags, int oif,
  
  	if (!m && (strict & RT6_LOOKUP_F_IFACE))
  		return RT6_NUD_FAIL_HARD;
diff --git a/scripts/package-build/linux-kernel/patches/kernel/0002-inotify-support-for-stackable-filesystems.patch b/scripts/package-build/linux-kernel/patches/kernel/0002-inotify-support-for-stackable-filesystems.patch
deleted file mode 100644
index 115f6831..00000000
--- a/scripts/package-build/linux-kernel/patches/kernel/0002-inotify-support-for-stackable-filesystems.patch
+++ /dev/null
@@ -1,299 +0,0 @@
-From 1d625d2f745b61a718ce52cd1729f467c17defa6 Mon Sep 17 00:00:00 2001
-From: Alex Harpin <development@landsofshadow.co.uk>
-Date: Wed, 31 Dec 2014 10:33:38 +0000
-Subject: [PATCH] VyOS: add inotify support for stackable filesystems
- (overlayfs)
-
-As it stands at the moment, overlayfs doesn't have full support for
-inotify, and as such anything that relies on inotify currently has
-issues.  The simplest method of demonstrating this is to tail a file
-(so tail -f /var/log/messages) and see that it doesn't follow changes
-in that file.  This has been reported in a number of places, including
-Bug #882147 in Ubuntu.  This patch is based on the version proposed by
-Li Jianguo in response to this bug, adding support for inotify in
-stackable filesystems.
-
-This commit provides a complete fix for the workaround implemented
-for bug #303, and will allow that commit to be reverted.
-
-Bug #425 http://bugzilla.vyos.net/show_bug.cgi?id=425
-
-(cherry picked from commit a93f1128bc83b5a6628da242e71c18ef05e81ea2)
-
----
- fs/notify/inotify/Kconfig        |   9 +++
- fs/notify/inotify/inotify_user.c | 114 ++++++++++++++++++++++++++++++-
- fs/overlayfs/super.c             |  27 ++++++--
- include/linux/inotify.h          |  28 ++++++++
- 4 files changed, 172 insertions(+), 6 deletions(-)
-
-diff --git a/fs/notify/inotify/Kconfig b/fs/notify/inotify/Kconfig
-index 1cc8be25df7e..bc4acd1a6ea4 100644
---- a/fs/notify/inotify/Kconfig
-+++ b/fs/notify/inotify/Kconfig
-@@ -15,3 +15,12 @@ config INOTIFY_USER
- 	  For more information, see <file:Documentation/filesystems/inotify.rst>
- 
- 	  If unsure, say Y.
-+
-+config INOTIFY_STACKFS
-+	bool "Inotify support for stackable filesystem"
-+	select INOTIFY_USER
-+	default y
-+	help
-+	  Say Y here to enable inotify support for stackable filesystem.
-+
-+	  If unsure, say N.
-diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
-index 1c4bfdab008d..cf567cc33679 100644
---- a/fs/notify/inotify/inotify_user.c
-+++ b/fs/notify/inotify/inotify_user.c
-@@ -15,6 +15,7 @@
- 
- #include <linux/file.h>
- #include <linux/fs.h> /* struct inode */
-+#include <linux/mount.h>
- #include <linux/fsnotify_backend.h>
- #include <linux/idr.h>
- #include <linux/init.h> /* fs_initcall */
-@@ -97,6 +98,93 @@ static void __init inotify_sysctls_init(void)
- #define inotify_sysctls_init() do { } while (0)
- #endif /* CONFIG_SYSCTL */
- 
-+#ifdef CONFIG_INOTIFY_STACKFS
-+
-+static DEFINE_RWLOCK(inotify_fs_lock);
-+static LIST_HEAD(inotify_fs_list);
-+
-+static inline struct file_system_type* peek_fs_type(struct path *path)
-+{
-+	return path->mnt->mnt_sb->s_type;
-+}
-+
-+static struct inotify_stackfs* inotify_get_stackfs(struct path *path)
-+{
-+	struct file_system_type *fs;
-+	struct inotify_stackfs *fse, *ret = NULL;
-+
-+	fs = peek_fs_type(path);
-+
-+	read_lock(&inotify_fs_lock);
-+	list_for_each_entry(fse, &inotify_fs_list, list) {
-+	if (fse->fs_type == fs) {
-+		ret = fse;
-+		break;
-+	}
-+	}
-+	read_unlock(&inotify_fs_lock);
-+
-+	return ret;
-+}
-+
-+static inline void inotify_put_stackfs(struct inotify_stackfs *fs)
-+{
-+}
-+
-+int inotify_register_stackfs(struct inotify_stackfs *fs)
-+{
-+	int ret = 0;
-+	struct inotify_stackfs *fse;
-+
-+	BUG_ON(IS_ERR_OR_NULL(fs->fs_type));
-+	BUG_ON(IS_ERR_OR_NULL(fs->func));
-+
-+	INIT_LIST_HEAD(&fs->list);
-+
-+	write_lock(&inotify_fs_lock);
-+	list_for_each_entry(fse, &inotify_fs_list, list) {
-+		if (fse->fs_type == fs->fs_type) {
-+			write_unlock(&inotify_fs_lock);
-+			ret = -EBUSY;
-+			goto out;
-+		}
-+	}
-+	list_add_tail(&fs->list, &inotify_fs_list);
-+	write_unlock(&inotify_fs_lock);
-+
-+out:
-+	return ret;
-+}
-+EXPORT_SYMBOL_GPL(inotify_register_stackfs);
-+
-+void inotify_unregister_stackfs(struct inotify_stackfs *fs)
-+{
-+	struct inotify_stackfs *fse, *n;
-+
-+	write_lock(&inotify_fs_lock);
-+	list_for_each_entry_safe(fse, n, &inotify_fs_list, list) {
-+		if (fse == fs) {
-+			list_del(&fse->list);
-+			break;
-+		}
-+	}
-+	write_unlock(&inotify_fs_lock);
-+}
-+EXPORT_SYMBOL_GPL(inotify_unregister_stackfs);
-+
-+#else
-+
-+static inline struct inotify_stackfs* inotify_get_stackfs(struct path *path)
-+{
-+	return NULL;
-+}
-+
-+static inline void inotify_put_stackfs(struct inotify_stackfs *fs)
-+{
-+}
-+
-+#endif /* CONFIG_INOTIFY_STACKFS */
-+
- static inline __u32 inotify_arg_to_mask(struct inode *inode, u32 arg)
- {
- 	__u32 mask;
-@@ -370,8 +458,8 @@ static const struct file_operations inotify_fops = {
- /*
-  * find_inode - resolve a user-given path to a specific inode
-  */
--static int inotify_find_inode(const char __user *dirname, struct path *path,
--						unsigned int flags, __u64 mask)
-+static inline int __inotify_find_inode(const char __user *dirname, struct path *path,
-+					unsigned int flags, __u64 mask)
- {
- 	int error;
- 
-@@ -392,6 +480,28 @@ static int inotify_find_inode(const char __user *dirname, struct path *path,
- 	return error;
- }
- 
-+static int inotify_find_inode(const char __user *dirname, struct path *path,
-+					unsigned int flags, __u64 mask)
-+{
-+	int ret;
-+	struct path tpath;
-+	struct inotify_stackfs *fse;
-+
-+	ret = __inotify_find_inode(dirname, &tpath, flags, mask);
-+	if (ret)
-+		return ret;
-+	fse = inotify_get_stackfs(&tpath);
-+	if (fse == NULL) {
-+		*path = tpath;
-+		return 0;
-+	}
-+	ret = fse->func(path, &tpath);
-+	inotify_put_stackfs(fse);
-+	path_put(&tpath);
-+
-+	return ret;
-+}
-+
- static int inotify_add_to_idr(struct idr *idr, spinlock_t *idr_lock,
- 			      struct inotify_inode_mark *i_mark)
- {
-diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
-index 93ee57bc82ad..5f4f886d011e 100644
---- a/fs/overlayfs/super.c
-+++ b/fs/overlayfs/super.c
-@@ -15,6 +15,7 @@
- #include <linux/seq_file.h>
- #include <linux/posix_acl_xattr.h>
- #include <linux/exportfs.h>
-+#include <linux/inotify.h>
- #include <linux/file.h>
- #include <linux/fs_context.h>
- #include <linux/fs_parser.h>
-@@ -1533,6 +1534,18 @@ static void ovl_inode_init_once(void *foo)
- 	inode_init_once(&oi->vfs_inode);
- }
- 
-+static int ovl_inotify_path(struct path *dst, struct path *src)
-+{
-+	ovl_path_real(src->dentry, dst);
-+	path_get(dst);
-+	return 0;
-+}
-+
-+static struct inotify_stackfs ovl_inotify = {
-+	.fs_type	= &ovl_fs_type,
-+	.func		= ovl_inotify_path,
-+};
-+
- static int __init ovl_init(void)
- {
- 	int err;
-@@ -1548,18 +1561,24 @@ static int __init ovl_init(void)
- 	err = ovl_aio_request_cache_init();
- 	if (!err) {
- 		err = register_filesystem(&ovl_fs_type);
--		if (!err)
--			return 0;
-+		if (err)
-+			goto err;
-+		err = inotify_register_stackfs(&ovl_inotify);
-+		if (err)
-+			goto err;
-+		return 0;
- 
--		ovl_aio_request_cache_destroy();
- 	}
-+err:
- 	kmem_cache_destroy(ovl_inode_cachep);
--
-+	unregister_filesystem(&ovl_fs_type);
-+	ovl_aio_request_cache_destroy();
- 	return err;
- }
- 
- static void __exit ovl_exit(void)
- {
-+	inotify_unregister_stackfs(&ovl_inotify);
- 	unregister_filesystem(&ovl_fs_type);
- 
- 	/*
-diff --git a/include/linux/inotify.h b/include/linux/inotify.h
-index 8d20caa1b268..c126e2f93a73 100644
---- a/include/linux/inotify.h
-+++ b/include/linux/inotify.h
-@@ -8,6 +8,8 @@
- #define _LINUX_INOTIFY_H
- 
- #include <uapi/linux/inotify.h>
-+#include <linux/list.h>
-+#include <linux/fs.h>
- 
- #define ALL_INOTIFY_BITS (IN_ACCESS | IN_MODIFY | IN_ATTRIB | IN_CLOSE_WRITE | \
- 			  IN_CLOSE_NOWRITE | IN_OPEN | IN_MOVED_FROM | \
-@@ -17,4 +19,30 @@
- 			  IN_DONT_FOLLOW | IN_EXCL_UNLINK | IN_MASK_ADD | \
- 			  IN_MASK_CREATE | IN_ISDIR | IN_ONESHOT)
- 
-+typedef int (*inotify_path_proc)(struct path *dst, struct path *src);
-+
-+struct inotify_stackfs {
-+	struct list_head	list;		/* entry in inotify_fs_list */
-+	struct file_system_type	*fs_type;	/* registed file_system_type */
-+	inotify_path_proc	func;		/* registed callback function */
-+};
-+
-+#ifdef CONFIG_INOTIFY_STACKFS
-+
-+extern int inotify_register_stackfs(struct inotify_stackfs *fs);
-+extern void inotify_unregister_stackfs(struct inotify_stackfs *fs);
-+
-+#else
-+
-+static inline int inotify_register_stackfs(struct inotify_stackfs *fs)
-+{
-+	return 0;
-+}
-+
-+static inline void inotify_unregister_stackfs(struct inotify_stackfs *fs)
-+{
-+}
-+
-+#endif	/* CONFIG_INOTIFY_STACKFS */
-+
- #endif	/* _LINUX_INOTIFY_H */
--- 
-2.39.5
-
diff --git a/scripts/package-build/linux-kernel/patches/kernel/0003-build-linux-perf-package.patch b/scripts/package-build/linux-kernel/patches/kernel/0003-build-linux-perf-package.patch
index 7a4691d9..32254849 100644
--- a/scripts/package-build/linux-kernel/patches/kernel/0003-build-linux-perf-package.patch
+++ b/scripts/package-build/linux-kernel/patches/kernel/0003-build-linux-perf-package.patch
@@ -1,62 +1,102 @@
-diff --git c/scripts/package/builddeb i/scripts/package/builddeb
-index d7dd0d04c70c..6f4a9a7c2c62 100755
---- c/scripts/package/builddeb
-+++ i/scripts/package/builddeb
-@@ -182,6 +182,16 @@ install_libc_headers () {
- 	mv $pdir/usr/include/asm $pdir/usr/include/$host_arch/
+From: Christian Breunig <christian@breunig.cc>
+Subject: [PATCH] VyOS: build a linux-perf Debian package alongside the kernel
+
+The upstream "make bindeb-pkg" target stopped emitting a perf package
+quite a while ago. Re-add it by hooking into the new builddeb / mkdebian
+infrastructure:
+
+  * mkdebian: emit a "linux-perf-${KERNELRELEASE}" stanza in
+    debian/control whenever the architecture is not user-mode-linux.
+  * scripts/package/debian/rules: add a "binary-perf" target so the
+    binary build loop processes the new package.
+  * builddeb: add an install_perf() helper that invokes
+    "make -C tools/perf install" with prefix=/usr and DESTDIR pointing
+    at the package staging directory, plus a dispatch case for
+    "linux-perf-*" packages.
+
+Refreshed for Linux 6.18.x: the old patch targeted the previous loop
+based scripts/package/builddeb (one-shot builddeb invocation that
+iterated over every package); since v6.7 the package build is driven
+per-package from debian/rules, so we have to extend that mechanism
+instead.
+---
+ scripts/package/builddeb      | 16 ++++++++++++++++
+ scripts/package/debian/rules  |  3 ++-
+ scripts/package/mkdebian      | 12 ++++++++++++
+ 3 files changed, 30 insertions(+), 1 deletion(-)
+
+diff --git a/scripts/package/builddeb b/scripts/package/builddeb
+--- a/scripts/package/builddeb
++++ b/scripts/package/builddeb
+@@ -156,6 +156,20 @@ install_libc_headers () {
+ 	mv "$pdir/usr/include/asm" "$pdir/usr/include/${DEB_HOST_MULTIARCH}"
  }
  
 +install_perf () {
-+	pdir=$1
++	pdir=debian/$1
 +
-+	rm -rf $pdir
-+
-+	$MAKE -C tools/ perf_install prefix=$pdir/usr
-+	mv tools/perf/$pdir/usr $srctree/$pdir
++	rm -rf "$pdir"
++	mkdir -p "$pdir"
 +
++	# In-source kernel builds export srctree as a relative path (".").
++	# "make -C tools/perf" changes the working directory, which breaks
++	# Makefile.perf's "include $(srctree)/tools/build/Makefile.include"
++	# unless srctree is absolute. Force an absolute path here.
++	$MAKE -C "$srctree/tools/perf" srctree="$(realpath "$srctree")" \
++		prefix=/usr DESTDIR="$(pwd)/$pdir" install
 +}
 +
- rm -f debian/files
+ package=$1
  
- packages_enabled=$(dh_listpackages)
-@@ -199,6 +209,8 @@ do
- 		install_libc_headers debian/linux-libc-dev;;
- 	linux-headers-*)
- 		install_kernel_headers debian/linux-headers ${package#linux-headers-};;
-+	linux-perf-*)
-+		install_perf debian/linux-perf ${package};;
- 	esac
- done
+ case "${package}" in
+@@ -167,4 +181,6 @@ linux-libc-dev)
+ 	install_libc_headers "${package}";;
+ linux-headers-*)
+ 	install_kernel_headers "${package}";;
++linux-perf-*)
++	install_perf "${package}";;
+ esac
+diff --git a/scripts/package/debian/rules b/scripts/package/debian/rules
+--- a/scripts/package/debian/rules
++++ b/scripts/package/debian/rules
+@@ -27,13 +27,14 @@ make-opts = ARCH=$(ARCH) KERNELRELEASE=$(KERNELRELEASE) \
+     $(addprefix KBUILD_BUILD_VERSION=,$(revision)) \
+     $(addprefix CROSS_COMPILE=,$(CROSS_COMPILE))
  
-@@ -213,6 +225,8 @@ do
- 		create_package ${package} debian/linux-libc-dev;;
- 	linux-headers-*)
- 		create_package ${package} debian/linux-headers;;
-+	linux-perf-*)
-+		create_package ${package} debian/linux-perf;;
- 	esac
- done
+-binary-targets := $(addprefix binary-, image image-dbg headers libc-dev)
++binary-targets := $(addprefix binary-, image image-dbg headers libc-dev perf)
  
-diff --git c/scripts/package/mkdebian i/scripts/package/mkdebian
-index 5044224cf671..21f98ae50be0 100755
---- c/scripts/package/mkdebian
-+++ i/scripts/package/mkdebian
-@@ -238,6 +238,18 @@ Description: Linux support headers for userspace development
- Multi-Arch: same
- EOF
+ all-packages = $(shell dh_listpackages)
+ image-package = $(filter linux-image-% user-%, $(filter-out %-dbg, $(all-packages)))
+ image-dbg-package = $(filter %-dbg, $(all-packages))
+ libc-dev-package = $(filter linux-libc-dev, $(all-packages))
+ headers-package = $(filter linux-headers-%, $(all-packages))
++perf-package = $(filter linux-perf-%, $(all-packages))
  
+ mk-files = $(patsubst binary-%,debian/%.files,$1)
+ package = $($(@:binary-%=%-package))
+diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
+--- a/scripts/package/mkdebian
++++ b/scripts/package/mkdebian
+@@ -247,6 +247,18 @@ Description: Linux kernel headers for ${KERNELRELEASE} on $debarch
+  This is useful for people who need to build external modules
+ EOF
+ fi
++
 +cat <<EOF >> debian/control
 +
-+Package: linux-perf-$version
++Package: linux-perf-${KERNELRELEASE}
 +Section: devel
 +Architecture: $debarch
 +Depends: libpfm4, libslang2, libtraceevent1
-+Description: Performance analysis tools for Linux $version
++Description: Performance analysis tools for Linux ${KERNELRELEASE}
 + This package contains the 'perf' performance analysis tools for Linux
-+ kernel version $version .
++ kernel version ${KERNELRELEASE}.
 +Multi-Arch: same
 +EOF
-+
- if is_enabled CONFIG_MODULES; then
- cat <<EOF >> debian/control
+ fi
  
+ if is_enabled CONFIG_DEBUG_INFO; then
+-- 
+2.39.5
+