diff --git a/main/devicepkg-dev/APKBUILD b/main/devicepkg-dev/APKBUILD index 97422fa27..1844303b7 100644 --- a/main/devicepkg-dev/APKBUILD +++ b/main/devicepkg-dev/APKBUILD @@ -1,6 +1,6 @@ pkgname=devicepkg-dev -pkgver=0.18.1 -pkgrel=1 +pkgver=0.18.2 +pkgrel=0 pkgdesc="Provides default device package functions" url="https://postmarketos.org" arch="noarch" @@ -77,7 +77,7 @@ package() { sha512sums=" d69930dd790b00fb39760a37d95a10899f0d167e10e2804feb05d9ce04f94185dc32d36edc90214aba2ea2aa09bf18f7dab93f1d2eff23f67beb2cc83be30e7c compiler-gcc.h a483a970f6cf3e1f2724d8ec1039c2a935cc3e75efd016b3f134cef8a6e53820428bff0f1cb2bcfbd8ccda33c69fdb250be1cf061b2dc53c6063d2ab49023f97 devicepkg_build.sh -5b83255dabd2019ea07a589d185bee5dad6760e28ab02de3480a0adfd1cf20d0c2e0b4a978e56757899ef683819091cee99d168a48e24a3f604b725e1ba26849 devicepkg_package.sh +be600241f8312b60243ac2896bb45a8f00bb69cfb7cfda95f846a1e1bb664c92d18f1ee5c95f499473ac8a5daa209839de0d8bba41ea0db1165e2cbbc1d34b59 devicepkg_package.sh 93432976bb785c3ad23ba40ac80c11cb2fb0d83d73642ed39fa3f637a471d5d08641ccc42912d63139af49c521bb86bd02a613482bf8f5e95437aa000a125969 devicepkg_pmtest_post_install.sh f81e74e45ae8e55686ae459f550e229e7398daeafa72bd023c2d8c3a0d50e60bf53d5bbdfec931e9fbabe1cd71de57b2192805aaef091ab90bc7203cbaf66ba6 downstreamkernel_prepare.sh 107242a3da38a574c46cb779e0c75afbeef4cfe659e1b85971973ac55843df06f70f53a5985ca623d4123f05f2984f5dace4a53a3509ecefd7dfdc3c8b705cfe downstreamkernel_package.sh diff --git a/main/devicepkg-dev/devicepkg_package.sh b/main/devicepkg-dev/devicepkg_package.sh index 85d141d5f..18b4e2569 100644 --- a/main/devicepkg-dev/devicepkg_package.sh +++ b/main/devicepkg-dev/devicepkg_package.sh @@ -40,16 +40,18 @@ if [ -f "$srcdir/modules-initfs" ]; then install -Dm644 "$srcdir/modules-initfs" \ "$pkgdir/usr/share/mkinitfs/modules/00-$pkgname.modules" mkdir -p "$pkgdir/usr/share/mkinitfs/files" - echo "/usr/share/mkinitfs/modules/00-$pkgname.modules:/lib/modules/initramfs.load" \ + echo "/usr/share/mkinitfs/modules/00-$pkgname.modules:/usr/lib/modules/initramfs.load" \ > "$pkgdir/usr/share/mkinitfs/files/00-$pkgname-modules.files" fi if [ -f "$srcdir/modules-load.conf" ]; then install -Dm644 "$srcdir/modules-load.conf" \ - "$pkgdir/etc/modules-load.d/00-$pkgname.conf" + "$pkgdir/usr/lib/modules-load.d/00-$pkgname.conf" fi if [ -f "$srcdir/modprobe.conf" ]; then + # NOTE: This requires kmod, busybox only looks in /etc/modprobe.d + # See https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/2184 install -Dm644 "$srcdir/modprobe.conf" \ - "$pkgdir/etc/modprobe.d/$pkgname.conf" + "$pkgdir/usr/lib/modprobe.d/$pkgname.conf" fi