From: Anuj Mittal <[email protected]> This adds makefile patches for Intel RiverForest QAT16 recipe. The changes tweak makefiles in QAT16 to make sure that all binaries are installed at a proper path.
Signed-off-by: Anuj Mittal <[email protected]> --- ...add-generic-paths-to-makefile-for-install.patch | 131 +++++ ....0-34-qat-remove-local-path-from-makefile.patch | 31 ++ ..._2.3.0-34-qat-tweak-sample-code-makefiles.patch | 552 ++++++++++++++++++++ 3 files changed, 714 insertions(+) create mode 100644 meta-crystalforest/recipes-extended/qat/qat16/qat16_2.3.0-34-qat-add-generic-paths-to-makefile-for-install.patch create mode 100644 meta-crystalforest/recipes-extended/qat/qat16/qat16_2.3.0-34-qat-remove-local-path-from-makefile.patch create mode 100644 meta-crystalforest/recipes-extended/qat/qat16/qat16_2.3.0-34-qat-tweak-sample-code-makefiles.patch diff --git a/meta-crystalforest/recipes-extended/qat/qat16/qat16_2.3.0-34-qat-add-generic-paths-to-makefile-for-install.patch b/meta-crystalforest/recipes-extended/qat/qat16/qat16_2.3.0-34-qat-add-generic-paths-to-makefile-for-install.patch new file mode 100644 index 0000000..c6819c6 --- /dev/null +++ b/meta-crystalforest/recipes-extended/qat/qat16/qat16_2.3.0-34-qat-add-generic-paths-to-makefile-for-install.patch @@ -0,0 +1,131 @@ +From fb79480404c7cbf7098b5592b5599826fe5e010c Mon Sep 17 00:00:00 2001 +From: Anuj Mittal <[email protected]> +Date: Tue, 7 Jul 2015 10:27:32 +0800 +Subject: [PATCH 1/3] qat: add generic paths to makefile for install + +Upstream-Status: Inappropriate [Configuration] + +Signed-off-by: Anuj Mittal <[email protected]> +--- + quickassist/Makefile | 36 +++++++++++--------- + .../src/sample_code/performance/Makefile | 2 +- + 2 files changed, 21 insertions(+), 17 deletions(-) + +diff --git a/quickassist/Makefile b/quickassist/Makefile +index dcea692..6999ed6 100644 +--- a/quickassist/Makefile ++++ b/quickassist/Makefile +@@ -124,10 +124,10 @@ ifdef WITH_CPA_MUX + @cp $(ICP_BUILDSYSTEM_PATH)/build_files/qat_service_mux $(ICP_BUILD_OUTPUT)/qat_service; + endif + ifndef WITH_CPA_MUX +- @cp $(ICP_BUILDSYSTEM_PATH)/build_files/qat_service $(ICP_BUILD_OUTPUT)/; ++ @cp $(ICP_BUILDSYSTEM_PATH)/build_files/qat_service $(ICP_BUILD_OUTPUT)/etc/init.d; + endif +- @chmod 750 $(ICP_BUILD_OUTPUT)/qat_service; +- @cp $(CONFIG_PATH)/dh895xcc_qa_dev0.conf $(ICP_BUILD_OUTPUT)/; ++ @chmod 750 $(ICP_BUILD_OUTPUT)/etc/init.d/qat_service; ++ @cp $(CONFIG_PATH)/dh895xcc_qa_dev0.conf $(ICP_BUILD_OUTPUT)/etc/; + # @cp $(CONFIG_PATH)/dh89xxcc_qa_dev1.conf $(ICP_BUILD_OUTPUT)/; + # @cp $(CONFIG_PATH)/dh89xxcc_qa_dev0_single_accel.conf $(ICP_BUILD_OUTPUT)/; + +@@ -146,7 +146,7 @@ libosal_user: output_dir lac_lib_dir + @echo ; echo 'Building OSAL for user space'; + @cd $(OSAL_PATH)/src && $(MAKE) ARCH=$(ICP_ARCH_USER) ICP_ENV_DIR=$(ICP_TOP_ENV) OS_LEVEL=linux ICP_OS_LEVEL=user_space lib;\ + echo ; echo 'Copying OSAL library'; +- cp $(OSAL_PATH)/src/build/linux_2.6/user_space/libosal.a $(ICP_BUILD_OUTPUT)/; ++ cp $(OSAL_PATH)/src/build/linux_2.6/user_space/libosal.a $(ICP_BUILD_OUTPUT)/$(DEST_LIBDIR); + + hal: output_dir libosal + @echo ; echo 'Building Hal Libs'; +@@ -171,7 +171,7 @@ libosal_uservf: output_dir lac_lib_dir + @echo ; echo 'Building OSAL for user space'; + @cd $(OSAL_PATH)/src && export ICP_WITHOUT_IOMMU=1 && $(MAKE) ICP_ENV_DIR=$(ICP_TOP_ENV) OS_LEVEL=linux ICP_OS_LEVEL=user_space lib;\ + echo ; echo 'Copying OSAL library'; +- cp $(OSAL_PATH)/src/build/linux_2.6/user_space/libosal.a $(ICP_BUILD_OUTPUT)/; ++ cp $(OSAL_PATH)/src/build/linux_2.6/user_space/libosal.a $(ICP_BUILD_OUTPUT)/$(DEST_LIBDIR); + + adfvf: output_dir lac_lib_dir libosalvf + @echo ; echo 'Building ADFVF'; +@@ -181,13 +181,13 @@ adfvf: output_dir lac_lib_dir libosalvf + adf_user: output_dir lac_lib_dir libosal_user + @echo ; echo 'Building user ADF'; + @cd $(ADF_PATH) && export ADF_PLATFORM=ACCELDEV && export ICP_ENV_DIR=$(ICP_TOP_ENV) && export ONE_KO_RELEASE_PACKAGE=1 && ICP_OS_LEVEL=user_space && $(MAKE) ARCH=$(ICP_ARCH_USER) adf_user; +- cp $(ADF_PATH)/build/linux_2.6/libadf_proxy.a $(ICP_BUILD_OUTPUT)/; +- cp $(ADF_PATH)/build/linux_2.6/adf_ctl $(ICP_BUILD_OUTPUT)/; ++ cp $(ADF_PATH)/build/linux_2.6/libadf_proxy.a $(ICP_BUILD_OUTPUT)/$(DEST_LIBDIR); ++ cp $(ADF_PATH)/build/linux_2.6/adf_ctl $(ICP_BUILD_OUTPUT)/etc/init.d/; + + lac: output_dir libosal hal adf + @echo ; echo 'Building LAC'; + @cd $(LAC_PATH) && export ICP_ENV_DIR=$(ICP_TOP_ENV) && export ONE_KO_RELEASE_PACKAGE=1 && cd src && $(MAKE) ICP_OS_LEVEL=kernel_space OS_LEVEL=linux; +- @cp $(LAC_PATH)/src/build/linux_2.6/kernel_space/$(DRIVER) $(ICP_BUILD_OUTPUT)/; ++ @cp $(LAC_PATH)/src/build/linux_2.6/kernel_space/$(DRIVER) $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/kernel/drivers; + + lacvf: output_dir libosalvf adfvf + @echo ; echo 'Building LACVF'; +@@ -195,29 +195,29 @@ ifdef WITH_CPA_MUX + @cp $(CPA_MUX_PATH)/Module.symvers $(LAC_PATH)/src/ + endif + @cd $(LAC_PATH) && export ADF_PLATFORM=ACCELDEVVF && export ICP_ENV_DIR=$(ICP_TOP_ENV) && export ONE_KO_RELEASE_PACKAGE=1 && cd src && $(MAKE) ICP_OS_LEVEL=kernel_space OS_LEVEL=linux; +- @cp $(LAC_PATH)/src/build/linux_2.6/kernel_space/$(BASENAME)_vf.ko $(ICP_BUILD_OUTPUT)/; ++ @cp $(LAC_PATH)/src/build/linux_2.6/kernel_space/$(BASENAME)_vf.ko $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/kernel/drivers; + + lac_user: output_dir libosal_user adf_user + @echo ; echo 'Building LAC in user space'; + @cd $(LAC_PATH) && export ICP_ENV_DIR=$(ICP_TOP_ENV) && export ONE_KO_RELEASE_PACKAGE=1 && cd src && $(MAKE) ARCH=$(ICP_ARCH_USER) lib_static ICP_OS_LEVEL=user_space; +- cp $(LAC_PATH)/src/build/linux_2.6/user_space/lib$(BASENAME).a $(ICP_BUILD_OUTPUT)/; ++ cp $(LAC_PATH)/src/build/linux_2.6/user_space/lib$(BASENAME).a $(ICP_BUILD_OUTPUT)/$(DEST_LIBDIR); + @cd $(LAC_PATH) && export ICP_ENV_DIR=$(ICP_TOP_ENV) && export ONE_KO_RELEASE_PACKAGE=1 && cd src && $(MAKE) ARCH=$(ICP_ARCH_USER) lib_shared ICP_OS_LEVEL=user_space; +- cp $(LAC_PATH)/src/build/linux_2.6/user_space/lib$(BASENAME)_s.so $(ICP_BUILD_OUTPUT)/; ++ cp $(LAC_PATH)/src/build/linux_2.6/user_space/lib$(BASENAME)_s.so $(ICP_BUILD_OUTPUT)/$(DEST_LIBDIR); + + qat-fw: output_dir + @echo ; echo 'Copying QAT-FW Binary'; +- @cp -f $(QAT_FW_PATH)/icp_qat_ae.mof $(ICP_BUILD_OUTPUT)/mof_firmware.bin; ++ @cp -f $(QAT_FW_PATH)/icp_qat_ae.mof $(ICP_BUILD_OUTPUT)/lib/firmware/$(ICP_FIRMWARE_DIR)/mof_firmware.bin; + @echo ; echo 'Copying MMP Binary'; +- @cp -f $(QAT_FW_PATH)/icp_qat_pke.mof $(ICP_BUILD_OUTPUT)/mmp_firmware.bin; ++ @cp -f $(QAT_FW_PATH)/icp_qat_pke.mof $(ICP_BUILD_OUTPUT)/lib/firmware/$(ICP_FIRMWARE_DIR)/mmp_firmware.bin; + + qat_mux: output_dir libosal + @echo ; echo 'Building qat_mux module' + @cd $(CPA_MUX_PATH) && export ICP_ENV_DIR=$(ICP_TOP_ENV) && export ONE_KO_RELEASE_PACKAGE=1 && $(MAKE) ICP_OS_LEVEL=kernel_space OS_LEVEL=linux; +- @cp $(CPA_MUX_PATH)/build/linux_2.6/kernel_space/qat_mux.ko $(ICP_BUILD_OUTPUT)/; ++ @cp $(CPA_MUX_PATH)/build/linux_2.6/kernel_space/qat_mux.ko $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/kernel/drivers/; + @echo ; echo 'Building qat_mux in user space' + @cd $(CPA_MUX_PATH) && export ICP_ENV_DIR=$(ICP_TOP_ENV) && export ONE_KO_RELEASE_PACKAGE=1 && $(MAKE) ICP_OS_LEVEL=user_space; +- @cp $(CPA_MUX_PATH)/build/linux_2.6/user_space/libqat_mux_s.so $(ICP_BUILD_OUTPUT)/; +- @cp $(CPA_MUX_PATH)/build/linux_2.6/user_space/libqat_mux.a $(ICP_BUILD_OUTPUT)/; ++ @cp $(CPA_MUX_PATH)/build/linux_2.6/user_space/libqat_mux_s.so $(ICP_BUILD_OUTPUT)/$(DEST_LIBDIR); ++ @cp $(CPA_MUX_PATH)/build/linux_2.6/user_space/libqat_mux.a $(ICP_BUILD_OUTPUT)/$(DEST_LIBDIR); + @cp $(CPA_MUX_PATH)/Module.symvers $(LAC_PATH)/src/ + + clean: +@@ -244,6 +244,10 @@ endif + + output_dir: + test -d $(ICP_BUILD_OUTPUT) || mkdir -p $(ICP_BUILD_OUTPUT); ++ test -d $(ICP_BUILD_OUTPUT)$(DEST_LIBDIR) || mkdir -p $(ICP_BUILD_OUTPUT)$(DEST_LIBDIR); ++ test -d $(ICP_BUILD_OUTPUT)/lib/firmware/$(ICP_FIRMWARE_DIR) || mkdir -p $(ICP_BUILD_OUTPUT)/lib/firmware/$(ICP_FIRMWARE_DIR); ++ test -d $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/kernel/drivers || mkdir -p $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/kernel/drivers; ++ test -d $(ICP_BUILD_OUTPUT)/etc/init.d || mkdir -p $(ICP_BUILD_OUTPUT)/etc/init.d; + + lac_lib_dir: + test -d $(LAC_LIB_DIR) || mkdir -p $(LAC_LIB_DIR); +diff --git a/quickassist/lookaside/access_layer/src/sample_code/performance/Makefile b/quickassist/lookaside/access_layer/src/sample_code/performance/Makefile +index 9f48dc2..d201b66 100644 +--- a/quickassist/lookaside/access_layer/src/sample_code/performance/Makefile ++++ b/quickassist/lookaside/access_layer/src/sample_code/performance/Makefile +@@ -187,7 +187,7 @@ ifeq ($(WITH_CPA_MUX),1) + EXTRA_CFLAGS+=-DWITH_CPA_MUX + ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libqat_mux_s.so + else +- ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libicp_qa_al_s.so ++ ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/$(DEST_LIBDIR)/libicp_qa_al_s.so + endif + + ifeq ($(WITH_CMDRV),1) +-- +1.7.9.5 + diff --git a/meta-crystalforest/recipes-extended/qat/qat16/qat16_2.3.0-34-qat-remove-local-path-from-makefile.patch b/meta-crystalforest/recipes-extended/qat/qat16/qat16_2.3.0-34-qat-remove-local-path-from-makefile.patch new file mode 100644 index 0000000..1b07d32 --- /dev/null +++ b/meta-crystalforest/recipes-extended/qat/qat16/qat16_2.3.0-34-qat-remove-local-path-from-makefile.patch @@ -0,0 +1,31 @@ +From a27d89e4727d380d74e0f041f2fe57f639bf14c4 Mon Sep 17 00:00:00 2001 +From: Anuj Mittal <[email protected]> +Date: Tue, 7 Jul 2015 10:28:45 +0800 +Subject: [PATCH 2/3] qat: remove local path from makefile + +Upstream-Status: Inappropriate [Configuration] + +Remove the host machine /usr/include path from makefile. + +Signed-off-by: Anuj Mittal <[email protected]> +--- + .../build_files/env_files/linux_2.6_user_space.mk | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/quickassist/build_system/build_files/env_files/linux_2.6_user_space.mk b/quickassist/build_system/build_files/env_files/linux_2.6_user_space.mk +index 1451f4a..719d1bb 100755 +--- a/quickassist/build_system/build_files/env_files/linux_2.6_user_space.mk ++++ b/quickassist/build_system/build_files/env_files/linux_2.6_user_space.mk +@@ -72,8 +72,7 @@ + # + #------------------------------------------------------------- + +-INCLUDES+=-I/usr/include \ +- -I$(API_DIR) \ ++INCLUDES+=-I$(API_DIR) \ + -I$(OSAL_DIR)/include \ + -I$(OSAL_DIR)/src/linux/user_space/include + +-- +1.7.9.5 + diff --git a/meta-crystalforest/recipes-extended/qat/qat16/qat16_2.3.0-34-qat-tweak-sample-code-makefiles.patch b/meta-crystalforest/recipes-extended/qat/qat16/qat16_2.3.0-34-qat-tweak-sample-code-makefiles.patch new file mode 100644 index 0000000..22c4784 --- /dev/null +++ b/meta-crystalforest/recipes-extended/qat/qat16/qat16_2.3.0-34-qat-tweak-sample-code-makefiles.patch @@ -0,0 +1,552 @@ +From 062de975bb44ecf709d4dde3d11845697a46bc17 Mon Sep 17 00:00:00 2001 +From: Anuj Mittal <[email protected]> +Date: Tue, 7 Jul 2015 10:29:36 +0800 +Subject: [PATCH 3/3] qat: tweak sample code makefiles + +Upstream-Status: Inappropriate [Configuration] + +Make sure that the sample code makefiles point +to a valid location of icp_qa_al lib. + +Signed-off-by: Anuj Mittal <[email protected]> +--- + .../access_layer/src/sample_code/Makefile | 18 ++++-- + .../access_layer/src/sample_code/fips/Makefile | 4 +- + .../src/sample_code/functional/Makefile | 68 ++++++++++---------- + .../functional/asym/diffie_hellman_sample/Makefile | 2 +- + .../functional/asym/prime_sample/Makefile | 2 +- + .../functional/dc/dc_dp_sample/Makefile | 2 +- + .../functional/dc/stateful_sample/Makefile | 2 +- + .../dc/stateless_multi_op_checksum_sample/Makefile | 6 +- + .../functional/dc/stateless_sample/Makefile | 2 +- + .../functional/sym/alg_chaining_sample/Makefile | 2 +- + .../sample_code/functional/sym/ccm_sample/Makefile | 2 +- + .../functional/sym/cipher_sample/Makefile | 2 +- + .../functional/sym/drbg_sample/Makefile | 2 +- + .../sample_code/functional/sym/gcm_sample/Makefile | 2 +- + .../functional/sym/hash_file_sample/Makefile | 2 +- + .../functional/sym/hash_sample/Makefile | 2 +- + .../functional/sym/ipsec_sample/Makefile | 2 +- + .../functional/sym/nrbg_sample/Makefile | 2 +- + .../sample_code/functional/sym/ssl_sample/Makefile | 2 +- + .../functional/sym/symdp_sample/Makefile | 2 +- + .../src/sample_code/load_test_application/Makefile | 2 +- + .../src/sample_code/performance/Makefile | 2 +- + .../performance/qae/linux/kernel_space/Makefile | 8 +-- + 23 files changed, 74 insertions(+), 66 deletions(-) + +diff --git a/quickassist/lookaside/access_layer/src/sample_code/Makefile b/quickassist/lookaside/access_layer/src/sample_code/Makefile +index 91c7373..80a6a49 100644 +--- a/quickassist/lookaside/access_layer/src/sample_code/Makefile ++++ b/quickassist/lookaside/access_layer/src/sample_code/Makefile +@@ -95,6 +95,7 @@ SAMPLE_PATH?=$(ICP_ROOT)/quickassist/lookaside/access_layer/src/sample_code + PERF_PATH?=$(ICP_ROOT)/quickassist/lookaside/access_layer/src/sample_code/performance + FIPS_PATH?=$(ICP_ROOT)/quickassist/lookaside/access_layer/src/sample_code/fips + FUNC_PATH=$(SAMPLE_PATH)/functional ++FIPS_OUTPUT_NAME=fips_sample + + #include the makefile with all the default and common Make variable definitions + include $(ICP_BUILDSYSTEM_PATH)/build_files/common.mk +@@ -106,6 +107,8 @@ SAMPLE_BUILD_OUTPUT?=$(SAMPLE_PATH)/build + + output_dir: + test -d $(SAMPLE_BUILD_OUTPUT) || mkdir $(SAMPLE_BUILD_OUTPUT); ++ test -d $(SAMPLE_BUILD_OUTPUT)$(DEST_BINDIR) || mkdir -p $(SAMPLE_BUILD_OUTPUT)$(DEST_BINDIR) ++ + fips_code: + @if test -d $(FIPS_PATH); then echo ; echo 'Building FIPS Code'; fi; + @if test -d $(FIPS_PATH); \ +@@ -118,6 +121,7 @@ fips_code: + KERNEL_SOURCE_ROOT=$(KERNEL_SOURCE_ROOT) \ + ICP_ENV_DIR=$(ICP_ENV_DIR); \ + fi; ++ @cp $(FIPS_PATH)/build/linux_2.6/$(ICP_OS_LEVEL)/$(FIPS_OUTPUT_NAME).ko $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/kernel/drivers; + + fips_user_code: + @if test -d $(FIPS_PATH); then echo ; echo 'Building FIPS Code'; fi; +@@ -131,6 +135,8 @@ fips_user_code: + KERNEL_SOURCE_ROOT=$(KERNEL_SOURCE_ROOT) \ + ICP_ENV_DIR=$(ICP_ENV_DIR); \ + fi; ++ @cp $(FIPS_PATH)/build/linux_2.6/user_space/$(FIPS_OUTPUT_NAME)_s.so $(SAMPLE_BUILD_OUTPUT)$(DEST_LIBDIR); ++ @cp $(FIPS_PATH)/build/linux_2.6/user_space/$(FIPS_OUTPUT_NAME).a $(SAMPLE_BUILD_OUTPUT)$(DEST_LIBDIR); + + ifeq ($(LATENCY_CODE),1) + EXTRA_CFLAGS += -DLATENCY_CODE +@@ -161,26 +167,26 @@ perf_all: $(PERF_ALL) + perf_user: output_dir + @echo ; echo "Building perf_user"; + @cd $(PERF_PATH) && $(MAKE) clean ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=user_space lib_shared exe +- @cp $(PERF_PATH)/build/linux_2.6/user_space/$(PERF_OUTPUT_NAME)_s.so $(SAMPLE_BUILD_OUTPUT)/; +- @cp $(PERF_PATH)/build/linux_2.6/user_space/$(PERF_OUTPUT_NAME) $(SAMPLE_BUILD_OUTPUT)/; ++ @cp $(PERF_PATH)/build/linux_2.6/user_space/$(PERF_OUTPUT_NAME)_s.so $(SAMPLE_BUILD_OUTPUT)$(DEST_LIBDIR); ++ @cp $(PERF_PATH)/build/linux_2.6/user_space/$(PERF_OUTPUT_NAME) $(SAMPLE_BUILD_OUTPUT)$(DEST_BINDIR); + + perf_kernel: output_dir + @echo ; echo "Building perf_kernel"; + @cd $(PERF_PATH) && $(MAKE) ICP_OS_LEVEL=kernel_space +- @cp $(PERF_PATH)/build/linux_2.6/$(ICP_OS_LEVEL)/$(PERF_OUTPUT_NAME).ko $(SAMPLE_BUILD_OUTPUT)/; ++ @cp $(PERF_PATH)/build/linux_2.6/$(ICP_OS_LEVEL)/$(PERF_OUTPUT_NAME).ko $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/kernel/drivers; + + common_mem_drv: output_dir + @echo ; echo "Building common_mem_drv kernel space"; + @cd $(CMN_ROOT) && $(MAKE) ICP_OS_LEVEL=user_space cm_kernel +- @cp $(CMN_ROOT)/$(CMN_MODULE_NAME).ko $(ICP_BUILD_OUTPUT)/; ++ @cp $(CMN_ROOT)/$(CMN_MODULE_NAME).ko $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/kernel/drivers; + @echo ; echo "Building common_mem_drv user space"; + @cd $(CMN_ROOT) && $(MAKE) ICP_OS_LEVEL=user_space cm_user +- @cp $(CMN_ROOT)/$(CMN_MODULE_NAME).a $(ICP_BUILD_OUTPUT)/; ++ @cp $(CMN_ROOT)/$(CMN_MODULE_NAME).a $(ICP_BUILD_OUTPUT)$(DEST_LIBDIR); + + perf_qae: output_dir + @echo ; echo "Building perf_qae"; + @cd $(CMN_ROOT)/linux/kernel_space && $(MAKE) ICP_OS_LEVEL=kernel_space +- @cp $(CMN_ROOT)/linux/kernel_space/build/linux_2.6/$(ICP_OS_LEVEL)/$(CMN_MODULE_NAME).ko $(SAMPLE_BUILD_OUTPUT)/; ++ @cp $(CMN_ROOT)/linux/kernel_space/build/linux_2.6/$(ICP_OS_LEVEL)/$(CMN_MODULE_NAME).ko $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/kernel/drivers; + + + func: output_dir +diff --git a/quickassist/lookaside/access_layer/src/sample_code/fips/Makefile b/quickassist/lookaside/access_layer/src/sample_code/fips/Makefile +index ccd12ff..93dd27d 100644 +--- a/quickassist/lookaside/access_layer/src/sample_code/fips/Makefile ++++ b/quickassist/lookaside/access_layer/src/sample_code/fips/Makefile +@@ -95,13 +95,13 @@ EXTRA_CFLAGS+= -std=gnu99 -Wall -DDEBUG + EXTRA_CFLAGS+= -DKERNEL_SPACE + else + CFLAGS+= -std=gnu99 -Wall -DDEBUG +-LD_LIBRARY_PATH+= $(ICP_BUILD_OUTPUT) ++LD_LIBRARY_PATH+= $(ICP_BUILD_OUTPUT)/$(DEST_LIBDIR) + + ifeq ($(WITH_CPA_MUX),1) + EXTRA_CFLAGS+=-DWITH_CPA_MUX + ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libqat_mux_s.so + else +- ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libicp_qa_al_s.so ++ ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)$(DEST_LIBDIR)/libicp_qa_al_s.so + endif + + endif +diff --git a/quickassist/lookaside/access_layer/src/sample_code/functional/Makefile b/quickassist/lookaside/access_layer/src/sample_code/functional/Makefile +index 8944883..4b02692 100644 +--- a/quickassist/lookaside/access_layer/src/sample_code/functional/Makefile ++++ b/quickassist/lookaside/access_layer/src/sample_code/functional/Makefile +@@ -64,6 +64,8 @@ SYM_PATH?=$(SAMPLE_PATH)/sym + ASYM_PATH?=$(SAMPLE_PATH)/asym + ICP_API_DIR?=$(ICP_ROOT)/quickassist/include/ + ICP_LAC_DIR?=$(ICP_ROOT)/quickassist/lookaside/access_layer/ ++BIN_INSTALLPATH=$(SAMPLE_BUILD_OUTPUT)$(DEST_BINDIR) ++MODULE_INSTALLPATH=$(SAMPLE_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/kernel/drivers + + ifeq ($(WITH_CMDRV),1) + CMN_ROOT?=$(ICP_ROOT)/quickassist/utilities/libqae_mem/ +@@ -119,23 +121,23 @@ dc: $(BUILD_DC) + + dc_dp_sample: output_dir + @cd $(DC_PATH)/dc_dp_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space +- @cp $(DC_PATH)/dc_dp_sample/dc_dp_sample $(SAMPLE_BUILD_OUTPUT)/; +- @cp $(DC_PATH)/dc_dp_sample/dc_dp_sample.ko $(SAMPLE_BUILD_OUTPUT)/; ++ @cp $(DC_PATH)/dc_dp_sample/dc_dp_sample $(BIN_INSTALLPATH); ++ @cp $(DC_PATH)/dc_dp_sample/dc_dp_sample.ko $(MODULE_INSTALLPATH); + + stateless_sample: output_dir + @cd $(DC_PATH)/stateless_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space +- @cp $(DC_PATH)/stateless_sample/dc_stateless_sample.ko $(SAMPLE_BUILD_OUTPUT)/; +- @cp $(DC_PATH)/stateless_sample/dc_stateless_sample $(SAMPLE_BUILD_OUTPUT)/; ++ @cp $(DC_PATH)/stateless_sample/dc_stateless_sample.ko $(MODULE_INSTALLPATH); ++ @cp $(DC_PATH)/stateless_sample/dc_stateless_sample $(BIN_INSTALLPATH); + + stateful_sample: output_dir + @cd $(DC_PATH)/stateful_sample && $(MAKE) clean ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=user_space +- @cp $(DC_PATH)/stateful_sample/dc_stateful_sample $(SAMPLE_BUILD_OUTPUT)/; +- @cp $(DC_PATH)/stateful_sample/paper4 $(SAMPLE_BUILD_OUTPUT)/; ++ @cp $(DC_PATH)/stateful_sample/dc_stateful_sample $(BIN_INSTALLPATH); ++ @cp $(DC_PATH)/stateful_sample/paper4 $(BIN_INSTALLPATH); + + stateless_multi_op_checksum_sample: output_dir + @cd $(DC_PATH)/stateless_multi_op_checksum_sample && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space +- @cp $(DC_PATH)/stateless_multi_op_checksum_sample/dc_stateless_multi_op_sample.ko $(SAMPLE_BUILD_OUTPUT)/; +- @cp $(DC_PATH)/stateless_multi_op_checksum_sample/dc_stateless_multi_op_sample $(SAMPLE_BUILD_OUTPUT)/; ++ @cp $(DC_PATH)/stateless_multi_op_checksum_sample/dc_stateless_multi_op_sample.ko $(MODULE_INSTALLPATH); ++ @cp $(DC_PATH)/stateless_multi_op_checksum_sample/dc_stateless_multi_op_sample $(BIN_INSTALLPATH) + + BUILD_SYN=algchaining_sample ccm_sample cipher_sample \ + drbg_sample gcm_sample hash_file_sample \ +@@ -146,57 +148,57 @@ sym:$(BUILD_SYN) + @echo ; echo "Build sym component"; + algchaining_sample: output_dir + @cd $(SYM_PATH)/alg_chaining_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space +- @cp $(SYM_PATH)/alg_chaining_sample/algchaining_sample.ko $(SAMPLE_BUILD_OUTPUT)/; +- @cp $(SYM_PATH)/alg_chaining_sample/algchaining_sample $(SAMPLE_BUILD_OUTPUT)/; ++ @cp $(SYM_PATH)/alg_chaining_sample/algchaining_sample.ko $(MODULE_INSTALLPATH); ++ @cp $(SYM_PATH)/alg_chaining_sample/algchaining_sample $(BIN_INSTALLPATH); + + ccm_sample: output_dir + @cd $(SYM_PATH)/ccm_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space +- @cp $(SYM_PATH)/ccm_sample/ccm_sample.ko $(SAMPLE_BUILD_OUTPUT)/; +- @cp $(SYM_PATH)/ccm_sample/ccm_sample $(SAMPLE_BUILD_OUTPUT)/; ++ @cp $(SYM_PATH)/ccm_sample/ccm_sample.ko $(MODULE_INSTALLPATH); ++ @cp $(SYM_PATH)/ccm_sample/ccm_sample $(BIN_INSTALLPATH); + + cipher_sample: output_dir + @cd $(SYM_PATH)/cipher_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space +- @cp $(SYM_PATH)/cipher_sample/cipher_sample.ko $(SAMPLE_BUILD_OUTPUT)/; +- @cp $(SYM_PATH)/cipher_sample/cipher_sample $(SAMPLE_BUILD_OUTPUT)/; ++ @cp $(SYM_PATH)/cipher_sample/cipher_sample.ko $(MODULE_INSTALLPATH); ++ @cp $(SYM_PATH)/cipher_sample/cipher_sample $(BIN_INSTALLPATH); + + drbg_sample: output_dir + @cd $(SYM_PATH)/drbg_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space +- @cp $(SYM_PATH)/drbg_sample/drbg_sample.ko $(SAMPLE_BUILD_OUTPUT)/; +- @cp $(SYM_PATH)/drbg_sample/drbg_sample $(SAMPLE_BUILD_OUTPUT)/; ++ @cp $(SYM_PATH)/drbg_sample/drbg_sample.ko $(MODULE_INSTALLPATH); ++ @cp $(SYM_PATH)/drbg_sample/drbg_sample $(BIN_INSTALLPATH); + + gcm_sample: output_dir + @cd $(SYM_PATH)/gcm_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space +- @cp $(SYM_PATH)/gcm_sample/gcm_sample.ko $(SAMPLE_BUILD_OUTPUT)/; +- @cp $(SYM_PATH)/gcm_sample/gcm_sample $(SAMPLE_BUILD_OUTPUT)/; ++ @cp $(SYM_PATH)/gcm_sample/gcm_sample.ko $(MODULE_INSTALLPATH); ++ @cp $(SYM_PATH)/gcm_sample/gcm_sample $(BIN_INSTALLPATH); + + hash_file_sample: output_dir + @cd $(SYM_PATH)/hash_file_sample && $(MAKE) clean ICP_OS_LEVEL=user_space&& $(MAKE) ICP_OS_LEVEL=user_space +- @cp $(SYM_PATH)/hash_file_sample/hash_file_sample $(SAMPLE_BUILD_OUTPUT)/; ++ @cp $(SYM_PATH)/hash_file_sample/hash_file_sample $(BIN_INSTALLPATH); + + hash_sample: output_dir + @cd $(SYM_PATH)/hash_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space +- @cp $(SYM_PATH)/hash_sample/hash_sample.ko $(SAMPLE_BUILD_OUTPUT)/; +- @cp $(SYM_PATH)/hash_sample/hash_sample $(SAMPLE_BUILD_OUTPUT)/; ++ @cp $(SYM_PATH)/hash_sample/hash_sample.ko $(MODULE_INSTALLPATH); ++ @cp $(SYM_PATH)/hash_sample/hash_sample $(BIN_INSTALLPATH); + + ipsec_sample: output_dir + @cd $(SYM_PATH)/ipsec_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space +- @cp $(SYM_PATH)/ipsec_sample/ipsec_sample.ko $(SAMPLE_BUILD_OUTPUT)/; +- @cp $(SYM_PATH)/ipsec_sample/ipsec_sample $(SAMPLE_BUILD_OUTPUT)/; ++ @cp $(SYM_PATH)/ipsec_sample/ipsec_sample.ko $(MODULE_INSTALLPATH); ++ @cp $(SYM_PATH)/ipsec_sample/ipsec_sample $(BIN_INSTALLPATH); + + nrbg_sample: output_dir + @cd $(SYM_PATH)/nrbg_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space +- @cp $(SYM_PATH)/nrbg_sample/nrbg_sample $(SAMPLE_BUILD_OUTPUT)/; +- @cp $(SYM_PATH)/nrbg_sample/nrbg_sample.ko $(SAMPLE_BUILD_OUTPUT)/; ++ @cp $(SYM_PATH)/nrbg_sample/nrbg_sample $(BIN_INSTALLPATH); ++ @cp $(SYM_PATH)/nrbg_sample/nrbg_sample.ko $(MODULE_INSTALLPATH); + + ssl_sample: output_dir + @cd $(SYM_PATH)/ssl_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space +- @cp $(SYM_PATH)/ssl_sample/ssl_sample.ko $(SAMPLE_BUILD_OUTPUT)/; +- @cp $(SYM_PATH)/ssl_sample/ssl_sample $(SAMPLE_BUILD_OUTPUT)/; ++ @cp $(SYM_PATH)/ssl_sample/ssl_sample.ko $(MODULE_INSTALLPATH); ++ @cp $(SYM_PATH)/ssl_sample/ssl_sample $(BIN_INSTALLPATH); + + sym_dp_sample: output_dir + @cd $(SYM_PATH)/symdp_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space +- @cp $(SYM_PATH)/symdp_sample/sym_dp_sample.ko $(SAMPLE_BUILD_OUTPUT)/; +- @cp $(SYM_PATH)/symdp_sample/sym_dp_sample $(SAMPLE_BUILD_OUTPUT)/; ++ @cp $(SYM_PATH)/symdp_sample/sym_dp_sample.ko $(MODULE_INSTALLPATH); ++ @cp $(SYM_PATH)/symdp_sample/sym_dp_sample $(BIN_INSTALLPATH); + + BUILD_ASYM=diffie_hellman_sample prime_sample + +@@ -205,13 +207,13 @@ asym: $(BUILD_ASYM) + + diffie_hellman_sample: output_dir + @cd $(ASYM_PATH)/diffie_hellman_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space +- @cp $(ASYM_PATH)/diffie_hellman_sample/dh_sample.ko $(SAMPLE_BUILD_OUTPUT)/; +- @cp $(ASYM_PATH)/diffie_hellman_sample/dh_sample $(SAMPLE_BUILD_OUTPUT)/; ++ @cp $(ASYM_PATH)/diffie_hellman_sample/dh_sample.ko $(MODULE_INSTALLPATH); ++ @cp $(ASYM_PATH)/diffie_hellman_sample/dh_sample $(BIN_INSTALLPATH); + + prime_sample: output_dir + @cd $(ASYM_PATH)/prime_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space +- @cp $(ASYM_PATH)/prime_sample/prime_sample.ko $(SAMPLE_BUILD_OUTPUT)/; +- @cp $(ASYM_PATH)/prime_sample/prime_sample $(SAMPLE_BUILD_OUTPUT)/; ++ @cp $(ASYM_PATH)/prime_sample/prime_sample.ko $(MODULE_INSTALLPATH); ++ @cp $(ASYM_PATH)/prime_sample/prime_sample $(BIN_INSTALLPATH); + + CLEAN_DC=clean_dc_dp_sample clean_stateless_sample \ + clean_stateful_sample \ +diff --git a/quickassist/lookaside/access_layer/src/sample_code/functional/asym/diffie_hellman_sample/Makefile b/quickassist/lookaside/access_layer/src/sample_code/functional/asym/diffie_hellman_sample/Makefile +index d200d1e..a4bdae7 100644 +--- a/quickassist/lookaside/access_layer/src/sample_code/functional/asym/diffie_hellman_sample/Makefile ++++ b/quickassist/lookaside/access_layer/src/sample_code/functional/asym/diffie_hellman_sample/Makefile +@@ -112,7 +112,7 @@ ifeq ($(WITH_CPA_MUX),1) + EXTRA_CFLAGS+=-DWITH_CPA_MUX + ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libqat_mux_s.so + else +- ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libicp_qa_al_s.so ++ ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)$(DEST_LIBDIR)/libicp_qa_al_s.so + endif + + ADDITIONAL_OBJECTS += -L/usr/Lib -lpthread -lcrypto +diff --git a/quickassist/lookaside/access_layer/src/sample_code/functional/asym/prime_sample/Makefile b/quickassist/lookaside/access_layer/src/sample_code/functional/asym/prime_sample/Makefile +index e816b34..2d9cef4 100644 +--- a/quickassist/lookaside/access_layer/src/sample_code/functional/asym/prime_sample/Makefile ++++ b/quickassist/lookaside/access_layer/src/sample_code/functional/asym/prime_sample/Makefile +@@ -111,7 +111,7 @@ ifeq ($(WITH_CPA_MUX),1) + EXTRA_CFLAGS+=-DWITH_CPA_MUX + ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libqat_mux_s.so + else +- ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libicp_qa_al_s.so ++ ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)$(DEST_LIBDIR)/libicp_qa_al_s.so + endif + + ADDITIONAL_OBJECTS += -L/usr/Lib -lpthread -lcrypto +diff --git a/quickassist/lookaside/access_layer/src/sample_code/functional/dc/dc_dp_sample/Makefile b/quickassist/lookaside/access_layer/src/sample_code/functional/dc/dc_dp_sample/Makefile +index f805034..cde590e 100644 +--- a/quickassist/lookaside/access_layer/src/sample_code/functional/dc/dc_dp_sample/Makefile ++++ b/quickassist/lookaside/access_layer/src/sample_code/functional/dc/dc_dp_sample/Makefile +@@ -109,7 +109,7 @@ ifeq ($(WITH_CPA_MUX),1) + EXTRA_CFLAGS+=-DWITH_CPA_MUX + ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libqat_mux_s.so + else +- ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libicp_qa_al_s.so ++ ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)$(DEST_LIBDIR)/libicp_qa_al_s.so + endif + + ADDITIONAL_OBJECTS += -L/usr/Lib -lpthread -lcrypto +diff --git a/quickassist/lookaside/access_layer/src/sample_code/functional/dc/stateful_sample/Makefile b/quickassist/lookaside/access_layer/src/sample_code/functional/dc/stateful_sample/Makefile +index 98f9c0f..a877f0c 100644 +--- a/quickassist/lookaside/access_layer/src/sample_code/functional/dc/stateful_sample/Makefile ++++ b/quickassist/lookaside/access_layer/src/sample_code/functional/dc/stateful_sample/Makefile +@@ -107,7 +107,7 @@ ifeq ($(WITH_CPA_MUX),1) + EXTRA_CFLAGS+=-DWITH_CPA_MUX + ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libqat_mux_s.so + else +- ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libicp_qa_al_s.so ++ ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)$(DEST_LIBDIR)/libicp_qa_al_s.so + endif + + ADDITIONAL_OBJECTS += -L/usr/Lib -lpthread -lcrypto +diff --git a/quickassist/lookaside/access_layer/src/sample_code/functional/dc/stateless_multi_op_checksum_sample/Makefile b/quickassist/lookaside/access_layer/src/sample_code/functional/dc/stateless_multi_op_checksum_sample/Makefile +index 01590c3..d05c488 100644 +--- a/quickassist/lookaside/access_layer/src/sample_code/functional/dc/stateless_multi_op_checksum_sample/Makefile ++++ b/quickassist/lookaside/access_layer/src/sample_code/functional/dc/stateless_multi_op_checksum_sample/Makefile +@@ -108,10 +108,10 @@ ifeq ($(WITH_CPA_MUX),1) + EXTRA_CFLAGS+=-DWITH_CPA_MUX + ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libqat_mux_s.so + else +- ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libicp_qa_al_s.so ++ ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)$(DEST_LIBDIR)/libicp_qa_al_s.so + endif + +-ADDITIONAL_OBJECTS += -L/usr/Lib -lpthread -lcrypto ++ADDITIONAL_OBJECTS += -lpthread -lcrypto + + USER_SOURCE_FILES = ../../common/cpa_sample_utils.c cpa_dc_stateless_multi_op_checksum_sample.c + USER_SOURCE_FILES += ../stateless_sample/cpa_dc_sample_user.c +@@ -127,7 +127,7 @@ else + endif + + default: clean +- gcc -Wall -O1 $(USER_INCLUDES) -DUSER_SPACE $(EXTRA_CFLAGS) \ ++ $(CC) -Wall -O1 $(USER_INCLUDES) -DUSER_SPACE $(EXTRA_CFLAGS) \ + $(USER_SOURCE_FILES) $(ADDITIONAL_OBJECTS) -o $(OUTPUT_NAME) + + clean: +diff --git a/quickassist/lookaside/access_layer/src/sample_code/functional/dc/stateless_sample/Makefile b/quickassist/lookaside/access_layer/src/sample_code/functional/dc/stateless_sample/Makefile +index a9bf478..a43a2d2 100644 +--- a/quickassist/lookaside/access_layer/src/sample_code/functional/dc/stateless_sample/Makefile ++++ b/quickassist/lookaside/access_layer/src/sample_code/functional/dc/stateless_sample/Makefile +@@ -109,7 +109,7 @@ ifeq ($(WITH_CPA_MUX),1) + EXTRA_CFLAGS+=-DWITH_CPA_MUX + ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libqat_mux_s.so + else +- ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libicp_qa_al_s.so ++ ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)$(DEST_LIBDIR)/libicp_qa_al_s.so + endif + + ADDITIONAL_OBJECTS += -L/usr/Lib -lpthread -lcrypto +diff --git a/quickassist/lookaside/access_layer/src/sample_code/functional/sym/alg_chaining_sample/Makefile b/quickassist/lookaside/access_layer/src/sample_code/functional/sym/alg_chaining_sample/Makefile +index 768f4f9..2ed0bb4 100644 +--- a/quickassist/lookaside/access_layer/src/sample_code/functional/sym/alg_chaining_sample/Makefile ++++ b/quickassist/lookaside/access_layer/src/sample_code/functional/sym/alg_chaining_sample/Makefile +@@ -112,7 +112,7 @@ ifeq ($(WITH_CPA_MUX),1) + EXTRA_CFLAGS+=-DWITH_CPA_MUX + ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libqat_mux_s.so + else +- ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libicp_qa_al_s.so ++ ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)$(DEST_LIBDIR)/libicp_qa_al_s.so + endif + + ADDITIONAL_OBJECTS += -L/usr/Lib -lpthread -lcrypto +diff --git a/quickassist/lookaside/access_layer/src/sample_code/functional/sym/ccm_sample/Makefile b/quickassist/lookaside/access_layer/src/sample_code/functional/sym/ccm_sample/Makefile +index 94a3b3c..c5d2949 100644 +--- a/quickassist/lookaside/access_layer/src/sample_code/functional/sym/ccm_sample/Makefile ++++ b/quickassist/lookaside/access_layer/src/sample_code/functional/sym/ccm_sample/Makefile +@@ -113,7 +113,7 @@ ifeq ($(WITH_CPA_MUX),1) + EXTRA_CFLAGS+=-DWITH_CPA_MUX + ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libqat_mux_s.so + else +- ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libicp_qa_al_s.so ++ ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)$(DEST_LIBDIR)/libicp_qa_al_s.so + endif + + ADDITIONAL_OBJECTS += -L/usr/Lib -lpthread -lcrypto +diff --git a/quickassist/lookaside/access_layer/src/sample_code/functional/sym/cipher_sample/Makefile b/quickassist/lookaside/access_layer/src/sample_code/functional/sym/cipher_sample/Makefile +index d1444b3..1e2d9da 100644 +--- a/quickassist/lookaside/access_layer/src/sample_code/functional/sym/cipher_sample/Makefile ++++ b/quickassist/lookaside/access_layer/src/sample_code/functional/sym/cipher_sample/Makefile +@@ -112,7 +112,7 @@ ifeq ($(WITH_CPA_MUX),1) + EXTRA_CFLAGS+=-DWITH_CPA_MUX + ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libqat_mux_s.so + else +- ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libicp_qa_al_s.so ++ ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)$(DEST_LIBDIR)/libicp_qa_al_s.so + endif + + ADDITIONAL_OBJECTS += -L/usr/Lib -lpthread -lcrypto +diff --git a/quickassist/lookaside/access_layer/src/sample_code/functional/sym/drbg_sample/Makefile b/quickassist/lookaside/access_layer/src/sample_code/functional/sym/drbg_sample/Makefile +index df41218..759c5af 100644 +--- a/quickassist/lookaside/access_layer/src/sample_code/functional/sym/drbg_sample/Makefile ++++ b/quickassist/lookaside/access_layer/src/sample_code/functional/sym/drbg_sample/Makefile +@@ -114,7 +114,7 @@ ifeq ($(WITH_CPA_MUX),1) + EXTRA_CFLAGS+=-DWITH_CPA_MUX + ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libqat_mux_s.so + else +- ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libicp_qa_al_s.so ++ ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)$(DEST_LIBDIR)/libicp_qa_al_s.so + endif + + ADDITIONAL_OBJECTS += -L/usr/Lib -lpthread -lcrypto +diff --git a/quickassist/lookaside/access_layer/src/sample_code/functional/sym/gcm_sample/Makefile b/quickassist/lookaside/access_layer/src/sample_code/functional/sym/gcm_sample/Makefile +index 94fa34b..2a4bae3 100644 +--- a/quickassist/lookaside/access_layer/src/sample_code/functional/sym/gcm_sample/Makefile ++++ b/quickassist/lookaside/access_layer/src/sample_code/functional/sym/gcm_sample/Makefile +@@ -113,7 +113,7 @@ ifeq ($(WITH_CPA_MUX),1) + EXTRA_CFLAGS+=-DWITH_CPA_MUX + ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libqat_mux_s.so + else +- ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libicp_qa_al_s.so ++ ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)$(DEST_LIBDIR)/libicp_qa_al_s.so + endif + + ADDITIONAL_OBJECTS += -L/usr/Lib -lpthread -lcrypto +diff --git a/quickassist/lookaside/access_layer/src/sample_code/functional/sym/hash_file_sample/Makefile b/quickassist/lookaside/access_layer/src/sample_code/functional/sym/hash_file_sample/Makefile +index 7647770..92d23dd 100644 +--- a/quickassist/lookaside/access_layer/src/sample_code/functional/sym/hash_file_sample/Makefile ++++ b/quickassist/lookaside/access_layer/src/sample_code/functional/sym/hash_file_sample/Makefile +@@ -112,7 +112,7 @@ ifeq ($(WITH_CPA_MUX),1) + EXTRA_CFLAGS+=-DWITH_CPA_MUX + ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libqat_mux_s.so + else +- ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libicp_qa_al_s.so ++ ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)$(DEST_LIBDIR)/libicp_qa_al_s.so + endif + + ADDITIONAL_OBJECTS += -L/usr/Lib -lpthread -lcrypto +diff --git a/quickassist/lookaside/access_layer/src/sample_code/functional/sym/hash_sample/Makefile b/quickassist/lookaside/access_layer/src/sample_code/functional/sym/hash_sample/Makefile +index c5688be..78e59b7 100644 +--- a/quickassist/lookaside/access_layer/src/sample_code/functional/sym/hash_sample/Makefile ++++ b/quickassist/lookaside/access_layer/src/sample_code/functional/sym/hash_sample/Makefile +@@ -112,7 +112,7 @@ ifeq ($(WITH_CPA_MUX),1) + EXTRA_CFLAGS+=-DWITH_CPA_MUX + ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libqat_mux_s.so + else +- ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libicp_qa_al_s.so ++ ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)$(DEST_LIBDIR)/libicp_qa_al_s.so + endif + + ADDITIONAL_OBJECTS += -L/usr/Lib -lpthread -lcrypto +diff --git a/quickassist/lookaside/access_layer/src/sample_code/functional/sym/ipsec_sample/Makefile b/quickassist/lookaside/access_layer/src/sample_code/functional/sym/ipsec_sample/Makefile +index e532421..0f7261b 100644 +--- a/quickassist/lookaside/access_layer/src/sample_code/functional/sym/ipsec_sample/Makefile ++++ b/quickassist/lookaside/access_layer/src/sample_code/functional/sym/ipsec_sample/Makefile +@@ -112,7 +112,7 @@ ifeq ($(WITH_CPA_MUX),1) + EXTRA_CFLAGS+=-DWITH_CPA_MUX + ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libqat_mux_s.so + else +- ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libicp_qa_al_s.so ++ ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)$(DEST_LIBDIR)/libicp_qa_al_s.so + endif + + ADDITIONAL_OBJECTS += -L/usr/Lib -lpthread -lcrypto +diff --git a/quickassist/lookaside/access_layer/src/sample_code/functional/sym/nrbg_sample/Makefile b/quickassist/lookaside/access_layer/src/sample_code/functional/sym/nrbg_sample/Makefile +index 0c17b9a..4784e03 100644 +--- a/quickassist/lookaside/access_layer/src/sample_code/functional/sym/nrbg_sample/Makefile ++++ b/quickassist/lookaside/access_layer/src/sample_code/functional/sym/nrbg_sample/Makefile +@@ -112,7 +112,7 @@ ifeq ($(WITH_CPA_MUX),1) + EXTRA_CFLAGS+=-DWITH_CPA_MUX + ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libqat_mux_s.so + else +- ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libicp_qa_al_s.so ++ ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/$(DEST_LIBDIR)/libicp_qa_al_s.so + endif + + ADDITIONAL_OBJECTS += -L/usr/Lib -lpthread -lcrypto +diff --git a/quickassist/lookaside/access_layer/src/sample_code/functional/sym/ssl_sample/Makefile b/quickassist/lookaside/access_layer/src/sample_code/functional/sym/ssl_sample/Makefile +index 9418a98..d9a5b53 100644 +--- a/quickassist/lookaside/access_layer/src/sample_code/functional/sym/ssl_sample/Makefile ++++ b/quickassist/lookaside/access_layer/src/sample_code/functional/sym/ssl_sample/Makefile +@@ -113,7 +113,7 @@ ifeq ($(WITH_CPA_MUX),1) + EXTRA_CFLAGS+=-DWITH_CPA_MUX + ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libqat_mux_s.so + else +- ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libicp_qa_al_s.so ++ ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)$(DEST_LIBDIR)/libicp_qa_al_s.so + endif + + ADDITIONAL_OBJECTS += -L/usr/Lib -lpthread -lcrypto +diff --git a/quickassist/lookaside/access_layer/src/sample_code/functional/sym/symdp_sample/Makefile b/quickassist/lookaside/access_layer/src/sample_code/functional/sym/symdp_sample/Makefile +index 7184ade..d2d2025 100644 +--- a/quickassist/lookaside/access_layer/src/sample_code/functional/sym/symdp_sample/Makefile ++++ b/quickassist/lookaside/access_layer/src/sample_code/functional/sym/symdp_sample/Makefile +@@ -117,7 +117,7 @@ ifeq ($(WITH_CPA_MUX),1) + EXTRA_CFLAGS += -DWITH_CPA_MUX + ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libqat_mux_s.so + else +- ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libicp_qa_al_s.so ++ ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)$(DEST_LIBDIR)/libicp_qa_al_s.so + endif + + ADDITIONAL_OBJECTS += -L/usr/Lib -lpthread -lcrypto +diff --git a/quickassist/lookaside/access_layer/src/sample_code/load_test_application/Makefile b/quickassist/lookaside/access_layer/src/sample_code/load_test_application/Makefile +index dcce406..8dc79a2 100644 +--- a/quickassist/lookaside/access_layer/src/sample_code/load_test_application/Makefile ++++ b/quickassist/lookaside/access_layer/src/sample_code/load_test_application/Makefile +@@ -124,7 +124,7 @@ ifeq ($(WITH_CPA_MUX),1) + EXTRA_CFLAGS+=-DWITH_CPA_MUX + ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libqat_mux_s.so + else +- ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libicp_qa_al_s.so ++ ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)$(DEST_LIBDIR)/libicp_qa_al_s.so + endif + + ADDITIONAL_OBJECTS += $(PERF_SAMPLE_SRC_ROOT)/build/cpa_sample_code_s.so +diff --git a/quickassist/lookaside/access_layer/src/sample_code/performance/Makefile b/quickassist/lookaside/access_layer/src/sample_code/performance/Makefile +index d201b66..fe6cb00 100644 +--- a/quickassist/lookaside/access_layer/src/sample_code/performance/Makefile ++++ b/quickassist/lookaside/access_layer/src/sample_code/performance/Makefile +@@ -187,7 +187,7 @@ ifeq ($(WITH_CPA_MUX),1) + EXTRA_CFLAGS+=-DWITH_CPA_MUX + ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libqat_mux_s.so + else +- ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/$(DEST_LIBDIR)/libicp_qa_al_s.so ++ ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)$(DEST_LIBDIR)/libicp_qa_al_s.so + endif + + ifeq ($(WITH_CMDRV),1) +diff --git a/quickassist/lookaside/access_layer/src/sample_code/performance/qae/linux/kernel_space/Makefile b/quickassist/lookaside/access_layer/src/sample_code/performance/qae/linux/kernel_space/Makefile +index 540f3d3..ebbf205 100644 +--- a/quickassist/lookaside/access_layer/src/sample_code/performance/qae/linux/kernel_space/Makefile ++++ b/quickassist/lookaside/access_layer/src/sample_code/performance/qae/linux/kernel_space/Makefile +@@ -113,10 +113,10 @@ INCLUDES= -I$(PERF_SAMPLE_SRC_ROOT) \ + ifeq ($(ICP_OS_LEVEL),user_space) + EXTRA_CFLAGS += -DUSER_SPACE -D_GNU_SOURCE + LD_LIBRARY_PATH?=/usr/lib +-ADDITIONAL_OBJECTS += -L$(ICP_BUILD_OUTPUT)/icp_qa_al.a +-ADDITIONAL_OBJECTS += -L$(ICP_BUILD_OUTPUT)/libadf_proxy.a +-ADDITIONAL_OBJECTS += -L$(ICP_BUILD_OUTPUT)/libosal.a +-ADDITIONAL_OBJECTS += -L/Lib -lpthread ++ADDITIONAL_OBJECTS += -L$(ICP_BUILD_OUTPUT)/${DEST_LIBDIR}/icp_qa_al.a ++ADDITIONAL_OBJECTS += -L$(ICP_BUILD_OUTPUT)/${DEST_LIBDIR}/libadf_proxy.a ++ADDITIONAL_OBJECTS += -L$(ICP_BUILD_OUTPUT)/${DEST_LIBDIR}/libosal.a ++ADDITIONAL_OBJECTS += -L/Lib -L${DEST_LIBDIR} -lpthread + else + EXTRA_CFLAGS += -DKERNEL_SPACE + endif +-- +1.7.9.5 + -- 1.7.9.5 -- _______________________________________________ meta-intel mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-intel
