cryptsetup: Upgrade to 2.0.3
PATCH v2 1/1 cryptsetup: Upgrade to 2.0.3
From: Mingli Yu <[email protected]>
* Update the homepage to https://gitlab.com/cryptsetup/cryptsetup
* Add json-c to DEPENDS as cryptsetup requires the json-c library for JSON data processing since cryptsetup 2.0.0 per "The LUKS2 format and features" part of
https://mirrors.edge.kernel.org/pub/linux/utils/cryptsetup/v2.0/v2.0.0-ReleaseNotes
* Add file /usr/lib/tmpfiles.d/cryptsetup.conf to FILES_${PN} when systemd enabled in DISTRO_FEATURES
---
.../{cryptsetup_1.7.4.bb => cryptsetup_2.0.3.bb} | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
rename meta-oe/recipes-crypto/cryptsetup/{cryptsetup_1.7.4.bb => cryptsetup_2.0.3.bb} (72%)meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.0.3.bb renamed from meta-oe/recipes-crypto/cryptsetup/cryptsetup_1.7.4.bb +7 -5
@@ -4,16 +4,16 @@ device-mapper mappings. These include plain dm-crypt volumes and \ LUKS volumes. The difference is that LUKS uses a metadata header \ and can hence offer more features than plain dm-crypt. On the other \ hand, the header is visible and vulnerable to damage." -HOMEPAGE = "http://code.google.com/p/cryptsetup/" +HOMEPAGE = "https://gitlab.com/cryptsetup/cryptsetup" SECTION = "console" LICENSE = "GPL-2.0-with-OpenSSL-exception" LIC_FILES_CHKSUM = "file://COPYING;md5=32107dd283b1dfeb66c9b3e6be312326" -DEPENDS = "util-linux libdevmapper popt libgcrypt" +DEPENDS = "util-linux libdevmapper popt libgcrypt json-c" -SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v1.7/${BP}.tar.xz" -SRC_URI[md5sum] = "058ed35c5b776032c2a036838f9e22a7" -SRC_URI[sha256sum] = "7ccf893ef79a38fb92d61f03c17b964982119f5319cdaa85a1335b8558cca016" +SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v2.0/${BP}.tar.xz" +SRC_URI[md5sum] = "ea1c722f8d4c4e36427628b679b1f819" +SRC_URI[sha256sum] = "4d6cca04c1f5ff4a68d045d190efb2623087eda0274ded92f92a4b6911e501d4" inherit autotools gettext pkgconfig
@@ -33,4 +33,6 @@ RRECOMMENDS_${PN} = "kernel-module-aes-generic \ EXTRA_OECONF = "--enable-static" +FILES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','${exec_prefix}/lib/tmpfiles.d/cryptsetup.conf', '', d)}" + BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.17.1
Quoted 10 lines · On 7/16/18 6:58 PM, [email protected] wrote:
From: Mingli Yu <[email protected]>
* Update the homepage to https://gitlab.com/cryptsetup/cryptsetup
* Add json-c to DEPENDS as cryptsetup requires the json-c library for JSON data processing since cryptsetup 2.0.0 per "The LUKS2 format and features" part of
https://mirrors.edge.kernel.org/pub/linux/utils/cryptsetup/v2.0/v2.0.0-ReleaseNotes
* Add file/usr/lib/tmpfiles.d/cryptsetup.confto FILES_${PN} when systemd enabled inDISTRO_FEATURES
I am seeing a new failure for meta-oe/recipes-extended/libblockdev/libblockdev_2.16.bb
| ../../../git/src/plugins/crypto.c: In function 'bd_crypto_tc_open':
| ../../../git/src/plugins/crypto.c:973:12: error: missing initializer for field 'veracrypt_pim' of 'struct crypt_params_tcrypt' [-Werror=missing-field-initializers]
| struct crypt_params_tcrypt params = {NULL,0,NULL,0,NULL,NULL,NULL,0,0};
| ^~~~~~~~~~~~~~~~~~~
| In file included from ../../../git/src/plugins/crypto.c:22:
| /mnt/a/oe/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-gnueabi/libblockdev/2.16-r0/recipe-sysroot/usr/include/libcryptsetup.h:436:11: note: 'veracrypt_pim' declared here
| uint32_t veracrypt_pim; /**< VeraCrypt Personal Iteration Multiplier */
| ^~~~~~~~~~~~~Quoted 43 lines
Signed-off-by Mingli Yu <[email protected]>--- .../{cryptsetup_1.7.4.bb => cryptsetup_2.0.3.bb} | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)rename meta-oe/recipes-crypto/cryptsetup/{cryptsetup_1.7.4.bb => cryptsetup_2.0.3.bb} (72%)
meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.0.3.bb renamed from meta-oe/recipes-crypto/cryptsetup/cryptsetup_1.7.4.bb +7
-5@@ -4,16 +4,16 @@ device-mapper mappings. These include plain dm-crypt volumes and \ LUKS volumes. The difference is that LUKS uses a metadata header \ and can hence offer more features than plain dm-crypt. On the other \ hand, the header is visible and vulnerable to damage." -HOMEPAGE = "http://code.google.com/p/cryptsetup/" +HOMEPAGE = "https://gitlab.com/cryptsetup/cryptsetup" SECTION = "console" LICENSE = "GPL-2.0-with-OpenSSL-exception" LIC_FILES_CHKSUM = "file://COPYING;md5=32107dd283b1dfeb66c9b3e6be312326" -DEPENDS = "util-linux libdevmapper popt libgcrypt" +DEPENDS = "util-linux libdevmapper popt libgcrypt json-c" -SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v1.7/${BP}.tar.xz" -SRC_URI[md5sum] = "058ed35c5b776032c2a036838f9e22a7" -SRC_URI[sha256sum] = "7ccf893ef79a38fb92d61f03c17b964982119f5319cdaa85a1335b8558cca016" +SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v2.0/${BP}.tar.xz" +SRC_URI[md5sum] = "ea1c722f8d4c4e36427628b679b1f819" +SRC_URI[sha256sum] = "4d6cca04c1f5ff4a68d045d190efb2623087eda0274ded92f92a4b6911e501d4" inherit autotools gettext pkgconfig@@ -33,4 +33,6 @@ RRECOMMENDS_${PN} = "kernel-module-aes-generic \ EXTRA_OECONF = "--enable-static" +FILES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','${exec_prefix}/lib/tmpfiles.d/cryptsetup.conf', '', d)}" + BBCLASSEXTEND = "native nativesdk"
Quoted 10 lines · Khem Raj
Quoted 7 lines · On 7/16/18 6:58 PM, [email protected] wrote:
From: Mingli Yu <[email protected]>
* Update the homepage to https://gitlab.com/cryptsetup/cryptsetup
* Add json-c to DEPENDS as cryptsetup requires the json-c library for JSON data processing since cryptsetup 2.0.0 per "The LUKS2 format and features" part of
Quoted 8 lines
Quoted 5 lines
https://mirrors.edge.kernel.org/pub/linux/utils/cryptsetup/v2.0/v2.0.0-ReleaseNotes
* Add file
/usr/lib/tmpfiles.d/cryptsetup.confto FILES_${PN} when systemd enabled inDISTRO_FEATURESI am seeing a new failure for meta-oe/recipes-extended/libblockdev/libblockdev_2.16.bb
Will fix it in V3.
Thanks,
Quoted 65 lines
|
../../../git/src/plugins/crypto.c: In function 'bd_crypto_tc_open':
|../../../git/src/plugins/crypto.c:973:12: error: missing initializer for field 'veracrypt_pim' of 'structcrypt_params_tcrypt' [-Werror=missing-field-initializers]
| structcrypt_params_tcryptparams =
{NULL,0,NULL,0,NULL,NULL,NULL,0,0};| ^~~~~~~~~~~~~~~~~~~ | In file included from ../../../git/src/plugins/crypto.c:22: |
/mnt/a/oe/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-gnueabi/libblockdev/2.16-r0/recipe-sysroot/usr/include/libcryptsetup.h:436:11:
note: 'veracrypt_pim' declared here
|uint32_tveracrypt_pim; /**< VeraCrypt Personal Iteration
Multiplier */
| ^~~~~~~~~~~~~Quoted 45 lines
Signed-off-by Mingli Yu <[email protected]>--- .../{cryptsetup_1.7.4.bb => cryptsetup_2.0.3.bb} | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)rename meta-oe/recipes-crypto/cryptsetup/{cryptsetup_1.7.4.bb =>
cryptsetup_2.0.3.bb} (72%)meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.0.3.bb renamed from meta-oe/recipes-crypto/cryptsetup/cryptsetup_1.7.4.bb +1
-1@@ -4,16 +4,16 @@ device-mapper mappings. These include plain dm-crypt volumes and \ LUKS volumes. The difference is that LUKS uses a metadata header \ and can hence offer more features than plain dm-crypt. On the other \ hand, the header is visible and vulnerable to damage." -HOMEPAGE = "http://code.google.com/p/cryptsetup/" +HOMEPAGE = "https://gitlab.com/cryptsetup/cryptsetup" SECTION = "console" LICENSE = "GPL-2.0-with-OpenSSL-exception" LIC_FILES_CHKSUM ="file://COPYING;md5=32107dd283b1dfeb66c9b3e6be312326"
meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.0.3.bb renamed from meta-oe/recipes-crypto/cryptsetup/cryptsetup_1.7.4.bb +1
-4-DEPENDS = "util-linux libdevmapper popt libgcrypt" +DEPENDS = "util-linux libdevmapper popt libgcrypt json-c" -SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v1.7/${BP}.tar.xz" -SRC_URI[md5sum] = "058ed35c5b776032c2a036838f9e22a7" -SRC_URI[sha256sum] ="
7ccf893ef79a38fb92d61f03c17b964982119f5319cdaa85a1335b8558cca016"meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.0.3.bb renamed from meta-oe/recipes-crypto/cryptsetup/cryptsetup_1.7.4.bb +3
-0+SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v2.0/${BP}.tar.xz" +SRC_URI[md5sum] = "ea1c722f8d4c4e36427628b679b1f819" +SRC_URI[sha256sum] ="
4d6cca04c1f5ff4a68d045d190efb2623087eda0274ded92f92a4b6911e501d4"
inherit autotools gettext pkgconfigmeta-oe/recipes-crypto/cryptsetup/cryptsetup_2.0.3.bb renamed from meta-oe/recipes-crypto/cryptsetup/cryptsetup_1.7.4.bb +1
-0@@ -33,4 +33,6 @@ RRECOMMENDS_${PN} = "kernel-module-aes-generic \ EXTRA_OECONF = "--enable-static" +FILES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','${exec_prefix}/lib/tmpfiles.d/cryptsetup.conf','', d)}"
+
BBCLASSEXTEND = "native nativesdk"
Quoted 26 lines · Khem Raj
Quoted 7 lines · On 7/16/18 6:58 PM, [email protected] wrote:
From: Mingli Yu <[email protected]>
* Update the homepage to https://gitlab.com/cryptsetup/cryptsetup
* Add json-c to DEPENDS as cryptsetup requires the json-c library for JSON data processing since cryptsetup 2.0.0 per "The LUKS2 format and features" part ofQuoted 5 lines
https://mirrors.edge.kernel.org/pub/linux/utils/cryptsetup/v2.0/v2.0.0-ReleaseNotes
* Add file
/usr/lib/tmpfiles.d/cryptsetup.confto FILES_${PN} when systemd enabled inDISTRO_FEATURESI am seeing a new failure for meta-oe/recipes-extended/libblockdev/libblockdev_2.16.bb
|
../../../git/src/plugins/crypto.c: In function 'bd_crypto_tc_open':
|../../../git/src/plugins/crypto.c:973:12: error: missing initializer for field 'veracrypt_pim' of 'structcrypt_params_tcrypt' [-Werror=missing-field-initializers]
| structcrypt_params_tcryptparams =
{NULL,0,NULL,0,NULL,NULL,NULL,0,0};
Quoted 4 lines
| ^~~~~~~~~~~~~~~~~~~ | In file included from ../../../git/src/plugins/crypto.c:22: |
/mnt/a/oe/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-gnueabi/libblockdev/2.16-r0/recipe-sysroot/usr/include/libcryptsetup.h:436:11:
Hi Khem,
The root cause for this failure is some API changed after cryptsetup upgrade to 2.0.3 and libblockdev depends on cryptsetup and we should also upgrade libblockdev accordingly.
And I notice there is already a patch with subject "[oe] [PATCH][meta-oe] libblockdev: 2.16 -> 2.18" has already upgraded the libblockdev to 2.18.
After upgrade to 2.18, the build failure for libblockdev which your saw should be gone, so I think there is no need to resend V3 for cryptsetup. What do you think?
Thanks,
Quoted 53 lines
note: '
veracrypt_pim' declared here
|uint32_tveracrypt_pim; /**< VeraCrypt Personal Iteration
Multiplier */
| ^~~~~~~~~~~~~Quoted 45 lines
Signed-off-by Mingli Yu <[email protected]>--- .../{cryptsetup_1.7.4.bb => cryptsetup_2.0.3.bb} | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)rename meta-oe/recipes-crypto/cryptsetup/{cryptsetup_1.7.4.bb =>
cryptsetup_2.0.3.bb} (72%)meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.0.3.bb renamed from meta-oe/recipes-crypto/cryptsetup/cryptsetup_1.7.4.bb +1
-1@@ -4,16 +4,16 @@ device-mapper mappings. These include plain dm-crypt volumes and \ LUKS volumes. The difference is that LUKS uses a metadata header \ and can hence offer more features than plain dm-crypt. On the other \ hand, the header is visible and vulnerable to damage." -HOMEPAGE = "http://code.google.com/p/cryptsetup/" +HOMEPAGE = "https://gitlab.com/cryptsetup/cryptsetup" SECTION = "console" LICENSE = "GPL-2.0-with-OpenSSL-exception" LIC_FILES_CHKSUM ="file://COPYING;md5=32107dd283b1dfeb66c9b3e6be312326"
meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.0.3.bb renamed from meta-oe/recipes-crypto/cryptsetup/cryptsetup_1.7.4.bb +1
-4-DEPENDS = "util-linux libdevmapper popt libgcrypt" +DEPENDS = "util-linux libdevmapper popt libgcrypt json-c" -SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v1.7/${BP}.tar.xz" -SRC_URI[md5sum] = "058ed35c5b776032c2a036838f9e22a7" -SRC_URI[sha256sum] ="
7ccf893ef79a38fb92d61f03c17b964982119f5319cdaa85a1335b8558cca016"meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.0.3.bb renamed from meta-oe/recipes-crypto/cryptsetup/cryptsetup_1.7.4.bb +3
-0+SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v2.0/${BP}.tar.xz" +SRC_URI[md5sum] = "ea1c722f8d4c4e36427628b679b1f819" +SRC_URI[sha256sum] ="
4d6cca04c1f5ff4a68d045d190efb2623087eda0274ded92f92a4b6911e501d4"
inherit autotools gettext pkgconfigmeta-oe/recipes-crypto/cryptsetup/cryptsetup_2.0.3.bb renamed from meta-oe/recipes-crypto/cryptsetup/cryptsetup_1.7.4.bb +1
-0@@ -33,4 +33,6 @@ RRECOMMENDS_${PN} = "kernel-module-aes-generic \ EXTRA_OECONF = "--enable-static" +FILES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','${exec_prefix}/lib/tmpfiles.d/cryptsetup.conf','', d)}"
+
BBCLASSEXTEND = "native nativesdk"
Quoted 41 lines · Mingli
Quoted 26 lines · Khem Raj
Quoted 7 lines · On 7/16/18 6:58 PM, [email protected] wrote:
From: Mingli Yu <[email protected]>
* Update the homepage to https://gitlab.com/cryptsetup/cryptsetup
* Add json-c to DEPENDS as cryptsetup requires the json-c library for JSON data processing since cryptsetup 2.0.0 per "The LUKS2 format and features" part ofQuoted 5 lines
https://mirrors.edge.kernel.org/pub/linux/utils/cryptsetup/v2.0/v2.0.0-ReleaseNotes
* Add file
/usr/lib/tmpfiles.d/cryptsetup.confto FILES_${PN} when systemd enabled inDISTRO_FEATURESI am seeing a new failure for meta-oe/recipes-extended/libblockdev/libblockdev_2.16.bb
|
../../../git/src/plugins/crypto.c: In function 'bd_crypto_tc_open':
|../../../git/src/plugins/crypto.c:973:12: error: missing initializer for field 'veracrypt_pim' of 'structcrypt_params_tcrypt' [-Werror=missing-field-initializers]
| structcrypt_params_tcryptparams =
{NULL,0,NULL,0,NULL,NULL,NULL,0,0};Quoted 4 lines
| ^~~~~~~~~~~~~~~~~~~ | In file included from ../../../git/src/plugins/crypto.c:22: |
/mnt/a/oe/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-gnueabi/libblockdev/2.16-r0/recipe-sysroot/usr/include/libcryptsetup.h:436:11:Hi Khem,
The root cause for this failure is some API changed after cryptsetup upgrade to 2.0.3 and libblockdev depends on cryptsetup and we should also upgrade libblockdev accordingly.
Quoted 7 lines
And I notice there is already a patch with subject "[oe] [PATCH][meta-oe] libblockdev: 2.16 -> 2.18" has already upgraded the libblockdev to 2.18.
After upgrade to 2.18, the build failure for libblockdev which your saw should be gone, so I think there is no need to resend V3 for cryptsetup. What do you think?
Thats fine. I will pickup that series on top of
this and see how it goes.
Quoted 56 lines
Thanks,
Quoted 53 lines
note: '
veracrypt_pim' declared here
|uint32_tveracrypt_pim; /**< VeraCrypt Personal Iteration
Multiplier */
| ^~~~~~~~~~~~~Quoted 45 lines
Signed-off-by Mingli Yu <[email protected]>--- .../{cryptsetup_1.7.4.bb => cryptsetup_2.0.3.bb} | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)rename meta-oe/recipes-crypto/cryptsetup/{cryptsetup_1.7.4.bb =>
cryptsetup_2.0.3.bb} (72%)meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.0.3.bb renamed from meta-oe/recipes-crypto/cryptsetup/cryptsetup_1.7.4.bb +1
-1@@ -4,16 +4,16 @@ device-mapper mappings. These include plain dm-crypt volumes and \ LUKS volumes. The difference is that LUKS uses a metadata header \ and can hence offer more features than plain dm-crypt. On the other \ hand, the header is visible and vulnerable to damage." -HOMEPAGE = "http://code.google.com/p/cryptsetup/" +HOMEPAGE = "https://gitlab.com/cryptsetup/cryptsetup" SECTION = "console" LICENSE = "GPL-2.0-with-OpenSSL-exception" LIC_FILES_CHKSUM ="file://COPYING;md5=32107dd283b1dfeb66c9b3e6be312326"
meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.0.3.bb renamed from meta-oe/recipes-crypto/cryptsetup/cryptsetup_1.7.4.bb +1
-4-DEPENDS = "util-linux libdevmapper popt libgcrypt" +DEPENDS = "util-linux libdevmapper popt libgcrypt json-c" -SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v1.7/${BP}.tar.xz" -SRC_URI[md5sum] = "058ed35c5b776032c2a036838f9e22a7" -SRC_URI[sha256sum] ="
7ccf893ef79a38fb92d61f03c17b964982119f5319cdaa85a1335b8558cca016"meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.0.3.bb renamed from meta-oe/recipes-crypto/cryptsetup/cryptsetup_1.7.4.bb +3
-0+SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v2.0/${BP}.tar.xz" +SRC_URI[md5sum] = "ea1c722f8d4c4e36427628b679b1f819" +SRC_URI[sha256sum] ="
4d6cca04c1f5ff4a68d045d190efb2623087eda0274ded92f92a4b6911e501d4"
inherit autotools gettext pkgconfigmeta-oe/recipes-crypto/cryptsetup/cryptsetup_2.0.3.bb renamed from meta-oe/recipes-crypto/cryptsetup/cryptsetup_1.7.4.bb +1
-0@@ -33,4 +33,6 @@ RRECOMMENDS_${PN} = "kernel-module-aes-generic \ EXTRA_OECONF = "--enable-static" +FILES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','${exec_prefix}/lib/tmpfiles.d/cryptsetup.conf','', d)}"
+
BBCLASSEXTEND = "native nativesdk"