From f77e53d6278108e53a9fde153cc91b1754a949da Mon Sep 17 00:00:00 2001 From: Lans Zhang Date: Fri, 28 Jul 2017 10:09:02 +0800 Subject: meta-secure-core: code style fixup Signed-off-by: Lans Zhang --- .../ima-evm-utils/ima-evm-utils_git.bb | 18 ++++---- .../recipes-support/keyutils/keyutils_1.5.9.bb | 48 --------------------- .../recipes-support/keyutils/keyutils_git.bb | 49 ++++++++++++++++++++++ 3 files changed, 59 insertions(+), 56 deletions(-) delete mode 100644 meta-integrity/recipes-support/keyutils/keyutils_1.5.9.bb create mode 100644 meta-integrity/recipes-support/keyutils/keyutils_git.bb (limited to 'meta-integrity') 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 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = " \ - git://git.code.sf.net/p/linux-ima/ima-evm-utils \ - file://0001-Don-t-build-man-pages.patch \ - file://0001-Install-evmctl-to-sbindir-rather-than-bindir.patch \ +DEPENDS += "openssl attr keyutils" + +PV = "1.0+git${SRCPV}" + +SRC_URI = "\ + git://git.code.sf.net/p/linux-ima/ima-evm-utils \ + file://0001-Don-t-build-man-pages.patch \ + file://0001-Install-evmctl-to-sbindir-rather-than-bindir.patch \ " SRCREV = "3e2a67bdb0673581a97506262e62db098efef6d7" -PV = "1.0+git${SRCPV}" S = "${WORKDIR}/git" -DEPENDS += "openssl attr keyutils" -RDEPENDS_${PN}_class-target += "libcrypto libattr keyutils" - inherit pkgconfig autotools # Specify any options you want to pass to the configure script using EXTRA_OECONF: @@ -21,4 +21,6 @@ EXTRA_OECONF = "" FILES_${PN}-dev += "${includedir}" +RDEPENDS_${PN}_class-target += "libcrypto libattr keyutils" + BBCLASSEXTEND = "native nativesdk" diff --git a/meta-integrity/recipes-support/keyutils/keyutils_1.5.9.bb b/meta-integrity/recipes-support/keyutils/keyutils_1.5.9.bb deleted file mode 100644 index 1c33f2b..0000000 --- a/meta-integrity/recipes-support/keyutils/keyutils_1.5.9.bb +++ /dev/null @@ -1,48 +0,0 @@ -SUMMARY = "Linux Key Management Utilities" -DESCRIPTION = "Keyutils is a set of utilities for managing the key retention \ -facility in the kernel, which can be used by filesystems, block devices and \ -more to gain and retain the authorization and encryption keys required to \ -perform secure operations." -SECTION = "base" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENCE.GPL;md5=5f6e72824f5da505c1f4a7197f004b45" - -PR = "r1" - -SRCREV = "9209a0c8fd63afc59f644e078b40cec531409c30" - -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git;protocol=git \ - file://keyutils_fix_library_install.patch \ - file://keyutils-fix-the-cflags-for-all-of-targets.patch \ - " -SRC_URI_append_arm = " file://keyutils-remove-m32-m64.patch" -SRC_URI_append_aarch64 = " file://keyutils-remove-m32-m64.patch" -SRC_URI_append_mips = " file://keyutils-remove-m32-m64.patch" -SRC_URI_append_mips64 = " file://keyutils-remove-m32-m64.patch" -SRC_URI_append_x86 = " file://keyutils_fix_x86_cflags.patch" -SRC_URI_append_x86-64 = " file://keyutils_fix_x86-64_cflags.patch" -SRC_URI_append_powerpc = "file://keyutils-remove-m32-m64.patch" - -S = "${WORKDIR}/git" - -inherit autotools-brokensep - -INSTALL_FLAGS = " \ - LIBDIR=${libdir} \ - USRLIBDIR=${libdir} \ - BINDIR=${bindir} \ - SBINDIR=${sbindir} \ - ETCDIR=${sysconfdir} \ - SHAREDIR=${datadir} \ - MANDIR=${mandir} \ - INCLUDEDIR=${includedir} \ - DESTDIR=${D} \ -" - -do_install() { - cd ${S} && oe_runmake ${INSTALL_FLAGS} install -} - -FILES_${PN} += "${datadir}/request-key-debug.sh" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-integrity/recipes-support/keyutils/keyutils_git.bb b/meta-integrity/recipes-support/keyutils/keyutils_git.bb new file mode 100644 index 0000000..e88e75b --- /dev/null +++ b/meta-integrity/recipes-support/keyutils/keyutils_git.bb @@ -0,0 +1,49 @@ +SUMMARY = "Linux Key Management Utilities" +DESCRIPTION = "Keyutils is a set of utilities for managing the key retention \ +facility in the kernel, which can be used by filesystems, block devices and \ +more to gain and retain the authorization and encryption keys required to \ +perform secure operations." +SECTION = "base" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENCE.GPL;md5=5f6e72824f5da505c1f4a7197f004b45" + +PV = "1.5.9+git${SRCPV}" + +SRC_URI = "\ + git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git \ + file://keyutils_fix_library_install.patch \ + file://keyutils-fix-the-cflags-for-all-of-targets.patch \ +" +SRC_URI_append_arm = " file://keyutils-remove-m32-m64.patch" +SRC_URI_append_aarch64 = " file://keyutils-remove-m32-m64.patch" +SRC_URI_append_mips = " file://keyutils-remove-m32-m64.patch" +SRC_URI_append_mips64 = " file://keyutils-remove-m32-m64.patch" +SRC_URI_append_x86 = " file://keyutils_fix_x86_cflags.patch" +SRC_URI_append_x86-64 = " file://keyutils_fix_x86-64_cflags.patch" +SRC_URI_append_powerpc = "file://keyutils-remove-m32-m64.patch" +SRCREV = "9209a0c8fd63afc59f644e078b40cec531409c30" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep + +INSTALL_FLAGS = "\ + LIBDIR=${libdir} \ + USRLIBDIR=${libdir} \ + BINDIR=${bindir} \ + SBINDIR=${sbindir} \ + ETCDIR=${sysconfdir} \ + SHAREDIR=${datadir} \ + MANDIR=${mandir} \ + INCLUDEDIR=${includedir} \ + DESTDIR=${D} \ +" + +do_install() { + cd ${S} && oe_runmake ${INSTALL_FLAGS} install +} + +FILES_${PN} += "${datadir}/request-key-debug.sh" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf