From patchwork Mon Oct 4 13:35:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Henrique Cerri X-Patchwork-Id: 1536114 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=gOoiwfUT; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HNMDk289Hz9t54 for ; Tue, 5 Oct 2021 00:36:06 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1mXO8O-00012Z-J3; Mon, 04 Oct 2021 13:36:00 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mXO8M-00010z-W8 for kernel-team@lists.ubuntu.com; Mon, 04 Oct 2021 13:35:59 +0000 Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id D45973F331 for ; Mon, 4 Oct 2021 13:35:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1633354558; bh=YQAudfzIH7K66EABlm0V3AmlC1FEkHpNgef/MYCM4MI=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=gOoiwfUT0AFS355ri0wb8UC2QXKDmB3sicH2nh2GP4zqLNnpN5SZn3FKvFWn0jIF7 tiT0j+09VFR45l2laEfirFRo2zzY4FGDHFNvklbT7YVQPo88Sv6jymsjlHJtJHKFWv V0xxYSi+mU6swFZSiSqNJ/34HnMRUCqrPpQmLRP/KqmXE5b/jboFVZzc08MhnlJ67Y pi/PTvm1MyuNkX2nyB3izZTbs/rQZuSlCLwy8tdX5IYQycHqotWf/IS1E8vhuoW7BM vgn3GWmyvptQc9CGcYf+OJRzuHqwt6P/0LUGf/e3WDsJpLMgOrhKwc7GoaoJ79ZVB4 35LTvu+n1s8Gg== Received: by mail-qk1-f197.google.com with SMTP id s20-20020a05620a0bd400b0045e893f2ed8so11223021qki.11 for ; Mon, 04 Oct 2021 06:35:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YQAudfzIH7K66EABlm0V3AmlC1FEkHpNgef/MYCM4MI=; b=wsA1jL1xZp8xNndCQmO5uWFF2ZGgD1Gke7gm94tDS9i6vyMvBGciriN9CRZwyok9gE mQYZbZmniX/fEDx+B2bK5jSvUkAMiD6sKh5UhIB+wOmh3YU2VJRbbX9VV22UP/7yjHNI 5HXn/fyI9T3HNNEQgWyUiKnM3Spch9Na0e7s7IdvCzDnA1Xa9n3mnEj0mql7nwtV8pZg M2ZDM7wP2p2DPAm2Fb+orFihOmzZYgY/dsgdrD9Li6bsrGzKGFpVG8LacZm+g0UwoV6F uLSNJDoqZBaEnGc8+pikeMGkQv1zGqBRKCKpTj4f/BnFRDFHky0eAIbaFEhcwkNDzcrF BPsw== X-Gm-Message-State: AOAM531ka6EeVJo2JqeuNf0X5cMoY3GgQUK8+bwNpQ8Viw2hRI9F7gCQ igBIZ2BRBwEI9EaNJBgx/68hA8CQui70G8Gk/Mu3VOqMdlVWuVeIkLkFfPLEABNtAZ4LeprBJBI XgPSVAvRHzkk/++Upf6MLblT9OkKu66vpy/g9RpPS X-Received: by 2002:a37:2d46:: with SMTP id t67mr9709202qkh.84.1633354557356; Mon, 04 Oct 2021 06:35:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyKWbqk1D7qsSNRraqX8G9nkdtLR5Uqueo4TSAswnAc6C+sttIsOq9/rg91ba9SN2mA3FevnQ== X-Received: by 2002:a37:2d46:: with SMTP id t67mr9709175qkh.84.1633354557025; Mon, 04 Oct 2021 06:35:57 -0700 (PDT) Received: from valinor.lan ([177.95.46.212]) by smtp.gmail.com with ESMTPSA id f5sm8437400qtp.44.2021.10.04.06.35.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Oct 2021 06:35:56 -0700 (PDT) From: Marcelo Henrique Cerri To: kernel-team@lists.ubuntu.com Subject: [F, I][PATCH 2/2] UBUNTU: [Packaging] Add fips-checks as part of finalchecks Date: Mon, 4 Oct 2021 10:35:48 -0300 Message-Id: <20211004133548.2168392-4-marcelo.cerri@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211004133548.2168392-1-marcelo.cerri@canonical.com> References: <20211004133548.2168392-1-marcelo.cerri@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1945989 Call fips-checks as part of the debian target "finalchecks". That will ensure the checks are executed during build and during cranky close. Kernels need to enable this check via do_fips_checks. Signed-off-by: Marcelo Henrique Cerri --- debian/rules.d/0-common-vars.mk | 3 +++ debian/rules.d/1-maintainer.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk index b71546ab03a0..b53af89388d8 100644 --- a/debian/rules.d/0-common-vars.mk +++ b/debian/rules.d/0-common-vars.mk @@ -219,6 +219,9 @@ do_flavour_header_package=true # DTBs do_dtbs=false +# FIPS check +do_fips_checks=false + # Support parallel= in DEB_BUILD_OPTIONS (see #209008) # # These 2 environment variables set the -j value of the kernel build. For example, diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk index 5944ca526703..572c93bc3032 100644 --- a/debian/rules.d/1-maintainer.mk +++ b/debian/rules.d/1-maintainer.mk @@ -134,6 +134,9 @@ autoreconstruct: fi finalchecks: debian/control +ifeq ($(do_fips_checks),true) + $(DROOT)/scripts/misc/fips-checks +endif $(DROOT)/scripts/misc/final-checks "$(DEBIAN)" "$(prev_fullver)" diffupstream: