From patchwork Tue Jul 4 08:19:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1803092 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=t6j+uXoX; 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 4QwG0x3ss4z20b5 for ; Tue, 4 Jul 2023 18:19:28 +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 1qGbFo-0001YY-CA; Tue, 04 Jul 2023 08:19:20 +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 1qGbFm-0001YL-EI for kernel-team@lists.ubuntu.com; Tue, 04 Jul 2023 08:19:18 +0000 Received: from mail-lj1-f198.google.com (mail-lj1-f198.google.com [209.85.208.198]) (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 3F3203F1CB for ; Tue, 4 Jul 2023 08:19:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1688458757; bh=cD1WgZGDMfcgOqq8ZzUJEX66dhfjbdKZHx12QJ2Agfw=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=t6j+uXoXk0FmCfUNwooI2fRDjweodq5JrEK2VJ1RjojyNc5odTxC1D+I6tz+BmUL/ pefpBQOrEWtABnwOnFogwKOATM9mQYCmRNoGPFq3w4o88O5oLKhcupVItF75Sel+Xt b5yhObWfMVOXDR5jj6kJaEMFZ1tKcxVQYKZIGr5IR3E/5TMf7Zb8taEhNqnbEke068 0sOOaMhtUZp8klpLvKf6tZ0nzDKm/Ttcfhh14BRWUW1Ft/sQeRzNfqdAaOofRb45Hg S9sAmjjbOwA6GL/zgxmC+Bl2w0og5b8RVtPx9w9gothUR9niknDgmr71X8ihQMUhf4 g+WyVn+Hooxgw== Received: by mail-lj1-f198.google.com with SMTP id 38308e7fff4ca-2b69ab85db1so46503211fa.2 for ; Tue, 04 Jul 2023 01:19:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688458756; x=1691050756; 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=cD1WgZGDMfcgOqq8ZzUJEX66dhfjbdKZHx12QJ2Agfw=; b=UguUuNwcNniO4agpAPZbv7+E2QsxVIyG428PWzjmhPLbrDbP9RJZunbpQbUC41ts1c weYKJ01tu9yfDBOyH+FA8wcG286PMUKkGvdSSzVDE3nmvmYczcyPEp4E6s7VFdHipbT1 ENGnLlcNIofW1Nd0kc8ujTd6SqQP2hL5HtLqfRxN33F6u4C0Xk7PYBj5X54FM3ymiym2 QhCLau0zpTuuxk7vBGvALWIvvtp6DAgu6xb00Pnj+wyMDgPGjnTKNdwHHgm6bccoc4st qHogmMipiKFPE1NEok4ROKommrDQxObONH8aSSv1M8vErXpGMfRyZcZkGKz9+e+MctTQ 9FHw== X-Gm-Message-State: ABy/qLZIwltMkxNZvVVQGoZegPclS0ZdjCyxcMEw/9dTyyebjYHODeRd hMR0lwjRje1e472uIw13ZNFu0kKfgFYWeH27esTENeeJaL1YjPW0wUaihmX8fSJ8faFpQhOfhEI J8iLq3MHt14YIbun00WyXJ2iRUREGwRWicuIb8IEMkl6FwYvcFQ== X-Received: by 2002:a2e:99d0:0:b0:2b6:d582:5a0 with SMTP id l16-20020a2e99d0000000b002b6d58205a0mr7179497ljj.12.1688458756673; Tue, 04 Jul 2023 01:19:16 -0700 (PDT) X-Google-Smtp-Source: APBJJlFJhDwVss8Izj+XnmPCCpckUnIFip1hJe1Jois+UW/8aw48dK8rzWLEt7G8sVZyJH4hJN7swg== X-Received: by 2002:a2e:99d0:0:b0:2b6:d582:5a0 with SMTP id l16-20020a2e99d0000000b002b6d58205a0mr7179490ljj.12.1688458756378; Tue, 04 Jul 2023 01:19:16 -0700 (PDT) Received: from localhost ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id u19-20020a170906069300b0099364d9f0e2sm2905073ejb.98.2023.07.04.01.19.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 01:19:15 -0700 (PDT) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [Unstable/Mantic][PATCH] UBUNTU: [Packaging] snap: Remove old configs handling Date: Tue, 4 Jul 2023 10:19:14 +0200 Message-Id: <20230704081914.14618-1-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.39.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" Signed-off-by: Juerg Haefliger Acked-by: Andrei Gherzan Acked-by: Tim Gardner --- debian/snapcraft.mk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/debian/snapcraft.mk b/debian/snapcraft.mk index 00efb13c213b..bbccdcc2feca 100644 --- a/debian/snapcraft.mk +++ b/debian/snapcraft.mk @@ -8,8 +8,4 @@ else arch := $(ARCH) endif config: - if [ -e debian/config/config.common.ubuntu ]; then \ - cat debian.$(branch)/config/config.common.ubuntu debian.$(branch)/config/$(arch)/config.common.$(arch) debian.$(branch)/config/$(arch)/config.flavour.$(flavour) >.config; \ - else \ - python3 debian/scripts/misc/annotations --export --arch $(arch) --flavour $(flavour) >.config; \ - fi + python3 debian/scripts/misc/annotations --export --arch $(arch) --flavour $(flavour) >.config