diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | 90-linux.hook | 2 | ||||
| -rw-r--r-- | PKGBUILD | 17 | ||||
| -rw-r--r-- | linux.install | 2 |
4 files changed, 14 insertions, 15 deletions
@@ -1,7 +1,7 @@ pkgbase = linux-macbook - pkgver = 4.19.9.arch1 + pkgver = 4.19.12.arch1 pkgrel = 1 - url = https://git.archlinux.org/linux.git/log/?h=v4.19.9-arch1 + url = https://git.archlinux.org/linux.git/log/?h=v4.19.12-arch1 arch = x86_64 license = GPL2 makedepends = xmlto @@ -13,7 +13,7 @@ pkgbase = linux-macbook makedepends = python-sphinx makedepends = graphviz options = !strip - source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v4.19.9-arch1 + source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v4.19.12-arch1 source = config source = 60-linux.hook source = 90-linux.hook @@ -26,7 +26,7 @@ pkgbase = linux-macbook sha256sums = SKIP sha256sums = 2aa5cde5c40ca06ea0a10b9a212bd9b96deb548d58c0a55386f0e8ae5fc0edf5 sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21 - sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919 + sha256sums = c043f3033bb781e2688794a59f6d1f7ed49ef9b13eb77ff9a425df33a244a636 sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65 sha256sums = c5a714823c3418692bc5c212dd5d094a0e2ae6147d6726822911f1c26e3a1d1b sha256sums = a4e044fb954f035aa70af4c7d79f8a6076933bdbbf9efee749304829621d77ed diff --git a/90-linux.hook b/90-linux.hook index be0d886539f4..fca45abe1a62 100644 --- a/90-linux.hook +++ b/90-linux.hook @@ -2,7 +2,7 @@ Type = File Operation = Install Operation = Upgrade -Target = boot/vmlinuz-%PKGBASE% +Target = usr/lib/modules/%KERNVER%/vmlinuz Target = usr/lib/initcpio/* [Action] @@ -5,7 +5,7 @@ #pkgbase=linux # Build stock -ARCH kernel pkgbase=linux-macbook # Build kernel with a different name -_srcver=4.19.9-arch1 +_srcver=4.19.12-arch1 pkgver=${_srcver//-/.} pkgrel=1 arch=(x86_64) @@ -31,7 +31,7 @@ validpgpkeys=( sha256sums=('SKIP' '2aa5cde5c40ca06ea0a10b9a212bd9b96deb548d58c0a55386f0e8ae5fc0edf5' 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' - '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919' + 'c043f3033bb781e2688794a59f6d1f7ed49ef9b13eb77ff9a425df33a244a636' 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' 'c5a714823c3418692bc5c212dd5d094a0e2ae6147d6726822911f1c26e3a1d1b' 'a4e044fb954f035aa70af4c7d79f8a6076933bdbbf9efee749304829621d77ed') @@ -78,22 +78,19 @@ _package() { install=linux.install local kernver="$(<version)" + local modulesdir="$pkgdir/usr/lib/modules/$kernver" cd $_srcname msg2 "Installing boot image..." - local image="$pkgdir/boot/vmlinuz-$pkgbase" - install -Dm644 "$(make -s image_name)" "$image" + # systemd expects to find the kernel here to allow hibernation + # https://github.com/systemd/systemd/commit/edda44605f06a41fb86b7ab8128dcf99161d2344 + install -Dm644 "$(make -s image_name)" "$modulesdir/vmlinuz" + install -Dm644 "$modulesdir/vmlinuz" "$pkgdir/boot/vmlinuz-$pkgbase" msg2 "Installing modules..." - local modulesdir="$pkgdir/usr/lib/modules/$kernver" - mkdir -p "$modulesdir" make INSTALL_MOD_PATH="$pkgdir/usr" modules_install - # systemd expects to find the kernel here to allow hibernation - # https://github.com/systemd/systemd/commit/edda44605f06a41fb86b7ab8128dcf99161d2344 - ln -sr "$image" "$modulesdir/vmlinuz" - # a place for external modules, # with version file for building modules and running depmod from hook local extramodules="extramodules$_kernelname" diff --git a/linux.install b/linux.install index c8e5a68d75ba..7127469f1fb9 100644 --- a/linux.install +++ b/linux.install @@ -23,3 +23,5 @@ post_remove() { rm -f boot/initramfs-%PKGBASE%.img rm -f boot/initramfs-%PKGBASE%-fallback.img } + +# vim:set ft=sh ts=8 sts=2 sw=2 et: |