Re: [yocto] [meta-security][thud][PATCH] tpm2.0-tss: Remove resourcemgr sub-package
On 12/7/18 2:38 AM, Daniel Dragomir wrote: > 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. merged. > 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" -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-security][thud][PATCH] tpm2.0-tss: Remove resourcemgr sub-package
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