Return-Path: Received: from mail-pl0-f44.google.com (mail-pl0-f44.google.com [209.85.160.44]) by mail.openembedded.org (Postfix) with ESMTP id 4A19970016 for ; Tue, 17 Jul 2018 02:37:40 +0000 (UTC) Received: by mail-pl0-f44.google.com with SMTP id s17-v6so6735593plp.7 for ; Mon, 16 Jul 2018 19:37:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:references:from:organization:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=V1ZO5CJ1ljeTEIwQ7dB40Jn5wxl0KRAl580kCsqSrq4=; b=Ztw/f+90TW1SPJrSQ4dOYu09xVDMo68Kte7tXaQfJ2YJPtf0ob8JNvFBAarv+Tn136 c7XlCMdH99hFCIF+lsKImTPEJsHQeCes+3GmjX9RS8AedUIK9q0TgOmiVPiM9tYXGGS2 vY+umoLPVANVbk/vv6dJyE+nhYVpO0swpF/4jaQWnBn6V0ukF/q+TiRhVlyuUmd7GFTd 2LpcCkCeJTUWVy1shNSWZP/fqrdKXaB7ujgeYk45wXr7o/AgG8Bt0bJLmm863Gjda6HX LpszQnSTRGSAeVqR+uyZ5Ac9XShtLZUJeFMUxHY2mD1gH3YD9pDEg6lku2hzcU632okC K0oQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=V1ZO5CJ1ljeTEIwQ7dB40Jn5wxl0KRAl580kCsqSrq4=; b=NUG3ig7sbQykcr5TPBs5BXD+GbGEB4aVwLTt9Qa6iLlS43djcjNFBal2U4npXJtfSW j9wKA6FW7dH65fQhkz5axnjhDJJZU/I/1h2Jvs359SSSpyCGl76Quq97oSoR7jV7XkHC /tqTKQPUzR+7j00KJT9xj/vLXczPojnyKJQD+AldU68MgCRaq1Rph3MnotPgEOm5iIfn Q73d3sDocJNOpgmKR4PYIvKtQ13QXnVvhGxPn2n03Ll56Q4EZaKgebdQqroWAfjBP2pB l7FYpp4hlnKgY9orCiarJ2TnpxeoX0BFpJiz4batwP2F/+851yRyc+H3zH/f4JK2alLB wHBw== X-Gm-Message-State: AOUpUlGmJLF725+KOv+4NQ3bOlWaoWKRti3yn9hOiiwY6vHYRPLJxTo3 MvXOdAWsNrzuuouCKjIf0lD5qFMk X-Google-Smtp-Source: AAOMgpc8W0m+njkSIkQjTm84XMT3Nj98jOkE0k4VtHcM5n4iheHepmvtwdgToeS1j0/u2y+uGYgHnw== X-Received: by 2002:a17:902:981:: with SMTP id 1-v6mr19157407pln.11.1531795060879; Mon, 16 Jul 2018 19:37:40 -0700 (PDT) Received: from hermes.local ([2601:646:877f:9499:7d41:3be:d05:72ba]) by smtp.gmail.com with ESMTPSA id s87-v6sm63569344pfg.172.2018.07.16.19.37.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Jul 2018 19:37:40 -0700 (PDT) To: mingli.yu@windriver.com, openembedded-devel@lists.openembedded.org References: <20180717015840.131005-1-mingli.yu@windriver.com> From: Khem Raj Organization: HIMVIS LLC Message-ID: Date: Mon, 16 Jul 2018 19:37:39 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:60.0) Gecko/20100101 Thunderbird/60.0 MIME-Version: 1.0 In-Reply-To: <20180717015840.131005-1-mingli.yu@windriver.com> Subject: Re: [meta-oe][PATCH v2] cryptsetup: Upgrade to 2.0.3 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Jul 2018 02:37:40 -0000 Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit On 7/16/18 6:58 PM, mingli.yu@windriver.com wrote: > From: Mingli Yu > > * 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 > 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 */ | ^~~~~~~~~~~~~ > Signed-off-by: Mingli Yu > --- > .../{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%) > > diff --git a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_1.7.4.bb b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.0.3.bb > similarity index 72% > rename from meta-oe/recipes-crypto/cryptsetup/cryptsetup_1.7.4.bb > rename to meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.0.3.bb > index c13b764f7..df85add6a 100644 > --- a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_1.7.4.bb > +++ b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.0.3.bb > @@ -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" >