diff options
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | 90-linux.hook | 2 | ||||
-rw-r--r-- | 99-linux.hook | 2 | ||||
-rw-r--r-- | PKGBUILD | 19 | ||||
-rw-r--r-- | linux.install | 1 |
5 files changed, 14 insertions, 16 deletions
@@ -1,6 +1,6 @@ pkgbase = linux-uksm pkgver = 4.19.5 - pkgrel = 1 + pkgrel = 2 url = https://github.com/dolohow/uksm arch = x86_64 license = GPL2 @@ -28,8 +28,8 @@ pkgbase = linux-uksm sha512sums = 81d52d3d9bf542c9bdd3024ef1a956804bfdfb1d9e321100caff76de96da8f0591a4fd843b00252ccc43b9c01441793b680eca4e25532472ef26d9b914dbe411 sha512sums = 96d277687f17db056bd8fdb6177ef0529679bdf5f4e764812ff44c6dfa1049130576a7893e3bb484d4f86f1f44f0654ccec2a625a07d783e7de037a1bacf6f8b sha512sums = 7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a - sha512sums = 4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44 - sha512sums = 6346b66f54652256571ef65da8e46db49a95ac5978ecd57a507c6b2a28aee70bb3ff87045ac493f54257c9965da1046a28b72cb5abb0087204d257f14b91fd74 + sha512sums = 2718b58dbbb15063bacb2bde6489e5b3c59afac4c0e0435b97fe720d42c711b6bcba926f67a8687878bd51373c9cf3adb1915a11666d79ccb220bf36e0788ab7 + sha512sums = b27d13a1e486de6a8500724d2aea3fc11b2f46698e6aa5e41b37b8c8bbf973763b3c5eca464522ea198305167bace2a20ce4d1c40b01ce6f82838c81f3135f48 sha512sums = 2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf sha512sums = 39c50e70d28ddaa2cca030f1050c3ead72d44d957a533d0d09a5a8b92d3743c5712fef1a60aacfcac8319346dd407247667e1c25a96cd2585e9d9b017ccd707c 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] diff --git a/99-linux.hook b/99-linux.hook index 036f6bf2534a..138b911b6794 100644 --- a/99-linux.hook +++ b/99-linux.hook @@ -1,7 +1,7 @@ [Trigger] Type = File Operation = Remove -Target = boot/vmlinuz-%PKGBASE% +Target = usr/lib/modules/%KERNVER%/vmlinuz [Action] Description = Remove %PKGBASE% initramfs files... @@ -56,7 +56,7 @@ _major=4.19 _minor=5 pkgver=${_major}.${_minor} _srcname=linux-${pkgver} -pkgrel=1 +pkgrel=2 arch=('x86_64') url="https://github.com/dolohow/uksm" license=('GPL2') @@ -204,22 +204,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" @@ -388,8 +385,8 @@ sha512sums=('ee460800a071aeae966078d3e7dc525e1e8e9cbb406fe878438c55da4ea42d10f50 '81d52d3d9bf542c9bdd3024ef1a956804bfdfb1d9e321100caff76de96da8f0591a4fd843b00252ccc43b9c01441793b680eca4e25532472ef26d9b914dbe411' '96d277687f17db056bd8fdb6177ef0529679bdf5f4e764812ff44c6dfa1049130576a7893e3bb484d4f86f1f44f0654ccec2a625a07d783e7de037a1bacf6f8b' '7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a' - '4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44' - '6346b66f54652256571ef65da8e46db49a95ac5978ecd57a507c6b2a28aee70bb3ff87045ac493f54257c9965da1046a28b72cb5abb0087204d257f14b91fd74' + '2718b58dbbb15063bacb2bde6489e5b3c59afac4c0e0435b97fe720d42c711b6bcba926f67a8687878bd51373c9cf3adb1915a11666d79ccb220bf36e0788ab7' + 'b27d13a1e486de6a8500724d2aea3fc11b2f46698e6aa5e41b37b8c8bbf973763b3c5eca464522ea198305167bace2a20ce4d1c40b01ce6f82838c81f3135f48' '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf' '39c50e70d28ddaa2cca030f1050c3ead72d44d957a533d0d09a5a8b92d3743c5712fef1a60aacfcac8319346dd407247667e1c25a96cd2585e9d9b017ccd707c') diff --git a/linux.install b/linux.install index 95860e414f7e..f7bdeb92e69e 100644 --- a/linux.install +++ b/linux.install @@ -4,3 +4,4 @@ post_upgrade() { fi } +# vim:set ft=sh ts=8 sts=2 sw=2 et: |