Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package msr-safe for openSUSE:Factory checked in at 2023-08-28 17:16:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/msr-safe (Old) and /work/SRC/openSUSE:Factory/.msr-safe.new.1766 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "msr-safe" Mon Aug 28 17:16:31 2023 rev:3 rq:1106236 version:1.7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/msr-safe/msr-safe.changes 2023-04-01 19:32:52.905548949 +0200 +++ /work/SRC/openSUSE:Factory/.msr-safe.new.1766/msr-safe.changes 2023-08-28 17:16:36.091637706 +0200 @@ -1,0 +2,10 @@ +Sat Aug 26 07:41:34 UTC 2023 - Michal Suchanek <[email protected]> + +- Fix build on Linux 6.4 + +- New patch: Fixup-for-commit-1aaba11da9aa-driver-core-class-remo.patch +- New patch: Fix-the-layout-changes-after-linux-6.patch +- Delete patches: 0000-msr_allowlist-diff.patch 0001-msr_batch-diff.patch + 0002-msr_entry-diff.patch 0003-msr_version-diff.patch + +------------------------------------------------------------------- Old: ---- 0000-msr_allowlist-diff.patch 0001-msr_batch-diff.patch 0002-msr_entry-diff.patch 0003-msr_version-diff.patch New: ---- Fix-the-layout-changes-after-linux-6.patch Fixup-for-commit-1aaba11da9aa-driver-core-class-remo.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ msr-safe.spec ++++++ --- /var/tmp/diff_new_pack.kL8uUw/_old 2023-08-28 17:16:37.571690854 +0200 +++ /var/tmp/diff_new_pack.kL8uUw/_new 2023-08-28 17:16:37.575690997 +0200 @@ -1,7 +1,7 @@ # # spec file for package msr-safe # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,23 +29,18 @@ Source3: 10-msr-safe.rules Source4: msr-safe.sh Source5: system-user-msr.conf -Patch0: 0000-msr_allowlist-diff.patch -Patch1: 0001-msr_batch-diff.patch -Patch2: 0002-msr_entry-diff.patch -Patch3: 0003-msr_version-diff.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: %kernel_module_package_buildreqs +Patch1: Fix-the-layout-changes-after-linux-6.patch +Patch2: Fixup-for-commit-1aaba11da9aa-driver-core-class-remo.patch +BuildRequires: %{kernel_module_package_buildreqs} BuildRequires: kernel-default-devel BuildRequires: systemd-rpm-macros BuildRequires: sysuser-tools Requires(post): fillup Requires(post): udev -Requires(postun): udev - -%kernel_module_package - +Requires(postun):udev # Only supported on intel architectures ExclusiveArch: %{ix86} x86_64 +%kernel_module_package %description Userspace utility for the kernel module of the same name @@ -64,7 +59,7 @@ %package -n system-user-msr Summary: System user msr & group msr Group: System/Fhs -%{sysusers_requires} +%sysusers_requires %description -n system-user-msr This package provides the system account and group "msr". @@ -119,7 +114,6 @@ %service_del_postun msr-safe.service %files -n system-user-msr -%defattr(-,root,root) %{_sysusersdir}/system-user-msr.conf %{_fillupdir}/sysconfig.msr-safe ++++++ Fix-the-layout-changes-after-linux-6.patch ++++++ >From cd350fbb0786c478099dd6030a01515a5d3360e7 Mon Sep 17 00:00:00 2001 From: Jeffrey Cheung <[email protected]> Date: Sat, 1 Apr 2023 03:37:38 +0000 Subject: [PATCH] Fix the layout changes after linux 6 --- msr_allowlist.c | 4 ++++ msr_batch.c | 4 ++++ msr_entry.c | 4 ++++ msr_version.c | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/msr_allowlist.c b/msr_allowlist.c index ba95b1c..77ed8c1 100644 --- a/msr_allowlist.c +++ b/msr_allowlist.c @@ -362,7 +362,11 @@ static int parse_next_allowlist_entry(char *inbuf, char **nextinbuf, struct allo #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,39) static char *msr_allowlist_nodename(struct device *dev, mode_t *mode) #else +#if LINUX_VERSION_CODE <= KERNEL_VERSION(6,2,0) static char *msr_allowlist_nodename(struct device *dev, umode_t *mode) +#else +static char *msr_allowlist_nodename(const struct device *dev, umode_t *mode) +#endif #endif { return kasprintf(GFP_KERNEL, "cpu/msr_allowlist"); diff --git a/msr_batch.c b/msr_batch.c index 316a0dc..ba1228b 100644 --- a/msr_batch.c +++ b/msr_batch.c @@ -183,7 +183,11 @@ void msrbatch_cleanup(int majordev) #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,39) static char *msrbatch_nodename(struct device *dev, mode_t *mode) #else +#if LINUX_VERSION_CODE <= KERNEL_VERSION(6,2,0) static char *msrbatch_nodename(struct device *dev, umode_t *mode) +#else +static char *msrbatch_nodename(const struct device *dev, umode_t *mode) +#endif #endif { return kasprintf(GFP_KERNEL, "cpu/msr_batch"); diff --git a/msr_entry.c b/msr_entry.c index 93db1b8..0974aa8 100644 --- a/msr_entry.c +++ b/msr_entry.c @@ -257,7 +257,11 @@ static struct notifier_block __refdata msr_class_cpu_notifier = #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,39) static char *msr_devnode(struct device *dev, mode_t *mode) #else +#if LINUX_VERSION_CODE <= KERNEL_VERSION(6,2,0) static char *msr_devnode(struct device *dev, umode_t *mode) +#else +static char *msr_devnode(const struct device *dev, umode_t *mode) +#endif #endif { return kasprintf(GFP_KERNEL, "cpu/%u/msr_safe", MINOR(dev->devt)); diff --git a/msr_version.c b/msr_version.c index df7dffb..72fe8dd 100644 --- a/msr_version.c +++ b/msr_version.c @@ -53,7 +53,11 @@ static const struct file_operations fops = #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,39) static char *msr_version_nodename(struct device *dev, mode_t *mode) #else +#if LINUX_VERSION_CODE <= KERNEL_VERSION(6,2,0) static char *msr_version_nodename(struct device *dev, umode_t *mode) +#else +static char *msr_version_nodename(const struct device *dev, umode_t *mode) +#endif #endif { if (mode) -- 2.41.0 ++++++ Fixup-for-commit-1aaba11da9aa-driver-core-class-remo.patch ++++++ >From 2f92e3f6bec5eb0196651c402da507cb50eab959 Mon Sep 17 00:00:00 2001 From: Michal Suchanek <[email protected]> Date: Mon, 28 Aug 2023 08:31:16 +0200 Subject: [PATCH] Fixup for commit 1aaba11da9aa ("driver core: class: remove module * from class_create()") Since Linux 6.4-rc1 the first argument to class_Create is removed. Signed-off-by: Michal Suchanek <[email protected]> --- msr_allowlist.c | 6 +++++- msr_batch.c | 6 +++++- msr_entry.c | 6 +++++- msr_version.c | 6 +++++- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/msr_allowlist.c b/msr_allowlist.c index 77ed8c1..f815d05 100644 --- a/msr_allowlist.c +++ b/msr_allowlist.c @@ -414,7 +414,11 @@ int msr_allowlist_init(int *majordev) } cdev_registered = 1; - cdev_class = class_create(THIS_MODULE, "msr_allowlist"); + cdev_class = class_create( +#if LINUX_VERSION_CODE < KERNEL_VERSION(6,4,0) + THIS_MODULE, +#endif + "msr_allowlist"); if (IS_ERR(cdev_class)) { err = PTR_ERR(cdev_class); diff --git a/msr_batch.c b/msr_batch.c index ba1228b..56feb15 100644 --- a/msr_batch.c +++ b/msr_batch.c @@ -211,7 +211,11 @@ int msrbatch_init(int *majordev) } cdev_registered = 1; - cdev_class = class_create(THIS_MODULE, "msr_batch"); + cdev_class = class_create( +#if LINUX_VERSION_CODE < KERNEL_VERSION(6,4,0) + THIS_MODULE, +#endif + "msr_batch"); if (IS_ERR(cdev_class)) { err = PTR_ERR(cdev_class); diff --git a/msr_entry.c b/msr_entry.c index 0974aa8..9e16803 100644 --- a/msr_entry.c +++ b/msr_entry.c @@ -319,7 +319,11 @@ static int __init msr_init(void) pr_debug("msr_allowlist major dev: %i\n", mdev_msr_allowlist); pr_debug("msr_version major dev: %i\n", mdev_msr_version); - msr_class = class_create(THIS_MODULE, "msr_safe"); + msr_class = class_create( +#if LINUX_VERSION_CODE < KERNEL_VERSION(6,4,0) + THIS_MODULE, +#endif + "msr_safe"); if (IS_ERR(msr_class)) { err = PTR_ERR(msr_class); diff --git a/msr_version.c b/msr_version.c index 72fe8dd..5abe857 100644 --- a/msr_version.c +++ b/msr_version.c @@ -107,7 +107,11 @@ int msr_version_init(int *majordev) } cdev_registered = 1; - cdev_class = class_create(THIS_MODULE, "msr_safe_version"); + cdev_class = class_create( +#if LINUX_VERSION_CODE < KERNEL_VERSION(6,4,0) + THIS_MODULE, +#endif + "msr_safe_version"); if (IS_ERR(cdev_class)) { err = PTR_ERR(cdev_class); -- 2.41.0
