diff options
author | Jeremy Puhlman <jpuhlman@mvista.com> | 2020-07-13 21:00:00 -0700 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2020-07-14 21:27:35 -0700 |
commit | b3a2f0016a4ec28292d18cc599591a8f89180ab6 (patch) | |
tree | e42c5105b6348d44d6f138ea7c70eae50154e160 | |
parent | 0b69bd35530e9286d379daaec79f2b57174ee065 (diff) | |
download | meta-security-b3a2f0016a4ec28292d18cc599591a8f89180ab6.tar.gz |
cryptsetup-tpm-incubator: RPROVIDES cryptsetup and cryptsetup-dev
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
Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | meta-tpm/recipes-tpm2/cryptsetup-tpm-incubator/cryptsetup-tpm-incubator_0.9.9.bb | 5 |
1 files changed, 5 insertions, 0 deletions
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" | |||
36 | RDEPENDS_${PN} += "lvm2 libdevmapper" | 36 | RDEPENDS_${PN} += "lvm2 libdevmapper" |
37 | RRECOMMENDS_${PN} += "lvm2-udevrules" | 37 | RRECOMMENDS_${PN} += "lvm2-udevrules" |
38 | 38 | ||
39 | RPROVIDES_${PN} = "cryptsetup" | ||
39 | RREPLACES_${PN} = "cryptsetup" | 40 | RREPLACES_${PN} = "cryptsetup" |
40 | RCONFLICTS_${PN} ="cryptsetup" | 41 | RCONFLICTS_${PN} ="cryptsetup" |
41 | 42 | ||
43 | RPROVIDES_${PN}-dev = "cryptsetup-dev" | ||
44 | RREPLACES_${PN}-dev = "cryptsetup-dev" | ||
45 | RCONFLICTS_${PN}-dev ="cryptsetup-dev" | ||
46 | |||
42 | BBCLASSEXTEND = "native nativesdk" | 47 | BBCLASSEXTEND = "native nativesdk" |