meta-secure-core: code style fixup

Signed-off-by: Lans Zhang <jia.zhang@windriver.com>
This commit is contained in:
Lans Zhang
2017-07-28 10:09:02 +08:00
parent afea92abb3
commit f77e53d627
7 changed files with 28 additions and 25 deletions
+1 -1
View File
@@ -45,7 +45,7 @@ yocto build tree, you can add it to the build system by adding the
location of the meta-secure-core layer to bblayers.conf, along with any location of the meta-secure-core layer to bblayers.conf, along with any
other layers needed. e.g.: other layers needed. e.g.:
BBLAYERS ?= " \ BBLAYERS ?= "\
/path/to/yocto/meta \ /path/to/yocto/meta \
/path/to/yocto/meta-poky \ /path/to/yocto/meta-poky \
/path/to/yocto/meta-yocto-bsp \ /path/to/yocto/meta-yocto-bsp \
@@ -131,7 +131,7 @@ do_deploy_class-target() {
FILES_${PN} += "/boot/efi" FILES_${PN} += "/boot/efi"
CONFFILES_${PN} += " \ CONFFILES_${PN} += "\
${EFI_BOOT_PATH}/grub.cfg \ ${EFI_BOOT_PATH}/grub.cfg \
${EFI_BOOT_PATH}/grubenv \ ${EFI_BOOT_PATH}/grubenv \
${EFI_BOOT_PATH}/boot-menu.inc \ ${EFI_BOOT_PATH}/boot-menu.inc \
@@ -1,5 +1,5 @@
SUMMARY = "A generic signing tool framework" SUMMARY = "A generic signing tool framework"
DESCRIPTION = " \ DESCRIPTION = "\
This project targets to provide a generic signing framework. This framework \ This project targets to provide a generic signing framework. This framework \
separates the signing request and signing process and correspondingly forms \ separates the signing request and signing process and correspondingly forms \
the so-called signlet and signaturelet. \ the so-called signlet and signaturelet. \
@@ -18,7 +18,7 @@ DEPENDS += "openssl"
PV = "0.3.2+git${SRCPV}" PV = "0.3.2+git${SRCPV}"
SRC_URI = " \ SRC_URI = "\
git://github.com/jiazhang0/libsign.git \ git://github.com/jiazhang0/libsign.git \
" "
SRCREV = "0e8005f1c546ef25d834084f5cd85d386cf7cd1d" SRCREV = "0e8005f1c546ef25d834084f5cd85d386cf7cd1d"
@@ -27,7 +27,7 @@ PARALLEL_MAKE = ""
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
EXTRA_OEMAKE = " \ EXTRA_OEMAKE = "\
CC="${CC}" \ CC="${CC}" \
bindir="${STAGING_BINDIR}" \ bindir="${STAGING_BINDIR}" \
libdir="${STAGING_LIBDIR}" \ libdir="${STAGING_LIBDIR}" \
@@ -43,7 +43,7 @@ do_install() {
oe_runmake install DESTDIR="${D}" oe_runmake install DESTDIR="${D}"
} }
FILES_${PN} += " \ FILES_${PN} += "\
${libdir}/signaturelet \ ${libdir}/signaturelet \
" "
@@ -1,6 +1,6 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto:" FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto:"
SRC_URI += " \ SRC_URI += "\
${@bb.utils.contains('DISTRO_FEATURES', 'encrypted-storage', \ ${@bb.utils.contains('DISTRO_FEATURES', 'encrypted-storage', \
'file://dmcrypt.scc file://dmcrypt.cfg', '', d)} \ 'file://dmcrypt.scc file://dmcrypt.cfg', '', d)} \
" "
@@ -1,18 +1,18 @@
LICENSE = "GPLv2" LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SRC_URI = " \ DEPENDS += "openssl attr keyutils"
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}" PV = "1.0+git${SRCPV}"
S = "${WORKDIR}/git" 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"
DEPENDS += "openssl attr keyutils" S = "${WORKDIR}/git"
RDEPENDS_${PN}_class-target += "libcrypto libattr keyutils"
inherit pkgconfig autotools inherit pkgconfig autotools
@@ -21,4 +21,6 @@ EXTRA_OECONF = ""
FILES_${PN}-dev += "${includedir}" FILES_${PN}-dev += "${includedir}"
RDEPENDS_${PN}_class-target += "libcrypto libattr keyutils"
BBCLASSEXTEND = "native nativesdk" BBCLASSEXTEND = "native nativesdk"
@@ -4,17 +4,17 @@ 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 \ more to gain and retain the authorization and encryption keys required to \
perform secure operations." perform secure operations."
SECTION = "base" SECTION = "base"
LICENSE = "GPLv2" LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://LICENCE.GPL;md5=5f6e72824f5da505c1f4a7197f004b45" LIC_FILES_CHKSUM = "file://LICENCE.GPL;md5=5f6e72824f5da505c1f4a7197f004b45"
PR = "r1" PV = "1.5.9+git${SRCPV}"
SRCREV = "9209a0c8fd63afc59f644e078b40cec531409c30" SRC_URI = "\
git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git \
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_library_install.patch \ file://keyutils-fix-the-cflags-for-all-of-targets.patch \
file://keyutils-fix-the-cflags-for-all-of-targets.patch \ "
"
SRC_URI_append_arm = " file://keyutils-remove-m32-m64.patch" SRC_URI_append_arm = " file://keyutils-remove-m32-m64.patch"
SRC_URI_append_aarch64 = " 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_mips = " file://keyutils-remove-m32-m64.patch"
@@ -22,12 +22,13 @@ SRC_URI_append_mips64 = " file://keyutils-remove-m32-m64.patch"
SRC_URI_append_x86 = " file://keyutils_fix_x86_cflags.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_x86-64 = " file://keyutils_fix_x86-64_cflags.patch"
SRC_URI_append_powerpc = "file://keyutils-remove-m32-m64.patch" SRC_URI_append_powerpc = "file://keyutils-remove-m32-m64.patch"
SRCREV = "9209a0c8fd63afc59f644e078b40cec531409c30"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
inherit autotools-brokensep inherit autotools-brokensep
INSTALL_FLAGS = " \ INSTALL_FLAGS = "\
LIBDIR=${libdir} \ LIBDIR=${libdir} \
USRLIBDIR=${libdir} \ USRLIBDIR=${libdir} \
BINDIR=${bindir} \ BINDIR=${bindir} \
@@ -1,4 +1,4 @@
DEPENDS_append_class-target += " \ DEPENDS_append_class-target += "\
sbsigntool-native \ sbsigntool-native \
libsign-native \ libsign-native \
openssl-native \ openssl-native \