summaryrefslogtreecommitdiff
path: root/libre/linux-libre
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 06:30:49 +0200
commit2c0e4d1e9bf9a8ec731ac35aabcbfd265ccb866e (patch)
tree8786b93cc859afc2fd69eb271ed1002394346f8c /libre/linux-libre
parent6201066a6bf0ab5cae37202993700a0571f01e15 (diff)
downloadabslibre-2c0e4d1e9bf9a8ec731ac35aabcbfd265ccb866e.tar.gz
abslibre-2c0e4d1e9bf9a8ec731ac35aabcbfd265ccb866e.tar.bz2
abslibre-2c0e4d1e9bf9a8ec731ac35aabcbfd265ccb866e.zip
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>
Diffstat (limited to 'libre/linux-libre')
-rw-r--r--libre/linux-libre/PKGBUILD30
-rw-r--r--libre/linux-libre/parabola-armv7h_defconfig (renamed from libre/linux-libre/config.armv7h)0
-rw-r--r--libre/linux-libre/parabola-i686_defconfig (renamed from libre/linux-libre/config.i686)0
-rw-r--r--libre/linux-libre/parabola-x86_64_defconfig (renamed from libre/linux-libre/config.x86_64)0
4 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)"
diff --git a/libre/linux-libre/config.armv7h b/libre/linux-libre/parabola-armv7h_defconfig
index 6df26b56d..6df26b56d 100644
--- a/libre/linux-libre/config.armv7h
+++ b/libre/linux-libre/parabola-armv7h_defconfig
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/parabola-i686_defconfig
index 8e0fff3ad..8e0fff3ad 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/parabola-i686_defconfig
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/parabola-x86_64_defconfig
index dec54ff59..dec54ff59 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/parabola-x86_64_defconfig