diff --git a/core/linux-armv7/PKGBUILD b/core/linux-armv7/PKGBUILD index d7779c089..f72bf33be 100644 --- a/core/linux-armv7/PKGBUILD +++ b/core/linux-armv7/PKGBUILD @@ -7,16 +7,16 @@ pkgbase=linux-armv7 _srcname=linux-4.14 _kernelname=${pkgbase#linux} _desc="ARMv7 multi-platform" -pkgver=4.14.0 +pkgver=4.14.1 pkgrel=1 -rcnrel=armv7-x0 +rcnrel=armv7-x1 arch=('armv7h') url="http://www.kernel.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git' 'uboot-tools' 'vboot-utils' 'dtc') options=('!strip') source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" - #"http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz" + "http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz" "http://rcn-ee.com/deb/sid-armhf/v${pkgver}-${rcnrel}/patch-${pkgver%.0}-${rcnrel}.diff.gz" '0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch' '0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch' @@ -34,7 +34,8 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" 'linux.preset' '99-linux.hook') md5sums=('bacdb9ffdcd922aa069a5e1520160e24' - 'cebb22526e0d05b8575d99cc965ee98f' + '67622696833123f68345614fdd512c3f' + '3658ca4f8413a1143771bdc0ddec8609' 'a9a96c56f83a0190a55511bf340774e1' '0783eff6ee3c3e69d860468ea350a091' '98c229baab4561144eb37210a20283a1' @@ -44,7 +45,7 @@ md5sums=('bacdb9ffdcd922aa069a5e1520160e24' '1073c8192dc512674ccbf923334c5b79' 'c1712dcecd00d08884cf2e078159b023' '90d0639b90925ad2e79cc26a7ec51e58' - 'be40c005af1bc2a7d4a1c22bfb251b4a' + '95d8b62d2c6d98dc736800c629119029' '4f2379ed84258050edb858ee8d281678' '61c5ff73c136ed07a7aadbf58db3d96a' '584777ae88bce2c5659960151b64c7d8' @@ -55,7 +56,7 @@ prepare() { cd "${srcdir}/${_srcname}" # add upstream patch - #git apply --whitespace=nowarn ../patch-${pkgver} + git apply --whitespace=nowarn ../patch-${pkgver} # RCN patch git apply ../patch-${pkgver%.0}-${rcnrel}.diff diff --git a/core/linux-armv7/config b/core/linux-armv7/config index c39175589..d5c1af232 100644 --- a/core/linux-armv7/config +++ b/core/linux-armv7/config @@ -8118,6 +8118,7 @@ CONFIG_UFS_FS=m # CONFIG_UFS_DEBUG is not set CONFIG_EXOFS_FS=m # CONFIG_EXOFS_DEBUG is not set +# CONFIG_AUFS_FS is not set CONFIG_ORE=m CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=y