diff options
author | Lans Zhang <jia.zhang@windriver.com> | 2017-07-28 10:09:02 +0800 |
---|---|---|
committer | Lans Zhang <jia.zhang@windriver.com> | 2017-07-28 10:09:02 +0800 |
commit | f77e53d6278108e53a9fde153cc91b1754a949da (patch) | |
tree | 5b55b34d80828942258738ade9f44af06df9b94e /meta-integrity | |
parent | afea92abb3c4d917dad3616e1dcc79c26f4f10e4 (diff) | |
download | meta-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.bb | 18 | ||||
-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 @@ | |||
1 | LICENSE = "GPLv2" | 1 | LICENSE = "GPLv2" |
2 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 2 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
3 | 3 | ||
4 | SRC_URI = " \ | 4 | DEPENDS += "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 \ | 6 | PV = "1.0+git${SRCPV}" |
7 | file://0001-Install-evmctl-to-sbindir-rather-than-bindir.patch \ | 7 | |
8 | SRC_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 | " |
9 | SRCREV = "3e2a67bdb0673581a97506262e62db098efef6d7" | 13 | SRCREV = "3e2a67bdb0673581a97506262e62db098efef6d7" |
10 | PV = "1.0+git${SRCPV}" | ||
11 | 14 | ||
12 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
13 | 16 | ||
14 | DEPENDS += "openssl attr keyutils" | ||
15 | RDEPENDS_${PN}_class-target += "libcrypto libattr keyutils" | ||
16 | |||
17 | inherit pkgconfig autotools | 17 | inherit 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 | ||
22 | FILES_${PN}-dev += "${includedir}" | 22 | FILES_${PN}-dev += "${includedir}" |
23 | 23 | ||
24 | RDEPENDS_${PN}_class-target += "libcrypto libattr keyutils" | ||
25 | |||
24 | BBCLASSEXTEND = "native nativesdk" | 26 | BBCLASSEXTEND = "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 \ | |||
4 | more to gain and retain the authorization and encryption keys required to \ | 4 | more to gain and retain the authorization and encryption keys required to \ |
5 | perform secure operations." | 5 | perform secure operations." |
6 | SECTION = "base" | 6 | SECTION = "base" |
7 | |||
7 | LICENSE = "GPLv2" | 8 | LICENSE = "GPLv2" |
8 | LIC_FILES_CHKSUM = "file://LICENCE.GPL;md5=5f6e72824f5da505c1f4a7197f004b45" | 9 | LIC_FILES_CHKSUM = "file://LICENCE.GPL;md5=5f6e72824f5da505c1f4a7197f004b45" |
9 | 10 | ||
10 | PR = "r1" | 11 | PV = "1.5.9+git${SRCPV}" |
11 | |||
12 | SRCREV = "9209a0c8fd63afc59f644e078b40cec531409c30" | ||
13 | 12 | ||
14 | SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git;protocol=git \ | 13 | SRC_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 | " | ||
18 | SRC_URI_append_arm = " file://keyutils-remove-m32-m64.patch" | 18 | SRC_URI_append_arm = " file://keyutils-remove-m32-m64.patch" |
19 | SRC_URI_append_aarch64 = " file://keyutils-remove-m32-m64.patch" | 19 | SRC_URI_append_aarch64 = " file://keyutils-remove-m32-m64.patch" |
20 | SRC_URI_append_mips = " file://keyutils-remove-m32-m64.patch" | 20 | SRC_URI_append_mips = " file://keyutils-remove-m32-m64.patch" |
@@ -22,12 +22,13 @@ SRC_URI_append_mips64 = " file://keyutils-remove-m32-m64.patch" | |||
22 | SRC_URI_append_x86 = " file://keyutils_fix_x86_cflags.patch" | 22 | SRC_URI_append_x86 = " file://keyutils_fix_x86_cflags.patch" |
23 | SRC_URI_append_x86-64 = " file://keyutils_fix_x86-64_cflags.patch" | 23 | SRC_URI_append_x86-64 = " file://keyutils_fix_x86-64_cflags.patch" |
24 | SRC_URI_append_powerpc = "file://keyutils-remove-m32-m64.patch" | 24 | SRC_URI_append_powerpc = "file://keyutils-remove-m32-m64.patch" |
25 | SRCREV = "9209a0c8fd63afc59f644e078b40cec531409c30" | ||
25 | 26 | ||
26 | S = "${WORKDIR}/git" | 27 | S = "${WORKDIR}/git" |
27 | 28 | ||
28 | inherit autotools-brokensep | 29 | inherit autotools-brokensep |
29 | 30 | ||
30 | INSTALL_FLAGS = " \ | 31 | INSTALL_FLAGS = "\ |
31 | LIBDIR=${libdir} \ | 32 | LIBDIR=${libdir} \ |
32 | USRLIBDIR=${libdir} \ | 33 | USRLIBDIR=${libdir} \ |
33 | BINDIR=${bindir} \ | 34 | BINDIR=${bindir} \ |