diff options
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | 60-linux.hook | 1 | ||||
| -rw-r--r-- | PKGBUILD | 26 |
3 files changed, 10 insertions, 19 deletions
@@ -28,7 +28,7 @@ pkgbase = linux-clear-lts2018 sha256sums = f64087c9fc1e6d123c7e24315a8dd5b6dbb6cbb9dc61371a7f7b1d88bcfc8233 sha256sums = SKIP sha256sums = 8c11086809864b5cef7d079f930bd40da8d0869c091965fa62e95de9a0fe13b5 - sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21 + sha256sums = 452b8d4d71e1565ca91b1bebb280693549222ef51c47ba8964e411b2d461699c sha256sums = c043f3033bb781e2688794a59f6d1f7ed49ef9b13eb77ff9a425df33a244a636 sha256sums = ed9d35cb7d7bd829ff6253353efa5e2d119820fe4f4310aea536671f5e4caa37 sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65 diff --git a/60-linux.hook b/60-linux.hook index b33873c854fb..584ce35372b0 100644 --- a/60-linux.hook +++ b/60-linux.hook @@ -4,7 +4,6 @@ Operation = Install Operation = Upgrade Operation = Remove Target = usr/lib/modules/%KERNVER%/* -Target = usr/lib/modules/%EXTRAMODULES%/* [Action] Description = Updating %PKGBASE% module dependencies... @@ -140,8 +140,8 @@ CONFIG_MODULE_COMPRESS_XZ=y|' ./.config fi ### Prepared version - make -s kernelrelease > ../version - msg2 "Prepared %s version %s" "$pkgbase" "$(<../version)" + make -s kernelrelease > version + msg2 "Prepared %s version %s" "$pkgbase" "$(<version)" ### Optionally load needed modules for the make localmodconfig # See https://aur.archlinux.org/packages/modprobed-db @@ -183,11 +183,11 @@ _package() { backup=("etc/mkinitcpio.d/${pkgbase}.preset") install=linux.install + cd $_srcname + local kernver="$(<version)" local modulesdir="$pkgdir/usr/lib/modules/$kernver" - cd ${_srcname} - msg2 "Installing boot image..." # systemd expects to find the kernel here to allow hibernation # https://github.com/systemd/systemd/commit/edda44605f06a41fb86b7ab8128dcf99161d2344 @@ -200,13 +200,6 @@ _package() { msg2 "Installing modules..." make INSTALL_MOD_PATH="$pkgdir/usr" modules_install - # a place for external modules, - # with version file for building modules and running depmod from hook - local extramodules="extramodules$_kernelname" - local extradir="$pkgdir/usr/lib/modules/$extramodules" - install -Dt "$extradir" -m644 ../version - ln -sr "$extradir" "$modulesdir/extramodules" - # remove build and source links rm "$modulesdir"/{source,build} @@ -216,7 +209,6 @@ _package() { local subst=" s|%PKGBASE%|$pkgbase|g s|%KERNVER%|$kernver|g - s|%EXTRAMODULES%|$extramodules|g " # hack to allow specifying an initially nonexisting install file @@ -240,12 +232,12 @@ _package() { _package-headers() { pkgdesc="Header files and scripts for building modules for linux-clear-lts2018" - local builddir="$pkgdir/usr/lib/modules/$(<version)/build" - cd ${_srcname} + local builddir="$pkgdir/usr/lib/modules/$(<version)/build" msg2 "Installing build files..." - install -Dt "$builddir" -m644 Makefile .config Module.symvers System.map vmlinux + install -Dt "$builddir" -m644 .config Makefile Module.symvers System.map \ + localversion.* version vmlinux install -Dt "$builddir/kernel" -m644 kernel/Makefile install -Dt "$builddir/arch/x86" -m644 arch/x86/Makefile cp -t "$builddir" -a scripts @@ -312,7 +304,7 @@ _package-headers() { msg2 "Adding symlink..." mkdir -p "$pkgdir/usr/src" - ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase-$pkgver" + ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase" msg2 "Fixing permissions..." chmod -Rc u=rwX,go=rX "$pkgdir" @@ -331,7 +323,7 @@ sha256sums=('0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1' 'f64087c9fc1e6d123c7e24315a8dd5b6dbb6cbb9dc61371a7f7b1d88bcfc8233' 'SKIP' '8c11086809864b5cef7d079f930bd40da8d0869c091965fa62e95de9a0fe13b5' - 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' + '452b8d4d71e1565ca91b1bebb280693549222ef51c47ba8964e411b2d461699c' 'c043f3033bb781e2688794a59f6d1f7ed49ef9b13eb77ff9a425df33a244a636' 'ed9d35cb7d7bd829ff6253353efa5e2d119820fe4f4310aea536671f5e4caa37' 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65') |