[linux-yocto] [PATCH 47/48] kernel/sched: Revert compile fixes

[Daniel Dragomir]

From: Charlie Paul 

These changes were needed for the kernel to compile after
applying the three previous revert patches.

Signed-off-by: Charlie Paul 
---
 kernel/sched/core.c | 2 +-
 kernel/sched/rt.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 54bbbd9..a7d0587 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -1757,7 +1757,7 @@ int select_task_rq(struct task_struct *p, int cpu, int 
sd_flags, int wake_flags)
 {
lockdep_assert_held(&p->pi_lock);
 
-   if (tsk_nr_cpus_allowed(p) > 1)
+   if (p->nr_cpus_allowed > 1)
cpu = p->sched_class->select_task_rq(p, cpu, sd_flags, 
wake_flags);
else
cpu = cpumask_any(tsk_cpus_allowed(p));
diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
index 32be096..701eddf 100644
--- a/kernel/sched/rt.c
+++ b/kernel/sched/rt.c
@@ -2198,7 +2198,7 @@ static void switched_to_rt(struct rq *rq, struct 
task_struct *p)
 */
if (task_on_rq_queued(p) && rq->curr != p) {
 #ifdef CONFIG_SMP
-   if (tsk_nr_cpus_allowed(p) > 1 && rq->rt.overloaded)
+   if (p->nr_cpus_allowed > 1 && rq->rt.overloaded)
queue_push_tasks(rq);
 #endif /* CONFIG_SMP */
if (p->prio < rq->curr->prio)
-- 
2.7.4

-- 
___
linux-yocto mailing list
linux-yo...@yoctoproject.org
https://lists.yoctoproject.org/listinfo/linux-yocto

[yocto] [meta-security][thud][PATCH] tpm2.0-tss: Remove resourcemgr sub-package

[Daniel Dragomir]

Since in 2.0.x branch resourcemgr was removed as deprecated by
commit 7966ef8916f79ed09eab966a58d773f413fbb67f ("Remove resourcemgr
and fixup build.") and commit 0e175d36c13b1801d75ae768ac520154585326f8
("contrib: Remove systemd service and udev rules for old resourcemgr."),
remove resourcemgr sub-package with it's components.

Build will fail when trying sed command on resourcemgr.service
(No such file or directory).

Signed-off-by: Daniel Dragomir 
---
 meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss_2.0.1.bb | 19 ---
 1 file changed, 19 deletions(-)

diff --git a/meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss_2.0.1.bb 
b/meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss_2.0.1.bb
index 3e7b81a..9d1ff72 100644
--- a/meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss_2.0.1.bb
+++ b/meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss_2.0.1.bb
@@ -24,22 +24,6 @@ EXTRA_USERS_PARAMS = "\
groupadd tss; \
"
 
-SYSTEMD_PACKAGES = "resourcemgr"
-SYSTEMD_SERVICE_resourcemgr = "resourcemgr.service"
-SYSTEMD_AUTO_ENABLE_resourcemgr = "enable"
-
-do_patch[postfuncs] += 
"${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','systemd','fix_systemd_unit','',
 d)}"
-fix_systemd_unit () {
-sed -i -e 's;^ExecStart=.*/resourcemgr;ExecStart=${sbindir}/resourcemgr;' 
${S}/contrib/resourcemgr.service
-}
-
-do_install_append() {
-if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; 
then
-install -d ${D}${systemd_system_unitdir}
-install -m0644 ${S}/contrib/resourcemgr.service 
${D}${systemd_system_unitdir}/resourcemgr.service
-fi
-}
-
 PROVIDES = "${PACKAGES}"
 PACKAGES = " \
 ${PN} \
@@ -57,7 +41,6 @@ PACKAGES = " \
 libtss2 \
 libtss2-dev \
 libtss2-staticdev \
-resourcemgr \
 "
 
 FILES_libtss2-tcti-device = "${libdir}/libtss2-tcti-device.so.*"
@@ -89,5 +72,3 @@ FILES_libtss2-dev = " \
 FILES_libtss2-staticdev = "${libdir}/libtss*a"
 
 FILES_${PN} = "${libdir}/udev"
-
-FILES_resourcemgr = "${sbindir}/resourcemgr 
${systemd_system_unitdir}/resourcemgr.service"
-- 
2.7.4

-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto

[yocto] [meta-security][thud][PATCH] tpm2-abrmd: Fix QA error

[Daniel Dragomir]

QA Issue: tpm2-abrmd: Files/directories were installed but not
  shipped in any package:
/usr/share/dbus-1
/usr/share/dbus-1/system-services
/usr/share/dbus-1/system-services/com.intel.tss2.Tabrmd.service

Signed-off-by: Daniel Dragomir 
---
 meta-tpm/recipes-tpm/tpm2-abrmd/tpm2-abrmd_2.0.2.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-tpm/recipes-tpm/tpm2-abrmd/tpm2-abrmd_2.0.2.bb 
b/meta-tpm/recipes-tpm/tpm2-abrmd/tpm2-abrmd_2.0.2.bb
index 951556d..6347379 100644
--- a/meta-tpm/recipes-tpm/tpm2-abrmd/tpm2-abrmd_2.0.2.bb
+++ b/meta-tpm/recipes-tpm/tpm2-abrmd/tpm2-abrmd_2.0.2.bb
@@ -46,7 +46,8 @@ do_install_append() {
 install -m 0644 "${WORKDIR}/tpm2-abrmd.default" 
"${D}${sysconfdir}/default/tpm2-abrmd"
 }
 
-FILES_${PN} += "${libdir}/systemd/system-preset"
+FILES_${PN} += "${libdir}/systemd/system-preset \
+   ${datadir}/dbus-1"
 
 RDEPENDS_${PN} += "tpm2.0-tss"
 
-- 
2.7.4

-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto