diff --git a/core/linux-kirkwood/PKGBUILD b/core/linux-kirkwood/PKGBUILD index 1c628c5a0..8a8a643c9 100644 --- a/core/linux-kirkwood/PKGBUILD +++ b/core/linux-kirkwood/PKGBUILD @@ -6,10 +6,9 @@ buildarch=2 pkgbase=linux-kirkwood _kernelname=${pkgbase#linux} _desc="Marvell Kirkwood" -pkgver=4.4.47 +pkgver=4.4.57 srcver=${pkgver%.0} pkgrel=1 -cryptodev_commit=f116a93224fc7b85f83d2c53f565f8fd86165ecc bfqver=v7r11 ### BFQ patch kernel version @@ -32,21 +31,19 @@ source=("https://kernel.org/pub/linux/kernel/v4.x/linux-${srcver}.tar.xz" 'mach-types::http://www.arm.linux.org.uk/developer/machines/download.php' '0001-disable-mv643xx_eth-TSO.patch' "git+https://github.com/sfjro/aufs4-standalone.git#branch=${aufsbranch}" - "cryptodev-${cryptodev_commit}.tar.gz::https://github.com/cryptodev-linux/cryptodev-linux/archive/${cryptodev_commit}.tar.gz" "ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${bfqkern}.0.patch" "ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${bfqkern}.0.patch" "ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for.patch" 'linux.preset') -md5sums=('f8b50a8c693e4a4fb6b7096368a34e29' +md5sums=('23fa54aef6eaa2fe5b59327bdacb36e7' 'b91129f87c799e7184c00257eeddd2f2' 'b5fce698f52da9ac170a6639f3135bca' 'cf1aff1c7a534c3ecba8eea36a4016b2' '09d44b9f07abfaeaf4f688ee52034786' 'SKIP' - 'bd52f10ced89e663d2f4d138948828fd' - 'c1d7fcfe88edb658375089c0a9cc1811' - '953133d5e387de2ad79ac0ae5c27cb6b' - 'f0387e673975e9f2a5e05136948edece' + 'c1d7fcfe88edb658375089c0a9cc1811' + '953133d5e387de2ad79ac0ae5c27cb6b' + 'f0387e673975e9f2a5e05136948edece' '6d8c200779cbdef582e9e435ed86ca31') prepare() { @@ -112,17 +109,13 @@ build() { msg "Building!" make ${MAKEFLAGS} uImage modules - - msg "Building cryptodev module" - cd "${srcdir}/cryptodev-linux-${cryptodev_commit}" - make KERNEL_DIR="${srcdir}/linux-${srcver}" } _package() { pkgdesc="The Linux Kernel and modules - ${_desc}" depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7') optdepends=('crda: to set the correct wireless channels of your country') - provides=('kernel26' 'linux=${pkgver}' 'aufs_friendly' 'cryptodev_friendly') + provides=('kernel26' 'linux=${pkgver}' 'aufs_friendly') conflicts=('linux-kirkwood-dt' 'linux' 'linux-olinuxino') backup=("etc/mkinitcpio.d/${pkgbase}.preset") install=${pkgname}.install @@ -166,10 +159,6 @@ _package() { mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}-${_kernelname:-ARCH}" echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}-${_kernelname:-ARCH}/version" - # install cryptodev module - cd "${srcdir}/cryptodev-linux-${cryptodev_commit}" - make -C "${srcdir}/linux-${srcver}" INSTALL_MOD_PATH="${pkgdir}" SUBDIRS=`pwd` modules_install - cd "${srcdir}/linux-${srcver}" # Now we call depmod... @@ -317,10 +306,6 @@ _package-headers() { # remove unneeded architectures rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,x86,xtensa} - - # install cryptodev header - cd "${srcdir}/cryptodev-linux-${cryptodev_commit}" - install -D crypto/cryptodev.h "${pkgdir}/usr/src/linux-${_kernver}/crypto/cryptodev.h" } pkgname=("${pkgbase}" "${pkgbase}-headers")