From patchwork Wed Dec 7 06:08:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1713027 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=rUVtwsVm; 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 4NRn0B6ppxz23pB for ; Wed, 7 Dec 2022 17:08:25 +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 1p2nbN-0006Md-7O; Wed, 07 Dec 2022 06:08:17 +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 1p2nbL-0006MS-Tl for kernel-team@lists.ubuntu.com; Wed, 07 Dec 2022 06:08:15 +0000 Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.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 B563144343 for ; Wed, 7 Dec 2022 06:08:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1670393290; bh=9xuPX1k/36CXoutn1DBeytMir7Ch59iKZ6gLWA7/HJI=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=rUVtwsVm0orkGV2qo9WhTnaCvKISJDqHOkixVZiRuruOXUi59mV+a5hOy8ZOr4HAh QvEyFY4cgA4Z53SYei9CuH7WveeOS3nyfZpQgVSR64OJkIPuMJ4WysSiclOiYV+SU2 qyLbTOhvPHINdWv+cezYWKSeYocaq1qfpXkzXcHEL/5xx5FR1rTwAVHc+wupMRgN/U xJxAKS6oUEvRx9MEYh6UZmSkgg2h3HhjMOiaLBx4Vl4TqilbXr2NwenS69LHNEtdsK UqUo4egwsefCzVgFbLvMMvvtfUTfUbA3QZ0dW8i0pXeJ0+A8M7KFmr0+AfihpRyZ/P 8hJ2KqWA6kofQ== Received: by mail-ed1-f69.google.com with SMTP id h8-20020a056402280800b0046af59e0986so9527136ede.22 for ; Tue, 06 Dec 2022 22:08:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=9xuPX1k/36CXoutn1DBeytMir7Ch59iKZ6gLWA7/HJI=; b=rzQNgs3DMs8Wa9NJXkVOLS6shIjZVS9RzzqVfv5VJmqpmNgkEl2Oe+35vZy2ldMhOw dbDDQFFNL3bptHjw9kcEmn0ehE4gzCiukU+KoCa8T5Y+rwKp24R1nX4VVRDDr8plx1g1 E6LHcQiTvyGIcUegdR08nGAcQdg5JXH4smJeOTadITF+0RmiH6+oe7rOj31Qi4cyq6uq I2zoIArzDWRePB8dnusfk2sPQR294YQxQeNw7wyeifNMT+LLyCEEOzTx8pXitWwiWsZ0 zznfhALOzQJiyXx6/s4JPF5HW6LpXxk1b+Z8b0Buh/UPNsyb1nCY/MEmCk787qyG5ZN8 uC9w== X-Gm-Message-State: ANoB5pllIhW4cn6bwTGdu6cYJePw1kX4mzPsxfDdM//jeHAUMyCuzo90 8EVIx1jqvLU+ItNoWn2AgKcm8/IVFtptV01VOR7D1NdWpavtoE/7w1qjqyKr6IXxUstZhJ8RmpK fWKslnsKJzIEHFj4wkieBseO9PTTnJkWLlTRS9+DCIQ== X-Received: by 2002:a17:906:94c1:b0:7c0:68c8:19db with SMTP id d1-20020a17090694c100b007c068c819dbmr34866999ejy.485.1670393290384; Tue, 06 Dec 2022 22:08:10 -0800 (PST) X-Google-Smtp-Source: AA0mqf4XYUF+jab83BwAmVBgD7FRknWNA4YpTmATvjqCBRznU1fUvEg4Bp2xmNPvMt8JqC2M3lc2QA== X-Received: by 2002:a17:906:94c1:b0:7c0:68c8:19db with SMTP id d1-20020a17090694c100b007c068c819dbmr34866988ejy.485.1670393290143; Tue, 06 Dec 2022 22:08:10 -0800 (PST) Received: from gollum.fritz.box ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id bq4-20020a056402214400b00467481df198sm1779467edb.48.2022.12.06.22.08.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Dec 2022 22:08:09 -0800 (PST) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [Unstable][PATCH] UBUNTU: [Packaging] Remove obsolete etc/kernelconfig Date: Wed, 7 Dec 2022 07:08:08 +0100 Message-Id: <20221207060808.85067-1-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.34.1 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" etc/kernelconfig is no longer needed with the new annotation scheme so drop it. Check for its existence in the kernelconfig script until all derivatives have migrated to the new scheme at which point this can be dropped as well. Signed-off-by: Juerg Haefliger --- debian.master/etc/kernelconfig | 1 - debian/scripts/misc/kernelconfig | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) delete mode 100644 debian.master/etc/kernelconfig diff --git a/debian.master/etc/kernelconfig b/debian.master/etc/kernelconfig deleted file mode 100644 index 2ecc9e822d51..000000000000 --- a/debian.master/etc/kernelconfig +++ /dev/null @@ -1 +0,0 @@ -archs="amd64 armhf arm64 ppc64el riscv64 s390x" diff --git a/debian/scripts/misc/kernelconfig b/debian/scripts/misc/kernelconfig index 7a556474b54f..e9c6fe3b6de3 100755 --- a/debian/scripts/misc/kernelconfig +++ b/debian/scripts/misc/kernelconfig @@ -30,7 +30,11 @@ kerneldir="`pwd`" confdir="$kerneldir/${DEBIAN}/config" variant="$2" -. $DEBIAN/etc/kernelconfig +# TODO: Drop this once all derivatives have migrated to the new annotations +# scheme +if [ -e $DEBIAN/etc/kernelconfig ] ; then + . $DEBIAN/etc/kernelconfig +fi bindir="`pwd`/${DROOT}/scripts/misc" test -d CONFIGS || mkdir CONFIGS