core/linux-cubox: cryptodev support.

core/linux-cubox/PKGBUILD

@@ -8,16 +8,19 @@ pkgname=('linux-cubox' 'linux-headers-cubox')
 _kernelname=${pkgname#linux}
 _basekernel=3.5
 pkgver=${_basekernel}.7
-pkgrel=3
+pkgrel=4
+cryptover=1.4
 arch=('arm')
 url="http://www.kernel.org/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'uboot-mkimage' 'git' 'python2')
 options=('!strip')
 source=('config'
-        'change-default-console-loglevel.patch')
-md5sums=('004ab6ff32c7ada65f33d241e8d5b515'
-         '9d3c56a4b999c8bfbd4018089a62f662')
+        'change-default-console-loglevel.patch'
+        "http://download.gna.org/cryptodev-linux/cryptodev-linux-${cryptover}.tar.gz")
+md5sums=('64f271dbdde04963c91092c88bce50e8'
+         '9d3c56a4b999c8bfbd4018089a62f662'
+         '7b0ac1c0a88d8fbe7316db02f21666e6')
 
 __gitroot="git://github.com/vDorst/linux.git"
 __gitname="linux"
@@ -75,13 +78,17 @@ build() {
 
   # build!
   make ${MAKEFLAGS} modules uImage
+
+  # build cryptodev module
+  cd "${srcdir}/cryptodev-linux-${cryptover}"
+  make KERNEL_DIR="${srcdir}/${__gitname}"
 }
 
 package_linux-cubox() {
   pkgdesc="The Linux Kernel and modules for the Cubox"
   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-cubox' 'linux=${pkgver}')
+  provides=('kernel26-cubox' 'linux=${pkgver}' 'cryptodev_friendly')
   conflicts=('kernel26' 'linux')
   replaces=('kernel26')
   backup=("etc/mkinitcpio.d/${pkgname}.preset")
@@ -116,6 +123,12 @@ package_linux-cubox() {
   mkdir -p "${pkgdir}/lib/modules/extramodules-${pkgver}-${_kernelname:-ARCH}"
   echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${pkgver}-${_kernelname:-ARCH}/version"
 
+  # install cryptodev module
+  cd "${srcdir}/cryptodev-linux-${cryptover}"
+  make -C "${srcdir}/${__gitname}" INSTALL_MOD_PATH="${pkgdir}" SUBDIRS=`pwd` modules_install
+
+  cd "${srcdir}/${__gitname}"
+
   # Now we call depmod...
   depmod -b "$pkgdir" -F System.map "$_kernver"
 
@@ -236,6 +249,10 @@ package_linux-headers-cubox() {
   mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners"
   cp drivers/media/common/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners/"
 
+  # install cryptodev header
+  install -Dm644 "${srcdir}/cryptodev-linux-${cryptover}/crypto/cryptodev.h" \
+    "${pkgdir}/usr/src/linux-${_kernver}/crypto/cryptodev.h"
+
   # copy in Kconfig files
   for i in `find . -name "Kconfig*"`; do
     mkdir -p "${pkgdir}"/usr/src/linux-${_kernver}/`echo ${i} | sed 's|/Kconfig.*||'`

core/openssl-cryptodev/PKGBUILD

@@ -16,11 +16,15 @@ pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
 pkgrel=1
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'armv7h')
 url='https://www.openssl.org'
 license=('custom:BSD')
 depends=('perl' 'cryptodev_friendly')
-makedepends=('linux-headers')
+if [ "${CARCH}" == 'armv7h' ]; then
+	makedepends=('linux-headers-cubox')
+else
+	makedepends=('linux-headers')
+fi
 optdepends=('ca-certificates')
 options=('!makeflags')
 backup=('etc/ssl/openssl.cnf')
@@ -31,7 +35,7 @@ source=("https://www.openssl.org/source/${_pkgname}-${_ver}.tar.gz"
         'no-rpath.patch'
         'ca-dir.patch')
 md5sums=('ae412727c8c15b67880aef7bd2999b2e'
-         'a3d90bc42253def61cd1c4237f1ce5f7'
+         '5bbc0655bda2af95bc8eb568963ce8ba'
          'dc78d3d06baffc16217519242ce92478'
          '3bf51be3a1bbd262be46dc619f92aa90')
 
@@ -46,6 +50,12 @@ build() {
 		openssltarget='linux-armv4'
 	fi
 
+	if [ "${CARCH}" == 'armv7h' ]; then
+		_kernel_release="$(pacman -Q linux-headers-cubox | grep -Eo "[^\ ]+$")-ARCH+"
+	else
+		_kernel_release="$(uname -r)"
+	fi
+
 	# avoid conflicts with other man pages
 	# see http://www.linuxfromscratch.org/patches/downloads/openssl/
 	patch -p1 -i $srcdir/fix-manpages.patch
@@ -58,7 +68,7 @@ build() {
 		-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS -DHASH_MAX_LEN=64 \
 		shared threads zlib enable-md2 \
 		"${openssltarget}" \
-		-Wa,--noexecstack "${CFLAGS} -I/usr/src/linux-`uname -r`" \
+		-Wa,--noexecstack "${CFLAGS} -I/usr/src/linux-${_kernel_release}" \
 		-DOPENSSL_NO_TLS1_2_CLIENT
 
 	make depend