From patchwork Wed May 31 09:40:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1788206 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.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=JJaJiPoV; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QWPQQ3scTz20Py for ; Wed, 31 May 2023 19:40:45 +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 1q4IJp-0006Xo-C6; Wed, 31 May 2023 09:40:37 +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 1q4IJn-0006Xh-NQ for kernel-team@lists.ubuntu.com; Wed, 31 May 2023 09:40:35 +0000 Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (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 62FD44135B for ; Wed, 31 May 2023 09:40:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1685526035; bh=NqhwUYdnpWxF/g77Nosntqn3rRh8XL+nf3VnsUnRNVM=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=JJaJiPoVDZZSHx/Ch27qe0sMKjEM7PEpYT3OwPocAJD2DxRaktOkTgiv5MfRP2bgy OxaReklVjUd35bHspKV0+oQ4HWRkYBn6PXlZ/yDqbGzSWxarCRftD40knEzkm9lhuw aqY4WUwkP903KnRog1CiT56Oc0iZ5VtgjcM/CNykMqRdrgqNlL/P87QRVOSjsT3yiY 6gT4AJ+YuRTN4ND2C1zPMB7KiFjgrvNGXMCC9n330rIYew5fYV52zNWCRu4Q8zt1fi X1yFrUDTxQSmhihIF/nfMXGKqq230H5rCZhihZ6pdAHiW+XWVZBxf9u3Hl/CWnwzwo gcQkuOa2fovzg== Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-973c42bfc38so469987766b.0 for ; Wed, 31 May 2023 02:40:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685526034; x=1688118034; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=NqhwUYdnpWxF/g77Nosntqn3rRh8XL+nf3VnsUnRNVM=; b=Qd6PZPREeazKFneuikyUf75oB7+GMG0Zi1NpbixR6dup67eizNhZEQ+6fg/EQ0N/L5 x0Gi2eg6AvFDegOS7j2cYeiaPWpiPwHe0XZ0uWkx99ry5SKSyROfTi7mwGm/NOJ86AdI H1BdRf5wl6VUO+9VdYdkTqCfppHzIfrMCf16wIy6PljnWXgKIYvb+6W1L6krRbTNXZCB T98EfQRxfU/SJL1Ijae1RySoTi+xq99lKBvmcy3yiddnxQ0O7s2f7yaX2eDW4+VEE5S0 la2qG3t8seRd8C9Qiw/IYqq5iqq0EDQEbc4LqbBGM01T7v4FY5zPP09zsL/+CecOvr5T x2Bg== X-Gm-Message-State: AC+VfDwh0+1FeQe8PTI9bNtjLp774LiaWRi7t/gA95G7831Wyb6/2sWj X3QxyuN/320jodYn19LQwUSP2b9zrRO86vM2qpkdawg5ZgRO5PgQ4DIiLWLD+0a8999xCJKfemR tmvLCegb64sNxO3Ww1oNSeLSzaMSyw26zhtCrTjxUJJdynxx/YA== X-Received: by 2002:a17:907:3e01:b0:959:99bb:8cc2 with SMTP id hp1-20020a1709073e0100b0095999bb8cc2mr5078120ejc.34.1685526034335; Wed, 31 May 2023 02:40:34 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4FNHuEmQ32Mp5Iyyh0bj8MUmYTdLvpM6XvUtA+d4W30OL1eGsqotJBSutwo4Ivx6EZ/KSzbQ== X-Received: by 2002:a17:907:3e01:b0:959:99bb:8cc2 with SMTP id hp1-20020a1709073e0100b0095999bb8cc2mr5078113ejc.34.1685526034008; Wed, 31 May 2023 02:40:34 -0700 (PDT) Received: from localhost ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id x19-20020a1709064a9300b0096616adc0d5sm8640771eju.104.2023.05.31.02.40.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 May 2023 02:40:33 -0700 (PDT) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][J][PATCH] UBUNTU: [Packaging] rules: Use old-kernelconfig for old configs Date: Wed, 31 May 2023 11:40:32 +0200 Message-Id: <20230531094032.323782-1-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.37.2 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" Use the original old-kernelconfig script if the configs haven't been migrated yet to the new annotations scheme. Ignore: yes Fixes: 4010fc1ea927 ("UBUNTU: [Packaging] new annotations model infrastructure") Signed-off-by: Juerg Haefliger Acked-by: Andrea Righi Acked-by: Andrei Gherzan --- debian/rules.d/1-maintainer.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk index 0380d83d9ef8..16eb8819c43c 100644 --- a/debian/rules.d/1-maintainer.mk +++ b/debian/rules.d/1-maintainer.mk @@ -41,9 +41,13 @@ printdebian: updateconfigs defaultconfigs editconfigs genconfigs dumpconfigs: dh_testdir; +ifneq ($(wildcard $(DEBIAN)/config/config.common.ubuntu),) + $(SHELL) $(DROOT)/scripts/misc/old-kernelconfig $@ "$(do_enforce_all)" +else kmake='$(kmake)' skip_checks=$(do_skip_checks) conc_level=$(conc_level) \ $(SHELL) $(DROOT)/scripts/misc/kernelconfig $@ @rm -rf build +endif migrateconfigs: ifneq ($(wildcard $(DEBIAN)/config/config.common.ubuntu),)