From ad28364c1f8cfeb35c88054e74e74c8e047ff94c Mon Sep 17 00:00:00 2001
From: "coadde [Márcio Alexandre Silva Delgado]" <coadde@parabola.nu>
Date: Fri, 22 Aug 2014 16:13:28 -0300
Subject: build without LOCALVERSION from main linux-libre kernel (-PARABOLA)

---
 libre/acpi_call-parabola-grsec/PKGBUILD   | 2 +-
 libre/acpi_call-parabola-lts/PKGBUILD     | 2 +-
 libre/acpi_call-parabola/PKGBUILD         | 2 +-
 libre/bbswitch-parabola-grsec/PKGBUILD    | 2 +-
 libre/bbswitch-parabola-lts/PKGBUILD      | 2 +-
 libre/bbswitch-parabola/PKGBUILD          | 2 +-
 libre/linux-libre-grsec/PKGBUILD          | 6 +++---
 libre/linux-libre-lts/PKGBUILD            | 6 +++---
 libre/linux-libre/PKGBUILD                | 8 ++++----
 libre/linux-libre/config.i686             | 2 +-
 libre/linux-libre/config.x86_64           | 2 +-
 libre/lirc-parabola-grsec/PKGBUILD        | 2 +-
 libre/lirc-parabola-lts/PKGBUILD          | 2 +-
 libre/lirc-parabola/PKGBUILD              | 2 +-
 libre/tp_smapi-parabola-grsec/PKGBUILD    | 2 +-
 libre/tp_smapi-parabola-lts/PKGBUILD      | 2 +-
 libre/tp_smapi-parabola/PKGBUILD          | 2 +-
 libre/vhba-module-parabola-grsec/PKGBUILD | 2 +-
 libre/vhba-module-parabola-lts/PKGBUILD   | 2 +-
 libre/vhba-module-parabola/PKGBUILD       | 2 +-
 20 files changed, 27 insertions(+), 27 deletions(-)

(limited to 'libre')

diff --git a/libre/acpi_call-parabola-grsec/PKGBUILD b/libre/acpi_call-parabola-grsec/PKGBUILD
index af2e44bf2..06c4e4521 100644
--- a/libre/acpi_call-parabola-grsec/PKGBUILD
+++ b/libre/acpi_call-parabola-grsec/PKGBUILD
@@ -27,7 +27,7 @@ _replaces=("${_pkgname}" "${_pkgname}-libre")
 # Generic (you shouldn't have to modify any of these variables)
 pkgname=${_pkgname}-parabola${_kernelname}
 _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1)))
-_extramodules=extramodules-${_basekernel}${_kernelname:--PARABOLA}
+_extramodules=extramodules-${_basekernel}${_kernelname}
 depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}")
 makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}")
 replaces=( "${_replaces[@]/%/${_kernelname}}")
diff --git a/libre/acpi_call-parabola-lts/PKGBUILD b/libre/acpi_call-parabola-lts/PKGBUILD
index 8f03cbfb5..3b7bc0bf4 100644
--- a/libre/acpi_call-parabola-lts/PKGBUILD
+++ b/libre/acpi_call-parabola-lts/PKGBUILD
@@ -27,7 +27,7 @@ _replaces=("${_pkgname}" "${_pkgname}-libre")
 # Generic (you shouldn't have to modify any of these variables)
 pkgname=${_pkgname}-parabola${_kernelname}
 _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1)))
-_extramodules=extramodules-${_basekernel}${_kernelname:--PARABOLA}
+_extramodules=extramodules-${_basekernel}${_kernelname}
 depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}")
 makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}")
 replaces=( "${_replaces[@]/%/${_kernelname}}")
diff --git a/libre/acpi_call-parabola/PKGBUILD b/libre/acpi_call-parabola/PKGBUILD
index 480e8d48a..27e0ae3be 100644
--- a/libre/acpi_call-parabola/PKGBUILD
+++ b/libre/acpi_call-parabola/PKGBUILD
@@ -27,7 +27,7 @@ _replaces=("${_pkgname}" "${_pkgname}-libre")
 # Generic (you shouldn't have to modify any of these variables)
 pkgname=${_pkgname}-parabola${_kernelname}
 _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1)))
-_extramodules=extramodules-${_basekernel}${_kernelname:--PARABOLA}
+_extramodules=extramodules-${_basekernel}${_kernelname}
 depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}")
 makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}")
 replaces=( "${_replaces[@]/%/${_kernelname}}")
diff --git a/libre/bbswitch-parabola-grsec/PKGBUILD b/libre/bbswitch-parabola-grsec/PKGBUILD
index 7d2ea7c48..927d0e9e9 100644
--- a/libre/bbswitch-parabola-grsec/PKGBUILD
+++ b/libre/bbswitch-parabola-grsec/PKGBUILD
@@ -26,7 +26,7 @@ install='kmod.install'
 # Generic (you shouldn't have to modify any of these variables)
 pkgname=${_pkgname}-parabola${_kernelname}
 _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1)))
-_extramodules=extramodules-${_basekernel}${_kernelname:--PARABOLA}
+_extramodules=extramodules-${_basekernel}${_kernelname}
 depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}")
 makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}")
 replaces=( "${_pkgname}${_kernelname}") # for Arch-compatability
diff --git a/libre/bbswitch-parabola-lts/PKGBUILD b/libre/bbswitch-parabola-lts/PKGBUILD
index 59cf046ab..232250942 100644
--- a/libre/bbswitch-parabola-lts/PKGBUILD
+++ b/libre/bbswitch-parabola-lts/PKGBUILD
@@ -26,7 +26,7 @@ install='kmod.install'
 # Generic (you shouldn't have to modify any of these variables)
 pkgname=${_pkgname}-parabola${_kernelname}
 _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1)))
-_extramodules=extramodules-${_basekernel}${_kernelname:--PARABOLA}
+_extramodules=extramodules-${_basekernel}${_kernelname}
 depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}")
 makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}")
 replaces=( "${_pkgname}${_kernelname}") # for Arch-compatability
diff --git a/libre/bbswitch-parabola/PKGBUILD b/libre/bbswitch-parabola/PKGBUILD
index 83f37239b..633747617 100644
--- a/libre/bbswitch-parabola/PKGBUILD
+++ b/libre/bbswitch-parabola/PKGBUILD
@@ -26,7 +26,7 @@ install='kmod.install'
 # Generic (you shouldn't have to modify any of these variables)
 pkgname=${_pkgname}-parabola${_kernelname}
 _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1)))
-_extramodules=extramodules-${_basekernel}${_kernelname:--PARABOLA}
+_extramodules=extramodules-${_basekernel}${_kernelname}
 depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}")
 makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}")
 replaces=( "${_pkgname}${_kernelname}") # for Arch-compatability
diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD
index fc344bdfe..ffb4ad7fe 100644
--- a/libre/linux-libre-grsec/PKGBUILD
+++ b/libre/linux-libre-grsec/PKGBUILD
@@ -164,10 +164,10 @@ _package() {
   # gzip -9 all modules to save 100MB of space
   find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
   # make room for external modules
-  ln -s "../extramodules-${_basekernel}${_kernelname:--PARABOLA}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
+  ln -s "../extramodules-${_basekernel}${_kernelname}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
   # add real version for building modules and running depmod from post_install/upgrade
-  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--PARABOLA}"
-  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--PARABOLA}/version"
+  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname}"
+  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname}/version"
 
   # Now we call depmod...
   depmod -b "${pkgdir}" -F System.map "${_kernver}"
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 192de5963..c85f4e917 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -168,10 +168,10 @@ _package() {
   # gzip -9 all modules to save 100MB of space
   find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
   # make room for external modules
-  ln -s "../extramodules-${_basekernel}${_kernelname:--PARABOLA}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
+  ln -s "../extramodules-${_basekernel}${_kernelname}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
   # add real version for building modules and running depmod from post_install/upgrade
-  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--PARABOLA}"
-  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--PARABOLA}/version"
+  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname}"
+  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname}/version"
 
   # Now we call depmod...
   depmod -b "${pkgdir}" -F System.map "${_kernver}"
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 367ae5d54..efd308276 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -8,7 +8,7 @@
 # Contributor: Márcio Silva <coadde@parabola.nu>
 # Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 
-pkgbase=linux-libre         # Build stock -PARABOLA kernel
+pkgbase=linux-libre         # Build stock "" kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _pkgbasever=3.16-gnu
 _pkgver=3.16.1-gnu
@@ -155,10 +155,10 @@ _package() {
   # gzip -9 all modules to save 100MB of space
   find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
   # make room for external modules
-  ln -s "../extramodules-${_basekernel}${_kernelname:--PARABOLA}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
+  ln -s "../extramodules-${_basekernel}${_kernelname}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
   # add real version for building modules and running depmod from post_install/upgrade
-  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--PARABOLA}"
-  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--PARABOLA}/version"
+  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname}"
+  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname}/version"
 
   # Now we call depmod...
   depmod -b "${pkgdir}" -F System.map "${_kernver}"
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index 3a04607aa..4ae45413e 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -49,7 +49,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="-PARABOLA"
+CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index f6d137835..839fefb0f 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -50,7 +50,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="-PARABOLA"
+CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
diff --git a/libre/lirc-parabola-grsec/PKGBUILD b/libre/lirc-parabola-grsec/PKGBUILD
index 53e090f93..07f39c6e9 100644
--- a/libre/lirc-parabola-grsec/PKGBUILD
+++ b/libre/lirc-parabola-grsec/PKGBUILD
@@ -42,7 +42,7 @@ makedepends=('help2man' 'alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'python2
 
 # Generic (you shouldn't have to modify any of these variables)
 _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1)))
-_extramodules=extramodules-${_basekernel}${_kernelname:--PARABOLA}
+_extramodules=extramodules-${_basekernel}${_kernelname}
 makedepends+=("linux-libre${_kernelname}>=${_basekernel}"         "linux-libre${_kernelname}<${_toohigh}"
               "linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}")
 
diff --git a/libre/lirc-parabola-lts/PKGBUILD b/libre/lirc-parabola-lts/PKGBUILD
index beca86a2f..b1d4d8c64 100644
--- a/libre/lirc-parabola-lts/PKGBUILD
+++ b/libre/lirc-parabola-lts/PKGBUILD
@@ -42,7 +42,7 @@ makedepends=('help2man' 'alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'python2
 
 # Generic (you shouldn't have to modify any of these variables)
 _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1)))
-_extramodules=extramodules-${_basekernel}${_kernelname:--PARABOLA}
+_extramodules=extramodules-${_basekernel}${_kernelname}
 makedepends+=("linux-libre${_kernelname}>=${_basekernel}"         "linux-libre${_kernelname}<${_toohigh}"
               "linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}")
 
diff --git a/libre/lirc-parabola/PKGBUILD b/libre/lirc-parabola/PKGBUILD
index e22d22841..60b1f8674 100644
--- a/libre/lirc-parabola/PKGBUILD
+++ b/libre/lirc-parabola/PKGBUILD
@@ -44,7 +44,7 @@ makedepends=('help2man' 'alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'python2
 
 # Generic (you shouldn't have to modify any of these variables)
 _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1)))
-_extramodules=extramodules-${_basekernel}${_kernelname:--PARABOLA}
+_extramodules=extramodules-${_basekernel}${_kernelname}
 makedepends+=("linux-libre${_kernelname}>=${_basekernel}"         "linux-libre${_kernelname}<${_toohigh}"
               "linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}")
 
diff --git a/libre/tp_smapi-parabola-grsec/PKGBUILD b/libre/tp_smapi-parabola-grsec/PKGBUILD
index 65e23730b..b6c29a239 100644
--- a/libre/tp_smapi-parabola-grsec/PKGBUILD
+++ b/libre/tp_smapi-parabola-grsec/PKGBUILD
@@ -31,7 +31,7 @@ install='kmod.install'
 # Generic (you shouldn't have to modify any of these variables)
 pkgname=${_pkgname}-parabola${_kernelname}
 _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1)))
-_extramodules=extramodules-${_basekernel}${_kernelname:--PARABOLA}
+_extramodules=extramodules-${_basekernel}${_kernelname}
 depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}")
 makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}")
 replaces=( "${_pkgname}${_kernelname}") # for Arch-compatability
diff --git a/libre/tp_smapi-parabola-lts/PKGBUILD b/libre/tp_smapi-parabola-lts/PKGBUILD
index 4dffb2e0c..fd59dd37b 100644
--- a/libre/tp_smapi-parabola-lts/PKGBUILD
+++ b/libre/tp_smapi-parabola-lts/PKGBUILD
@@ -31,7 +31,7 @@ install='kmod.install'
 # Generic (you shouldn't have to modify any of these variables)
 pkgname=${_pkgname}-parabola${_kernelname}
 _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1)))
-_extramodules=extramodules-${_basekernel}${_kernelname:--PARABOLA}
+_extramodules=extramodules-${_basekernel}${_kernelname}
 depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}")
 makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}")
 replaces=( "${_pkgname}${_kernelname}") # for Arch-compatability
diff --git a/libre/tp_smapi-parabola/PKGBUILD b/libre/tp_smapi-parabola/PKGBUILD
index 46bae3029..30901436c 100644
--- a/libre/tp_smapi-parabola/PKGBUILD
+++ b/libre/tp_smapi-parabola/PKGBUILD
@@ -31,7 +31,7 @@ install='kmod.install'
 # Generic (you shouldn't have to modify any of these variables)
 pkgname=${_pkgname}-parabola${_kernelname}
 _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1)))
-_extramodules=extramodules-${_basekernel}${_kernelname:--PARABOLA}
+_extramodules=extramodules-${_basekernel}${_kernelname}
 depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}")
 makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}")
 replaces=( "${_pkgname}${_kernelname}") # for Arch-compatability
diff --git a/libre/vhba-module-parabola-grsec/PKGBUILD b/libre/vhba-module-parabola-grsec/PKGBUILD
index ec010b212..96aa61aa4 100644
--- a/libre/vhba-module-parabola-grsec/PKGBUILD
+++ b/libre/vhba-module-parabola-grsec/PKGBUILD
@@ -29,7 +29,7 @@ install=$_pkgname.install
 # Generic (you shouldn't have to modify any of these variables)
 pkgname=${_pkgname}-parabola${_kernelname}
 _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1)))
-_extramodules=extramodules-${_basekernel}${_kernelname:--PARABOLA}
+_extramodules=extramodules-${_basekernel}${_kernelname}
 depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}")
 makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}")
 replaces=( "${_pkgname}${_kernelname}") # for Arch-compatability
diff --git a/libre/vhba-module-parabola-lts/PKGBUILD b/libre/vhba-module-parabola-lts/PKGBUILD
index 119c0ae55..a56873b2a 100644
--- a/libre/vhba-module-parabola-lts/PKGBUILD
+++ b/libre/vhba-module-parabola-lts/PKGBUILD
@@ -29,7 +29,7 @@ install=$_pkgname.install
 # Generic (you shouldn't have to modify any of these variables)
 pkgname=${_pkgname}-parabola${_kernelname}
 _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1)))
-_extramodules=extramodules-${_basekernel}${_kernelname:--PARABOLA}
+_extramodules=extramodules-${_basekernel}${_kernelname}
 depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}")
 makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}")
 replaces=( "${_pkgname}${_kernelname}") # for Arch-compatability
diff --git a/libre/vhba-module-parabola/PKGBUILD b/libre/vhba-module-parabola/PKGBUILD
index ae08287c3..c3af30632 100644
--- a/libre/vhba-module-parabola/PKGBUILD
+++ b/libre/vhba-module-parabola/PKGBUILD
@@ -29,7 +29,7 @@ install=$_pkgname.install
 # Generic (you shouldn't have to modify any of these variables)
 pkgname=${_pkgname}-parabola${_kernelname}
 _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1)))
-_extramodules=extramodules-${_basekernel}${_kernelname:--PARABOLA}
+_extramodules=extramodules-${_basekernel}${_kernelname}
 depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}")
 makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}")
 replaces=( "${_pkgname}${_kernelname}") # for Arch-compatability
-- 
cgit v1.2.3