| Message ID | 20241105143638.2301245-80-akuster808@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | Patch review | expand |
> -----Original Message----- > From: openembedded-devel@lists.openembedded.org <openembedded-devel@lists.openembedded.org> On Behalf Of Armin Kuster > Sent: den 5 november 2024 15:36 > To: openembedded-devel@lists.openembedded.org > Cc: Markus Volk <f_l_k@t-online.de>; Khem Raj <raj.khem@gmail.com> > Subject: [oe] [meta-oe][styhead][PATCH 79/90] cryptsetup: fix udev PACKAGECONFIG > > From: Markus Volk <f_l_k@t-online.de> > > This commit removed the lvm2-udevrules package. > [https://git.openembedded.org/meta-openembedded/commit/?h=master-next&id=c37c867e1adddd6fa39cf3f3d4c6688ea6dc825a] The change below is broken unless commit c37c867e1adddd6fa39cf3f3d4c6688ea6dc825a referenced above is also backported to Styhead, which it probably should be. > > Align accordingly to avoid error at do_rootfs > > Error: > Problem 1: package udisks2-2.10.1-r0.corei7_64 from oe-repo requires libblockdev.so.3()(64bit), but none of the providers can be installed > - package udisks2-2.10.1-r0.corei7_64 from oe-repo requires libbd_utils.so.3()(64bit), but none of the providers can be installed > - package udisks2-2.10.1-r0.corei7_64 from oe-repo requires libblockdev >= 3.2.0, but none of the providers can be installed > - package gvfs-1.56.0-r0.corei7_64 from oe-repo requires udisks2, but none of the providers can be installed > - package libblockdev-3.2.0-r0.corei7_64 from oe-repo requires libcryptsetup.so.12()(64bit), but none of the providers can be installed > - package libblockdev-3.2.0-r0.corei7_64 from oe-repo requires libcryptsetup.so.12(CRYPTSETUP_2.0)(64bit), but none of the providers can be installed > - package libblockdev-3.2.0-r0.corei7_64 from oe-repo requires libcryptsetup.so.12(CRYPTSETUP_2.4)(64bit), but none of the providers can be installed > - package libblockdev-3.2.0-r0.corei7_64 from oe-repo requires libcryptsetup.so.12(CRYPTSETUP_2.7)(64bit), but none of the providers can be installed > - package libblockdev-3.2.0-r0.corei7_64 from oe-repo requires cryptsetup >= 2.7.5, but none of the providers can be installed > - conflicting requests > - nothing provides lvm2-udevrules needed by cryptsetup-2.7.5-r0.corei7_64 from oe-repo > Problem 2: package gvfs-1.56.0-r0.corei7_64 from oe-repo requires udisks2, but none of the providers can be installed > - package udisks2-2.10.1-r0.corei7_64 from oe-repo requires libblockdev.so.3()(64bit), but none of the providers can be installed > - package udisks2-2.10.1-r0.corei7_64 from oe-repo requires libbd_utils.so.3()(64bit), but none of the providers can be installed > - package udisks2-2.10.1-r0.corei7_64 from oe-repo requires libblockdev >= 3.2.0, but none of the providers can be installed > - package gvfsd-trash-1.56.0-r0.corei7_64 from oe-repo requires libgvfscommon.so()(64bit), but none of the providers can be installed > - package gvfsd-trash-1.56.0-r0.corei7_64 from oe-repo requires libgvfsdaemon.so()(64bit), but none of the providers can be installed > - package gvfsd-trash-1.56.0-r0.corei7_64 from oe-repo requires gvfs >= 1.56.0, but none of the providers can be installed > - package libblockdev-3.2.0-r0.corei7_64 from oe-repo requires libcryptsetup.so.12()(64bit), but none of the providers can be installed > - package libblockdev-3.2.0-r0.corei7_64 from oe-repo requires libcryptsetup.so.12(CRYPTSETUP_2.0)(64bit), but none of the providers can be installed > - package libblockdev-3.2.0-r0.corei7_64 from oe-repo requires libcryptsetup.so.12(CRYPTSETUP_2.4)(64bit), but none of the providers can be installed > - package libblockdev-3.2.0-r0.corei7_64 from oe-repo requires libcryptsetup.so.12(CRYPTSETUP_2.7)(64bit), but none of the providers can be installed > - package libblockdev-3.2.0-r0.corei7_64 from oe-repo requires cryptsetup >= 2.7.5, but none of the providers can be installed > - conflicting requests > - nothing provides lvm2-udevrules needed by cryptsetup-2.7.5-r0.corei7_64 from oe-repo > (try to add '--skip-broken' to skip uninstallable packages) > > Signed-off-by: Markus Volk <f_l_k@t-online.de> > Signed-off-by: Khem Raj <raj.khem@gmail.com> > (cherry picked from commit 1ca8df16af411871e10f268064570146cdef54cb) > Signed-off-by: Armin Kuster <akuster808@gmail.com> > --- > meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.5.bb | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.5.bb b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.5.bb > index 54b47ea3fd..60bf501eb9 100644 > --- a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.5.bb > +++ b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.5.bb > @@ -53,7 +53,7 @@ PACKAGECONFIG[veritysetup] = "--enable-veritysetup,--disable-veritysetup" > PACKAGECONFIG[luks2-reencryption] = "--enable-luks2-reencryption,--disable-luks2-reencryption" > PACKAGECONFIG[integritysetup] = "--enable-integritysetup,--disable-integritysetup" > PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux" > -PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,,udev lvm2-udevrules" > +PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,,udev lvm2" I also have a suspicion that this should depend on libdevmapper rather than lvm2. However, we have udev support disabled for cryptsetup in our environment so I cannot verify it. > PACKAGECONFIG[kernel_crypto] = "--enable-kernel_crypto,--disable-kernel_crypto" > # gcrypt-pkbdf2 requries --with-crypto_backend=gcrypt or the flag isn't > # recognized. > -- > 2.43.0 //Peter
diff --git a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.5.bb b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.5.bb index 54b47ea3fd..60bf501eb9 100644 --- a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.5.bb +++ b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.5.bb @@ -53,7 +53,7 @@ PACKAGECONFIG[veritysetup] = "--enable-veritysetup,--disable-veritysetup" PACKAGECONFIG[luks2-reencryption] = "--enable-luks2-reencryption,--disable-luks2-reencryption" PACKAGECONFIG[integritysetup] = "--enable-integritysetup,--disable-integritysetup" PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux" -PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,,udev lvm2-udevrules" +PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,,udev lvm2" PACKAGECONFIG[kernel_crypto] = "--enable-kernel_crypto,--disable-kernel_crypto" # gcrypt-pkbdf2 requries --with-crypto_backend=gcrypt or the flag isn't # recognized.