summaryrefslogtreecommitdiff
path: root/kernels/linux-libre-x86_64
diff options
context:
space:
mode:
authorDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2019-05-21 20:59:34 +0200
committerDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2019-05-22 07:48:34 +0200
commitf72298ff967e2c8ad1a35ed76be30d45756e0bc8 (patch)
treebfa6c8059e084e9c1be8aaaa295f305c224a7ec2 /kernels/linux-libre-x86_64
parentb363424b708c8998fcb86f5d30402a83fd49a8d7 (diff)
kernels: linux-libre-x86_64: 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. Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Diffstat (limited to 'kernels/linux-libre-x86_64')
-rw-r--r--kernels/linux-libre-x86_64/PKGBUILD21
-rw-r--r--kernels/linux-libre-x86_64/parabola-x86_64_defconfig (renamed from kernels/linux-libre-x86_64/config.x86_64)0
2 files changed, 14 insertions, 7 deletions
diff --git a/kernels/linux-libre-x86_64/PKGBUILD b/kernels/linux-libre-x86_64/PKGBUILD
index 993a0489a..ecb93f844 100644
--- a/kernels/linux-libre-x86_64/PKGBUILD
+++ b/kernels/linux-libre-x86_64/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=2
+pkgrel=3
arch=(i686)
url='https://linux-libre.fsfla.org/'
license=(GPL2)
@@ -34,8 +35,7 @@ source=(
"https://repo.parabola.nu/other/linux-libre/logos/logo_linux_"{clut224.ppm,vga16.ppm,mono.pbm}{,.sig}
"https://repo.parabola.nu/other/linux-libre/logos/logo_linux_mono.pbm"{,.sig}
"https://repo.parabola.nu/other/linux-libre/logos/logo_linux_vga16.ppm"{,.sig}
- # the kernel config file
- config.x86_64 # the main kernel config file
+ parabola-x86_64_defconfig # the kernel configuration for the x86_64 architecture
60-linux.hook # pacman hook for depmod
90-linux.hook # pacman hook for initramfs regeneration
linux.preset # standard config files for mkinitcpio ramdisk
@@ -95,15 +95,22 @@ prepare() {
install -m644 -t drivers/video/logo \
../logo_linux_{clut224.ppm,vga16.ppm,mono.pbm}
+ # 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-x86_64_defconfig arch/x86/configs/
+ msg2 "Setting config..."
+ make CROSS_COMPILE=x86_64-pc-linux-gnu- parabola-x86_64_defconfig
+ # end of Parabola changes
+
msg2 "Setting version..."
scripts/setlocalversion --save-scmversion
echo "-$pkgrel" > localversion.10-pkgrel
echo "$_kernelname" > localversion.20-pkgname
- msg2 "Setting config..."
- cp ../config.x86_64 .config
- make olddefconfig
-
make -s kernelrelease > ../version
msg2 "Prepared %s version %s" "$pkgbase" "$(<../version)"
}
diff --git a/kernels/linux-libre-x86_64/config.x86_64 b/kernels/linux-libre-x86_64/parabola-x86_64_defconfig
index dec54ff59..dec54ff59 100644
--- a/kernels/linux-libre-x86_64/config.x86_64
+++ b/kernels/linux-libre-x86_64/parabola-x86_64_defconfig