- added rtas patch (fix build with librtas)

diff --git a/util-linux-rtas.patch b/util-linux-rtas.patch
new file mode 100644 (file)
index 0000000..b26e804
--- /dev/null
+++ b/util-linux-rtas.patch
@@ -0,0 +1,22 @@
+--- util-linux-2.37/sys-utils/lscpu-cputype.c.orig     2021-05-26 13:32:10.618108196 +0200
++++ util-linux-2.37/sys-utils/lscpu-cputype.c  2021-07-04 15:09:29.174747744 +0200
+@@ -6,6 +6,10 @@
+ 
+ #include "fileutils.h"
+ 
++#if defined(HAVE_LIBRTAS)
++# include <librtas.h>
++#endif
++
+ /* Lookup a pattern and get the value for format  "<pattern> : <key>"
+  */
+ int lookup(char *line, char *pattern, char **value)
+@@ -738,7 +742,7 @@ int lscpu_read_archext(struct lscpu_cxt
+               ct->physsockets = strbe16toh(buf, 4);
+               ct->physchips = strbe16toh(buf, 6);
+               ct->physcoresperchip = strbe16toh(buf, 8);
+-nortas:
++nortas: ;
+       }
+ #endif
+       return 0;

diff --git a/util-linux.spec b/util-linux.spec
index 1d04d2d92b212cd1dcf2783a7f27a6ae5e6a89ca..24f980dc48febfb7d142c30c5022be3231bc33c6 100644 (file)
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -67,6 +67,7 @@ Patch3:               %{name}-procpartitions.patch
 Patch4:                su-paths.patch
 Patch5:                %{name}-ac.patch
 Patch6:                %{name}-diet.patch
+Patch7:                %{name}-rtas.patch
 URL:           https://github.com/karelzak/util-linux
 BuildRequires: audit-libs-devel >= 1.0.6
 BuildRequires: autoconf >= 2.64
@@ -810,6 +811,7 @@ Bashowe dopełnianie parametrów dla poleceń z pakietu util-linux.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch7 -p1
 %{?with_initrd:%patch6 -p1}
 
 cp -p %{SOURCE10} nologin.c