1 files changed, 9 insertions, 25 deletions
diff --git a/libre/linux-libre-aufs_friendly/PKGBUILD b/libre/linux-libre-aufs_friendly/PKGBUILD
index d9d76a154..102a59b24 100644
--- a/libre/linux-libre-aufs_friendly/PKGBUILD
+++ b/libre/linux-libre-aufs_friendly/PKGBUILD
@@ -163,13 +163,13 @@ build() {
   fi
 }
 
-package_linux-libre() {
+package_linux-libre-aufs_friendly() {
   pkgdesc="The Linux-libre Kernel and modules, with symbols exported for AUFS3-libre"
   depends=('coreutils' 'module-init-tools>=3.16')
   optdepends=('crda: to set the correct wireless channels of your country')
-  provides=('kernel26' 'aufs-libre_friendly')
-  conflicts=('kernel26' 'kernel26-libre' 'linux')
-  replaces=('kernel26' 'kernel26-libre' 'linux')
+  provides=('kernel26-aufs_friendly' "linux-aufs_friendly=$pkgver")
+  conflicts=('kernel26-aufs_friendly' 'kernel26-libre-aufs_friendly' 'linux-aufs_friendly')
+  replaces=('kernel26-aufs_friendly' 'kernel26-libre-aufs_friendly' 'linux-aufs_friendly')
   backup=("etc/mkinitcpio.d/${pkgname}.preset")
   install=${pkgname}.install
   if [ "$CARCH" = "mips64el" ]; then
@@ -233,11 +233,11 @@ package_linux-libre() {
   echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE}/version"
 }
 
-package_linux-libre-headers() {
-  pkgdesc="Header files and scripts for building modules for linux-libre kernel"
-  provides=('kernel26-headers' "linux-headers=${pkgver}")
-  conflicts=('kernel26-headers' 'kernel26-libre-headers' 'linux-headers')
-  replaces=('kernel26-headers' 'kernel26-libre-headers' 'linux-headers')
+package_linux-libre-aufs_friendly-headers() {
+  pkgdesc="Header files and scripts for building modules for linux-libre-aufs_friendly kernel"
+  provides=('kernel26-aufs_friendly-headers' "linux-aufs_friendly-headers=${pkgver}")
+  conflicts=('kernel26-aufs_friendly-headers' 'kernel26-libre-aufs_friendly-headers' 'linux-aufs_friendly-headers')
+  replaces=('kernel26-aufs_friendly-headers' 'kernel26-libre-aufs_friendly-headers' 'linux-aufs_friendly-headers')
 
   KARCH=x86
   [ $CARCH = "mips64el" ] && KARCH=mips
@@ -384,19 +384,3 @@ package_linux-libre-headers() {
   fi
 }
 
-package_linux-libre-docs() {
-  pkgdesc="Kernel hackers manual - HTML documentation that comes with the Linux-libre kernel."
-  provides=('kernel26-docs' "linux-docs=$pkgver")
-  conflicts=('kernel26-docs' 'kernel26-libre-docs' 'linux-docs')
-  replaces=('kernel26-docs' 'kernel26-libre-docs' 'linux-docs')
-
-  cd "${srcdir}/linux-${_basekernel}"
-
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}"
-  cp -al Documentation "${pkgdir}/usr/src/linux-${_kernver}"
-  find "${pkgdir}" -type f -exec chmod 444 {} \;
-  find "${pkgdir}" -type d -exec chmod 755 {} \;
-
-  # remove a file already in linux package
-  rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile"
-}