From patchwork Fri Oct 1 15:44:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1535395 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=Oz8t/3BQ; 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 4HLZFW63kHz9t0T for ; Sat, 2 Oct 2021 01:45:35 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1mWKj1-0008OF-Fh; Fri, 01 Oct 2021 15:45:27 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mWKii-000880-9u for kernel-team@lists.ubuntu.com; Fri, 01 Oct 2021 15:45:08 +0000 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (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-0.canonical.com (Postfix) with ESMTPS id 51ACD405FA for ; Fri, 1 Oct 2021 15:45:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1633103107; bh=vEply9T949KNR47FIydrnIKAjWQeyFrn8sFXxiMYcwE=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Oz8t/3BQDKC5BAvMpfxUMKAyUf3QPQYNFoS7qEofNtE4wmuCjbKWS6TIlZWA0aYER d5/SZIrHaq4grfk5nOgqkIkz0ppJDAt/DwWQP9/c5IHo8Drm+y+xO83hBjLbpsGVxC XeWq/cQfTsixhNllcpHT3lOYqpKt93F3bhhMzCTpjQ8J/gAKxIUcA7UdGPRVepjMlH wsE5MLirTdNzS79aUPOesma0x1uG0FkkKY5SN/li4loCJslvRGpJWCnH7OO2nJ3WlF TYGJPTeUi3Tr34PpxLQk4J3HKssEU6LTuiIvcHTEJ9yedsEEB07vx8Y/r6ZBMlKJn8 qO1sOEkjjPwPg== Received: by mail-wm1-f69.google.com with SMTP id j21-20020a05600c1c1500b00300f1679e4dso6124158wms.4 for ; Fri, 01 Oct 2021 08:45:07 -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=vEply9T949KNR47FIydrnIKAjWQeyFrn8sFXxiMYcwE=; b=ceBG3R6+JpSy313shCWPXCyNYRpwJufsX4ts1pAYWl1LDrQuzGcu6zLugWRh0btwM/ x29V+gTPNDkwMsgwJv0J108L15Mg5jjEZKlIdOsDTszY2uFVDgsI6fz5AtNaH4JN8Ck2 hht5vvG2LfouLObJUgBP/f/yKkd/f+3UfLbh/erU4q015Y7da1cObUQC0Y/diajD+wOy AycjEqW4uEwS5qu7g+qV5aVwWtMMakDEKOIkf3A94Ka7LHPCnAHkXwW1MHReXyjuvVhD 5nQxjb8jZNGHNAXFayhIg0jo2EYDwW+p2lwGpIC9uuyP5HiwsBpVBNuJHL6uKpHbV62X 6FsA== X-Gm-Message-State: AOAM533xfkS8WQRo2hKliAe5QMrrYCgpWKrlzP/MFj/jI4y504RS5TtZ /Wax0b+kMoSDuPjkphL/Ll03AP0+3QsDw04IDIh9htz7bynNDfXo4WpCA+ZGIO1Snrc7G+Rtxz3 JD2XQFghW3t9WdgymXV3FMJa8HHg7Vuy8ywHf4iYz/w== X-Received: by 2002:a05:600c:350a:: with SMTP id h10mr5162384wmq.163.1633103106726; Fri, 01 Oct 2021 08:45:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyxg/F0BtFfz8ln6uDTTWuim/OF33f7NiTpqk04pRMqsfg9nEQyqXiMKBtefohCDyXr0a3e/A== X-Received: by 2002:a05:600c:350a:: with SMTP id h10mr5162361wmq.163.1633103106486; Fri, 01 Oct 2021 08:45:06 -0700 (PDT) Received: from localhost ([2a01:4b00:85fd:d700:dd38:5596:506f:f213]) by smtp.gmail.com with ESMTPSA id k1sm6271593wrl.33.2021.10.01.08.45.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Oct 2021 08:45:05 -0700 (PDT) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [SRU][FOCAL][PATCH 14/16] UBUNTU: [Packaging] build canonical-revoked-certs.pem from branch/arch certs Date: Fri, 1 Oct 2021 16:44:30 +0100 Message-Id: <20211001154432.20287-15-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211001154432.20287-1-dimitri.ledkov@canonical.com> References: <20211001154432.20287-1-dimitri.ledkov@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/1932029 Signed-off-by: Dimitri John Ledkov Signed-off-by: Andrea Righi (cherry picked from commit 3e44f229eef829ee3044651975512569824c4e5f) (xnox: cherry-pick is from impish:linux) Signed-off-by: Dimitri John Ledkov --- debian/rules | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index f8d53afa28..b10128a11f 100755 --- a/debian/rules +++ b/debian/rules @@ -137,7 +137,7 @@ binary: binary-indep binary-arch build: build-arch build-indep -clean: debian/control debian/canonical-certs.pem +clean: debian/control debian/canonical-certs.pem debian/canonical-revoked-certs.pem dh_testdir dh_testroot dh_clean @@ -247,3 +247,15 @@ debian/canonical-certs.pem: $(wildcard $(DROOT)/certs/*-all.pem) $(wildcard $(DR fi; \ done; \ done >"$@" + +debian/canonical-revoked-certs.pem: $(wildcard $(DROOT)/revoked-certs/*-all.pem) $(wildcard $(DROOT)/revoked-certs/*-$(arch).pem) $(wildcard $(DEBIAN)/revoked-certs/*-all.pem) $(wildcard $(DEBIAN)/revoked-certs/*-$(arch).pem) + for cert in $(sort $(notdir $^)); \ + do \ + for dir in $(DEBIAN) $(DROOT); \ + do \ + if [ -f "$$dir/revoked-certs/$$cert" ]; then \ + cat "$$dir/revoked-certs/$$cert"; \ + break; \ + fi; \ + done; \ + done >"$@"