On 7/13/20 9:00 PM, Jeremy Puhlman wrote: > From: Jeremy Puhlman <[email protected]> > > Without this we get weird conflict when you include dev packages: > rror: Transaction check error: > file /usr/include/libcryptsetup.h conflicts between attempted installs of > cryptsetup-tpm-incubator-dev-0.9.9-r0.corei7_64 and > lib32-cryptsetup-dev-2.3.2-r0.1.i586 > file /usr/lib64/libcryptsetup.so conflicts between attempted installs of > cryptsetup-tpm-incubator-dev-0.9.9-r0.corei7_64 and > cryptsetup-dev-2.3.2-r0.1.corei7_64 > file /usr/lib64/pkgconfig/libcryptsetup.pc conflicts between attempted > installs of cryptsetup-tpm-incubator-dev-0.9.9-r0.corei7_64 and > cryptsetup-dev-2.3.2-r0.1.corei7_64 > file /usr/lib/libcryptsetup.so conflicts between attempted installs of > lib32-cryptsetup-tpm-incubator-dev-0.9.9-r0.i586 and > lib32-cryptsetup-dev-2.3.2-r0.1.i586 > file /usr/lib/pkgconfig/libcryptsetup.pc conflicts between attempted > installs > of lib32-cryptsetup-tpm-incubator-dev-0.9.9-r0.i586 and > lib32-cryptsetup-dev-2.3.2-r0.1.i586
I plan on taking this for Dunfell. Master no long compiles do to core package updates. not sure what I am going to do for Master yet. thanks for the patch. Armin > Signed-off-by: Jeremy Puhlman <[email protected]> > --- > .../cryptsetup-tpm-incubator/cryptsetup-tpm-incubator_0.9.9.bb | 5 > +++++ > 1 file changed, 5 insertions(+) > > diff --git > a/meta-tpm/recipes-tpm2/cryptsetup-tpm-incubator/cryptsetup-tpm-incubator_0.9.9.bb > > b/meta-tpm/recipes-tpm2/cryptsetup-tpm-incubator/cryptsetup-tpm-incubator_0.9.9.bb > index b706d15..2617162 100644 > --- > a/meta-tpm/recipes-tpm2/cryptsetup-tpm-incubator/cryptsetup-tpm-incubator_0.9.9.bb > +++ > b/meta-tpm/recipes-tpm2/cryptsetup-tpm-incubator/cryptsetup-tpm-incubator_0.9.9.bb > @@ -36,7 +36,12 @@ FILES_${PN} += "${libdir}/tmpfiles.d" > RDEPENDS_${PN} += "lvm2 libdevmapper" > RRECOMMENDS_${PN} += "lvm2-udevrules" > > +RPROVIDES_${PN} = "cryptsetup" > RREPLACES_${PN} = "cryptsetup" > RCONFLICTS_${PN} ="cryptsetup" > > +RPROVIDES_${PN}-dev = "cryptsetup-dev" > +RREPLACES_${PN}-dev = "cryptsetup-dev" > +RCONFLICTS_${PN}-dev ="cryptsetup-dev" > + > BBCLASSEXTEND = "native nativesdk" > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#49953): https://lists.yoctoproject.org/g/yocto/message/49953 Mute This Topic: https://lists.yoctoproject.org/mt/75492532/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
