Merge pull request #883 from rsdy/master

core/linux-odroid* enable kernel support for commonly used crypto and ha...
2025-03-19 00:21:40 +00:00 · 2014-06-26 20:17:05 -06:00 · 2014-06-26 20:17:05 -06:00 · 84e9040766
commit 84e9040766
parent af8a50f030 4d9cae56cc
10 changed files with 51 additions and 47 deletions
--- a/core/linux-odroid-xu-headless/PKGBUILD
+++ b/core/linux-odroid-xu-headless/PKGBUILD
@ -9,7 +9,7 @@ _srcname=linux-${_commit}
 _kernelname=${pkgbase#linux}
 _desc="ODROID-XU (headless)"
 pkgver=3.4.91
-pkgrel=3
+pkgrel=4
 arch=('armv7h')
 url="http://www.kernel.org/"
 license=('GPL2')
@ -19,7 +19,7 @@ source=("https://github.com/hardkernel/linux/archive/${_commit}.tar.gz"
        'config'
        'size.patch')
 md5sums=('56b4eef760ca55ff652eda63bb375aa1'
-         'f35bff4ac84b389e0f5505b70d2e8aba'
+         'd78e79ffad8cdc9ebb21ac79af41a00f'
         '45b9fd00c7cad62dcd5782b2ba9c4d34')

 prepare() {
--- a/core/linux-odroid-xu-headless/config
+++ b/core/linux-odroid-xu-headless/config
@ -3515,7 +3515,7 @@ CONFIG_CRYPTO_AUTHENC=y
 # Authenticated Encryption with Associated Data
 #
 # CONFIG_CRYPTO_CCM is not set
-# CONFIG_CRYPTO_GCM is not set
+CONFIG_CRYPTO_GCM=m
 CONFIG_CRYPTO_SEQIV=m

 #
@ -3527,7 +3527,7 @@ CONFIG_CRYPTO_CTR=m
 CONFIG_CRYPTO_ECB=y
 # CONFIG_CRYPTO_LRW is not set
 CONFIG_CRYPTO_PCBC=y
-# CONFIG_CRYPTO_XTS is not set
+CONFIG_CRYPTO_XTS=m

 #
 # Hash modes
@ -3551,9 +3551,9 @@ CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA1_ARM=y
 CONFIG_CRYPTO_SHA256=m
-# CONFIG_CRYPTO_SHA512 is not set
+CONFIG_CRYPTO_SHA512=m
 # CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_WP512 is not set
+CONFIG_CRYPTO_WP512=m

 #
 # Ciphers
@ -3569,9 +3569,9 @@ CONFIG_CRYPTO_ARC4=y
 CONFIG_CRYPTO_DES=y
 CONFIG_CRYPTO_FCRYPT=y
 # CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_SALSA20 is not set
+CONFIG_CRYPTO_SALSA20=m
 # CONFIG_CRYPTO_SEED is not set
-# CONFIG_CRYPTO_SERPENT is not set
+CONFIG_CRYPTO_SERPENT=m
 # CONFIG_CRYPTO_TEA is not set
 CONFIG_CRYPTO_TWOFISH=y
 CONFIG_CRYPTO_TWOFISH_COMMON=y
--- a/core/linux-odroid-xu-mainline/PKGBUILD
+++ b/core/linux-odroid-xu-mainline/PKGBUILD
@ -9,7 +9,7 @@ _srcname=linux-${_commit}
 _kernelname=${pkgbase#linux}
 _desc="ODROID-XU Mainline"
 pkgver=3.13.11
-pkgrel=1
+pkgrel=2
 arch=('armv7h')
 url="https://github.com/hardkernel/linux/tree/odroid-3.13.y-linaro"
 license=('GPL2')
@ -22,7 +22,7 @@ source=("https://github.com/hardkernel/linux/archive/${_commit}.tar.gz"
 md5sums=('d1ef186c24c93932dd39d7b2707897ff'
         'SKIP'
         '3b15ed9c33e6ff85621458a52ba1ad4b'
-         '63ed92ecfb00749802fc484617efbf41')
+         '00eb89f37b3449e21671eb899f54eebf')

 prepare() {
  cd "${srcdir}/${_srcname}"
--- a/core/linux-odroid-xu-mainline/config
+++ b/core/linux-odroid-xu-mainline/config
@ -3986,7 +3986,7 @@ CONFIG_CRYPTO_AUTHENC=m
 # Authenticated Encryption with Associated Data
 #
 CONFIG_CRYPTO_CCM=m
-# CONFIG_CRYPTO_GCM is not set
+CONFIG_CRYPTO_GCM=m
 CONFIG_CRYPTO_SEQIV=m

 #
@ -3998,7 +3998,7 @@ CONFIG_CRYPTO_CTR=m
 CONFIG_CRYPTO_ECB=y
 # CONFIG_CRYPTO_LRW is not set
 # CONFIG_CRYPTO_PCBC is not set
-# CONFIG_CRYPTO_XTS is not set
+CONFIG_CRYPTO_XTS=m

 #
 # Hash modes
@ -4025,9 +4025,9 @@ CONFIG_CRYPTO_MICHAEL_MIC=y
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA1_ARM=y
 CONFIG_CRYPTO_SHA256=m
-# CONFIG_CRYPTO_SHA512 is not set
+CONFIG_CRYPTO_SHA512=m
 # CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_WP512 is not set
+CONFIG_CRYPTO_WP512=m

 #
 # Ciphers
@ -4043,11 +4043,12 @@ CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_DES=m
 # CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_SALSA20 is not set
+CONFIG_CRYPTO_SALSA20=m
 # CONFIG_CRYPTO_SEED is not set
-# CONFIG_CRYPTO_SERPENT is not set
+CONFIG_CRYPTO_SERPENT=m
 # CONFIG_CRYPTO_TEA is not set
-# CONFIG_CRYPTO_TWOFISH is not set
+CONFIG_CRYPTO_TWOFISH=y
+CONFIG_CRYPTO_TWOFISH_COMMON=y

 #
 # Compression
--- a/core/linux-odroid-xu/PKGBUILD
+++ b/core/linux-odroid-xu/PKGBUILD
@ -9,7 +9,7 @@ _srcname=linux-${_commit}
 _kernelname=${pkgbase#linux}
 _desc="ODROID-XU"
 pkgver=3.4.91
-pkgrel=3
+pkgrel=4
 arch=('armv7h')
 url="http://www.kernel.org/"
 license=('GPL2')
@ -18,7 +18,7 @@ options=('!strip')
 source=("https://github.com/hardkernel/linux/archive/${_commit}.tar.gz"
        'config')
 md5sums=('56b4eef760ca55ff652eda63bb375aa1'
-         '35cee12c062fc5300449175958104f35')
+         'f675d32f3cb528b3e1688db4810bb217')

 prepare() {
  cd "${srcdir}/${_srcname}"
--- a/core/linux-odroid-xu/config
+++ b/core/linux-odroid-xu/config
@ -3667,7 +3667,7 @@ CONFIG_CRYPTO_AUTHENC=y
 # Authenticated Encryption with Associated Data
 #
 # CONFIG_CRYPTO_CCM is not set
-# CONFIG_CRYPTO_GCM is not set
+CONFIG_CRYPTO_GCM=m
 CONFIG_CRYPTO_SEQIV=m

 #
@ -3679,7 +3679,7 @@ CONFIG_CRYPTO_CTR=m
 CONFIG_CRYPTO_ECB=y
 # CONFIG_CRYPTO_LRW is not set
 CONFIG_CRYPTO_PCBC=y
-# CONFIG_CRYPTO_XTS is not set
+CONFIG_CRYPTO_XTS=m

 #
 # Hash modes
@ -3703,9 +3703,9 @@ CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA1_ARM=y
 CONFIG_CRYPTO_SHA256=m
-# CONFIG_CRYPTO_SHA512 is not set
+CONFIG_CRYPTO_SHA512=m
 # CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_WP512 is not set
+CONFIG_CRYPTO_WP512=m

 #
 # Ciphers
@ -3721,9 +3721,9 @@ CONFIG_CRYPTO_ARC4=y
 CONFIG_CRYPTO_DES=y
 CONFIG_CRYPTO_FCRYPT=y
 # CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_SALSA20 is not set
+CONFIG_CRYPTO_SALSA20=m
 # CONFIG_CRYPTO_SEED is not set
-# CONFIG_CRYPTO_SERPENT is not set
+CONFIG_CRYPTO_SERPENT=m
 # CONFIG_CRYPTO_TEA is not set
 CONFIG_CRYPTO_TWOFISH=y
 CONFIG_CRYPTO_TWOFISH_COMMON=y
--- a/core/linux-odroid/PKGBUILD
+++ b/core/linux-odroid/PKGBUILD
@ -8,7 +8,7 @@ pkgname=('linux-odroid-x' 'linux-odroid-x2' 'linux-odroid-u2' 'linux-headers-odr
 _kernelname=${pkgname#linux}
 _basekernel=3.8
 pkgver=${_basekernel}.13.23
-pkgrel=3
+pkgrel=4
 arch=('armv7h')
 url="http://github.com/hardkernel/linux/"
 license=('GPL2')
@ -20,9 +20,9 @@ source=("https://github.com/hardkernel/linux/archive/${_commit}.tar.gz"
        'config_x2'
        'config_u2')
 md5sums=('2dbe85108d58e4d44ded2087eef570d4'
-         '4c98d2c4e8a58d0709892f602e2795a9'
-         '1b5def2885b4bc437efb238fcfa22101'
-         'e7788423ad753c8f344d7734dbef12f7')
+         '280e6e06de702066fe270f949683c04a'
+         '6dabac3ca95f67f115ac71c9a3203869'
+         'c01494f2376c3263961c82ca7521cf96')

 prepare() {
  cd "${srcdir}/linux-${_commit}"
--- a/core/linux-odroid/config_u2
+++ b/core/linux-odroid/config_u2
@ -4004,7 +4004,7 @@ CONFIG_CRYPTO_AUTHENC=y
 # Authenticated Encryption with Associated Data
 #
 # CONFIG_CRYPTO_CCM is not set
-# CONFIG_CRYPTO_GCM is not set
+CONFIG_CRYPTO_GCM=m
 # CONFIG_CRYPTO_SEQIV is not set

 #
@ -4040,9 +4040,9 @@ CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA1_ARM=y
 CONFIG_CRYPTO_SHA256=m
-# CONFIG_CRYPTO_SHA512 is not set
+CONFIG_CRYPTO_SHA512=m
 # CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_WP512 is not set
+CONFIG_CRYPTO_WP512=m

 #
 # Ciphers
@ -4058,11 +4058,12 @@ CONFIG_CRYPTO_ARC4=y
 CONFIG_CRYPTO_DES=y
 CONFIG_CRYPTO_FCRYPT=m
 # CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_SALSA20 is not set
+CONFIG_CRYPTO_SALSA20=m
 # CONFIG_CRYPTO_SEED is not set
-# CONFIG_CRYPTO_SERPENT is not set
+CONFIG_CRYPTO_SERPENT=m
 # CONFIG_CRYPTO_TEA is not set
-# CONFIG_CRYPTO_TWOFISH is not set
+CONFIG_CRYPTO_TWOFISH=y
+CONFIG_CRYPTO_TWOFISH_COMMON=y

 #
 # Compression
--- a/core/linux-odroid/config_x
+++ b/core/linux-odroid/config_x
@ -3909,7 +3909,7 @@ CONFIG_CRYPTO_AUTHENC=y
 # Authenticated Encryption with Associated Data
 #
 # CONFIG_CRYPTO_CCM is not set
-# CONFIG_CRYPTO_GCM is not set
+CONFIG_CRYPTO_GCM=m
 # CONFIG_CRYPTO_SEQIV is not set

 #
@ -3945,9 +3945,9 @@ CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA1_ARM=y
 CONFIG_CRYPTO_SHA256=m
-# CONFIG_CRYPTO_SHA512 is not set
+CONFIG_CRYPTO_SHA512=m
 # CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_WP512 is not set
+CONFIG_CRYPTO_WP512=m

 #
 # Ciphers
@ -3963,11 +3963,12 @@ CONFIG_CRYPTO_ARC4=y
 CONFIG_CRYPTO_DES=y
 CONFIG_CRYPTO_FCRYPT=m
 # CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_SALSA20 is not set
+CONFIG_CRYPTO_SALSA20=m
 # CONFIG_CRYPTO_SEED is not set
-# CONFIG_CRYPTO_SERPENT is not set
+CONFIG_CRYPTO_SERPENT=m
 # CONFIG_CRYPTO_TEA is not set
-# CONFIG_CRYPTO_TWOFISH is not set
+CONFIG_CRYPTO_TWOFISH=y
+CONFIG_CRYPTO_TWOFISH_COMMON=y

 #
 # Compression
--- a/core/linux-odroid/config_x2
+++ b/core/linux-odroid/config_x2
@ -3909,7 +3909,7 @@ CONFIG_CRYPTO_AUTHENC=y
 # Authenticated Encryption with Associated Data
 #
 # CONFIG_CRYPTO_CCM is not set
-# CONFIG_CRYPTO_GCM is not set
+CONFIG_CRYPTO_GCM=m
 # CONFIG_CRYPTO_SEQIV is not set

 #
@ -3945,9 +3945,9 @@ CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA1_ARM=y
 CONFIG_CRYPTO_SHA256=m
-# CONFIG_CRYPTO_SHA512 is not set
+CONFIG_CRYPTO_SHA512=m
 # CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_WP512 is not set
+CONFIG_CRYPTO_WP512=m

 #
 # Ciphers
@ -3963,11 +3963,12 @@ CONFIG_CRYPTO_ARC4=y
 CONFIG_CRYPTO_DES=y
 CONFIG_CRYPTO_FCRYPT=m
 # CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_SALSA20 is not set
+CONFIG_CRYPTO_SALSA20=m
 # CONFIG_CRYPTO_SEED is not set
-# CONFIG_CRYPTO_SERPENT is not set
+CONFIG_CRYPTO_SERPENT=m
 # CONFIG_CRYPTO_TEA is not set
-# CONFIG_CRYPTO_TWOFISH is not set
+CONFIG_CRYPTO_TWOFISH=y
+CONFIG_CRYPTO_TWOFISH_COMMON=y

 #
 # Compression