From patchwork Mon Mar 22 07:44:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1456402 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=Z9QWWEWH; dkim-atps=neutral Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F3mmv3QZmz9sVS for ; Mon, 22 Mar 2021 18:47:27 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 23D8D40287; Mon, 22 Mar 2021 07:47:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8yaquEeQyrBG; Mon, 22 Mar 2021 07:47:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 1D6AA402A4; Mon, 22 Mar 2021 07:47:22 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id BD9451BF3B1 for ; Mon, 22 Mar 2021 07:47:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id AD53B82E29 for ; Mon, 22 Mar 2021 07:47:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tfai-jXViRpg for ; Mon, 22 Mar 2021 07:47:19 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by smtp1.osuosl.org (Postfix) with ESMTPS id B8F6182E19 for ; Mon, 22 Mar 2021 07:47:19 +0000 (UTC) Received: by mail-wr1-x436.google.com with SMTP id o16so15573117wrn.0 for ; Mon, 22 Mar 2021 00:47:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=XbVF0u3LnMVmEWEFmDLMJzjftwNdI63cYJIrZZrGG3k=; b=Z9QWWEWHqh3zmbWnBJsIGG7NamQ1ACKtOIRqzjXEiX1PsmlXNmD7C2HzF58ofr9qhY tWL2Bd9jre+Y0tn7eLAOKPypzsoso50qgxGXdfwPzGeJ4k7P8cobMhBJPX07SIa204QF mLngWkAqAZts5NNmg1v7wl/lE5IbvFZfniUX+7axdvPqNzTVxX3Q9RT6SO/nc+TwR5Kz JGBPhx+8+U8f8N8hvM6vZQjrJuE6KpWwVR3H9jpNmhylcfywm2qjx+DYcSLfPm/WTxLG 9kCviudd6hGTACzq7WRu2LFkr+Q4d5YrN1C7F9NSUBVMP5cCrXwn+E9n3b+VkKnTSfC5 +q9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=XbVF0u3LnMVmEWEFmDLMJzjftwNdI63cYJIrZZrGG3k=; b=U4nS41r0O1PWeyRaNWaKftZmW8LduzR7PL8a521tuzxVDIzLNkj7twe6GTu3oiNsBg neOjgSGZFGOKlXMmi0UKmCLyftBRMSPB7Tz6Q94fXi7EtQtspsVWrbHhU+0zIT7ve03E xxpz5VjqCaj9FpiRfW4cXhRO/NJuVKl5LYJZxtscKGjXxHSwzcyl/0VtcR2ORbE8+vWg 8QMFtfmG0M7K92Ppz16DvsKjgXQlyQo2dO8Es5Nv2nTVAkYEedaypRcuOA1HDZxD45EO xyJwl/W7oCjwqB2ZlETxcB8gsxG94cfhCSiQxRSjtUcjVvUI6PgW2jWxARvQ0s0UkHVp rK6g== X-Gm-Message-State: AOAM530wERkEeUHKFtOq8sgHAlu4gcVwJhmSmzadfvrM9Tcqe4Qfnmal 9oivCBP2TI/+vmXvSYCxWdxCWjGB5SY= X-Google-Smtp-Source: ABdhPJwjvLaBkSP8dBcScOTP/jqBPVvPHmlN9uFE31Tu2jIq5NaFQooP1rGX43slocKSiHbQkn2ZYw== X-Received: by 2002:a5d:4443:: with SMTP id x3mr16797456wrr.49.1616399237677; Mon, 22 Mar 2021 00:47:17 -0700 (PDT) Received: from kali.home (lfbn-ren-1-358-30.w2-10.abo.wanadoo.fr. [2.10.19.30]) by smtp.gmail.com with ESMTPSA id d13sm19333316wro.23.2021.03.22.00.47.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Mar 2021 00:47:17 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Mon, 22 Mar 2021 08:44:42 +0100 Message-Id: <20210322074442.1112603-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.30.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/s390-tools: fix zkey build X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine , Alexander Egorenkov Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Build of zkey fails since bump to version 2.16.0 in commit b82b58a8ddc3d079aa2976b3dafbc965b6107648 Fixes: - http://autobuild.buildroot.org/results/e7f229a98dab188ee9c40e4709fd26bfa67358d3 Signed-off-by: Fabrice Fontaine --- ...en-the-compiler-flags-are-overridden.patch | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 package/s390-tools/0002-zkey-Fix-build-error-when-the-compiler-flags-are-overridden.patch diff --git a/package/s390-tools/0002-zkey-Fix-build-error-when-the-compiler-flags-are-overridden.patch b/package/s390-tools/0002-zkey-Fix-build-error-when-the-compiler-flags-are-overridden.patch new file mode 100644 index 0000000000..ee725d396e --- /dev/null +++ b/package/s390-tools/0002-zkey-Fix-build-error-when-the-compiler-flags-are-overridden.patch @@ -0,0 +1,54 @@ +From 3f3f063c98278f53ad3b34e68b70fca62eaea8fb Mon Sep 17 00:00:00 2001 +From: Ingo Franzki +Date: Tue, 23 Feb 2021 08:52:26 +0100 +Subject: [PATCH] zkey: Fix build error when the compiler flags are overridden +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When the compiler flags are overridden, the build of zkey may fail with: + +kms.c:44:2: error: #error KMS_PLUGIN_LOCATION must be defined + 44 | #error KMS_PLUGIN_LOCATION must be defined + | ^~~~~ + +The Makefile uses CFLAGS variable for defining the KMS_PLUGIN_LOCATION, +but it should rather use ALL_CFLAGS. + +Also use ALL_CPPFLAGS for defining HAVE_LUKS2_SUPPORT. + +Fixes: https://github.com/ibm-s390-linux/s390-tools/issues/108 + +Signed-off-by: Ingo Franzki +Reviewed-by: Jan Hoeppner +Signed-off-by: Jan Höppner + +[Retrieved from: +https://github.com/ibm-s390-linux/s390-tools/commit/3f3f063c98278f53ad3b34e68b70fca62eaea8fb] +Signed-off-by: Fabrice Fontaine +--- + zkey/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/zkey/Makefile b/zkey/Makefile +index 41129bcf..f74e2091 100644 +--- a/zkey/Makefile ++++ b/zkey/Makefile +@@ -18,7 +18,7 @@ ifneq (${HAVE_CRYPTSETUP2},0) + ifneq (${HAVE_OPENSSL},0) + BUILD_TARGETS += zkey-cryptsetup + INSTALL_TARGETS += install-zkey-cryptsetup +- CPPFLAGS += -DHAVE_LUKS2_SUPPORT ++ ALL_CPPFLAGS += -DHAVE_LUKS2_SUPPORT + else + BUILD_TARGETS += zkey-cryptsetup-skip-openssl + INSTALL_TARGETS += zkey-cryptsetup-skip-openssl +@@ -34,7 +34,7 @@ endif + + libs = $(rootdir)/libutil/libutil.a + +-CFLAGS += -DKMS_PLUGIN_LOCATION=\"$(ZKEYKMSPLUGINDIR)\" ++ALL_CFLAGS += -DKMS_PLUGIN_LOCATION=\"$(ZKEYKMSPLUGINDIR)\" + + detect-libcryptsetup.dep: + echo "#include " > detect-libcryptsetup.dep