- update qat17 version to 4.1.0-00022 - remove qat17.inc by merging into BB file
Signed-off-by: Tan, Raymond <raymond....@intel.com> --- recipes-extended/qat/qat17.inc | 148 ---------------------------- recipes-extended/qat/qat17_1.0.3-42.bb | 29 ------ recipes-extended/qat/qat17_4.1.0-00022.bb | 155 ++++++++++++++++++++++++++++++ 3 files changed, 155 insertions(+), 177 deletions(-) delete mode 100644 recipes-extended/qat/qat17.inc delete mode 100644 recipes-extended/qat/qat17_1.0.3-42.bb create mode 100644 recipes-extended/qat/qat17_4.1.0-00022.bb diff --git a/recipes-extended/qat/qat17.inc b/recipes-extended/qat/qat17.inc deleted file mode 100644 index 76e5487..0000000 --- a/recipes-extended/qat/qat17.inc +++ /dev/null @@ -1,148 +0,0 @@ -DESCRIPTION = "Intel(r) QuickAssist Technology API" -HOMEPAGE = "https://01.org/packet-processing/intel%C2%AE-quickassist-technology-drivers-and-patches" - -#Dual BSD and GPLv2 License -LICENSE = "BSD & GPLv2" -LIC_FILES_CHKSUM = "\ - file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \ - file://${COMMON_LICENSE_DIR}/BSD;md5=3775480a712fc46a69647678acb234cb \ - " -DEPENDS += "boost" -DEPENDS += "udev" -DEPENDS += "zlib openssl" -PROVIDES += "virtual/qat" - -SRC_URI="file://qat16_2.3.0-34-qat-fix-for-cross-compilation-issue.patch \ - file://qat16_2.3.0-34-qat-remove-local-path-from-makefile.patch \ - file://qat16_2.3.0-34-make-sure-CFLAGS-are-correct.patch \ - " -#https://01.org/sites/default/files/page/qatmux.l.${PV}.tgz;name=qat -COMPATIBLE_MACHINE = "crystalforest|intel-corei7-64|intel-core2-32" -COMPATIBLE_HOST_x86-x32 = 'null' -COMPATIBLE_HOST_libc-musl_class-target = 'null' - -S = "${WORKDIR}" -ICP_TOOLS = "accelcomp" -SAMPLE_CODE_DIR = "${S}/quickassist/lookaside/access_layer/src/sample_code" -export INSTALL_MOD_PATH = "${D}" -export ICP_DRIVER_TYPE = "QAT1.7" -export ICP_FIRMWARE_DIR="c3xxx" -export ICP_ROOT = "${S}" -export ICP_ENV_DIR = "${S}/quickassist/build_system/build_files/env_files" -export ICP_BUILDSYSTEM_PATH = "${S}/quickassist/build_system" -export ICP_TOOLS_TARGET = "${ICP_TOOLS}" -export FUNC_PATH = "${ICP_ROOT}/quickassist/lookaside/access_layer/src/sample_code/functional" -export INSTALL_FW_PATH = "${D}${base_libdir}/firmware" -export KERNEL_SOURCE_ROOT = "${STAGING_KERNEL_DIR}" -export ICP_BUILD_OUTPUT = "${D}" -export DEST_LIBDIR = "${libdir}" -export DEST_BINDIR = "${bindir}" -export QAT_KERNEL_VER = "${KERNEL_VERSION}" -export SAMPLE_BUILD_OUTPUT = "${D}" -export MODULE_DIR = "${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers" -export INSTALL_MOD_DIR = "${D}${base_libdir}/modules/${KERNEL_VERSION}" -export KERNEL_BUILDDIR = "${STAGING_KERNEL_BUILDDIR}" -export SC_EPOLL_DISABLED = "1" -export WITH_UPSTREAM = "1" -export WITH_CMDRV = "1" -export KERNEL_SOURCE_DIR = "${ICP_ROOT}/quickassist/qat/" - -export BIN_LIST="qat_c3xxx.bin qat_c3xxx_a0.bin qat_c3xxx_mmp.bin qat_c62x.bin qat_c62x_mmp.bin" -export BIN_DH895XCC="qat_895xcc.bin qat_mmp.bin" -export BIN_C62X="qat_c62x.bin qat_c62x_mmp.bin" -export BIN_C3XXX="qat_c3xxx.bin qat_c3xxx_mmp.bin" - -export KO_INTEL_QAT="${S}/quickassist/qat/drivers/crypto/qat/qat_common" -export KO_QAT_DH895XCC="${S}/quickassist/qat/drivers/crypto/qat/qat_dh895xcc" -export KO_QAT_DH895XCCVF="${S}/quickassist/qat/drivers/crypto/qat/qat_dh895xccvf" -export KO_QAT_C62X="${S}/quickassist/qat/drivers/crypto/qat/qat_c62x" -export KO_QAT_C62XVF="${S}/quickassist/qat/drivers/crypto/qat/qat_c62xvf" -export KO_QAT_C3XXX="${S}/quickassist/qat/drivers/crypto/qat/qat_c3xxx" -export KO_QAT_C3XXXVF="${S}/quickassist/qat/drivers/crypto/qat/qat_c3xxxvf" - -inherit module -inherit update-rc.d -INITSCRIPT_NAME = "qat_service" - -PARALLEL_MAKE = "" - -#To get around the double slashes in paths in QAT makefiles -PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" - -EXTRA_OEMAKE_append = " CFLAGS+='-fgnu89-inline -fPIC'" -EXTRA_OEMAKE = "-e MAKEFLAGS=" - -do_compile () { - export LD="${LD} --hash-style=gnu" - export MACHINE="${TARGET_ARCH}" - - cd ${S}/quickassist - oe_runmake - - cd ${S}/quickassist/qat - oe_runmake 'clean' - oe_runmake 'modules_install' - - cd ${S}/quickassist/utilities/adf_ctl - oe_runmake - - cd ${S}/quickassist/utilities/libusdm_drv - oe_runmake - - #build the whole sample code: per_user only - cd ${SAMPLE_CODE_DIR} - oe_runmake 'perf_user' -} - -do_install() { - cp ${TOPDIR}/downloads/qat1.7.upstream.l.${PV}.tar.gz ${S} - export MACHINE="${TARGET_ARCH}" - - cd ${S}/quickassist - oe_runmake install - - install -d ${D}/etc/udev/rules.d - install -d ${D}${sbindir} - install -d ${D}${sysconfdir}/conf_files - install -d ${D}${prefix}/qat - - echo 'KERNEL=="icp_adf_ctl" MODE="0600"' > ${D}/etc/udev/rules.d/00-dh895xcc_qa.rules - echo 'KERNEL=="icp_dev[0-9]*" MODE="0600"' >> ${D}/etc/udev/rules.d/00-dh895xcc_qa.rules - echo 'KERNEL=="icp_dev_mem?" MODE="0600"' >> ${D}/etc/udev/rules.d/00-dh895xcc_qa.rules - - install -m 0755 ${S}/qat1.7.upstream.l.${PV}.tar.gz ${D}${prefix}/qat - - install -D -m 0755 ${S}/quickassist/lookaside/access_layer/src/build/linux_2.6/user_space/*.so ${D}${base_libdir} - install -D -m 0755 ${S}/quickassist/utilities/libusdm_drv/libusdm_drv_s.so ${D}${base_libdir} - install -D -m 0750 ${S}/quickassist/utilities/adf_ctl/adf_ctl ${D}${sbindir} - install -D -m 640 ${S}/quickassist/utilities/adf_ctl/conf_files/c3xxx_dev0.conf ${D}${sysconfdir} - install -D -m 640 ${S}/quickassist/utilities/adf_ctl/conf_files/c3xxx_dev0.conf ${D}${sysconfdir}/conf_files - install -D -m 640 ${S}/quickassist/utilities/adf_ctl/conf_files/c3xxxvf_dev0.conf.vm ${D}${sysconfdir}/conf_files - install -m 0755 ${S}/quickassist/qat/fw/qat_c3xxx.bin ${D}${base_libdir}/firmware - install -m 0755 ${S}/quickassist/qat/fw/qat_c3xxx_a0.bin ${D}${base_libdir}/firmware - install -m 0755 ${S}/quickassist/qat/fw/qat_c3xxx_mmp.bin ${D}${base_libdir}/firmware - install -m 0755 ${S}/quickassist/qat/fw/qat_c62x.bin ${D}${base_libdir}/firmware - install -m 0755 ${S}/quickassist/qat/fw/qat_c62x_mmp.bin ${D}${base_libdir}/firmware - install -m 0755 ${S}/quickassist/lookaside/access_layer/src/sample_code/performance/compression/calgary ${D}${base_libdir}/firmware - install -m 0755 ${S}/quickassist/lookaside/access_layer/src/sample_code/performance/compression/calgary32 ${D}${base_libdir}/firmware - install -m 0755 ${S}/quickassist/lookaside/access_layer/src/sample_code/performance/compression/canterbury ${D}${base_libdir}/firmware -} - -PACKAGES += "${PN}-app" - -FILES_${PN}-dev = "${includedir}/ \ - " -FILES_${PN} += "\ - ${libdir}/ \ - ${base_libdir}/firmware \ - ${sysconfdir}/ \ - ${sbindir}/ \ - ${base_libdir}/*.so \ - " - -FILES_${PN}-dbg += "${sysconfdir}/init.d/.debug/ \ - " - -FILES_${PN}-app += "${bindir}/* \ - ${prefix}/qat \ - " diff --git a/recipes-extended/qat/qat17_1.0.3-42.bb b/recipes-extended/qat/qat17_1.0.3-42.bb deleted file mode 100644 index 4f6d35c..0000000 --- a/recipes-extended/qat/qat17_1.0.3-42.bb +++ /dev/null @@ -1,29 +0,0 @@ -include qat17.inc - -DESCRIPTION = "Intel(r) QuickAssist Technology API" -HOMEPAGE = "https://01.org/packet-processing/intel%C2%AE-quickassist-technology-drivers-and-patches" - -#Dual BSD and GPLv2 License -LICENSE = "BSD & GPLv2" - -TARGET_CC_ARCH += "${LDFLAGS}" - -SRC_URI="https://01.org/sites/default/files/downloads/intelr-quickassist-technology/qat1.7.upstream.l.1.0.3-42.tar.gz \ - file://qat16_2.3.0-34-qat-remove-local-path-from-makefile.patch \ - file://qat16_2.6.0-65-qat-override-CC-LD-AR-only-when-it-is-not-define.patch \ - file://qat17_0.6.0-1-qat-fix-kernel-patch.patch \ - file://qat17_0.8.0-37-qat-added-include-dir-path.patch \ - file://qat17_0.9.0-4-qat-add-install-target-and-add-folder.patch \ - " - -SRC_URI[md5sum] = "ee059cf134486f5684466555e8636ee0" -SRC_URI[sha256sum] = "84d2c4a242987548135274da7c3def31461af6f1b4beb74f519a993e854abf5b" - -# Support for 4.14 not yet available -python () { - if d.getVar("PREFERRED_PROVIDER_virtual/kernel") == "linux-intel" and \ - d.getVar("PREFERRED_VERSION_linux-intel") == "4.14%" or \ - d.getVar("PREFERRED_PROVIDER_virtual/kernel") == "linux-intel-rt" and \ - d.getVar("PREFERRED_VERSION_linux-intel-rt") == "4.14%": - raise bb.parse.SkipPackage("This version of QAT has not been tested with Linux Kernel 4.14 or newer") -} diff --git a/recipes-extended/qat/qat17_4.1.0-00022.bb b/recipes-extended/qat/qat17_4.1.0-00022.bb new file mode 100644 index 0000000..6669a19 --- /dev/null +++ b/recipes-extended/qat/qat17_4.1.0-00022.bb @@ -0,0 +1,155 @@ +DESCRIPTION = "Intel(r) QuickAssist Technology API" +HOMEPAGE = "https://01.org/packet-processing/intel%C2%AE-quickassist-technology-drivers-and-patches" + +#Dual BSD and GPLv2 License +LICENSE = "BSD & GPLv2" +LIC_FILES_CHKSUM = "\ + file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \ + file://${COMMON_LICENSE_DIR}/BSD;md5=3775480a712fc46a69647678acb234cb \ + " +DEPENDS += "boost" +DEPENDS += "udev" +DEPENDS += "zlib openssl" +PROVIDES += "virtual/qat" + +TARGET_CC_ARCH += "${LDFLAGS}" + +SRC_URI="https://01.org/sites/default/files/downloads/intelr-quickassist-technology/qat1.7.l.4.1.0-00022.tar.gz \ + file://qat16_2.3.0-34-qat-remove-local-path-from-makefile.patch \ + file://qat16_2.6.0-65-qat-override-CC-LD-AR-only-when-it-is-not-define.patch \ + file://qat17_0.6.0-1-qat-fix-kernel-patch.patch \ + file://qat17_0.8.0-37-qat-added-include-dir-path.patch \ + file://qat17_0.9.0-4-qat-add-install-target-and-add-folder.patch \ + " + +SRC_URI[md5sum] = "29ab942f9c151d3c0e025accfd971ee6" +SRC_URI[sha256sum] = "6caa72c65b9350f1708b2ed341e40ae3c6881953c501d0fbb7e2f8affaa5e025" + +COMPATIBLE_MACHINE = "crystalforest|intel-corei7-64|intel-core2-32" +COMPATIBLE_HOST_x86-x32 = 'null' +COMPATIBLE_HOST_libc-musl_class-target = 'null' + +S = "${WORKDIR}" +ICP_TOOLS = "accelcomp" +SAMPLE_CODE_DIR = "${S}/quickassist/lookaside/access_layer/src/sample_code" +export INSTALL_MOD_PATH = "${D}" +export ICP_DRIVER_TYPE = "QAT1.7" +export ICP_FIRMWARE_DIR="c3xxx" +export ICP_ROOT = "${S}" +export ICP_ENV_DIR = "${S}/quickassist/build_system/build_files/env_files" +export ICP_BUILDSYSTEM_PATH = "${S}/quickassist/build_system" +export ICP_TOOLS_TARGET = "${ICP_TOOLS}" +export FUNC_PATH = "${ICP_ROOT}/quickassist/lookaside/access_layer/src/sample_code/functional" +export INSTALL_FW_PATH = "${D}${base_libdir}/firmware" +export KERNEL_SOURCE_ROOT = "${STAGING_KERNEL_DIR}" +export ICP_BUILD_OUTPUT = "${D}" +export DEST_LIBDIR = "${libdir}" +export DEST_BINDIR = "${bindir}" +export QAT_KERNEL_VER = "${KERNEL_VERSION}" +export SAMPLE_BUILD_OUTPUT = "${D}" +export MODULE_DIR = "${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers" +export INSTALL_MOD_DIR = "${D}${base_libdir}/modules/${KERNEL_VERSION}" +export KERNEL_BUILDDIR = "${STAGING_KERNEL_BUILDDIR}" +export SC_EPOLL_DISABLED = "1" +export WITH_UPSTREAM = "1" +export WITH_CMDRV = "1" +export KERNEL_SOURCE_DIR = "${ICP_ROOT}/quickassist/qat/" + +export BIN_LIST="qat_c3xxx.bin qat_c3xxx_mmp.bin qat_c62x.bin qat_c62x_mmp.bin" +export BIN_DH895XCC="qat_895xcc.bin qat_895xcc_mmp.bin" +export BIN_C62X="qat_c62x.bin qat_c62x_mmp.bin" +export BIN_C3XXX="qat_c3xxx.bin qat_c3xxx_mmp.bin" + +export KO_INTEL_QAT="${S}/quickassist/qat/drivers/crypto/qat/qat_common" +export KO_QAT_DH895XCC="${S}/quickassist/qat/drivers/crypto/qat/qat_dh895xcc" +export KO_QAT_DH895XCCVF="${S}/quickassist/qat/drivers/crypto/qat/qat_dh895xccvf" +export KO_QAT_C62X="${S}/quickassist/qat/drivers/crypto/qat/qat_c62x" +export KO_QAT_C62XVF="${S}/quickassist/qat/drivers/crypto/qat/qat_c62xvf" +export KO_QAT_C3XXX="${S}/quickassist/qat/drivers/crypto/qat/qat_c3xxx" +export KO_QAT_C3XXXVF="${S}/quickassist/qat/drivers/crypto/qat/qat_c3xxxvf" + +inherit module +inherit update-rc.d +INITSCRIPT_NAME = "qat_service" + +PARALLEL_MAKE = "" + +#To get around the double slashes in paths in QAT makefiles +PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" + +EXTRA_OEMAKE_append = " CFLAGS+='-fgnu89-inline -fPIC'" +EXTRA_OEMAKE = "-e MAKEFLAGS=" + +do_compile () { + export LD="${LD} --hash-style=gnu" + export MACHINE="${TARGET_ARCH}" + + cd ${S}/quickassist + oe_runmake + + cd ${S}/quickassist/qat + oe_runmake 'clean' + oe_runmake 'modules_install' + + cd ${S}/quickassist/utilities/adf_ctl + oe_runmake + + cd ${S}/quickassist/utilities/libusdm_drv + oe_runmake + + #build the whole sample code: per_user only + cd ${SAMPLE_CODE_DIR} + oe_runmake 'perf_user' +} + +do_install() { + cp ${TOPDIR}/downloads/qat1.7.l.${PV}.tar.gz ${S} + export MACHINE="${TARGET_ARCH}" + + cd ${S}/quickassist + oe_runmake install + + install -d ${D}/etc/udev/rules.d + install -d ${D}${sbindir} + install -d ${D}${sysconfdir}/conf_files + install -d ${D}${prefix}/qat + + echo 'KERNEL=="icp_adf_ctl" MODE="0600"' > ${D}/etc/udev/rules.d/00-dh895xcc_qa.rules + echo 'KERNEL=="icp_dev[0-9]*" MODE="0600"' >> ${D}/etc/udev/rules.d/00-dh895xcc_qa.rules + echo 'KERNEL=="icp_dev_mem?" MODE="0600"' >> ${D}/etc/udev/rules.d/00-dh895xcc_qa.rules + + install -m 0755 ${S}/qat1.7.l.${PV}.tar.gz ${D}${prefix}/qat + + install -D -m 0755 ${S}/quickassist/lookaside/access_layer/src/build/linux_2.6/user_space/*.so ${D}${base_libdir} + install -D -m 0755 ${S}/quickassist/utilities/libusdm_drv/libusdm_drv_s.so ${D}${base_libdir} + install -D -m 0750 ${S}/quickassist/utilities/adf_ctl/adf_ctl ${D}${sbindir} + install -D -m 640 ${S}/quickassist/utilities/adf_ctl/conf_files/c3xxx_dev0.conf ${D}${sysconfdir} + install -D -m 640 ${S}/quickassist/utilities/adf_ctl/conf_files/c3xxx_dev0.conf ${D}${sysconfdir}/conf_files + install -D -m 640 ${S}/quickassist/utilities/adf_ctl/conf_files/c3xxxvf_dev0.conf.vm ${D}${sysconfdir}/conf_files + install -m 0755 ${S}/quickassist/qat/fw/qat_c3xxx.bin ${D}${base_libdir}/firmware + install -m 0755 ${S}/quickassist/qat/fw/qat_c3xxx_mmp.bin ${D}${base_libdir}/firmware + install -m 0755 ${S}/quickassist/qat/fw/qat_c62x.bin ${D}${base_libdir}/firmware + install -m 0755 ${S}/quickassist/qat/fw/qat_c62x_mmp.bin ${D}${base_libdir}/firmware + install -m 0755 ${S}/quickassist/lookaside/access_layer/src/sample_code/performance/compression/calgary ${D}${base_libdir}/firmware + install -m 0755 ${S}/quickassist/lookaside/access_layer/src/sample_code/performance/compression/calgary32 ${D}${base_libdir}/firmware + install -m 0755 ${S}/quickassist/lookaside/access_layer/src/sample_code/performance/compression/canterbury ${D}${base_libdir}/firmware +} + +PACKAGES += "${PN}-app" + +FILES_${PN}-dev = "${includedir}/ \ + " +FILES_${PN} += "\ + ${libdir}/ \ + ${base_libdir}/firmware \ + ${sysconfdir}/ \ + ${sbindir}/ \ + ${base_libdir}/*.so \ + " + +FILES_${PN}-dbg += "${sysconfdir}/init.d/.debug/ \ + " + +FILES_${PN}-app += "${bindir}/* \ + ${prefix}/qat \ + " \ No newline at end of file -- 1.9.1 -- _______________________________________________ meta-intel mailing list meta-intel@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-intel