From 6ef92cc44db39fde3ee0ad28e96cace1696b2145 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Thu, 1 Mar 2012 00:01:31 -0500 Subject: [PATCH] core/linux to 3.1.10-4 - cryptodev --- core/linux/PKGBUILD | 23 +++++++++++++++++++---- core/linux/linux.install | 2 +- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/core/linux/PKGBUILD b/core/linux/PKGBUILD index 9c994c94b..09c0a68ee 100644 --- a/core/linux/PKGBUILD +++ b/core/linux/PKGBUILD @@ -10,7 +10,8 @@ pkgname=('linux' 'linux-headers') _kernelname=${pkgname#linux} _basekernel=3.1 pkgver=${_basekernel}.10 -pkgrel=3 +pkgrel=4 +cryptover=1.2 arch=('arm') url="http://www.kernel.org/" license=('GPL2') @@ -27,7 +28,8 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.bz2 'config' 'mach-types::http://www.arm.linux.org.uk/developer/machines/download.php' 'change-default-console-loglevel.patch' - 'usb-add-reset-resume-quirk-for-several-webcams.patch') + 'usb-add-reset-resume-quirk-for-several-webcams.patch' + "http://download.gna.org/cryptodev-linux/cryptodev-linux-${cryptover}.tar.gz") md5sums=('8d43453f8159b2332ad410b19d86a931' 'a8e1c25a93a685ec2a1c3a808715fe9d' '7f2c10e9e8ab4decaaf1dd5437a775a3' @@ -39,7 +41,8 @@ md5sums=('8d43453f8159b2332ad410b19d86a931' 'e9c48e4c43e1044122bc4832dcbe065c' 'ca6fec585152e0488ee04bc0b311ecf3' '9d3c56a4b999c8bfbd4018089a62f662' - 'd00814b57448895e65fbbc800e8a58ba') + 'd00814b57448895e65fbbc800e8a58ba' + '372a5f22a11848c621f186f71249b523') build() { cd "${srcdir}/linux-${_basekernel}" @@ -100,6 +103,10 @@ build() { # build! make ${MAKEFLAGS} uImage modules + + # build cryptodev module + cd "${srcdir}/cryptodev-linux-${cryptover}" + make KERNEL_DIR="${srcdir}/linux-${_basekernel}" } package_linux() { @@ -107,7 +114,7 @@ package_linux() { groups=('base') depends=('coreutils' 'linux-firmware' 'module-init-tools>=3.16' 'mkinitcpio>=0.7') optdepends=('crda: to set the correct wireless channels of your country') - provides=('kernel26' 'aufs_friendly') + provides=('kernel26' 'aufs_friendly' 'cryptodev_friendly') conflicts=('kernel26') replaces=('kernel26') install=${pkgname}.install @@ -140,6 +147,10 @@ package_linux() { # add real version for building modules and running depmod from post_install/upgrade 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-${cryptover}" + make -C "${srcdir}/linux-${_basekernel}" INSTALL_MOD_PATH="${pkgdir}" SUBDIRS=`pwd` modules_install } package_linux-headers() { @@ -273,4 +284,8 @@ package_linux-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-${cryptover}" + install -D crypto/cryptodev.h "${pkgdir}/usr/src/linux-${_kernver}/crypto/cryptodev.h" } diff --git a/core/linux/linux.install b/core/linux/linux.install index 255327d83..6c45a5f6d 100644 --- a/core/linux/linux.install +++ b/core/linux/linux.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.1.10-3-ARCH +KERNEL_VERSION=3.1.10-4-ARCH post_install () { # updating module dependencies