diff options
-rw-r--r-- | conf/machine/include/qoriq.inc | 6 | ||||
-rw-r--r-- | recipes-kernel/cryptodev/cryptodev-qoriq-linux_1.7.bb (renamed from recipes-kernel/cryptodev/cryptodev-linux_1.7.bb) | 6 | ||||
-rw-r--r-- | recipes-kernel/cryptodev/cryptodev-qoriq-module_1.7.bb (renamed from recipes-kernel/cryptodev/cryptodev-module_1.7.bb) | 6 | ||||
-rw-r--r-- | recipes-kernel/cryptodev/cryptodev-qoriq-tests_1.7.bb (renamed from recipes-kernel/cryptodev/cryptodev-tests_1.7.bb) | 6 | ||||
-rw-r--r-- | recipes-kernel/cryptodev/cryptodev-qoriq_1.7.inc (renamed from recipes-kernel/cryptodev/cryptodev_1.7.inc) | 11 |
5 files changed, 28 insertions, 7 deletions
diff --git a/conf/machine/include/qoriq.inc b/conf/machine/include/qoriq.inc index f99f4e7..84b5abb 100644 --- a/conf/machine/include/qoriq.inc +++ b/conf/machine/include/qoriq.inc | |||
@@ -3,12 +3,12 @@ | |||
3 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq" | 3 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq" |
4 | PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-qoriq" | 4 | PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-qoriq" |
5 | PREFERRED_PROVIDER_u-boot ?= "u-boot-qoriq" | 5 | PREFERRED_PROVIDER_u-boot ?= "u-boot-qoriq" |
6 | PREFERRED_PROVIDER_cryptodev-linux = "cryptodev-qoriq-linux" | ||
7 | PREFERRED_PROVIDER_cryptodev-module = "cryptodev-qoriq-module" | ||
8 | PREFERRED_PROVIDER_cryptodev-tests = "cryptodev-qoriq-tests" | ||
6 | 9 | ||
7 | PREFERRED_VERSION_qemu = "2.4.0+fsl" | 10 | PREFERRED_VERSION_qemu = "2.4.0+fsl" |
8 | PREFERRED_VERSION_openssl = "1.0.1i" | 11 | PREFERRED_VERSION_openssl = "1.0.1i" |
9 | PREFERRED_VERSION_cryptodev-linux = "1.7" | ||
10 | PREFERRED_VERSION_cryptodev-module = "1.7" | ||
11 | PREFERRED_VERSION_cryptodev-tests = "1.7" | ||
12 | 12 | ||
13 | MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" | 13 | MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" |
14 | MACHINE_EXTRA_RRECOMMENDS += "udev-rules-qoriq kernel-modules" | 14 | MACHINE_EXTRA_RRECOMMENDS += "udev-rules-qoriq kernel-modules" |
diff --git a/recipes-kernel/cryptodev/cryptodev-linux_1.7.bb b/recipes-kernel/cryptodev/cryptodev-qoriq-linux_1.7.bb index 92ccd71..58db505 100644 --- a/recipes-kernel/cryptodev/cryptodev-linux_1.7.bb +++ b/recipes-kernel/cryptodev/cryptodev-qoriq-linux_1.7.bb | |||
@@ -1,7 +1,9 @@ | |||
1 | require cryptodev_${PV}.inc | 1 | require cryptodev-qoriq_${PV}.inc |
2 | 2 | ||
3 | SUMMARY = "A /dev/crypto device driver header file" | 3 | SUMMARY = "A /dev/crypto device driver header file" |
4 | 4 | ||
5 | PROVIDES = "cryptodev-linux" | ||
6 | |||
5 | do_compile[noexec] = "1" | 7 | do_compile[noexec] = "1" |
6 | 8 | ||
7 | # Just install cryptodev.h which is the only header file needed to be exported | 9 | # Just install cryptodev.h which is the only header file needed to be exported |
@@ -10,3 +12,5 @@ do_install() { | |||
10 | } | 12 | } |
11 | 13 | ||
12 | ALLOW_EMPTY_${PN} = "1" | 14 | ALLOW_EMPTY_${PN} = "1" |
15 | |||
16 | COMPATIBLE_MACHINE = "(qoriq)" | ||
diff --git a/recipes-kernel/cryptodev/cryptodev-module_1.7.bb b/recipes-kernel/cryptodev/cryptodev-qoriq-module_1.7.bb index e6b1f27..383b482 100644 --- a/recipes-kernel/cryptodev/cryptodev-module_1.7.bb +++ b/recipes-kernel/cryptodev/cryptodev-qoriq-module_1.7.bb | |||
@@ -1,10 +1,14 @@ | |||
1 | require cryptodev_${PV}.inc | 1 | require cryptodev-qoriq_${PV}.inc |
2 | 2 | ||
3 | SUMMARY = "A /dev/crypto device driver kernel module" | 3 | SUMMARY = "A /dev/crypto device driver kernel module" |
4 | 4 | ||
5 | PROVIDES = "cryptodev-module" | ||
6 | |||
5 | inherit module qoriq_build_64bit_kernel | 7 | inherit module qoriq_build_64bit_kernel |
6 | 8 | ||
7 | # Header file provided by a separate package | 9 | # Header file provided by a separate package |
8 | DEPENDS += "cryptodev-linux" | 10 | DEPENDS += "cryptodev-linux" |
9 | 11 | ||
10 | EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"' | 12 | EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"' |
13 | |||
14 | COMPATIBLE_MACHINE = "(qoriq)" | ||
diff --git a/recipes-kernel/cryptodev/cryptodev-tests_1.7.bb b/recipes-kernel/cryptodev/cryptodev-qoriq-tests_1.7.bb index 128ccc9..a60ea98 100644 --- a/recipes-kernel/cryptodev/cryptodev-tests_1.7.bb +++ b/recipes-kernel/cryptodev/cryptodev-qoriq-tests_1.7.bb | |||
@@ -1,8 +1,10 @@ | |||
1 | require cryptodev_${PV}.inc | 1 | require cryptodev-qoriq_${PV}.inc |
2 | 2 | ||
3 | SUMMARY = "A test suite for /dev/crypto device driver" | 3 | SUMMARY = "A test suite for /dev/crypto device driver" |
4 | DEPENDS = "openssl" | 4 | DEPENDS = "openssl" |
5 | 5 | ||
6 | PROVIDES = "cryptodev-tests" | ||
7 | |||
6 | EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"' | 8 | EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"' |
7 | 9 | ||
8 | do_compile() { | 10 | do_compile() { |
@@ -15,3 +17,5 @@ do_install() { | |||
15 | 17 | ||
16 | FILES_${PN}-dbg += "${bindir}/tests_cryptodev/.debug" | 18 | FILES_${PN}-dbg += "${bindir}/tests_cryptodev/.debug" |
17 | FILES_${PN} = "${bindir}/tests_cryptodev/*" | 19 | FILES_${PN} = "${bindir}/tests_cryptodev/*" |
20 | |||
21 | COMPATIBLE_MACHINE = "(qoriq)" | ||
diff --git a/recipes-kernel/cryptodev/cryptodev_1.7.inc b/recipes-kernel/cryptodev/cryptodev-qoriq_1.7.inc index 2060ce3..e4700db 100644 --- a/recipes-kernel/cryptodev/cryptodev_1.7.inc +++ b/recipes-kernel/cryptodev/cryptodev-qoriq_1.7.inc | |||
@@ -6,6 +6,15 @@ RREPLACES_${PN} = "ocf-linux" | |||
6 | LICENSE = "GPLv2" | 6 | LICENSE = "GPLv2" |
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
8 | 8 | ||
9 | python() { | ||
10 | pkgs = d.getVar('PACKAGES', True).split() | ||
11 | for p in pkgs: | ||
12 | if 'cryptodev-qoriq' in p: | ||
13 | d.appendVar("RPROVIDES_%s" % p, p.replace('cryptodev-qoriq', 'cryptodev')) | ||
14 | d.appendVar("RCONFLICTS_%s" % p, p.replace('cryptodev-qoriq', 'cryptodev')) | ||
15 | d.appendVar("RREPLACES_%s" % p, p.replace('cryptodev-qoriq', 'cryptodev')) | ||
16 | } | ||
17 | |||
9 | SRC_URI = "http://download.gna.org/cryptodev-linux/cryptodev-linux-${PV}.tar.gz" | 18 | SRC_URI = "http://download.gna.org/cryptodev-linux/cryptodev-linux-${PV}.tar.gz" |
10 | SRC_URI[md5sum] = "0b63b3481cf2c90386b35f057481d36b" | 19 | SRC_URI[md5sum] = "0b63b3481cf2c90386b35f057481d36b" |
11 | SRC_URI[sha256sum] = "41880533b53de4d7b3f054e230f576988dafb8eed7bef5ebcf6422bb2e3a3b25" | 20 | SRC_URI[sha256sum] = "41880533b53de4d7b3f054e230f576988dafb8eed7bef5ebcf6422bb2e3a3b25" |
@@ -46,7 +55,7 @@ file://0024-fix-COMPAT_CIOCKEY-ioctl-command-number.patch \ | |||
46 | 55 | ||
47 | # NOTE: remove this patch and all traces of DISTRO_FEATURE c29x_pkc | 56 | # NOTE: remove this patch and all traces of DISTRO_FEATURE c29x_pkc |
48 | # if pkc-host does not need customized cryptodev patches anymore | 57 | # if pkc-host does not need customized cryptodev patches anymore |
49 | SRC_URI_append = "${@bb.utils.contains('DISTRO_FEATURES', 'c29x_pkc', ' file://0001-don-t-advertise-RSA-keygen.patch', '' ,d)}" | 58 | SRC_URI_append = "${@bb.utils.contains('DISTRO_FEATURES', 'c29x_pkc', ' file://0001-don-t-advertise-RSA-keygen.patch', '', d)}" |
50 | 59 | ||
51 | S = "${WORKDIR}/cryptodev-linux-${PV}" | 60 | S = "${WORKDIR}/cryptodev-linux-${PV}" |
52 | 61 | ||