From e66be38a4a4df4c5e5d5695585393d95d0f93f5c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 24 Aug 2020 11:45:48 -0700 Subject: cryptodev-qoriq: Upgrade to 1.11 OE-core is having 1.11 as well Signed-off-by: Khem Raj --- recipes-kernel/cryptodev/cryptodev-qoriq-1.10.inc | 21 --------------------- recipes-kernel/cryptodev/cryptodev-qoriq-1.11.inc | 21 +++++++++++++++++++++ .../cryptodev/cryptodev-qoriq-linux_1.10.bb | 5 ----- .../cryptodev/cryptodev-qoriq-linux_1.11.bb | 5 +++++ .../cryptodev/cryptodev-qoriq-module_1.10.bb | 10 ---------- .../cryptodev/cryptodev-qoriq-module_1.11.bb | 10 ++++++++++ .../cryptodev/cryptodev-qoriq-tests_1.10.bb | 8 -------- .../cryptodev/cryptodev-qoriq-tests_1.11.bb | 8 ++++++++ 8 files changed, 44 insertions(+), 44 deletions(-) delete mode 100644 recipes-kernel/cryptodev/cryptodev-qoriq-1.10.inc create mode 100644 recipes-kernel/cryptodev/cryptodev-qoriq-1.11.inc delete mode 100644 recipes-kernel/cryptodev/cryptodev-qoriq-linux_1.10.bb create mode 100644 recipes-kernel/cryptodev/cryptodev-qoriq-linux_1.11.bb delete mode 100644 recipes-kernel/cryptodev/cryptodev-qoriq-module_1.10.bb create mode 100644 recipes-kernel/cryptodev/cryptodev-qoriq-module_1.11.bb delete mode 100644 recipes-kernel/cryptodev/cryptodev-qoriq-tests_1.10.bb create mode 100644 recipes-kernel/cryptodev/cryptodev-qoriq-tests_1.11.bb diff --git a/recipes-kernel/cryptodev/cryptodev-qoriq-1.10.inc b/recipes-kernel/cryptodev/cryptodev-qoriq-1.10.inc deleted file mode 100644 index bb785831..00000000 --- a/recipes-kernel/cryptodev/cryptodev-qoriq-1.10.inc +++ /dev/null @@ -1,21 +0,0 @@ -HOMEPAGE = "http://cryptodev-linux.org/" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -python() { - d.appendVar('PROVIDES', ' ' + d.getVar('BPN').replace('-qoriq', '')) - pkgs = d.getVar('PACKAGES').split() - for p in pkgs: - if '-qoriq' in p: - d.appendVar("RPROVIDES_" + p, ' ' + p.replace('-qoriq', '')) - d.appendVar("RCONFLICTS_" + p, ' ' + p.replace('-qoriq', '')) - d.appendVar("RREPLACES_" + p, ' ' + p.replace('-qoriq', '')) -} - -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/cryptodev-linux;protocol=https;nobranch=1" -SRCREV = "f3007431120a1b4ae983c2b9ea09051311aa5e2f" - -S = "${WORKDIR}/git" - -CLEANBROKEN = "1" diff --git a/recipes-kernel/cryptodev/cryptodev-qoriq-1.11.inc b/recipes-kernel/cryptodev/cryptodev-qoriq-1.11.inc new file mode 100644 index 00000000..e734cc4e --- /dev/null +++ b/recipes-kernel/cryptodev/cryptodev-qoriq-1.11.inc @@ -0,0 +1,21 @@ +HOMEPAGE = "http://cryptodev-linux.org/" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +python() { + d.appendVar('PROVIDES', ' ' + d.getVar('BPN').replace('-qoriq', '')) + pkgs = d.getVar('PACKAGES').split() + for p in pkgs: + if '-qoriq' in p: + d.appendVar("RPROVIDES_" + p, ' ' + p.replace('-qoriq', '')) + d.appendVar("RCONFLICTS_" + p, ' ' + p.replace('-qoriq', '')) + d.appendVar("RREPLACES_" + p, ' ' + p.replace('-qoriq', '')) +} + +SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/cryptodev-linux;protocol=https;nobranch=1" +SRCREV = "2299d39475e91392abd050ea09f2d20feecb4adf" + +S = "${WORKDIR}/git" + +CLEANBROKEN = "1" diff --git a/recipes-kernel/cryptodev/cryptodev-qoriq-linux_1.10.bb b/recipes-kernel/cryptodev/cryptodev-qoriq-linux_1.10.bb deleted file mode 100644 index c2cbc71b..00000000 --- a/recipes-kernel/cryptodev/cryptodev-qoriq-linux_1.10.bb +++ /dev/null @@ -1,5 +0,0 @@ -require recipes-kernel/cryptodev/cryptodev-linux_${PV}.bb -require cryptodev-qoriq-${PV}.inc - -BBCLASSEXTEND = "" -COMPATIBLE_MACHINE = "(qoriq)" diff --git a/recipes-kernel/cryptodev/cryptodev-qoriq-linux_1.11.bb b/recipes-kernel/cryptodev/cryptodev-qoriq-linux_1.11.bb new file mode 100644 index 00000000..c2cbc71b --- /dev/null +++ b/recipes-kernel/cryptodev/cryptodev-qoriq-linux_1.11.bb @@ -0,0 +1,5 @@ +require recipes-kernel/cryptodev/cryptodev-linux_${PV}.bb +require cryptodev-qoriq-${PV}.inc + +BBCLASSEXTEND = "" +COMPATIBLE_MACHINE = "(qoriq)" diff --git a/recipes-kernel/cryptodev/cryptodev-qoriq-module_1.10.bb b/recipes-kernel/cryptodev/cryptodev-qoriq-module_1.10.bb deleted file mode 100644 index 86078c57..00000000 --- a/recipes-kernel/cryptodev/cryptodev-qoriq-module_1.10.bb +++ /dev/null @@ -1,10 +0,0 @@ -require recipes-kernel/cryptodev/cryptodev-module_${PV}.bb -require cryptodev-qoriq-${PV}.inc - -inherit qoriq_build_64bit_kernel - -SRC_URI += " \ -file://0001-Disable-installing-header-file-provided-by-another-p.patch \ -" - -COMPATIBLE_MACHINE = "(qoriq)" diff --git a/recipes-kernel/cryptodev/cryptodev-qoriq-module_1.11.bb b/recipes-kernel/cryptodev/cryptodev-qoriq-module_1.11.bb new file mode 100644 index 00000000..86078c57 --- /dev/null +++ b/recipes-kernel/cryptodev/cryptodev-qoriq-module_1.11.bb @@ -0,0 +1,10 @@ +require recipes-kernel/cryptodev/cryptodev-module_${PV}.bb +require cryptodev-qoriq-${PV}.inc + +inherit qoriq_build_64bit_kernel + +SRC_URI += " \ +file://0001-Disable-installing-header-file-provided-by-another-p.patch \ +" + +COMPATIBLE_MACHINE = "(qoriq)" diff --git a/recipes-kernel/cryptodev/cryptodev-qoriq-tests_1.10.bb b/recipes-kernel/cryptodev/cryptodev-qoriq-tests_1.10.bb deleted file mode 100644 index 784c38b7..00000000 --- a/recipes-kernel/cryptodev/cryptodev-qoriq-tests_1.10.bb +++ /dev/null @@ -1,8 +0,0 @@ -require recipes-kernel/cryptodev/cryptodev-tests_${PV}.bb -require cryptodev-qoriq-${PV}.inc - -SRC_URI += " \ -file://0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch \ -" - -COMPATIBLE_MACHINE = "(qoriq)" diff --git a/recipes-kernel/cryptodev/cryptodev-qoriq-tests_1.11.bb b/recipes-kernel/cryptodev/cryptodev-qoriq-tests_1.11.bb new file mode 100644 index 00000000..784c38b7 --- /dev/null +++ b/recipes-kernel/cryptodev/cryptodev-qoriq-tests_1.11.bb @@ -0,0 +1,8 @@ +require recipes-kernel/cryptodev/cryptodev-tests_${PV}.bb +require cryptodev-qoriq-${PV}.inc + +SRC_URI += " \ +file://0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch \ +" + +COMPATIBLE_MACHINE = "(qoriq)" -- cgit v1.2.3-54-g00ecf