fix some issues on the kernels

7 files changed, 54 insertions, 64 deletions

diff --git a/kernels/linux-libre-lts-knock/PKGBUILD b/kernels/linux-libre-lts-knock/PKGBUILD
index 2d72f2169..f85e92604 100644
--- a/kernels/linux-libre-lts-knock/PKGBUILD
+++ b/kernels/linux-libre-lts-knock/PKGBUILD
@@ -10,9 +10,10 @@
 pkgbase=linux-libre-lts-knock # Build stock -lts-knock kernel
 _pkgbasever=3.10-gnu
 _pkgver=3.10.53-gnu
+_archver=3.10.53
 _knockpatchver=3.10
 
-_replaces=('kernel26%' 'kernel26-libre%' 'linux%' 'linux-libre%-kmod-alx') # '%' gets replaced with _kernelname
+_replaces=('kernel26%' 'linux%') # '%' gets replaced with _kernelname
 
 _srcname=linux-${_pkgbasever%-*}
 pkgver=${_pkgver//-/.}
@@ -138,13 +139,13 @@ _package() {
   [ "${pkgbase}" = "linux-libre" ] && groups=('base')
   depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7')
   optdepends=('crda: to set the correct wireless channels of your country')
-  provides=( "${_replaces[@]/%/=${pkgver}}")
+  provides=( "${_replaces[@]/%/=${_archver}}")
   conflicts=("${_replaces[@]}")
   replaces=( "${_replaces[@]}")
   backup=("etc/mkinitcpio.d/${pkgbase}.preset")
   install=linux.install
 
-  cd "${srcdir}/${_srcname}
+  cd "${srcdir}/${_srcname}"
 
   # get kernel version
   _kernver="$(make LOCALVERSION= kernelrelease)"
@@ -197,16 +198,10 @@ _package() {
 
 _package-headers() {
   pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel"
-  provides=( "${_replaces[@]/%/-headers=${pkgver}}")
+  provides=( "${_replaces[@]/%/-headers=${_archver}}")
   conflicts=("${_replaces[@]/%/-headers}")
   replaces=( "${_replaces[@]/%/-headers}")
 
-  # in case of repackaging this is empty
-  if [ -z "${_kernver}" ]; then
-    cd "${srcdir}/linux-${_basekernel}"
-    _kernver="$(make LOCALVERSION= kernelrelease)"
-  fi
-
   install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"
 
   cd "${pkgdir}/usr/lib/modules/${_kernver}"
@@ -343,7 +338,7 @@ _package-headers() {
 
 _package-docs() {
   pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel"
-  provides=( "${_replaces[@]/%/-docs=${pkgver}}")
+  provides=( "${_replaces[@]/%/-docs=${_archver}}")
   conflicts=("${_replaces[@]/%/-docs}")
   replaces=( "${_replaces[@]/%/-docs}")
 
diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD
index ec7336a48..a984d646c 100644
--- a/kernels/linux-libre-pae/PKGBUILD
+++ b/kernels/linux-libre-pae/PKGBUILD
@@ -10,8 +10,9 @@
 pkgbase=linux-libre-pae     # Build stock -pae kernel
 _pkgbasever=3.16-gnu
 _pkgver=3.16.1-gnu
+_archver=3.16.1
 
-_replaces=('kernel26%' 'kernel26-libre%' 'linux%' 'linux-libre%-kmod-alx') # '%' gets replaced with _kernelname
+_replaces=('kernel26%' 'linux%') # '%' gets replaced with _kernelname
 
 _srcname=linux-${_pkgbasever%-*}
 pkgver=${_pkgver//-/.}
@@ -21,8 +22,8 @@ url="http://linux-libre.fsfla.org/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc')
 options=('!strip')
-source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasekernel}/linux-libre-${_pkgbasekernel}.tar.xz"
-        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasekernel}-${_pkgver}.xz"
+source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz"
+        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz"
         # the main kernel config files
         'config'
         # standard config files for mkinitcpio ramdisk
@@ -100,7 +101,7 @@ _package() {
   [ "${pkgbase}" = "linux-libre" ] && groups=('base')
   depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7')
   optdepends=('crda: to set the correct wireless channels of your country')
-  provides=( "${_replaces[@]/%/=${pkgver}}")
+  provides=( "${_replaces[@]/%/=${_archver}}")
   conflicts=("${_replaces[@]}")
   replaces=( "${_replaces[@]}")
   backup=("etc/mkinitcpio.d/${pkgbase}.preset")
@@ -161,7 +162,7 @@ _package() {
 
 _package-headers() {
   pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel"
-  provides=( "${_replaces[@]/%/-headers=${pkgver}}")
+  provides=( "${_replaces[@]/%/-headers=${_archver}}")
   conflicts=("${_replaces[@]/%/-headers}")
   replaces=( "${_replaces[@]/%/-headers}")
 
@@ -280,11 +281,11 @@ _package-headers() {
 
 _package-docs() {
   pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel"
-  provides=("kernel26${_kernelname}-docs=${pkgver}" "linux${_kernelname}-docs=${pkgver}")
-  conflicts=("kernel26${_kernelname}-docs" "kernel26-libre${_kernelname}-docs" "linux${_kernelname}-docs")
-  replaces=("kernel26${_kernelname}-docs" "kernel26-libre${_kernelname}-docs" "linux${_kernelname}-docs")
+  provides=( "${_replaces[@]/%/-docs=${_archver}}")
+  conflicts=("${_replaces[@]/%/-docs}")
+  replaces=( "${_replaces[@]/%/-docs}")
 
-  cd "${srcdir}/linux-${_basekernel}"
+  cd "${srcdir}/${_srcname}"
 
   mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build"
   cp -al Documentation "${pkgdir}/usr/lib/modules/${_kernver}/build"
diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD
index 0934fa247..f7d9dda81 100644
--- a/kernels/linux-libre-rt/PKGBUILD
+++ b/kernels/linux-libre-rt/PKGBUILD
@@ -13,11 +13,11 @@
 pkgbase=linux-libre-rt      # Build stock -rt kernel
 _pkgbasever=3.14-gnu
 _pkgver=3.14.12-gnu
+_archver=3.14.12
 _rtbasever=3.14
-_rtver=3.14.12
 _rtpatchver=rt9
 
-_replaces=('kernel26%' 'kernel26-libre%' 'linux%' 'linux-libre%-kmod-alx') # '%' gets replaced with _kernelname
+_replaces=('kernel26%' 'linux%') # '%' gets replaced with _kernelname
 
 _srcname=linux-${_pkgbasever%-*}
 pkgver=${_pkgver//-/.}_${_rtpatchver}
@@ -27,9 +27,9 @@ url="https://rt.wiki.kernel.org/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc')
 options=('!strip')
-source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasekernel}/linux-libre-${_pkgbasekernel}.tar.xz"
-        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasekernel}-${_pkgver}.xz"
-        "http://www.kernel.org/pub/linux/kernel/projects/rt/${_rtbasever}/patch-${_rtver}-${_rtpatchver}.patch.xz"
+source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz"
+        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz"
+        "http://www.kernel.org/pub/linux/kernel/projects/rt/${_rtbasever}/patch-${_archver}-${_rtpatchver}.patch.xz"
         # the main kernel config files
         'config.i686' 'config.x86_64' 'config.mips64el'
         # standard config files for mkinitcpio ramdisk
@@ -145,7 +145,7 @@ _package() {
   [ "${pkgbase}" = "linux-libre" ] && groups=('base')
   depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7')
   optdepends=('crda: to set the correct wireless channels of your country')
-  provides=( "${_replaces[@]/%/=${pkgver}}")
+  provides=( "${_replaces[@]/%/=${_archver}.${_rtpatchver}}")
   conflicts=("${_replaces[@]}")
   replaces=( "${_replaces[@]}")
   backup=("etc/mkinitcpio.d/${pkgbase}.preset")
@@ -160,8 +160,7 @@ _package() {
 
   mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot}
   make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}" modules_install
-
-  cp arch/${KARCH}/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgbase}"
+  cp arch/$KARCH/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgbase}"
 
   # set correct depmod command for install
   cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
@@ -205,16 +204,10 @@ _package() {
 
 _package-headers() {
   pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel"
-  provides=( "${_replaces[@]/%/-headers=${pkgver}}")
+  provides=( "${_replaces[@]/%/-headers=${_archver}.${_rtpatchver}}")
   conflicts=("${_replaces[@]/%/-headers}")
   replaces=( "${_replaces[@]/%/-headers}")
 
-  # in case of repackaging this is empty
-  if [ -z "${_kernver}" ]; then
-    cd "${srcdir}/linux-${_basekernel}"
-    _kernver="$(make LOCALVERSION= kernelrelease)"
-  fi
-
   install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"
 
   cd "${srcdir}/${_srcname}"
@@ -240,12 +233,6 @@ _package-headers() {
   cp Module.symvers "${pkgdir}/usr/lib/modules/${_kernver}/build"
   cp -a scripts "${pkgdir}/usr/lib/modules/${_kernver}/build"
 
-  if [ "$CARCH" = "mips64el" ]; then
-    cp arch/${KARCH}/Kbuild "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/"
-    cp -a arch/${KARCH}/loongson "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/"
-    cp ${srcdir}/Kbuild.platforms "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/"
-  fi
-
   # fix permissions on scripts dir
   chmod og-w -R "${pkgdir}/usr/lib/modules/${_kernver}/build/scripts"
   mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/.tmp_versions"
@@ -336,7 +323,7 @@ _package-headers() {
 
 _package-docs() {
   pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel"
-  provides=( "${_replaces[@]/%/-docs=${pkgver}}")
+  provides=( "${_replaces[@]/%/-docs=${_archver}.${_rtpatchver}}")
   conflicts=("${_replaces[@]/%/-docs}")
   replaces=( "${_replaces[@]/%/-docs}")
 
diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD
index bfe9c1dc2..537d51bd5 100644
--- a/kernels/linux-libre-xen/PKGBUILD
+++ b/kernels/linux-libre-xen/PKGBUILD
@@ -10,8 +10,9 @@
 pkgbase=linux-libre-xen     # Build stock -xen kernel
 _pkgbasever=3.16-gnu
 _pkgver=3.16.1-gnu
+_archver=3.16.1
 
-_replaces=('kernel26%' 'kernel26-libre%' 'linux%' 'linux-libre%-kmod-alx') # '%' gets replaced with _kernelname
+_replaces=('kernel26%' 'linux%') # '%' gets replaced with _kernelname
 
 _srcname=linux-${_pkgbasever%-*}
 pkgver=${_pkgver//-/.}
@@ -21,8 +22,8 @@ url="http://linux-libre.fsfla.org/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc')
 options=('!strip')
-source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasekernel}/linux-libre-${_pkgbasekernel}.tar.xz"
-        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_basekernel}-${_pkgver}.xz"
+source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz"
+        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz"
         # the main kernel config files
         'config'
         # standard config files for mkinitcpio ramdisk
@@ -100,7 +101,7 @@ _package() {
   [ "${pkgbase}" = "linux-libre" ] && groups=('base')
   depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7')
   optdepends=('crda: to set the correct wireless channels of your country')
-  provides=( "${_replaces[@]/%/=${pkgver}}")
+  provides=( "${_replaces[@]/%/=${_archver}}")
   conflicts=("${_replaces[@]}")
   replaces=( "${_replaces[@]}")
   backup=("etc/mkinitcpio.d/${pkgbase}.preset")
@@ -161,7 +162,7 @@ _package() {
 
 _package-headers() {
   pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel"
-  provides=( "${_replaces[@]/%/-headers=${pkgver}}")
+  provides=( "${_replaces[@]/%/-headers=${_archver}}")
   conflicts=("${_replaces[@]/%/-headers}")
   replaces=( "${_replaces[@]/%/-headers}")
 
@@ -280,7 +281,7 @@ _package-headers() {
 
 _package-docs() {
   pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel"
-  provides=( "${_replaces[@]/%/-docs=${pkgver}}")
+  provides=( "${_replaces[@]/%/-docs=${_archver}}")
   conflicts=("${_replaces[@]/%/-docs}")
   replaces=( "${_replaces[@]/%/-docs}")
 
diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD
index 2041f3005..7d51ac4f3 100644
--- a/libre/linux-libre-grsec/PKGBUILD
+++ b/libre/linux-libre-grsec/PKGBUILD
@@ -16,7 +16,7 @@ _pkgver=3.15.10-gnu
 _grsecver=3.0
 _timestamp=201408212335
 
-_replaces=('kernel26%' 'kernel26-libre%' 'linux%' 'linux-libre%-kmod-alx') # '%' gets replaced with _kernelname
+_replaces=('kernel26%' 'linux%') # '%' gets replaced with _kernelname
 
 _srcname=linux-${_pkgbasever%-*}
 pkgver=${_pkgver//-/.}.${_timestamp}
@@ -125,7 +125,7 @@ _package() {
   optdepends=('crda: to set the correct wireless channels of your country'
               'gradm: to configure and enable Role Based Access Control (RBAC)'
               'paxd: to enable PaX exploit mitigations and apply exceptions automatically')
-  provides=( "${_replaces[@]/%/=${pkgver}}")
+  provides=( "${_replaces[@]/%/=${_archver}.${_timestamp}}")
   conflicts=("${_replaces[@]}")
   replaces=( "${_replaces[@]}")
   backup=("etc/mkinitcpio.d/${pkgbase}.preset")
@@ -193,7 +193,7 @@ _package() {
 
 _package-headers() {
   pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel"
-  provides=( "${_replaces[@]/%/-headers=${pkgver}}")
+  provides=( "${_replaces[@]/%/-headers=${_archver}.${_timestamp}}")
   conflicts=("${_replaces[@]/%/-headers}")
   replaces=( "${_replaces[@]/%/-headers}")
 
@@ -312,7 +312,7 @@ _package-headers() {
 
 _package-docs() {
   pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel"
-  provides=( "${_replaces[@]/%/-docs=${pkgver}}")
+  provides=( "${_replaces[@]/%/-docs=${_archver}.${_timestamp}}")
   conflicts=("${_replaces[@]/%/-docs}")
   replaces=( "${_replaces[@]/%/-docs}")
 
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index f0f502750..c7af75a14 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -10,8 +10,10 @@
 pkgbase=linux-libre-lts     # Build kernel with -lts localname
 _pkgbasever=3.14-gnu
 _pkgver=3.14.17-gnu
+_archver=3.14.17
 
-_replaces=('kernel26%' 'kernel26-libre%' 'linux%' 'linux-libre%-kmod-alx') # '%' gets replaced with _kernelname
+_replaces=('kernel26%' 'linux%') # '%' gets replaced with _kernelname
+_replacesalx=('linux-libre%-kmod-alx') # '%' gets replaced with _kernelname
 
 _srcname=linux-${_pkgbasever%-*}
 pkgver=${_pkgver//-/.}
@@ -53,6 +55,7 @@ sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b'
 
 _kernelname=${pkgbase#linux-libre}
 _replaces=("${_replaces[@]/\%/${_kernelname}}")
+_replacesalx=("${_replacesalx/\%/${_kernelname}}")
 
 case "$CARCH" in
   i686|x86_64) KARCH=x86;;
@@ -129,9 +132,9 @@ _package() {
   [ "${pkgbase}" = "linux-libre" ] && groups=('base')
   depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7')
   optdepends=('crda: to set the correct wireless channels of your country')
-  provides=( "${_replaces[@]/%/=${pkgver}}")
-  conflicts=("${_replaces[@]}")
-  replaces=( "${_replaces[@]}")
+  provides=( "${_replaces[@]/%/=${_archver}}" "${_replacesalx}")
+  conflicts=("${_replaces[@]}" "${_replacesalx}")
+  replaces=( "${_replaces[@]}" "${_replacesalx}")
   backup=("etc/mkinitcpio.d/${pkgbase}.preset")
   install=linux.install
 
@@ -188,7 +191,7 @@ _package() {
 
 _package-headers() {
   pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel"
-  provides=( "${_replaces[@]/%/-headers=${pkgver}}")
+  provides=( "${_replaces[@]/%/-headers=${_archver}}")
   conflicts=("${_replaces[@]/%/-headers}")
   replaces=( "${_replaces[@]/%/-headers}")
 
@@ -307,7 +310,7 @@ _package-headers() {
 
 _package-docs() {
   pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel"
-  provides=( "${_replaces[@]/%/-docs=${pkgver}}")
+  provides=( "${_replaces[@]/%/-docs=${_archver}}")
   conflicts=("${_replaces[@]/%/-docs}")
   replaces=( "${_replaces[@]/%/-docs}")
 
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index c5a85232e..75e5618e4 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -10,8 +10,10 @@
 pkgbase=linux-libre         # Build stock "" kernel
 _pkgbasever=3.16-gnu
 _pkgver=3.16.1-gnu
+_archver=3.16.1
 
-_replaces=('kernel26%' 'kernel26-libre%' 'linux%' 'linux-libre%-kmod-alx') # '%' gets replaced with _kernelname
+_replaces=('kernel26%' 'linux%') # '%' gets replaced with _kernelname
+_replacesalx=('linux-libre%-kmod-alx') # '%' gets replaced with _kernelname
 
 _srcname=linux-${_pkgbasever%-*}
 pkgver=${_pkgver//-/.}
@@ -47,6 +49,7 @@ sha256sums=('9c2a524c901febe0f0138f702bfdeb52d6f79f22c1fdbabaa37580bc70f16218'
 
 _kernelname=${pkgbase#linux-libre}
 _replaces=("${_replaces[@]/\%/${_kernelname}}")
+_replacesalx=("${_replacesalx/\%/${_kernelname}}")
 
 case "$CARCH" in
   i686|x86_64) KARCH=x86;;
@@ -115,9 +118,9 @@ _package() {
   [ "${pkgbase}" = "linux-libre" ] && groups=('base')
   depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7')
   optdepends=('crda: to set the correct wireless channels of your country')
-  provides=( "${_replaces[@]/%/=${pkgver}}")
-  conflicts=("${_replaces[@]}")
-  replaces=( "${_replaces[@]}")
+  provides=( "${_replaces[@]/%/=${_archver}}" "${_replacesalx}")
+  conflicts=("${_replaces[@]}" "${_replacesalx}")
+  replaces=( "${_replaces[@]}" "${_replacesalx}")
   backup=("etc/mkinitcpio.d/${pkgbase}.preset")
   install=linux.install
 
@@ -174,7 +177,7 @@ _package() {
 
 _package-headers() {
   pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel"
-  provides=( "${_replaces[@]/%/-headers=${pkgver}}")
+  provides=( "${_replaces[@]/%/-headers=${_archver}}")
   conflicts=("${_replaces[@]/%/-headers}")
   replaces=( "${_replaces[@]/%/-headers}")
 
@@ -293,7 +296,7 @@ _package-headers() {
 
 _package-docs() {
   pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel"
-  provides=( "${_replaces[@]/%/-docs=${pkgver}}")
+  provides=( "${_replaces[@]/%/-docs=${_archver}}")
   conflicts=("${_replaces[@]/%/-docs}")
   replaces=( "${_replaces[@]/%/-docs}")