diff options
Diffstat (limited to 'system/kmod')
-rw-r--r-- | system/kmod/APKBUILD | 20 | ||||
-rw-r--r-- | system/kmod/strndupa.patch | 2 |
2 files changed, 13 insertions, 9 deletions
diff --git a/system/kmod/APKBUILD b/system/kmod/APKBUILD index 171f279ce..c973ea098 100644 --- a/system/kmod/APKBUILD +++ b/system/kmod/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmod -pkgver=30 +pkgver=33 pkgrel=0 pkgdesc="Linux kernel module management utilities" -url="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary" +url="https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/about/" arch="all" options="!check" # https://bugs.gentoo.org/408915#c3 license="GPL-2.0+" depends="" -makedepends="openssl-dev zlib-dev xz-dev zstd-dev" +makedepends="openssl-dev scdoc xz-dev zlib-dev zstd-dev" triggers="$pkgname.trigger=/lib/modules/*" subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc $pkgname-bash-completion:bashcomp:noarch" @@ -25,6 +25,7 @@ build() { --prefix=/usr \ --bindir=/bin \ --sysconfdir=/etc \ + --libdir=/lib \ --with-rootlibdir=/lib \ --with-zlib \ --with-xz \ @@ -41,11 +42,14 @@ package() { make DESTDIR="$pkgdir" install mkdir -p "$pkgdir"/sbin for i in lsmod rmmod insmod modinfo modprobe depmod; do + case $i in + lsmod|modinfo) ;; + *) rm "$pkgdir"/bin/$i;; + esac ln -sf ../bin/kmod "$pkgdir"/sbin/$i done - for i in lsmod modinfo; do - ln -s kmod "$pkgdir"/bin/$i - done + mkdir -p "$pkgdir"/usr/lib + mv "$pkgdir"/lib/pkgconfig "$pkgdir"/usr/lib/ install -Dm755 "$srcdir"/kmod-static-nodes.initd \ "$pkgdir"/etc/init.d/kmod-static-nodes } @@ -60,6 +64,6 @@ bashcomp() { } -sha512sums="e2cd34e600a72e44710760dfda9364b790b8352a99eafbd43e683e4a06f37e6b5c0b5d14e7c28070e30fc5fc6ceddedf7b97f3b6c2c5c2d91204fefd630b9a3e kmod-30.tar.xz -f2ea3527bfba182c5e15557c224a5bba8c7e2ea3d21cf604e6eb2277226dcf983c3aeb9ac44a322c7f2b4942b35135da999d63a5b946b829d3f3b09c050a0f17 strndupa.patch +sha512sums="32d79d0bb7e89012f18458d4e88325f8e19a7dba6e1d5cff01aec3e618d1757b0f7c119735bf38d02e0d056a14273fd7522fca7c61a4d12a3ea5854bb662fff8 kmod-33.tar.xz +8bc365bbff8e9602c18c6ba0ae635b6648216ba367a631818ec99851e68aba27742c5f1f0a51b0981877359da7668f6fa79584dc956757299d08c0f77b3dd559 strndupa.patch 7f0f89fe98167f71b7924f341ba701d001158225463c2f5e39f706a0224b1e952ee901b441f28cb15787563e83bb6e54eb752bf8669ae7c0ffbb11984542f354 kmod-static-nodes.initd" diff --git a/system/kmod/strndupa.patch b/system/kmod/strndupa.patch index d4527140e..bde1b23a6 100644 --- a/system/kmod/strndupa.patch +++ b/system/kmod/strndupa.patch @@ -2,7 +2,7 @@ diff --git a/libkmod/libkmod-util.c b/libkmod/libkmod-util.c index df12433..142e767 100644 --- a/shared/util.c +++ b/shared/util.c -@@ -334,7 +334,9 @@ int mkdir_p(const char *path, int len, mode_t mode) +@@ -389,7 +389,9 @@ int mkdir_p(const char *path, int len, mode_t mode) { char *start, *end; |