From: Denys Dmytriyenko <[email protected]> Signed-off-by: Denys Dmytriyenko <[email protected]> --- ...penssl_perf.sh-remove-module-manipulation.patch | 107 +++++++++++++++++++++ .../matrix/matrix-gui-crypto-demos_2.0.bb | 4 +- 2 files changed, 110 insertions(+), 1 deletion(-) create mode 100644 meta-arago-extras/recipes-core/matrix/matrix-gui-crypto-demos/0001-openssl_perf.sh-remove-module-manipulation.patch
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-crypto-demos/0001-openssl_perf.sh-remove-module-manipulation.patch b/meta-arago-extras/recipes-core/matrix/matrix-gui-crypto-demos/0001-openssl_perf.sh-remove-module-manipulation.patch new file mode 100644 index 0000000..f538a86 --- /dev/null +++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-crypto-demos/0001-openssl_perf.sh-remove-module-manipulation.patch @@ -0,0 +1,107 @@ +From 04607c9d12330f72e96733582734155cb1a32a37 Mon Sep 17 00:00:00 2001 +From: Denys Dmytriyenko <[email protected]> +Date: Tue, 17 Dec 2013 19:43:16 -0500 +Subject: [PATCH] openssl_perf.sh: remove module manipulation + +Signed-off-by: Denys Dmytriyenko <[email protected]> +--- + .../openssl_perf_scripts/openssl_perf.sh | 71 ---------------------- + 1 file changed, 71 deletions(-) + +diff --git a/cryptos_apps_program/openssl_perf_scripts/openssl_perf.sh b/cryptos_apps_program/openssl_perf_scripts/openssl_perf.sh +index 9da9ae2..1334274 100644 +--- a/cryptos_apps_program/openssl_perf_scripts/openssl_perf.sh ++++ b/cryptos_apps_program/openssl_perf_scripts/openssl_perf.sh +@@ -1,13 +1,7 @@ + #!/bin/sh + +- +-CRYPTOMOD=/lib/modules/2.6.37/kernel/crypto/ocf/cryptodev.ko +-OCFMOD=/lib/modules/2.6.37/crypto/ocf/ocf_omap3_cryptok.ko +- +- + OPENSSL=/usr/bin/openssl + +- + cat /proc/cpuinfo | grep OMAP3 > /dev/null 2> /dev/null + if [ `echo $?` = "0" ] + then +@@ -16,69 +10,6 @@ else + export CPU=other + fi + +- +- +- +-if [ $CPU = "OMAP3" ] +-then +-ls -l /dev/crypto > /dev/null 2> /dev/null +-if [ `echo $?` = "1" ] +-then +- if [ -r $CRYPTOMOD ] +- then +- echo "Installing cryptodev module" +- insmod $CRYPTOMOD +- if [ `echo $?` = "1" ] +- then +- echo "Cryptodev failed. Test will run in SW only mode." +- else +- lsmod | grep ocf_omap3_cryptok >/dev/null +- if [ `echo $?` = "1" ] +- then +- if [ -r $OCFMOD ] +- then +- echo "Installing ocf_omap3_crypto module" +- insmod $OCFMOD ocf_omap3_crypto_dma=1 +- if [ `echo $?` = "1" ] +- then +- echo "Removing cryptodev. Running test in SW only mode." +- rmmod cryptodev +- fi +- else +- echo "Can't find OCF driver. Running test in SW only mode." +- rmmod cryptodev +- fi +- else +- echo "ocf_omap3_crypto module is already installed" +- fi +- fi +- fi +-else +- echo "Cryptodev module is already installed" +- lsmod | grep ocf_omap3_cryptok >/dev/null +- if [ `echo $?` = "1" ] +- then +- if [ -r $OCFMOD ] +- then +- echo "Installing ocf_omap3_crypto module" +- insmod $OCFMOD ocf_omap3_crypto_dma=1 +- if [ `echo $?` = "1" ] +- then +- echo "Removing cryptodev. Running test in SW only mode." +- rmmod cryptodev +- fi +- else +- echo "Can't find OCF driver. Running test in SW only mode." +- rmmod cryptodev +- fi +- else +- echo "ocf_omap3_crypto module is already installed" +- fi +-fi +-fi +- +- +- + if [ -r $OPENSSL ] + then + $OPENSSL version +@@ -123,5 +54,3 @@ time -v $OPENSSL speed -evp md5 -engine cryptodev > $TEMP 2>&1 + egrep 'Doing|User|System|Percent|Elapsed' $TEMP + + rm $TEMP +- +- +-- +1.8.3.2 + diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-crypto-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-crypto-demos_2.0.bb index ad9be99..698749c 100644 --- a/meta-arago-extras/recipes-core/matrix/matrix-gui-crypto-demos_2.0.bb +++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-crypto-demos_2.0.bb @@ -4,7 +4,7 @@ LICENSE = "CC-BY-SA" require matrix-gui-apps-git.inc -PR = "${INC_PR}.7" +PR = "${INC_PR}.8" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -13,6 +13,8 @@ S_ti33x = "${WORKDIR}/git/cryptos_apps_program" S_ti43x = "${WORKDIR}/git/cryptos_apps_program" S_dra7xx-evm = "${WORKDIR}/git/cryptos_apps_program" +SRC_URI += "file://0001-openssl_perf.sh-remove-module-manipulation.patch;striplevel=2" + FILES_${PN} += "${MATRIX_BASE_DIR}/*" # Make sure crypto submenu and app images has been installed. Also make sure openssl is available -- 1.8.3.2 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
