diff --git a/core/linux-imx6-cubox-dt/PKGBUILD b/core/linux-imx6-cubox-dt/PKGBUILD index fd113eb97..9ef433b01 100644 --- a/core/linux-imx6-cubox-dt/PKGBUILD +++ b/core/linux-imx6-cubox-dt/PKGBUILD @@ -11,13 +11,15 @@ buildarch=4 pkgbase=linux-imx6-cubox-dt pkgname=('linux-imx6-cubox-dt' 'linux-headers-imx6-cubox-dt') # pkgname=linux-custom # Build kernel with a different name -_commit=e0fdb1dc84ca9e3d964cd26b7dee872bcdd85c49 +_commit=ea3391d6606a739c6fd06e8ee2b945a9e33a4e72 _srcname=linux-imx6-3.14-${_commit} _kernelname=${pkgname#linux} _basekernel=3.14 -pkgver=${_basekernel}.44 +pkgver=${_basekernel}.45 pkgrel=1 cryptodev_commit=da730106c2558c8e0c8e1b1b1812d32ef9574ab7 +bfqver=v7r8 + arch=('armv7h') url="http://www.kernel.org/" license=('GPL2') @@ -25,42 +27,50 @@ makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'uboot-mkimage' 'git' options=('!strip') source=("linux-${_commit}::https://github.com/moonman/linux-imx6-3.14/archive/${_commit}.tar.gz" "cryptodev-${cryptodev_commit}.tar.gz::https://github.com/cryptodev-linux/cryptodev-linux/archive/${cryptodev_commit}.tar.gz" - "git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs${pkgver:0:4}.21+" + "git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs${pkgver:0:4}.40+" '0001-Bluetooth-allocate-static-minor-for-vhci.patch' + "ftp://teambelgium.net/bfq/patches/${pkgver:0:4}.0-${bfqver}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${pkgver:0:4}.patch" + "ftp://teambelgium.net/bfq/patches/${pkgver:0:4}.0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${pkgver:0:4}.patch" + "ftp://teambelgium.net/bfq/patches/${pkgver:0:4}.0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${pkgver:0:4}.0.patch" 'config' '001_cec.patch' '002_cec.patch' - '003_cec.patch' - '0001-AUFS-fix-for-3.14.40.patch') + '003_cec.patch') -md5sums=('a0362c67e7d5f2961ade4900e300b444' +md5sums=('0c65f9d4f6ce8ea452fb9e9e8acfbacb' '8fb4d3b7cc970351f3b5078b7893a107' 'SKIP' '1b276abe16d14e133f3f28d9c9e6bd68' + 'defe6b5df33f8c11c2bf45f67ad35d8d' + '2c10ccc1169884d2f12ba95fe11d29fd' + '3baee38bf7fdcd47b2cc9628949b5784' '1ea8de6e5c6cae2e33f5767c7f16174e' '8bf79a580704e8dab806f58043720a90' '6391a74bf1d451b74df6f189a25cf642' - 'a70798b63a0e7c3fb50a57ea1815d353' - '0efe7a89ae51332d27330de3928a6523') + 'a70798b63a0e7c3fb50a57ea1815d353') prepare() { cd "${srcdir}/${_srcname}" -msg2 "Fix hci_vhci no minor warning" + msg2 "Fix hci_vhci no minor warning" patch -Np1 -i ${srcdir}/0001-Bluetooth-allocate-static-minor-for-vhci.patch -msg2 "Copying aufs3 patches into the kernel source tree" + msg2 "Copying aufs3 patches into the kernel source tree" cp -ru "${srcdir}/aufs3-standalone/"{Documentation,fs} "${srcdir}/${_srcname}/" cp -ru "${srcdir}/aufs3-standalone/include/uapi/linux/aufs_type.h" "${srcdir}/${_srcname}/include/"{linux/,uapi/linux/} -msg2 "Applying aufs3 patches" + msg2 "Applying aufs3 patches" patch -Np1 -i ../aufs3-standalone/aufs3-kbuild.patch patch -Np1 -i ../aufs3-standalone/aufs3-base.patch patch -Np1 -i ../aufs3-standalone/aufs3-mmap.patch patch -Np1 -i ../aufs3-standalone/aufs3-standalone.patch - patch -Np1 -i ${srcdir}/0001-AUFS-fix-for-3.14.40.patch -msg2 "CEC patches" + msg2 "Add BFQ patches" + patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${pkgver:0:4}.patch" + patch -Np1 -i "${srcdir}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${pkgver:0:4}.patch" + patch -Np1 -i "${srcdir}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${pkgver:0:4}.0.patch" + + msg2 "CEC patches" patch -Np1 -i ${srcdir}/001_cec.patch patch -Np1 -i ${srcdir}/002_cec.patch patch -Np1 -i ${srcdir}/003_cec.patch diff --git a/core/linux-imx6-cubox-dt/linux-imx6-cubox-dt.install b/core/linux-imx6-cubox-dt/linux-imx6-cubox-dt.install index f8b53c9cf..60a225df9 100644 --- a/core/linux-imx6-cubox-dt/linux-imx6-cubox-dt.install +++ b/core/linux-imx6-cubox-dt/linux-imx6-cubox-dt.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-imx6-cubox-dt -KERNEL_VERSION=3.14.44-1-ARCH +KERNEL_VERSION=3.14.45-1-ARCH post_install () { # updating module dependencies