diff options
| -rw-r--r-- | kernels/linux-libre-x86_64/PKGBUILD | 21 | ||||
| -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 |