kmod rebuild

system/base/kmod/actions.py

@@ -16,10 +16,11 @@ def setup():
                
     if get.buildTYPE() == "emul32":
         options += " --bindir=/usr/emul32 \
+                     --with-rootlibdir=/lib32 \
                      --libdir=/usr/lib32"
 
     if get.buildTYPE() != "emul32":
-        options += " --with-zstd"
+        options += " --with-zstd --with-rootlibdir=/lib"
                          
     autotools.configure(options)
 

system/base/kmod/files/kmod-configure-c99.patch

@@ -0,0 +1,37 @@
+configure.ac: In _Noreturn check, include <stdlib.h> for exit
+
+Otherwise, an implicit functiona declaration is used, causing
+a C99 compatibility issue.
+
+Submitted upstream:
+
+<https://lore.kernel.org/linux-modules/877cyq6kh9.fsf@oldenburg.str.redhat.com/>
+
+diff --git a/configure b/configure
+index d053310a8b4a313a..ec1f12d02428f848 100755
+--- a/configure
++++ b/configure
+@@ -14021,7 +14021,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+ printf %s "checking whether _Noreturn is supported... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-_Noreturn int foo(void) { exit(0); }
++#include <stdlib.h>
++	_Noreturn int foo(void) { exit(0); }
+ _ACEOF
+ if ac_fn_c_try_compile "$LINENO"
+ then :
+diff --git a/configure.ac b/configure.ac
+index 6989e9360da23721..12e0518533201ccf 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -68,7 +68,8 @@ AC_COMPILE_IFELSE(
+ 
+ AC_MSG_CHECKING([whether _Noreturn is supported])
+ AC_COMPILE_IFELSE(
+-	[AC_LANG_SOURCE([[_Noreturn int foo(void) { exit(0); }]])],
++	[AC_LANG_SOURCE([[#include <stdlib.h>
++	_Noreturn int foo(void) { exit(0); }]])],
+         [AC_DEFINE([HAVE_NORETURN], [1], [Define if _Noreturn is available])
+ 	 AC_MSG_RESULT([yes])],
+ 	[AC_MSG_RESULT([no])])

system/base/kmod/pspec.xml

@@ -22,7 +22,7 @@
             <Dependency>kernel-module-headers</Dependency>
         </BuildDependencies>
         <Patches>
-            <Patch level="1">kmod-15-dynamic-kmod.patch</Patch>
+            <Patch level="1">kmod-configure-c99.patch</Patch>
         </Patches>
     </Source>
 
@@ -87,6 +87,7 @@
         <Summary>kmod libraries</Summary>
         <Files>
             <Path fileType="library">/usr/lib</Path>
+            <Path fileType="library">/lib</Path>
         </Files>
     </Package>
 
@@ -104,11 +105,19 @@
             <Dependency>zlib-32bit</Dependency>
         </RuntimeDependencies>
         <Files>
+            <Path fileType="library">/lib32</Path>
             <Path fileType="library">/usr/lib32</Path>
         </Files>
     </Package>
 
     <History>
+        <Update release="14">
+            <Date>2023-01-14</Date>
+            <Version>30</Version>
+            <Comment>Rebuild.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="13">
             <Date>2022-06-30</Date>
             <Version>30</Version>