summaryrefslogtreecommitdiffstats
path: root/meta-integrity
diff options
context:
space:
mode:
authorLans Zhang <jia.zhang@windriver.com>2017-07-28 10:09:02 +0800
committerLans Zhang <jia.zhang@windriver.com>2017-07-28 10:09:02 +0800
commitf77e53d6278108e53a9fde153cc91b1754a949da (patch)
tree5b55b34d80828942258738ade9f44af06df9b94e /meta-integrity
parentafea92abb3c4d917dad3616e1dcc79c26f4f10e4 (diff)
downloadmeta-secure-core-f77e53d6278108e53a9fde153cc91b1754a949da.tar.gz
meta-secure-core: code style fixup
Signed-off-by: Lans Zhang <jia.zhang@windriver.com>
Diffstat (limited to 'meta-integrity')
-rw-r--r--meta-integrity/recipes-support/ima-evm-utils/ima-evm-utils_git.bb18
-rw-r--r--meta-integrity/recipes-support/keyutils/keyutils_git.bb (renamed from meta-integrity/recipes-support/keyutils/keyutils_1.5.9.bb)17
2 files changed, 19 insertions, 16 deletions
diff --git a/meta-integrity/recipes-support/ima-evm-utils/ima-evm-utils_git.bb b/meta-integrity/recipes-support/ima-evm-utils/ima-evm-utils_git.bb
index 16c315a..8ef322d 100644
--- a/meta-integrity/recipes-support/ima-evm-utils/ima-evm-utils_git.bb
+++ b/meta-integrity/recipes-support/ima-evm-utils/ima-evm-utils_git.bb
@@ -1,19 +1,19 @@
1LICENSE = "GPLv2" 1LICENSE = "GPLv2"
2LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 2LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
3 3
4SRC_URI = " \ 4DEPENDS += "openssl attr keyutils"
5 git://git.code.sf.net/p/linux-ima/ima-evm-utils \ 5
6 file://0001-Don-t-build-man-pages.patch \ 6PV = "1.0+git${SRCPV}"
7 file://0001-Install-evmctl-to-sbindir-rather-than-bindir.patch \ 7
8SRC_URI = "\
9 git://git.code.sf.net/p/linux-ima/ima-evm-utils \
10 file://0001-Don-t-build-man-pages.patch \
11 file://0001-Install-evmctl-to-sbindir-rather-than-bindir.patch \
8" 12"
9SRCREV = "3e2a67bdb0673581a97506262e62db098efef6d7" 13SRCREV = "3e2a67bdb0673581a97506262e62db098efef6d7"
10PV = "1.0+git${SRCPV}"
11 14
12S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
13 16
14DEPENDS += "openssl attr keyutils"
15RDEPENDS_${PN}_class-target += "libcrypto libattr keyutils"
16
17inherit pkgconfig autotools 17inherit pkgconfig autotools
18 18
19# Specify any options you want to pass to the configure script using EXTRA_OECONF: 19# Specify any options you want to pass to the configure script using EXTRA_OECONF:
@@ -21,4 +21,6 @@ EXTRA_OECONF = ""
21 21
22FILES_${PN}-dev += "${includedir}" 22FILES_${PN}-dev += "${includedir}"
23 23
24RDEPENDS_${PN}_class-target += "libcrypto libattr keyutils"
25
24BBCLASSEXTEND = "native nativesdk" 26BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-integrity/recipes-support/keyutils/keyutils_1.5.9.bb b/meta-integrity/recipes-support/keyutils/keyutils_git.bb
index 1c33f2b..e88e75b 100644
--- a/meta-integrity/recipes-support/keyutils/keyutils_1.5.9.bb
+++ b/meta-integrity/recipes-support/keyutils/keyutils_git.bb
@@ -4,17 +4,17 @@ facility in the kernel, which can be used by filesystems, block devices and \
4more to gain and retain the authorization and encryption keys required to \ 4more to gain and retain the authorization and encryption keys required to \
5perform secure operations." 5perform secure operations."
6SECTION = "base" 6SECTION = "base"
7
7LICENSE = "GPLv2" 8LICENSE = "GPLv2"
8LIC_FILES_CHKSUM = "file://LICENCE.GPL;md5=5f6e72824f5da505c1f4a7197f004b45" 9LIC_FILES_CHKSUM = "file://LICENCE.GPL;md5=5f6e72824f5da505c1f4a7197f004b45"
9 10
10PR = "r1" 11PV = "1.5.9+git${SRCPV}"
11
12SRCREV = "9209a0c8fd63afc59f644e078b40cec531409c30"
13 12
14SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git;protocol=git \ 13SRC_URI = "\
15 file://keyutils_fix_library_install.patch \ 14 git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git \
16 file://keyutils-fix-the-cflags-for-all-of-targets.patch \ 15 file://keyutils_fix_library_install.patch \
17 " 16 file://keyutils-fix-the-cflags-for-all-of-targets.patch \
17"
18SRC_URI_append_arm = " file://keyutils-remove-m32-m64.patch" 18SRC_URI_append_arm = " file://keyutils-remove-m32-m64.patch"
19SRC_URI_append_aarch64 = " file://keyutils-remove-m32-m64.patch" 19SRC_URI_append_aarch64 = " file://keyutils-remove-m32-m64.patch"
20SRC_URI_append_mips = " file://keyutils-remove-m32-m64.patch" 20SRC_URI_append_mips = " file://keyutils-remove-m32-m64.patch"
@@ -22,12 +22,13 @@ SRC_URI_append_mips64 = " file://keyutils-remove-m32-m64.patch"
22SRC_URI_append_x86 = " file://keyutils_fix_x86_cflags.patch" 22SRC_URI_append_x86 = " file://keyutils_fix_x86_cflags.patch"
23SRC_URI_append_x86-64 = " file://keyutils_fix_x86-64_cflags.patch" 23SRC_URI_append_x86-64 = " file://keyutils_fix_x86-64_cflags.patch"
24SRC_URI_append_powerpc = "file://keyutils-remove-m32-m64.patch" 24SRC_URI_append_powerpc = "file://keyutils-remove-m32-m64.patch"
25SRCREV = "9209a0c8fd63afc59f644e078b40cec531409c30"
25 26
26S = "${WORKDIR}/git" 27S = "${WORKDIR}/git"
27 28
28inherit autotools-brokensep 29inherit autotools-brokensep
29 30
30INSTALL_FLAGS = " \ 31INSTALL_FLAGS = "\
31 LIBDIR=${libdir} \ 32 LIBDIR=${libdir} \
32 USRLIBDIR=${libdir} \ 33 USRLIBDIR=${libdir} \
33 BINDIR=${bindir} \ 34 BINDIR=${bindir} \