summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorYurii Kolesnykov2019-02-04 22:34:58 +0100
committerYurii Kolesnykov2019-02-04 22:34:58 +0100
commit57a04eab4c17f96ab7958c32ceba2cb718aa594a (patch)
tree538c62f1266afb1612851156f7dbfa4801064be3
parentf0b80dbd79dc6c465ea911d6a79f2d480f8d5c56 (diff)
downloadaur-57a04eab4c17f96ab7958c32ceba2cb718aa594a.tar.gz
5.1.810809.3d7a64b992ea-2
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD11
2 files changed, 7 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 61a03cd5dd65..7b82723125b8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linux-drm-intel-next-queued-git
pkgdesc = Linux with patches for Intel graphics
pkgver = 5.1.810809.3d7a64b992ea
- pkgrel = 1
+ pkgrel = 2
url = https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-intel.html
arch = x86_64
license = GPL2
diff --git a/PKGBUILD b/PKGBUILD
index 2d911876dd8d..6db56806e41b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@ _kernel_rel=5.1
_branch=drm-intel-next-queued
_kernelname=${pkgbase#linux}
pkgver=5.1.810809.3d7a64b992ea
-pkgrel=1
+pkgrel=2
arch=('x86_64')
url='https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-intel.html'
license=(GPL2)
@@ -78,15 +78,17 @@ _package() {
install=linux.install
local kernver="$(<version)"
+ local modulesdir="$pkgdir/usr/lib/modules/$kernver"
cd $_srcname
msg2 "Installing boot image..."
- install -Dm644 "$(make -s image_name)" "$pkgdir/boot/vmlinuz-$pkgbase"
+ # 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
# a place for external modules,
@@ -149,7 +151,6 @@ _package-headers() {
cp -t "$builddir" -a include
cp -t "$builddir/arch/x86" -a arch/x86/include
install -Dt "$builddir/arch/x86/kernel" -m644 arch/x86/kernel/asm-offsets.s
- install -Dt "$builddir/arch/x86/kernel" -m644 arch/x86/kernel/macros.s
install -Dt "$builddir/drivers/md" -m644 drivers/md/*.h
install -Dt "$builddir/net/mac80211" -m644 net/mac80211/*.h