Mon Mar 12 03:47:14 UTC 2012

2 files changed, 18 insertions, 53 deletions

diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD
index 336d58cb0..47f4e371c 100644
--- a/kernels/linux-libre-rt/PKGBUILD
+++ b/kernels/linux-libre-rt/PKGBUILD
@@ -8,7 +8,7 @@
 # Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
 pkgbase=linux-libre-rt
-pkgname=('linux-libre-rt' 'linux-libre-rt-headers' 'linux-libre-rt-docs') # Build stock -LIBRE kernel
+pkgname=('linux-libre-rt' 'linux-libre-rt-headers') # Build stock -LIBRE kernel with RT support
 # pkgname=linux-custom       # Build kernel with a different name
 _kernelname=${pkgname#linux-libre}
 _basekernel=3.2
@@ -16,7 +16,7 @@ _releasever=6
 _rtpatchver=rt13
 _pkgver=${_basekernel}.${_releasever}
 pkgver=${_basekernel}.${_releasever}_${_rtpatchver}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -109,12 +109,11 @@ build() {
 
 package_linux-libre-rt() {
   pkgdesc="The Linux-libre Kernel and modules with RT patches"
-  groups=('base')
   depends=('coreutils' 'module-init-tools>=3.16' 'mkinitcpio>=0.7')
   optdepends=('crda: to set the correct wireless channels of your country')
-  provides=('kernel26' "linux=$_pkgver")
-  conflicts=('kernel26' 'kernel26-libre' 'linux')
-  replaces=('kernel26' 'kernel26-libre' 'linux')
+  provides=('kernel26-rt' "linux-rt=$_pkgver")
+  conflicts=('kernel26-rt' 'kernel26-libre-rt' 'linux-rt')
+  replaces=('kernel26-rt' 'kernel26-libre-rt' 'linux-rt')
   backup=("etc/mkinitcpio.d/${pkgname}.preset")
   install=${pkgname}.install
 
@@ -160,10 +159,10 @@ package_linux-libre-rt() {
 }
 
 package_linux-libre-rt-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')
+  pkgdesc="Header files and scripts for building modules for linux-libre-rt kernel"
+  provides=('kernel26-rt-headers' "linux-rt-headers=${_pkgver}")
+  conflicts=('kernel26-rt-headers' 'kernel26-libre-rt-headers' 'linux-rt-headers')
+  replaces=('kernel26-rt-headers' 'kernel26-libre-rt-headers' 'linux-rt-headers')
 
   mkdir -p "${pkgdir}/lib/modules/${_kernver}"
 
@@ -290,19 +289,3 @@ package_linux-libre-rt-headers() {
   rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa}
 }
 
-package_linux-libre-rt-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"
-}
diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD
index e8e763670..1dd0325fd 100644
--- a/kernels/linux-libre-xen/PKGBUILD
+++ b/kernels/linux-libre-xen/PKGBUILD
@@ -6,12 +6,12 @@
 # Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
 pkgbase=linux-libre-xen
-pkgname=('linux-libre-xen' 'linux-libre-xen-headers' 'linux-libre-xen-docs') # Build stock -LIBRE kernel with Xen guest support
+pkgname=('linux-libre-xen' 'linux-libre-xen-headers') # Build stock -LIBRE kernel with Xen guest support
 # pkgname=linux-custom       # Build kernel with a different name
 _kernelname=${pkgname#linux-libre}
 _basekernel=3.2
 pkgver=${_basekernel}.9
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -104,12 +104,11 @@ build() {
 
 package_linux-libre-xen() {
   pkgdesc="The Linux-libre Kernel and modules with Xen guest support"
-  groups=('base')
   depends=('coreutils' 'module-init-tools>=3.16' 'mkinitcpio>=0.7')
   optdepends=('crda: to set the correct wireless channels of your country')
-  provides=('kernel26' "linux=$pkgver")
-  conflicts=('kernel26' 'kernel26-libre' 'linux')
-  replaces=('kernel26' 'kernel26-libre' 'linux')
+  provides=('kernel26-xen' "linux-xen=$pkgver")
+  conflicts=('kernel26-xen' 'kernel26-libre-xen' 'linux-xen')
+  replaces=('kernel26-xen' 'kernel26-libre-xen' 'linux-xen')
   backup=("etc/mkinitcpio.d/${pkgname}.preset")
   install=${pkgname}.install
 
@@ -155,10 +154,10 @@ package_linux-libre-xen() {
 }
 
 package_linux-libre-xen-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')
+  pkgdesc="Header files and scripts for building modules for linux-libre-xen kernel"
+  provides=('kernel26-xen-headers' "linux-xen-headers=${pkgver}")
+  conflicts=('kernel26-xen-headers' 'kernel26-libre-xen-headers' 'linux-xen-headers')
+  replaces=('kernel26-xen-headers' 'kernel26-libre-xen-headers' 'linux-xen-headers')
 
   mkdir -p "${pkgdir}/lib/modules/${_kernver}"
 
@@ -284,20 +283,3 @@ package_linux-libre-xen-headers() {
   # remove unneeded architectures
   rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa}
 }
-
-package_linux-libre-xen-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"
-}