[arch-commits] Commit in linux-zen/trunk (PKGBUILD config)
Jan Steffens
heftig at archlinux.org
Sun Feb 4 03:48:27 UTC 2018
Date: Sunday, February 4, 2018 @ 03:48:26
Author: heftig
Revision: 315831
4.15.1-1
Modified:
linux-zen/trunk/PKGBUILD
linux-zen/trunk/config
----------+
PKGBUILD | 52 ++++++++++++++++++++++++----------------------------
config | 21 ++++++---------------
2 files changed, 30 insertions(+), 43 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-02-04 03:48:24 UTC (rev 315830)
+++ PKGBUILD 2018-02-04 03:48:26 UTC (rev 315831)
@@ -3,11 +3,11 @@
# Contributor: Tobias Powalowski <tpowa at archlinux.org>
# Contributor: Thomas Baechler <thomas at archlinux.org>
-pkgbase=linux-zen # Build -zen kernel
+pkgbase=linux-zen # Build stock -zen kernel
#pkgbase=linux-custom # Build kernel with a different name
_srcname=linux-4.15
-_zenpatch=zen-4.15-0ec9904b5ddaaae80333758f49b0a6e0982156f9.diff
-pkgver=4.15
+_zenpatch=zen-4.15.1-055cf9dd86d188d8a929228794a7695210231580.diff
+pkgver=4.15.1
pkgrel=1
arch=('x86_64')
url="https://github.com/zen-kernel/zen-kernel"
@@ -15,16 +15,13 @@
makedepends=('xmlto' 'kmod' 'inetutils' 'bc' 'libelf')
options=('!strip')
source=(
- "https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
- "https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.sign"
- #"https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz"
- #"https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.sign"
- "https://pkgbuild.com/~heftig/zen-patches/${_zenpatch}.xz"
- "https://pkgbuild.com/~heftig/zen-patches/${_zenpatch}.sign"
- 'config' # the main kernel config file
- '60-linux.hook' # pacman hook for depmod
- '90-linux.hook' # pacman hook for initramfs regeneration
- 'linux.preset' # standard config files for mkinitcpio ramdisk
+ https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.{xz,sign}
+ https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.{xz,sign}
+ https://pkgbuild.com/~heftig/zen-patches/${_zenpatch}.{xz,sign}
+ config # the main kernel config file
+ 60-linux.hook # pacman hook for depmod
+ 90-linux.hook # pacman hook for initramfs regeneration
+ linux.preset # standard config files for mkinitcpio ramdisk
)
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
@@ -33,38 +30,37 @@
)
sha256sums=('5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769'
'SKIP'
- '3fe1e6d40a0815b779208aff12e9e2df5bf00a34671a8a1d09ab966b303a09a2'
+ '202a0a34f221ae335de096c292927d7a7d4bcdbc2dd46d43b8a5f6420f95a0cf'
'SKIP'
- '3a9abcfa72a369aa35e7345fe46360d912aefa603334b194d3680eff8b1fc276'
+ '4184278fd05b8b1f405591459d7a1dc073589f2dfb15d8fdf7a23c6fad4ff8cd'
+ 'SKIP'
+ '1d66844a347c9910600648258eeca15b50001c4b3f8224fdac271a3c6814624e'
'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
'75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65')
_kernelname=${pkgbase#linux}
+: ${_kernelname:=-ARCH}
prepare() {
cd ${_srcname}
# add upstream patch
- #patch -p1 -i ../patch-${pkgver}
+ patch -p1 -i ../patch-${pkgver}
- # security patches
+ # add zen patch
+ patch -p1 -i ../${_zenpatch}
# add latest fixes from stable queue, if needed
# http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
- # add zen patch
- patch -p1 -i ../${_zenpatch}
+ cat ../config - >.config <<END
+CONFIG_LOCALVERSION="${_kernelname}"
+CONFIG_LOCALVERSION_AUTO=n
+END
- cp -Tf ../config .config
-
- if [ "${_kernelname}" != "" ]; then
- sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
- sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|CONFIG_LOCALVERSION_AUTO=n|" ./.config
- fi
-
# 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
sed -i '2iexit 0' scripts/depmod.sh
@@ -110,7 +106,7 @@
cp arch/x86/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgbase}"
# 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"
# add real version for building modules and running depmod from hook
Modified: config
===================================================================
--- config 2018-02-04 03:48:24 UTC (rev 315830)
+++ config 2018-02-04 03:48:26 UTC (rev 315831)
@@ -118,7 +118,7 @@
# CONFIG_NO_HZ_IDLE is not set
CONFIG_NO_HZ_FULL=y
# CONFIG_NO_HZ_FULL_ALL is not set
-# CONFIG_NO_HZ is not set
+CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
#
@@ -837,7 +837,8 @@
#
# 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_PCC_CPUFREQ=m
CONFIG_X86_ACPI_CPUFREQ=m
@@ -878,8 +879,8 @@
CONFIG_PCIEASPM=y
# CONFIG_PCIEASPM_DEBUG is not set
# CONFIG_PCIEASPM_DEFAULT is not set
-# CONFIG_PCIEASPM_POWERSAVE is not set
-CONFIG_PCIEASPM_POWER_SUPERSAVE=y
+CONFIG_PCIEASPM_POWERSAVE=y
+# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
# CONFIG_PCIEASPM_PERFORMANCE is not set
CONFIG_PCIE_PME=y
CONFIG_PCIE_DPC=y
@@ -7653,17 +7654,7 @@
CONFIG_SPEAKUP_SYNTH_TXPRT=m
CONFIG_SPEAKUP_SYNTH_DUMMY=m
CONFIG_STAGING_MEDIA=y
-CONFIG_INTEL_ATOMISP=y
-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_INTEL_ATOMISP is not set
CONFIG_I2C_BCM2048=m
CONFIG_DVB_CXD2099=m
CONFIG_LIRC_STAGING=y
More information about the arch-commits
mailing list