aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoryar2016-12-07 11:55:05 -0800
committeryar2016-12-07 11:55:05 -0800
commit28aaf2ab94fdc0969ec86e1e472bab585ee634f9 (patch)
tree231407cd3e3a7958ac44d154569ded1618b172a2
parent69ecd8318d340c69b0a79d1b26d7019bc80d4302 (diff)
downloadaur-28aaf2ab94fdc0969ec86e1e472bab585ee634f9.tar.gz
don't conflict w/grub
grub will be needed for KVM grub-legacy is a real conflict tho because menu.lst
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD4
2 files changed, 4 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b306e87392de..682d83c41333 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Tue Dec 6 17:07:34 UTC 2016
+# Wed Dec 7 19:54:16 UTC 2016
pkgbase = linux-linode
pkgdesc = Kernel for Linode servers
pkgver = 4.8.12
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/yardenac/linux-linode
install = install
arch = i686
@@ -20,7 +20,6 @@ pkgbase = linux-linode
depends = kmod
depends = mkinitcpio>=0.7
provides = linux
- conflicts = grub
conflicts = grub-legacy
options = !strip
backup = etc/mkinitcpio.d/linux-linode.preset
diff --git a/PKGBUILD b/PKGBUILD
index 0e5a0023a4a7..f0ec99e5550d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ _basekernel=4.8
_kernelname=${pkgname#linux}
_srcname=linux-${_basekernel}
pkgver=${_basekernel}.12
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url="https://github.com/yardenac/linux-linode"
license=(GPL2)
@@ -35,7 +35,7 @@ validpgpkeys=(
pkgdesc="Kernel for Linode servers"
depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7')
provides=(linux)
-conflicts=(grub grub-legacy)
+conflicts=(grub-legacy)
backup=(etc/mkinitcpio.d/${pkgname}.preset boot/grub/menu.lst)
install=install