Date: Sunday, November 19, 2017 @ 20:58:56 Author: heftig Revision: 310447
4.14: install modules directly to /usr/lib Signed-off-by: Oleksandr Natalenko <oleksa...@natalenko.name> Modified: linux/trunk/PKGBUILD ----------+ PKGBUILD | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-11-19 20:58:52 UTC (rev 310446) +++ PKGBUILD 2017-11-19 20:58:56 UTC (rev 310447) @@ -100,30 +100,27 @@ _basekernel=${_kernver%%-*} _basekernel=${_basekernel%.*} - mkdir -p "${pkgdir}"/{boot,lib/modules,usr} - make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}" modules_install + mkdir -p "${pkgdir}"/{boot,usr/lib/modules} + make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}/usr" modules_install cp arch/x86/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgbase}" # make room for external modules local _extramodules="extramodules-${_basekernel}${_kernelname:--ARCH}" - ln -s "../${_extramodules}" "${pkgdir}/lib/modules/${_kernver}/extramodules" + ln -s "../${_extramodules}" "${pkgdir}/usr/lib/modules/${_kernver}/extramodules" # add real version for building modules and running depmod from hook echo "${_kernver}" | - install -Dm644 /dev/stdin "${pkgdir}/lib/modules/${_extramodules}/version" + install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modules/${_extramodules}/version" # remove build and source links - rm "${pkgdir}"/lib/modules/${_kernver}/{source,build} + rm "${pkgdir}"/usr/lib/modules/${_kernver}/{source,build} # now we call depmod... - depmod -b "${pkgdir}" -F System.map "${_kernver}" + depmod -b "${pkgdir}/usr" -F System.map "${_kernver}" # add vmlinux - install -Dt "${pkgdir}/lib/modules/${_kernver}/build" -m644 vmlinux + install -Dt "${pkgdir}/usr/lib/modules/${_kernver}/build" -m644 vmlinux - # move module tree /lib -> /usr/lib - mv -t "${pkgdir}/usr" "${pkgdir}/lib" - # sed expression for following substitutions local _subst=" s|%PKGBASE%|${pkgbase}|g