Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package tp_smapi for openSUSE:Factory checked in at 2023-07-26 13:23:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tp_smapi (Old) and /work/SRC/openSUSE:Factory/.tp_smapi.new.15225 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tp_smapi" Wed Jul 26 13:23:27 2023 rev:3 rq:1100430 version:0.43 Changes: -------- --- /work/SRC/openSUSE:Factory/tp_smapi/tp_smapi.changes 2022-12-15 19:25:48.892264431 +0100 +++ /work/SRC/openSUSE:Factory/.tp_smapi.new.15225/tp_smapi.changes 2023-07-26 13:24:06.388058519 +0200 @@ -1,0 +2,5 @@ +Wed Jul 19 18:31:35 UTC 2023 - Axel Braun <[email protected]> + +- kernel_64.diff applied to fix build problem with Kernel 6.4 + +------------------------------------------------------------------- New: ---- kernel_64.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tp_smapi.spec ++++++ --- /var/tmp/diff_new_pack.yrmm25/_old 2023-07-26 13:24:06.916061706 +0200 +++ /var/tmp/diff_new_pack.yrmm25/_new 2023-07-26 13:24:06.920061730 +0200 @@ -1,7 +1,7 @@ # # spec file for package tp_smapi # -# 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 @@ -15,14 +15,16 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + Name: tp_smapi Summary: IBM ThinkPad hardware functions driver Version: 0.43 -Release: 1 +Release: 0 License: GPL-2.0-or-later Group: System/Kernel -Url: https://github.com/linux-thinkpad/tp_smapi +URL: https://github.com/linux-thinkpad/tp_smapi Source: tp_smapi-%{version}.tar.gz +Patch0: kernel_64.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: %kernel_module_package_buildreqs BuildRequires: kernel-source @@ -41,6 +43,7 @@ %prep %setup -n tp_smapi-%{version} +%patch0 -p2 set -- * mkdir source mv "$@" source/ ++++++ kernel_64.diff ++++++ diff -U 3 -dHrN -- a/tp_smapi-0.43/thinkpad_ec.c b/tp_smapi-0.43/thinkpad_ec.c --- a/tp_smapi-0.43/thinkpad_ec.c 2018-02-24 16:59:51.000000000 +0100 +++ b/tp_smapi-0.43/thinkpad_ec.c 2023-07-19 20:40:49.994151707 +0200 @@ -90,8 +90,10 @@ /* Locking: */ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37) static DECLARE_MUTEX(thinkpad_ec_mutex); -#else +#elif LINUX_VERSION_CODE < KERNEL_VERSION(6,4,0) static DEFINE_SEMAPHORE(thinkpad_ec_mutex); +#else +static DEFINE_SEMAPHORE(thinkpad_ec_mutex, 1); #endif /* Kludge in case the ACPI DSDT reserves the ports we need. */ diff -U 3 -dHrN -- a/tp_smapi-0.43/tp_smapi.c b/tp_smapi-0.43/tp_smapi.c --- a/tp_smapi-0.43/tp_smapi.c 2018-02-24 16:59:51.000000000 +0100 +++ b/tp_smapi-0.43/tp_smapi.c 2023-07-19 20:40:49.994151707 +0200 @@ -111,8 +111,10 @@ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37) static DECLARE_MUTEX(smapi_mutex); -#else +#elif LINUX_VERSION_CODE < KERNEL_VERSION(6,4,0) static DEFINE_SEMAPHORE(smapi_mutex); +#else +static DEFINE_SEMAPHORE(smapi_mutex, 1); #endif /**
