kernels: linux-libre: configuration: make sure that no user input is required

Sometimes the defconfig and the source code are out of sync, this
can result in issues like this one:
  |  ==> Starting build()...
  |  scripts/kconfig/conf  --syncconfig Kconfig
  |  *
  |  * Restart config...
  |  *
  |  *
  |  * General architecture-dependent options
  |  *
  |  OProfile system profiling (OPROFILE) [M/n/y/?] m
  |    OProfile multiplexing support (EXPERIMENTAL) (OPROFILE_EVENT_MULTIPLEX) [N/y/?] n
  |  Kprobes (KPROBES) [Y/n/?] y
  |  Optimize very unlikely/likely branches (JUMP_LABEL) [Y/n/?] y
  |    Static key selftest (STATIC_KEYS_SELFTEST) [N/y/?] n
  |  Stack Protector buffer overflow detection (STACKPROTECTOR) [Y/n/?] (NEW)

This makes sure that in such case, the default choice is used instead of
asking the user about it.

This feature has been requested by bill-auger as part of this bugreport:
https://labs.parabola.nu/issues/2319

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>

1 files changed, 21 insertions, 9 deletions

diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 9e80fdd0e..43c009f1a 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -6,6 +6,7 @@
 # Contributor: Michał Masłowski <mtjm@mtjm.eu>
 # Contributor: Luke R. <g4jc@openmailbox.org>
 # Contributor: Andreas Grapentin <andreas@grapentin.org>
+# Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 
 # Based on linux package
 
@@ -21,7 +22,7 @@ _replacesoldmodules=() # '%' gets replaced with _kernelname
 _srcname=linux-${_srcbasever%-*}
 _archpkgver=${_srcver%-*}
 pkgver=${_srcver//-/_}
-pkgrel=1
+pkgrel=2
 rcnrel=armv7-x3
 arch=(i686 x86_64 armv7h)
 url='https://linux-libre.fsfla.org/'
@@ -33,7 +34,9 @@ source=(
   "https://linux-libre.fsfla.org/pub/linux-libre/releases/$_srcbasever/linux-libre-$_srcbasever.tar.xz"{,.sign}
   "https://linux-libre.fsfla.org/pub/linux-libre/releases/$_srcver/patch-$_srcbasever-$_srcver.xz"{,.sign}
   "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_"{clut224.ppm,vga16.ppm,mono.pbm}{,.sig}
-  config.i686 config.x86_64 config.armv7h    # the main kernel config files
+  parabola-i686_defconfig                    # the kernel configuration for the i686 architecture
+  parabola-x86_64_defconfig                  # the kernel configuration for the x86_64 architecture
+  parabola-armv7h_defconfig                  # the kernel configuration for the armv7h architecture
   60-linux.hook                              # pacman hook for depmod
   90-linux.hook                              # pacman hook for initramfs regeneration
   linux.preset                               # standard config files for mkinitcpio ramdisk
@@ -121,11 +124,6 @@ prepare() {
   install -m644 -t drivers/video/logo \
     ../logo_linux_{clut224.ppm,vga16.ppm,mono.pbm}
 
-  msg2 "Setting version..."
-  scripts/setlocalversion --save-scmversion
-  echo "-$pkgrel" > localversion.10-pkgrel
-  echo "$_kernelname" > localversion.20-pkgname
-
   if [ "$CARCH" = "armv7h" ]; then
     # RCN patch (CM3 firmware deblobbed and AUFS/WireGuard removed)
     # Note: For stability reasons, AUFS has been removed in the RCN patch.
@@ -150,9 +148,23 @@ prepare() {
     patch -Np1 < "../$src"
   done
 
+  # Parabola changes
+  # Copy the parabola configuration in the source code
+  # - This makes sure that all the configuration of all
+  #   architectures are available in the source code
+  # - Using the built-in kenrel mechanism should take
+  #   care of making sure that no user input is required
+  cp -f ../parabola-armv7h_defconfig arch/arm/configs/
+  cp -f ../parabola-i686_defconfig arch/x86/configs/
+  cp -f ../parabola-x86_64_defconfig arch/x86/configs/
   msg2 "Setting config..."
-  cp ../config.$CARCH .config
-  make olddefconfig
+  make parabola-${CARCH}_defconfig
+  # end of Parabola changes
+
+  msg2 "Setting version..."
+  scripts/setlocalversion --save-scmversion
+  echo "-$pkgrel" > localversion.10-pkgrel
+  echo "$_kernelname" > localversion.20-pkgname
 
   make -s kernelrelease > ../version
   msg2 "Prepared %s version %s" "$pkgbase" "$(<../version)"