From 5ddca3039656c1a16057c01fe967d1b7ee80870d Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Wed, 4 Sep 2024 09:49:00 -0700 Subject: [PATCH] systemd/kmod: add fixes for usr merge (MR 5554) (MR 5563) This patch was submitted upstream to Alpine aports in https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/71426 [ci:skip-vercheck] [ci:skip-build] already built successfully in CI --- extra-repos/systemd/kmod/APKBUILD | 4 ++-- extra-repos/systemd/kmod/kmod.trigger | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extra-repos/systemd/kmod/APKBUILD b/extra-repos/systemd/kmod/APKBUILD index 457ad7963..20a3b9794 100644 --- a/extra-repos/systemd/kmod/APKBUILD +++ b/extra-repos/systemd/kmod/APKBUILD @@ -3,7 +3,7 @@ pkgname=kmod pkgver=99932 _pkgver=32 -pkgrel=3 +pkgrel=4 pkgdesc="Linux kernel module management utilities" url="http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary" arch="all" @@ -13,7 +13,7 @@ license="GPL-2.0-or-later" makedepends_build="sed libxslt" makedepends_host="$depends_dev zlib-dev xz-dev zstd-dev openssl-dev>3" makedepends="$makedepends_build $makedepends_host" -triggers="$pkgname.trigger=/lib/modules/*" +triggers="$pkgname.trigger=/lib/modules/*:/usr/lib/modules/*" subpackages=" $pkgname-dev $pkgname-doc diff --git a/extra-repos/systemd/kmod/kmod.trigger b/extra-repos/systemd/kmod/kmod.trigger index 4516d8a07..90eda9ba0 100644 --- a/extra-repos/systemd/kmod/kmod.trigger +++ b/extra-repos/systemd/kmod/kmod.trigger @@ -2,7 +2,7 @@ for i in "$@"; do if [ -e "$i"/modules.order ]; then - /sbin/depmod ${i#/lib/modules/} + /sbin/depmod "${i#*/lib/modules/}" else #clean up on uninstall rm -f "$i"/modules.alias \