linux-libre*: remove extra CONFIG_LOCALVERSION* and disable CONFIG_LOCALVERSION_AUTO

11 files changed, 14 insertions, 49 deletions

diff --git a/kernels/linux-libre-lts-knock/PKGBUILD b/kernels/linux-libre-lts-knock/PKGBUILD
index 20d9dbfbe..301930071 100644
--- a/kernels/linux-libre-lts-knock/PKGBUILD
+++ b/kernels/linux-libre-lts-knock/PKGBUILD
@@ -89,11 +89,6 @@ prepare() {
 
   cat "${srcdir}/config.${CARCH}" > ./.config
 
-  if [ "${_kernelname}" != "" ]; then
-    sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
-    sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|CONFIG_LOCALVERSION_AUTO=n|" ./.config
-  fi
-
   # append pkgrel to extraversion
   sed -ri "s|^(EXTRAVERSION =.*\S).*|\1-${pkgrel}|" Makefile
 
diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD
index 2fd037ac3..e024c11e4 100644
--- a/kernels/linux-libre-pae/PKGBUILD
+++ b/kernels/linux-libre-pae/PKGBUILD
@@ -69,11 +69,6 @@ prepare() {
 
   cat "${srcdir}/config" > ./.config # simpler
 
-  if [ "${_kernelname}" != "" ]; then
-    sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
-    sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|CONFIG_LOCALVERSION_AUTO=n|" ./.config
-  fi
-
   # append pkgrel to extraversion
   sed -ri "s|^(EXTRAVERSION =.*\S).*|\1-${pkgrel}|" Makefile
 
diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD
index f0c6c4b31..b53adda24 100644
--- a/kernels/linux-libre-rt/PKGBUILD
+++ b/kernels/linux-libre-rt/PKGBUILD
@@ -47,8 +47,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasekernel}
 sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b'
             'bdb59c597c883cc0f78cebccca5652e79b63f30e1d497e0560737ba66a48ae27'
             'aedc16bf897b0a1b0789158afad9ffed92be30eaedf8fe2f27cad659673dc93e'
-            '84a7e8d8ffb308f74e3e0bdfec81ac918ae90a6cad579ed5452481b5f5ceb003'
-            '23e14dbfc4f4f2991ed532ce07a856fa168ff74404d0c4e7f736147c8ebf41a3'
+            'bf045f04e45ed068c1d79e48915039edb56db6e0e18aa84bdd84335f0d211801'
+            '7dacc05e0d5cae7e176ed6f668a17ec43334daed58653847326e271b48c45aba'
             ''
             'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
             '074b67818582874146c389c029bc43648d145891a27e47aa2c5c42d3571f0264'
@@ -60,7 +60,7 @@ sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b'
             '65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d'
             'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7'
             'b0107c64c582f7c6fa2e0c7c32a5f944c644f53b5df04667d487731b3c3b4060'
-            '')
+            '3baf1279805edd561e80877a1baf32d98fe07220dc6e7cb4ced73ab531947bc4')
 
 _kernelname=${pkgbase#linux-libre}
 _replaces=("${_replaces[@]/\%/${_kernelname}}")
@@ -112,11 +112,6 @@ prepare() {
 
   cat "${srcdir}/config.${CARCH}" > ./.config
 
-  if [ "${_kernelname}" != "" ]; then
-    sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
-    sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|CONFIG_LOCALVERSION_AUTO=n|" ./.config
-  fi
-
   # append pkgrel to extraversion
   sed -ri "s|^(EXTRAVERSION =.*\S).*|\1-${pkgrel}|" Makefile
 
diff --git a/kernels/linux-libre-rt/config.i686 b/kernels/linux-libre-rt/config.i686
index b41244be5..f6a2bff37 100644
--- a/kernels/linux-libre-rt/config.i686
+++ b/kernels/linux-libre-rt/config.i686
@@ -51,7 +51,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
 CONFIG_LOCALVERSION="-rt"
-CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
 CONFIG_HAVE_KERNEL_LZMA=y
diff --git a/kernels/linux-libre-rt/config.x86_64 b/kernels/linux-libre-rt/config.x86_64
index eaf8ad676..130e9c6c2 100644
--- a/kernels/linux-libre-rt/config.x86_64
+++ b/kernels/linux-libre-rt/config.x86_64
@@ -52,7 +52,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
 CONFIG_LOCALVERSION="-rt"
-CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
 CONFIG_HAVE_KERNEL_LZMA=y
diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD
index b1b9e26ff..7d251f4c5 100644
--- a/kernels/linux-libre-xen/PKGBUILD
+++ b/kernels/linux-libre-xen/PKGBUILD
@@ -69,11 +69,6 @@ prepare() {
 
   cat "${srcdir}/config" > ./.config # simpler
 
-  if [ "${_kernelname}" != "" ]; then
-    sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
-    sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|CONFIG_LOCALVERSION_AUTO=n|" ./.config
-  fi
-
   # append pkgrel to extraversion
   sed -ri "s|^(EXTRAVERSION =.*\S).*|\1-${pkgrel}|" Makefile
 
diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD
index a6ab2b46b..0960fcc90 100644
--- a/libre/linux-libre-grsec/PKGBUILD
+++ b/libre/linux-libre-grsec/PKGBUILD
@@ -51,7 +51,7 @@ sha256sums=('93450dc189131b6a4de862f35c5087a58cc7bae1c24caa535d2357cc3301b688'
             '2e87a8ec1cc0c91938cac24992d8a3d4362b3e9d939767e4c9d2ec8e6d969d53'
             'f67f60a30bcf2e9a2ba88ad97cace308da7a7f94919bb95c3dc030f5885a8015'
             'faced4eb4c47c4eb1a9ee8a5bf8a7c4b49d6b4d78efbe426e410730e6267d182'
-            '')
+            '3854de5c0be17555dc0c5b4ec4e831225eaacf413395d74568a06abcddf3a242')
 
 _kernelname=${pkgbase#linux-libre}
 _replaces=("${_replaces[@]/\%/${_kernelname}}")
@@ -90,11 +90,6 @@ prepare() {
 
   cat "${srcdir}/config.${CARCH}" > ./.config
 
-  if [ "${_kernelname}" != "" ]; then
-    sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
-    sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|CONFIG_LOCALVERSION_AUTO=n|" ./.config
-  fi
-
   # append pkgrel to extraversion
   sed -ri "s|^(EXTRAVERSION =.*\S).*|\1-${_timestamp}-${pkgrel}|" Makefile
 
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 8858fce8e..ae375b6f1 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -41,7 +41,7 @@ sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b'
             '9e7dcc90121995024632476d50286b62dbb73da20a7970653a2d72a0a98406c0'
             '35f283689c4f8b346bc05ac57c3cce50a61a1d0c11a665fc1abf519bb3f1beea'
             'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
-            ''
+            'b053633d23d85972e5a99a83dc93bdab9b8aa1ab8450e98e3b84b46faa669fef'
             '074b67818582874146c389c029bc43648d145891a27e47aa2c5c42d3571f0264'
             '2e87a8ec1cc0c91938cac24992d8a3d4362b3e9d939767e4c9d2ec8e6d969d53'
             'f67f60a30bcf2e9a2ba88ad97cace308da7a7f94919bb95c3dc030f5885a8015'
@@ -50,7 +50,7 @@ sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b'
             '52dec83a8805a8642d74d764494acda863e0aa23e3d249e80d4b457e20a3fd29'
             '65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d'
             'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7'
-            '')
+            '3baf1279805edd561e80877a1baf32d98fe07220dc6e7cb4ced73ab531947bc4')
 
 _kernelname=${pkgbase#linux-libre}
 _replaces=("${_replaces[@]/\%/${_kernelname}}")
@@ -96,11 +96,6 @@ prepare() {
 
   cat "${srcdir}/config.${CARCH}" > ./.config
 
-  if [ "${_kernelname}" != "" ]; then
-    sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
-    sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|CONFIG_LOCALVERSION_AUTO=n|" ./.config
-  fi
-
   # append pkgrel to extraversion
   sed -ri "s|^(EXTRAVERSION =.*\S).*|\1-${pkgrel}|" Makefile
 
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 486038263..c7ca22124 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -35,16 +35,16 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
         '3.16-7981337ad0-loongson-community.patch')
 sha256sums=('9c2a524c901febe0f0138f702bfdeb52d6f79f22c1fdbabaa37580bc70f16218'
             '3bbc78694d76b12b6229799d7c4daf5215b9dd731908d96b03603aceb54ad5c7'
-            '65739ffbc01d1ecea8328130b14e0258aa036e37ede2f0b1aa9b8efa2ad68a66'
-            '0d827a89f8955e1f39b6a6d10887d1ca7a46b42cc4417bf823eb9f260c26f660'
-            ''
+            'df929e6e3ca5aa23ef7c4fb5c30b5a7757588ffcd1841fffa8e064feaa6c7834'
+            '10035cb6b7d4ce90b3743f0ada64364d1d03556589d1dc754caebd0f5919848b'
+            '44e9c253df7a7d1457e01f36dbd93f7c713c7e02e8a56f6e85a287f35e556bce'
             'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
             '074b67818582874146c389c029bc43648d145891a27e47aa2c5c42d3571f0264'
             '2e87a8ec1cc0c91938cac24992d8a3d4362b3e9d939767e4c9d2ec8e6d969d53'
             'f67f60a30bcf2e9a2ba88ad97cace308da7a7f94919bb95c3dc030f5885a8015'
             '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
             'f36f61a0a72bcb0a9c04264343503bfbf927c9ea0db819e66734a3933b060588'
-            '')
+            'fc78b69f6c0709f5170bfd609e8dc6c96291ea920ddbd4b5166448477b1f6619')
 
 _kernelname=${pkgbase#linux-libre}
 _replaces=("${_replaces[@]/\%/${_kernelname}}")
@@ -82,11 +82,6 @@ prepare() {
 
   cat "${srcdir}/config.${CARCH}" > ./.config
 
-  if [ "${_kernelname}" == "" ]; then
-    sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
-    sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|CONFIG_LOCALVERSION_AUTO=n|" ./.config
-  fi
-
   # append pkgrel to extraversion
   sed -ri "s|^(EXTRAVERSION =.*\S).*|\1-${pkgrel}|" Makefile
 
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index 526d232f7..66da5b7ad 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -50,7 +50,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
 CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
 CONFIG_HAVE_KERNEL_LZMA=y
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index 19b60ec42..92607b43e 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -51,7 +51,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
 CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
 CONFIG_HAVE_KERNEL_LZMA=y