aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoryardenac2013-04-25 20:07:22 -0700
committeryar2015-07-03 16:58:24 -0700
commit20cb1aa7b657ba704964988dd3c4666580ba9bf9 (patch)
tree62a0bf64113573aa5f9bd3b3ca674b14b796d302
parent2abcb293a09ce59ed15171c5faf17bbda7763455 (diff)
downloadaur-20cb1aa7b657ba704964988dd3c4666580ba9bf9.tar.gz
go easier on conflicts/replaces - we can coexist with vanilla kernel
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD5
2 files changed, 2 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 22289b1b0539..e40adf80ac30 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -13,14 +13,9 @@ pkgbase = linux-linode
depends = linux-firmware
depends = kmod
depends = mkinitcpio>=0.7
- provides = kernel26
provides = linux
- conflicts = kernel26
- conflicts = linux
conflicts = grub
conflicts = grub-legacy
- replaces = kernel26
- replaces = linux
options = !strip
backup = etc/mkinitcpio.d/linux-linode.preset
backup = boot/grub/menu.lst
diff --git a/PKGBUILD b/PKGBUILD
index f7e46be2f879..185f6051aadf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -25,9 +25,8 @@ md5sums=('1c738edfc54e7c65faeb90c436104e2f'
'f3def2cefdcbb954c21d8505d23cc83c')
pkgdesc="Kernel for Arch Linux on Linode"
depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7')
-provides=(kernel26 linux)
-conflicts=(kernel26 linux grub grub-legacy)
-replaces=(kernel26 linux)
+provides=(linux)
+conflicts=(grub grub-legacy)
backup=(etc/mkinitcpio.d/${pkgname}.preset boot/grub/menu.lst)
install=${pkgname}.install