From d5298e301bac5da6dd0ea6d6da682cdee24b8fbd Mon Sep 17 00:00:00 2001 From: Dan Ziemba Date: Thu, 14 Apr 2016 22:05:00 -0400 Subject: [PATCH] 4.5.1 --- .SRCINFO | 12 ++++++++---- PKGBUILD | 14 ++++++++------ config | 2 +- config.x86_64 | 2 +- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index ce0c580..ff42356 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ # Generated by mksrcinfo v8 -# Thu Mar 24 02:20:53 UTC 2016 +# Fri Apr 15 02:07:33 UTC 2016 pkgbase = linux-vfio - pkgver = 4.5 + pkgver = 4.5.1 pkgrel = 1 url = http://www.kernel.org/ arch = i686 @@ -15,6 +15,8 @@ pkgbase = linux-vfio options = !strip source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.5.tar.xz source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.5.tar.sign + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.5.1.xz + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.5.1.sign source = config source = config.x86_64 source = linux.preset @@ -23,8 +25,10 @@ pkgbase = linux-vfio source = i915_317.patch sha256sums = a40defb401e01b37d6b8c8ad5c1bbab665be6ac6310cdeed59950c96b31a519c sha256sums = SKIP - sha256sums = 4e520b53399541b5d166fba4be397756278cbcbc260be87bd3ff324496ac3619 - sha256sums = 30660541b981bfbf60db8ffdbf75dca63648ca19bc2fba564b4561f6ecc7bf1b + sha256sums = 060ad091ebfa2b63d62e86beaf68c3a5d4638c506c3ac941c1825ba756e830b1 + sha256sums = SKIP + sha256sums = 8a8a955f015ee8342701231a63836cec0e300fd7e96d30e8696fde8a383fcdc9 + sha256sums = 8b60911aad591306336e300e27071f2d108c5016e66a04327b82ac69acbfefff sha256sums = f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99 sha256sums = 975f79348119bfba8dd972a9fbfe6b38484c45bfd228f2f6d48a0c02426ba149 diff --git a/PKGBUILD b/PKGBUILD index c1cc900..5a5b143 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ pkgbase=linux-vfio _srcname=linux-4.5 -pkgver=4.5 +pkgver=4.5.1 pkgrel=1 arch=('i686' 'x86_64') url="http://www.kernel.org/" @@ -11,8 +11,8 @@ makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc') 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://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz" + "https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.sign" # the main kernel config files 'config' 'config.x86_64' # standard config files for mkinitcpio ramdisk @@ -22,8 +22,10 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" 'i915_317.patch') sha256sums=('a40defb401e01b37d6b8c8ad5c1bbab665be6ac6310cdeed59950c96b31a519c' 'SKIP' - '4e520b53399541b5d166fba4be397756278cbcbc260be87bd3ff324496ac3619' - '30660541b981bfbf60db8ffdbf75dca63648ca19bc2fba564b4561f6ecc7bf1b' + '060ad091ebfa2b63d62e86beaf68c3a5d4638c506c3ac941c1825ba756e830b1' + 'SKIP' + '8a8a955f015ee8342701231a63836cec0e300fd7e96d30e8696fde8a383fcdc9' + '8b60911aad591306336e300e27071f2d108c5016e66a04327b82ac69acbfefff' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' '975f79348119bfba8dd972a9fbfe6b38484c45bfd228f2f6d48a0c02426ba149' @@ -39,7 +41,7 @@ prepare() { cd "${srcdir}/${_srcname}" # add upstream patch - # patch -p1 -i "${srcdir}/patch-${pkgver}" + patch -p1 -i "${srcdir}/patch-${pkgver}" # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git diff --git a/config b/config index e96068e..af9d634 100644 --- a/config +++ b/config @@ -6238,7 +6238,7 @@ CONFIG_DMA_OF=y CONFIG_FSL_EDMA=m CONFIG_INTEL_IDMA64=m CONFIG_PCH_DMA=m -CONFIG_DW_DMAC_CORE=m +CONFIG_DW_DMAC_CORE=y CONFIG_DW_DMAC=m CONFIG_DW_DMAC_PCI=m CONFIG_HSU_DMA=y diff --git a/config.x86_64 b/config.x86_64 index 4cdb3e1..c107767 100644 --- a/config.x86_64 +++ b/config.x86_64 @@ -6008,7 +6008,7 @@ CONFIG_DMA_ACPI=y CONFIG_INTEL_IDMA64=m CONFIG_INTEL_IOATDMA=m CONFIG_INTEL_MIC_X100_DMA=m -CONFIG_DW_DMAC_CORE=m +CONFIG_DW_DMAC_CORE=y CONFIG_DW_DMAC=m CONFIG_DW_DMAC_PCI=m CONFIG_HSU_DMA=y