This commit is contained in:
Jan Alexander Steffens 2018-02-04 03:48:24 +00:00
parent 77f03fcad0
commit 4d3aeddeb1
2 changed files with 24 additions and 36 deletions

View File

@ -4,7 +4,7 @@
pkgbase=linux # Build stock -ARCH kernel pkgbase=linux # Build stock -ARCH kernel
#pkgbase=linux-custom # Build kernel with a different name #pkgbase=linux-custom # Build kernel with a different name
_srcname=linux-4.15 _srcname=linux-4.15
pkgver=4.15 pkgver=4.15.1
pkgrel=1 pkgrel=1
arch=('x86_64') arch=('x86_64')
url="https://www.kernel.org/" url="https://www.kernel.org/"
@ -12,14 +12,12 @@ license=('GPL2')
makedepends=('xmlto' 'kmod' 'inetutils' 'bc' 'libelf') makedepends=('xmlto' 'kmod' 'inetutils' 'bc' 'libelf')
options=('!strip') options=('!strip')
source=( source=(
"https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.{xz,sign}
"https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.sign" https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.{xz,sign}
#"https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz" config # the main kernel config file
#"https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.sign" 60-linux.hook # pacman hook for depmod
'config' # the main kernel config file 90-linux.hook # pacman hook for initramfs regeneration
'60-linux.hook' # pacman hook for depmod linux.preset # standard config files for mkinitcpio ramdisk
'90-linux.hook' # pacman hook for initramfs regeneration
'linux.preset' # standard config files for mkinitcpio ramdisk
0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
) )
@ -29,7 +27,9 @@ validpgpkeys=(
) )
sha256sums=('5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769' sha256sums=('5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769'
'SKIP' 'SKIP'
'8e80162a2d8952b7e0a4967647eed940b2b983e950bfe630918bd90cb1107a25' '202a0a34f221ae335de096c292927d7a7d4bcdbc2dd46d43b8a5f6420f95a0cf'
'SKIP'
'991672fadc4b0346a4cede2cd51e6c8760cde996780e56f7e372d1d5ab66fb3a'
'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
'75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919' '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
@ -37,14 +37,13 @@ sha256sums=('5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769'
'ac996455cddccc312d93e63845d92b2d8ab8fb53208a221948d28c76c678d215') 'ac996455cddccc312d93e63845d92b2d8ab8fb53208a221948d28c76c678d215')
_kernelname=${pkgbase#linux} _kernelname=${pkgbase#linux}
: ${_kernelname:=-ARCH}
prepare() { prepare() {
cd ${_srcname} cd ${_srcname}
# add upstream patch # add upstream patch
#patch -p1 -i ../patch-${pkgver} patch -p1 -i ../patch-${pkgver}
# security patches
# add latest fixes from stable queue, if needed # add latest fixes from stable queue, if needed
# http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
@ -55,15 +54,13 @@ prepare() {
# https://bugs.archlinux.org/task/56711 # https://bugs.archlinux.org/task/56711
patch -Np1 -i ../0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch patch -Np1 -i ../0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
cp -Tf ../config .config cat ../config - >.config <<END
CONFIG_LOCALVERSION="${_kernelname}"
if [ "${_kernelname}" != "" ]; then CONFIG_LOCALVERSION_AUTO=n
sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config END
sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|CONFIG_LOCALVERSION_AUTO=n|" ./.config
fi
# set extraversion to pkgrel # set extraversion to pkgrel
sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile sed -i "/^EXTRAVERSION =/s/=.*/= -${pkgrel}/" Makefile
# don't run depmod on 'make install'. We'll do this ourselves in packaging # don't run depmod on 'make install'. We'll do this ourselves in packaging
sed -i '2iexit 0' scripts/depmod.sh sed -i '2iexit 0' scripts/depmod.sh
@ -109,7 +106,7 @@ _package() {
cp arch/x86/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgbase}" cp arch/x86/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgbase}"
# make room for external modules # make room for external modules
local _extramodules="extramodules-${_basekernel}${_kernelname:--ARCH}" local _extramodules="extramodules-${_basekernel}${_kernelname}"
ln -s "../${_extramodules}" "${pkgdir}/usr/lib/modules/${_kernver}/extramodules" ln -s "../${_extramodules}" "${pkgdir}/usr/lib/modules/${_kernver}/extramodules"
# add real version for building modules and running depmod from hook # add real version for building modules and running depmod from hook

21
config
View File

@ -116,7 +116,7 @@ CONFIG_NO_HZ_COMMON=y
# CONFIG_NO_HZ_IDLE is not set # CONFIG_NO_HZ_IDLE is not set
CONFIG_NO_HZ_FULL=y CONFIG_NO_HZ_FULL=y
# CONFIG_NO_HZ_FULL_ALL is not set # CONFIG_NO_HZ_FULL_ALL is not set
# CONFIG_NO_HZ is not set CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y CONFIG_HIGH_RES_TIMERS=y
# #
@ -809,7 +809,8 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
# #
# CPU frequency scaling drivers # CPU frequency scaling drivers
# #
# CONFIG_CPUFREQ_DT is not set CONFIG_CPUFREQ_DT=m
CONFIG_CPUFREQ_DT_PLATDEV=y
CONFIG_X86_INTEL_PSTATE=y CONFIG_X86_INTEL_PSTATE=y
CONFIG_X86_PCC_CPUFREQ=m CONFIG_X86_PCC_CPUFREQ=m
CONFIG_X86_ACPI_CPUFREQ=m CONFIG_X86_ACPI_CPUFREQ=m
@ -850,8 +851,8 @@ CONFIG_PCIEAER=y
CONFIG_PCIEASPM=y CONFIG_PCIEASPM=y
# CONFIG_PCIEASPM_DEBUG is not set # CONFIG_PCIEASPM_DEBUG is not set
# CONFIG_PCIEASPM_DEFAULT is not set # CONFIG_PCIEASPM_DEFAULT is not set
# CONFIG_PCIEASPM_POWERSAVE is not set CONFIG_PCIEASPM_POWERSAVE=y
CONFIG_PCIEASPM_POWER_SUPERSAVE=y # CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
# CONFIG_PCIEASPM_PERFORMANCE is not set # CONFIG_PCIEASPM_PERFORMANCE is not set
CONFIG_PCIE_PME=y CONFIG_PCIE_PME=y
CONFIG_PCIE_DPC=y CONFIG_PCIE_DPC=y
@ -7623,17 +7624,7 @@ CONFIG_SPEAKUP_SYNTH_SPKOUT=m
CONFIG_SPEAKUP_SYNTH_TXPRT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m
CONFIG_SPEAKUP_SYNTH_DUMMY=m CONFIG_SPEAKUP_SYNTH_DUMMY=m
CONFIG_STAGING_MEDIA=y CONFIG_STAGING_MEDIA=y
CONFIG_INTEL_ATOMISP=y # CONFIG_INTEL_ATOMISP is not set
CONFIG_VIDEO_ATOMISP=m
CONFIG_VIDEO_ATOMISP_OV5693=m
CONFIG_VIDEO_ATOMISP_OV2722=m
CONFIG_VIDEO_ATOMISP_GC2235=m
CONFIG_VIDEO_ATOMISP_OV8858=m
CONFIG_VIDEO_ATOMISP_MSRLIST_HELPER=m
CONFIG_VIDEO_ATOMISP_MT9M114=m
CONFIG_VIDEO_ATOMISP_GC0310=m
CONFIG_VIDEO_ATOMISP_OV2680=m
CONFIG_VIDEO_ATOMISP_LM3554=m
CONFIG_I2C_BCM2048=m CONFIG_I2C_BCM2048=m
CONFIG_DVB_CXD2099=m CONFIG_DVB_CXD2099=m
CONFIG_LIRC_STAGING=y CONFIG_LIRC_STAGING=y