Page Menu
Home
Solus
Search
Configure Global Search
Log In
Files
F11032108
D12165.id29542.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
7 KB
Referenced Files
None
Subscribers
None
D12165.id29542.diff
View Options
diff --git a/abi_used_libs b/abi_used_libs
--- a/abi_used_libs
+++ b/abi_used_libs
@@ -1,3 +1,4 @@
libc.so.6
liblzma.so.5
libz.so.1
+libzstd.so.1
diff --git a/abi_used_symbols b/abi_used_symbols
--- a/abi_used_symbols
+++ b/abi_used_symbols
@@ -1,11 +1,9 @@
-libc.so.6:_IO_putc
libc.so.6:__asprintf_chk
libc.so.6:__assert_fail
libc.so.6:__ctype_b_loc
libc.so.6:__errno_location
libc.so.6:__fprintf_chk
-libc.so.6:__fxstat
-libc.so.6:__fxstatat
+libc.so.6:__isoc99_sscanf
libc.so.6:__libc_start_main
libc.so.6:__memcpy_chk
libc.so.6:__printf_chk
@@ -13,10 +11,10 @@
libc.so.6:__snprintf_chk
libc.so.6:__sprintf_chk
libc.so.6:__stack_chk_fail
+libc.so.6:__strncpy_chk
libc.so.6:__syslog_chk
libc.so.6:__vasprintf_chk
libc.so.6:__vfprintf_chk
-libc.so.6:__xstat
libc.so.6:basename
libc.so.6:bsearch
libc.so.6:calloc
@@ -39,15 +37,20 @@
libc.so.6:fread
libc.so.6:free
libc.so.6:fseek
+libc.so.6:fstat
+libc.so.6:fstatat
libc.so.6:ftell
libc.so.6:fwrite
libc.so.6:get_current_dir_name
libc.so.6:getc_unlocked
libc.so.6:getenv
libc.so.6:getopt_long
+libc.so.6:getpid
+libc.so.6:gettimeofday
libc.so.6:init_module
libc.so.6:lseek
libc.so.6:malloc
+libc.so.6:memchr
libc.so.6:memcmp
libc.so.6:memmove
libc.so.6:mkdir
@@ -59,7 +62,9 @@
libc.so.6:openlog
libc.so.6:optarg
libc.so.6:optind
+libc.so.6:pread
libc.so.6:program_invocation_short_name
+libc.so.6:putc
libc.so.6:putchar
libc.so.6:puts
libc.so.6:qsort
@@ -72,7 +77,7 @@
libc.so.6:renameat
libc.so.6:secure_getenv
libc.so.6:setenv
-libc.so.6:sscanf
+libc.so.6:stat
libc.so.6:stderr
libc.so.6:stdout
libc.so.6:strchr
@@ -81,7 +86,9 @@
libc.so.6:strcspn
libc.so.6:strdup
libc.so.6:strerror
+libc.so.6:strlen
libc.so.6:strncmp
+libc.so.6:strncpy
libc.so.6:strnlen
libc.so.6:strrchr
libc.so.6:strsep
@@ -104,3 +111,10 @@
libz.so.1:gzdopen
libz.so.1:gzerror
libz.so.1:gzread
+libzstd.so.1:ZSTD_DStreamOutSize
+libzstd.so.1:ZSTD_createDStream
+libzstd.so.1:ZSTD_decompressStream
+libzstd.so.1:ZSTD_freeDStream
+libzstd.so.1:ZSTD_getErrorName
+libzstd.so.1:ZSTD_initDStream
+libzstd.so.1:ZSTD_isError
diff --git a/files/0001-libkmod-Support-usr-lib-to-enable-stateless-configs-.patch b/files/0001-libkmod-Support-usr-lib-to-enable-stateless-configs-.patch
--- a/files/0001-libkmod-Support-usr-lib-to-enable-stateless-configs-.patch
+++ b/files/0001-libkmod-Support-usr-lib-to-enable-stateless-configs-.patch
@@ -10,18 +10,18 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c
-index fe68134..49fc865 100644
+index 7c2b889..70b7776 100644
--- a/libkmod/libkmod.c
+++ b/libkmod/libkmod.c
-@@ -61,7 +61,7 @@ static struct _index_files {
- static const char *default_config_paths[] = {
+@@ -65,7 +65,7 @@ static const char *default_config_paths[] = {
SYSCONFDIR "/modprobe.d",
"/run/modprobe.d",
+ "/usr/local/lib/modprobe.d",
- "/lib/modprobe.d",
+ "/usr/lib/modprobe.d",
NULL
};
--
-2.7.1
+2.30.2
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,8 +1,8 @@
name : kmod
-version : '25'
-release : 11
+version : '29'
+release : 12
source :
- - https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-25.tar.xz : 7165e6496656159dcb909a91ed708a0fe273a4b128b4b1dc997ccb5189eef1cd
+ - https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-29.tar.xz : 0b80eea7aa184ac6fd20cafa2a1fdf290ffecc70869a797079e2cc5c6225a52a
component : system.base
license :
- LGPL-2.1 # for libkmod, testsuite and helper libraries
@@ -10,15 +10,17 @@
summary : Linux kernel module management utilities
description: |
Linux kernel module management utilities
+builddeps :
+ - pkgconfig(libzstd)
optimize :
- lto
- size
setup : |
%patch -p1 < $pkgfiles/0001-libkmod-Support-usr-lib-to-enable-stateless-configs-.patch
%configure --bindir=/bin \
- --disable-manpages \
--with-xz \
- --with-zlib
+ --with-zlib \
+ --with-zstd
build : |
%make
install : |
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
<Source>
<Name>kmod</Name>
<Packager>
- <Name>Ikey Doherty</Name>
- <Email>ikey@solus-project.com</Email>
+ <Name>Reilly Brogan</Name>
+ <Email>solus@reillybrogan.com</Email>
</Packager>
<License>LGPL-2.1</License>
<License>GPL-2.0</License>
@@ -11,7 +11,7 @@
<Summary xml:lang="en">Linux kernel module management utilities</Summary>
<Description xml:lang="en">Linux kernel module management utilities
</Description>
- <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://solus-project.com/sources/README.Solus</Archive>
+ <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://getsol.us/sources/README.Solus</Archive>
</Source>
<Package>
<Name>kmod</Name>
@@ -20,10 +20,27 @@
</Description>
<PartOf>system.base</PartOf>
<Files>
- <Path fileType="executable">/bin</Path>
- <Path fileType="executable">/sbin</Path>
- <Path fileType="library">/usr/lib64/lib*.so.*</Path>
+ <Path fileType="executable">/bin/kmod</Path>
+ <Path fileType="executable">/sbin/depmod</Path>
+ <Path fileType="executable">/sbin/insmod</Path>
+ <Path fileType="executable">/sbin/lsmod</Path>
+ <Path fileType="executable">/sbin/modinfo</Path>
+ <Path fileType="executable">/sbin/modprobe</Path>
+ <Path fileType="executable">/sbin/rmmod</Path>
+ <Path fileType="library">/usr/lib64/libkmod.so.2</Path>
+ <Path fileType="library">/usr/lib64/libkmod.so.2.3.7</Path>
<Path fileType="data">/usr/share/bash-completion/completions/kmod</Path>
+ <Path fileType="man">/usr/share/man/man5/depmod.d.5</Path>
+ <Path fileType="man">/usr/share/man/man5/modprobe.d.5</Path>
+ <Path fileType="man">/usr/share/man/man5/modules.dep.5</Path>
+ <Path fileType="man">/usr/share/man/man5/modules.dep.bin.5</Path>
+ <Path fileType="man">/usr/share/man/man8/depmod.8</Path>
+ <Path fileType="man">/usr/share/man/man8/insmod.8</Path>
+ <Path fileType="man">/usr/share/man/man8/kmod.8</Path>
+ <Path fileType="man">/usr/share/man/man8/lsmod.8</Path>
+ <Path fileType="man">/usr/share/man/man8/modinfo.8</Path>
+ <Path fileType="man">/usr/share/man/man8/modprobe.8</Path>
+ <Path fileType="man">/usr/share/man/man8/rmmod.8</Path>
</Files>
</Package>
<Package>
@@ -33,21 +50,21 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="11">kmod</Dependency>
+ <Dependency release="12">kmod</Dependency>
</RuntimeDependencies>
<Files>
- <Path fileType="header">/usr/include/</Path>
- <Path fileType="library">/usr/lib64/lib*.so</Path>
- <Path fileType="data">/usr/lib64/pkgconfig/*.pc</Path>
+ <Path fileType="header">/usr/include/libkmod.h</Path>
+ <Path fileType="library">/usr/lib64/libkmod.so</Path>
+ <Path fileType="data">/usr/lib64/pkgconfig/libkmod.pc</Path>
</Files>
</Package>
<History>
- <Update release="11">
- <Date>2018-02-21</Date>
- <Version>25</Version>
+ <Update release="12">
+ <Date>2021-11-02</Date>
+ <Version>29</Version>
<Comment>Packaging update</Comment>
- <Name>Ikey Doherty</Name>
- <Email>ikey@solus-project.com</Email>
+ <Name>Reilly Brogan</Name>
+ <Email>solus@reillybrogan.com</Email>
</Update>
</History>
</PISI>
\ No newline at end of file
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Thu, Aug 10, 1:53 PM (1 d, 2 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5823446
Default Alt Text
D12165.id29542.diff (7 KB)
Attached To
Mode
D12165: kmod: Update to v30
Attached
Detach File
Event Timeline
Log In to Comment