Re: [yocto] [meta-security][PATCH 13/17] package-group: fix tpm package list
Hello, Would it not be more interesting to do two packages, one for the TPMV1.2 support and a second for the TPMV2.0 support? Best regards, Thomas P. On Tue, Oct 18, 2016 at 2:02 AM, Armin Kuster wrote: > Signed-off-by: Armin Kuster > --- > recipes-security/packagegroup/packagegroup-core-security.bb | 7 +-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/recipes-security/packagegroup/packagegroup-core-security.bb > b/recipes-security/packagegroup/packagegroup-core-security.bb > index 8639acd..ae856c7 100644 > --- a/recipes-security/packagegroup/packagegroup-core-security.bb > +++ b/recipes-security/packagegroup/packagegroup-core-security.bb > @@ -63,8 +63,11 @@ RDEPENDS_packagegroup-security-tpm = " \ > tpm-tools \ > trousers \ > tpm2.0-tools \ > -tpm2.0-tss \ > +libtss2 \ > +resourcemgr \ > +libtctidevice \ > +libtctisocket \ > +resourcemgr \ > libtpm \ > swtpm \ > -tpm2simulator-native \ > " > -- > 2.7.4 > > -- > ___ > yocto mailing list > yocto@yoctoproject.org > https://lists.yoctoproject.org/listinfo/yocto > -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-measured][PATCH] Fix tpm2.0-tss package issue: libraries are not ship into the right packages
Signed-off-by: Thomas Perrot
---
recipes-tpm/tpm2.0-tss/tpm2.0-tss_git.bb | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/recipes-tpm/tpm2.0-tss/tpm2.0-tss_git.bb
b/recipes-tpm/tpm2.0-tss/tpm2.0-tss_git.bb
index 453523e..175d36b 100644
--- a/recipes-tpm/tpm2.0-tss/tpm2.0-tss_git.bb
+++ b/recipes-tpm/tpm2.0-tss/tpm2.0-tss_git.bb
@@ -40,28 +40,28 @@ PACKAGES = " \
resourcemgr \
"
-FILES_libtss2 = "${libdir}/libsapi.so.0.0.0"
+FILES_libtss2 = "${libdir}/libsapi.so.0.0.0 ${libdir}/libsapi.so.0"
FILES_libtss2-dev = " \
${includedir}/sapi \
${includedir}/tcti/common.h \
-${libdir}/libsapi.so* \
+${libdir}/libsapi.so \
${libdir}/pkgconfig/sapi.pc \
"
FILES_libtss2-staticdev = " \
${libdir}/libsapi.a \
${libdir}/libsapi.la \
"
-FILES_libtctidevice = "${libdir}/libtcti-device.so.0.0.0"
+FILES_libtctidevice = "${libdir}/libtcti-device.so.0.0.0
${libdir}/libtcti-device.so.0"
FILES_libtctidevice-dev = " \
${includedir}/tcti/tcti_device.h \
-${libdir}/libtcti-device.so* \
+${libdir}/libtcti-device.so \
${libdir}/pkgconfig/tcti-device.pc \
"
FILES_libtctidevice-staticdev = "${libdir}/libtcti-device.*a"
-FILES_libtctisocket = "${libdir}/libtcti-socket.so.0.0.0"
+FILES_libtctisocket = "${libdir}/libtcti-socket.so.0.0.0
${libdir}/libtcti-socket.so.0"
FILES_libtctisocket-dev = " \
${includedir}/tcti/tcti_socket.h \
-${libdir}/libtcti-socket.so* \
+${libdir}/libtcti-socket.so \
${libdir}/pkgconfig/tcti-socket.pc \
"
FILES_libtctisocket-staticdev = "${libdir}/libtcti-socket.*a"
--
2.9.3
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-security][PATCH] Fix a trousers build on when not in use systemd: unparsed line: 'inherit'
Signed-off-by: Thomas Perrot
---
recipes-tpm/trousers/trousers_0.3.13.bb | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/recipes-tpm/trousers/trousers_0.3.13.bb
b/recipes-tpm/trousers/trousers_0.3.13.bb
index e274972..6853f18 100644
--- a/recipes-tpm/trousers/trousers_0.3.13.bb
+++ b/recipes-tpm/trousers/trousers_0.3.13.bb
@@ -16,8 +16,7 @@ SRC_URI =
"http://sourceforge.net/projects/trousers/files/${BPN}/${PV}/${BPN}-${
SRC_URI[md5sum] = "ad508f97b406f6e48cd90e85d78e7ca8"
SRC_URI[sha256sum] =
"bb908e4a3c88a17b247a4fc8e0fff3419d8a13170fe7bdfbe0e2c5c082a276d3"
-inherit autotools pkgconfig useradd update-rc.d
-inherit
${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)}
+inherit autotools pkgconfig useradd update-rc.d
${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)}
PACKAGECONFIG ?= "gmp "
PACKAGECONFIG[gmp] = "--with-gmp, --with-gmp=no, gmp"
--
2.1.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-virtualization][PATCH] Use bb.utils.contains instead of base_contains because it is deprecated
Signed-off-by: Thomas Perrot
---
recipes-containers/containerd/containerd_git.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/recipes-containers/containerd/containerd_git.bb
b/recipes-containers/containerd/containerd_git.bb
index 46b9dc1..1a2c445 100644
--- a/recipes-containers/containerd/containerd_git.bb
+++ b/recipes-containers/containerd/containerd_git.bb
@@ -59,8 +59,8 @@ do_compile() {
# Note: disabled for now, since docker is launching containerd
# inherit systemd
-# SYSTEMD_PACKAGES =
"${@base_contains('DISTRO_FEATURES','systemd','${PN}','',d)}"
-# SYSTEMD_SERVICE_${PN} =
"${@base_contains('DISTRO_FEATURES','systemd','containerd.service','',d)}"
+# SYSTEMD_PACKAGES =
"${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}"
+# SYSTEMD_SERVICE_${PN} =
"${@bb.utils.contains('DISTRO_FEATURES','systemd','containerd.service','',d)}"
do_install() {
mkdir -p ${D}/${bindir}
@@ -73,7 +73,7 @@ do_install() {
ln -sf containerd-shim ${D}/${bindir}/docker-containerd-shim
ln -sf containerd-ctr ${D}/${bindir}/docker-containerd-ctr
- if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+ if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};
then
install -d ${D}${systemd_unitdir}/system
install -m 644 ${S}/hack/containerd.service
${D}/${systemd_unitdir}/system
# adjust from /usr/local/bin to /usr/bin/
--
2.1.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-security][PATCH] Use bb.utils.contains instead of base_contains because it is deprecated
Signed-off-by: Thomas Perrot
---
recipes-kernel/linux/linux-yocto_4.1.bbappend | 8
recipes-security/clamav/clamav_0.99.1.bb | 2 +-
recipes-security/sssd/sssd_1.13.3.bb | 2 +-
recipes-tpm/trousers/trousers_0.3.13.bb | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/recipes-kernel/linux/linux-yocto_4.1.bbappend
b/recipes-kernel/linux/linux-yocto_4.1.bbappend
index 1043d5c..dc90e31 100644
--- a/recipes-kernel/linux/linux-yocto_4.1.bbappend
+++ b/recipes-kernel/linux/linux-yocto_4.1.bbappend
@@ -2,8 +2,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.1:"
# Tomoyo kernel support
SRC_URI += "\
- ${@base_contains('DISTRO_FEATURES', 'tomoyo', '
file://ccs-tools-yocto.4.1.patch', '', d)} \
- ${@base_contains('DISTRO_FEATURES', 'tomoyo', '
file://ccs-tools-yocto_security.patch', '', d)} \
- ${@base_contains('DISTRO_FEATURES', 'tomoyo', ' file://tomoyo.cfg', '',
d)} \
- ${@base_contains('DISTRO_FEATURES', 'tomoyo', ' file://tomoyo.scc', '',
d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'tomoyo', '
file://ccs-tools-yocto.4.1.patch', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'tomoyo', '
file://ccs-tools-yocto_security.patch', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'tomoyo', ' file://tomoyo.cfg',
'', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'tomoyo', ' file://tomoyo.scc',
'', d)} \
"
diff --git a/recipes-security/clamav/clamav_0.99.1.bb
b/recipes-security/clamav/clamav_0.99.1.bb
index edccc78..461015f 100644
--- a/recipes-security/clamav/clamav_0.99.1.bb
+++ b/recipes-security/clamav/clamav_0.99.1.bb
@@ -30,7 +30,7 @@ GID = "clamav"
PACKAGECONFIG ?= "ncurses openssl bz2 zlib "
PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "",
d)}"
-PACKAGECONFIG += "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd',
'', d)}"
+PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd',
'systemd', '', d)}"
PACKAGECONFIG[pcre] = "--with-pcre=${STAGING_LIBDIR}, --without-pcre, libpcre"
PACKAGECONFIG[xml] = "--with-xml=${STAGING_LIBDIR}/.., --with-xml=no, libxml2,"
PACKAGECONFIG[json] = "--with-libjson=${STAGING_LIBDIR}, --without-libjson,
json,"
diff --git a/recipes-security/sssd/sssd_1.13.3.bb
b/recipes-security/sssd/sssd_1.13.3.bb
index d538af3..fd4f2a2 100644
--- a/recipes-security/sssd/sssd_1.13.3.bb
+++ b/recipes-security/sssd/sssd_1.13.3.bb
@@ -24,7 +24,7 @@ CACHED_CONFIGUREVARS =
"ac_cv_member_struct_ldap_conncb_lc_arg=no \
"
PACKAGECONFIG ?="nss"
-PACKAGECONFIG += "${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux',
'', d)}"
+PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'selinux',
'selinux', '', d)}"
PACKAGECONFIG[ssh] = "--with-ssh, --with-ssh=no, "
PACKAGECONFIG[samba] = "--with-samba, --with-samba=no, samba"
diff --git a/recipes-tpm/trousers/trousers_0.3.13.bb
b/recipes-tpm/trousers/trousers_0.3.13.bb
index 7001788..e274972 100644
--- a/recipes-tpm/trousers/trousers_0.3.13.bb
+++ b/recipes-tpm/trousers/trousers_0.3.13.bb
@@ -17,7 +17,7 @@ SRC_URI[md5sum] = "ad508f97b406f6e48cd90e85d78e7ca8"
SRC_URI[sha256sum] =
"bb908e4a3c88a17b247a4fc8e0fff3419d8a13170fe7bdfbe0e2c5c082a276d3"
inherit autotools pkgconfig useradd update-rc.d
-inherit
${@base_contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)}
+inherit
${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)}
PACKAGECONFIG ?= "gmp "
PACKAGECONFIG[gmp] = "--with-gmp, --with-gmp=no, gmp"
@@ -33,7 +33,7 @@ do_install_append() {
install -d ${D}${sysconfdir}/udev/rules.d
install -m 0644 ${WORKDIR}/trousers-udev.rules
${D}${sysconfdir}/udev/rules.d/45-trousers.rules
-if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};
then
install -d ${D}${systemd_unitdir}/system
install -m 0644 ${WORKDIR}/tcsd.service ${D}${systemd_unitdir}/system/
sed -i -e 's#@SBINDIR@#${sbindir}#g'
${D}${systemd_unitdir}/system/tcsd.service
--
2.1.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-selinux][PATCH] Remove recipes for kernel 3.14 and 3.19 from master branch, to fix a build error. ERROR: No recipes available for: meta-selinux/recipes-kernel/linux/linux-yocto_3.19.bbap
Signed-off-by: Thomas Perrot
---
recipes-kernel/linux/linux-yocto_3.14.bbappend | 8
recipes-kernel/linux/linux-yocto_3.19.bbappend | 8
2 files changed, 16 deletions(-)
delete mode 100644 recipes-kernel/linux/linux-yocto_3.14.bbappend
delete mode 100644 recipes-kernel/linux/linux-yocto_3.19.bbappend
diff --git a/recipes-kernel/linux/linux-yocto_3.14.bbappend
b/recipes-kernel/linux/linux-yocto_3.14.bbappend
deleted file mode 100644
index 65c79ef..000
--- a/recipes-kernel/linux/linux-yocto_3.14.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-# Enable selinux support in the kernel if the feature is enabled
-SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'selinux',
'file://selinux.cfg', '', d)}"
-
-# For inconsistent kallsyms data bug on ARM
-#
http://lists.infradead.org/pipermail/linux-arm-kernel/2012-March/thread.html#89718
-EXTRA_OEMAKE += "${@bb.utils.contains('TARGET_ARCH', 'arm', '
KALLSYMS_EXTRA_PASS=1', '', d)}"
diff --git a/recipes-kernel/linux/linux-yocto_3.19.bbappend
b/recipes-kernel/linux/linux-yocto_3.19.bbappend
deleted file mode 100644
index a8c0647..000
--- a/recipes-kernel/linux/linux-yocto_3.19.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-# Enable selinux support in the kernel if the feature is enabled
-SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'selinux',
'file://selinux.cfg', '', d)}"
-
-# For inconsistent kallsyms data bug on ARM
-#
http://lists.infradead.org/pipermail/linux-arm-kernel/2012-March/thread.html#89718
-EXTRA_OEMAKE += "${@bb.utils.contains('TARGET_ARCH', 'arm', '
KALLSYMS_EXTRA_PASS=1', '', d)}"
--
2.1.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-security][PATCH] Remove recipe for the kernel 3.14 from master branch, to fix a build error. ERROR: No recipes available for: meta-security/recipes-kernel/linux/linux-yocto_3.14.bbappend
Signed-off-by: Thomas Perrot
---
recipes-kernel/linux/linux-yocto_3.14.bbappend | 4
1 file changed, 4 deletions(-)
delete mode 100644 recipes-kernel/linux/linux-yocto_3.14.bbappend
diff --git a/recipes-kernel/linux/linux-yocto_3.14.bbappend
b/recipes-kernel/linux/linux-yocto_3.14.bbappend
deleted file mode 100644
index b46419c..000
--- a/recipes-kernel/linux/linux-yocto_3.14.bbappend
+++ /dev/null
@@ -1,4 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-# Tomoyo kernel support
-SRC_URI += "${@base_contains('DISTRO_FEATURES', 'tomoyo', '
file://tomoyo.cfg', '', d)}"
--
2.1.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-selinux][PATCH] To fix ERROR: No recipes available for: /home/tperrot/dev/oe-build-easy/combination/meta-selinux/recipes-extended/net-tools/net-tools_1.60-25.bbappend The version of the
Signed-off-by: Thomas Perrot
---
.../net-tools/{net-tools_1.60-25.bbappend => net-tools_1.60-%.bbappend} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename recipes-extended/net-tools/{net-tools_1.60-25.bbappend =>
net-tools_1.60-%.bbappend} (100%)
diff --git a/recipes-extended/net-tools/net-tools_1.60-25.bbappend
b/recipes-extended/net-tools/net-tools_1.60-%.bbappend
similarity index 100%
rename from recipes-extended/net-tools/net-tools_1.60-25.bbappend
rename to recipes-extended/net-tools/net-tools_1.60-%.bbappend
--
2.1.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-security][PATCH] Corrects a typing error.
Signed-off-by: Thomas Perrot
---
recipes-security/libseccomp/libseccomp_2.2.0.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/recipes-security/libseccomp/libseccomp_2.2.0.bb
b/recipes-security/libseccomp/libseccomp_2.2.0.bb
index bd970ed..3b6aa67 100644
--- a/recipes-security/libseccomp/libseccomp_2.2.0.bb
+++ b/recipes-security/libseccomp/libseccomp_2.2.0.bb
@@ -30,7 +30,7 @@ inherit autotools-brokensep pkgconfig
PACKAGECONFIG ??= ""
PACKAGECONFIG[python] = "--enable-python, --disable-python, python"
-do_compile_appned() {
+do_compile_append() {
oe_runmake -C tests check-build
}
--
2.1.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-raspberrypi][PATCH] If SERIAL_CONSOLE is already define by another layer, this value may not be good.
Signed-off-by: Thomas Perrot --- conf/machine/include/rpi-base.inc |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/include/rpi-base.inc b/conf/machine/include/rpi-base.inc index a26803a..1dda207 100644 --- a/conf/machine/include/rpi-base.inc +++ b/conf/machine/include/rpi-base.inc @@ -7,7 +7,7 @@ include conf/machine/include/soc-family.inc IMAGE_FSTYPES ?= "tar.bz2 ext3 rpi-sdimg" -SERIAL_CONSOLE ?= "115200 ttyAMA0" +SERIAL_CONSOLE = "115200 ttyAMA0" XSERVER = " \ xserver-xorg \ -- 1.7.10.4 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-selinux][PATCH] Fix setools building (-fPIC error)
From: tprrt
Signed-off-by: tprrt
---
recipes-security/setools/setools_3.3.8.bb |3 +++
1 file changed, 3 insertions(+)
diff --git a/recipes-security/setools/setools_3.3.8.bb
b/recipes-security/setools/setools_3.3.8.bb
index 050f4ff..24c10b8 100644
--- a/recipes-security/setools/setools_3.3.8.bb
+++ b/recipes-security/setools/setools_3.3.8.bb
@@ -28,6 +28,9 @@ LIC_FILES_CHKSUM =
"file://${S}/COPYING;md5=26035c503c68ae1098177934ac0cc795 \
file://${S}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe \
file://${S}/COPYING.LGPL;md5=fbc093901857fcd118f065f900982c24"
+CFLAGS_append = " -fPIC"
+CXXFLAGS_append = " -fPIC"
+
DEPENDS += "bison-native flex-native python libsepol libselinux libxml2"
PACKAGE_BEFORE_PN += "${PN}-libs"
--
1.7.10.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
