Add provides=linux and remove conflicts, replaces

3 files changed, 10 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c3bccca7f2c9..e15c2cde45f5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Sun Jul 24 20:45:19 UTC 2016
+# Sun Jul 24 21:32:00 UTC 2016
 pkgbase = linux-git
 	pkgver = 4.7.r0.g523d939
 	pkgrel = 1
@@ -21,7 +21,7 @@ pkgbase = linux-git
 	source = linux-git.preset
 	sha256sums = SKIP
 	sha256sums = 02e8b02e8cd10aa059917a489a9663e7f66bdf12c5ae8a1e0369bb2862da6b68
-	sha256sums = f6a7d73b90e2e99ef7f0de811592eed249f674ac7b3aaf46b2ef586041acb05a
+	sha256sums = f40e9cd10c0b00449ec1c9b3fd03b8809e1f627f88d7351849262a4d708bfff0
 	sha256sums = 95fcfdfcb9d540d1a1428ce61e493ddf2c2a8ec96c8573deeadbb4ee407508c7
 
 pkgname = linux-git
@@ -32,20 +32,14 @@ pkgname = linux-git
 	depends = kmod
 	depends = mkinitcpio>=0.7
 	optdepends = crda: to set the correct wireless channels of your country
-	provides = kernel26-git=4.7.r0.g523d939
-	conflicts = kernel26-git
-	replaces = kernel26-git
+	provides = linux
 	backup = etc/mkinitcpio.d/linux-git.preset
 
 pkgname = linux-git-headers
 	pkgdesc = Header files and scripts for building modules for Linux kernel (git version)
-	provides = kernel26-git-headers=4.7.r0.g523d939
-	conflicts = kernel26-git-headers
-	replaces = kernel26-git-headers
+	provides = linux-headers
 
 pkgname = linux-git-docs
 	pkgdesc = Kernel hackers manual - HTML documentation that comes with the Linux kernel (git version)
-	provides = kernel26-git-docs=4.7.r0.g523d939
-	conflicts = kernel26-git-docs
-	replaces = kernel26-git-docs
+	provides = linux-docs
 
diff --git a/PKGBUILD b/PKGBUILD
index 820b6854c522..669a457f17f9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,7 +20,7 @@ source=('git+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git'
         "${pkgbase}.preset")
 sha256sums=('SKIP'
             '02e8b02e8cd10aa059917a489a9663e7f66bdf12c5ae8a1e0369bb2862da6b68'
-            'f6a7d73b90e2e99ef7f0de811592eed249f674ac7b3aaf46b2ef586041acb05a'
+            'f40e9cd10c0b00449ec1c9b3fd03b8809e1f627f88d7351849262a4d708bfff0'
             '95fcfdfcb9d540d1a1428ce61e493ddf2c2a8ec96c8573deeadbb4ee407508c7')
 
 _kernelname=${pkgbase#linux}
@@ -72,9 +72,7 @@ _package() {
   pkgdesc="The Linux kernel and modules (git version)"
   depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7')
   optdepends=('crda: to set the correct wireless channels of your country')
-  provides=("kernel26${_kernelname}=${pkgver}")
-  conflicts=("kernel26${_kernelname}")
-  replaces=("kernel26${_kernelname}")
+  provides=('linux')
   backup=("etc/mkinitcpio.d/${pkgbase}.preset")
   install=linux.install
 
@@ -131,9 +129,7 @@ _package() {
 
 _package-headers() {
   pkgdesc="Header files and scripts for building modules for Linux kernel (git version)"
-  provides=("kernel26${_kernelname}-headers=${pkgver}")
-  conflicts=("kernel26${_kernelname}-headers")
-  replaces=("kernel26${_kernelname}-headers")
+  provides=('linux-headers')
 
   install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"
 
@@ -258,9 +254,7 @@ _package-headers() {
 
 _package-docs() {
   pkgdesc="Kernel hackers manual - HTML documentation that comes with the Linux kernel (git version)"
-  provides=("kernel26${_kernelname}-docs=${pkgver}")
-  conflicts=("kernel26${_kernelname}-docs")
-  replaces=("kernel26${_kernelname}-docs")
+  provides=('linux-docs')
 
   cd "${_srcname}"
 
diff --git a/config.x86_64 b/config.x86_64
index c7c9256fec4b..d1412f99554a 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -54,7 +54,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="-g92d21ac"
+CONFIG_LOCALVERSION="-g523d939"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y