From patchwork Tue Jan 24 13:03:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1731191 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=Z+H7fB5M; 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 4P1Rx43vBTz23h0 for ; Wed, 25 Jan 2023 00:03:35 +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 1pKIxJ-0005Ep-NP; Tue, 24 Jan 2023 13:03: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 1pKIxH-0005Ed-2m for kernel-team@lists.ubuntu.com; Tue, 24 Jan 2023 13:03:15 +0000 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) (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 D815D3F51A for ; Tue, 24 Jan 2023 13:03:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1674565394; bh=OAdmAYd650J4ROr9F4yGYRNlpxCeLVfXpAeco+zeZdU=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=Z+H7fB5Mxx1brzuKrAME51vOTZX0gaIiNm6zRi4vK5AGBwDRcdzr07f4e+WbS5v3w oFKyO9URP1tRbW+ZicI9CDOYCyqW3CrxMywPWCC2V6f3CqoZa90ocVjDVy5OiOGUh8 tCjGdgZKxg5T4l39ZNr2Q/cMIe3bbW/BCjusPC7W2ZMrcnzjp4Dw6JDBM6ty5nEDNq uHxTEPV+bMIFw5eqM1myea648HOkyQRKQUQzb8HUo9F+5a2oZs+NEu6HnXoP2oRkV/ EJJ9kASsWB4tp6GBteNHknBDRUbzFETxMk8jcEf3pV/X7rC3O+j5lRfnWMP/33iEkI t6I1jtdUTO57g== Received: by mail-ej1-f72.google.com with SMTP id gb18-20020a170907961200b008715e951f02so9842654ejc.11 for ; Tue, 24 Jan 2023 05:03:14 -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=OAdmAYd650J4ROr9F4yGYRNlpxCeLVfXpAeco+zeZdU=; b=tK1SusJAU2X+lZyMnSG6Qm5caoW2fbxUwUh5wCaz3BWP0ub5n9sE7WFgHh+YRw3EE+ +aYdnOvWZfjDTroSJJ8nUxJoKPYsuBT4/xEWDRSiddWoldiVALTTVOZUUjhpDAhY1tig IS4H/UeDj9h/IgWWfR0R/GNK0QJDm4KxWP6IndY9wkO11447WzjCBCWGt51FJmy0acIx 8UQXBskpauY3iadNd7HKupOSELHhYkta4DUbLZPFHkUMx18IZzoNfj26UQJ7mINVvnbD nXDKK3zqRMqJTOnFk4R3IQzE3ny4D2kBZWIxlYDghdszhkBH5mZhisLIWK7xh/2+uYeA /Z8Q== X-Gm-Message-State: AFqh2kqpKHKUwa3kdQol5p7jnKXj3SFu2zMBMw/XMp/kDaKeIMugZpIS ZHvjnJoNx7M97KixZBVbmhqEZhlNr52rA8984od/k6QvMVxMy27pyUWbRtnzupvrjZuukXsrEFp QGwHEDZOicCriUo4cp6Naa/A9YIu8BekWh2LTsrf/vA== X-Received: by 2002:a17:906:4a8f:b0:84d:3403:f4f4 with SMTP id x15-20020a1709064a8f00b0084d3403f4f4mr29516169eju.64.1674565394212; Tue, 24 Jan 2023 05:03:14 -0800 (PST) X-Google-Smtp-Source: AMrXdXseNmXdbPkQeulNj3AzSX6NX0BFaUQG4diohR6TKRyaA30qmqDduBYQpLMxrpeh070rw5oGhA== X-Received: by 2002:a17:906:4a8f:b0:84d:3403:f4f4 with SMTP id x15-20020a1709064a8f00b0084d3403f4f4mr29516143eju.64.1674565393942; Tue, 24 Jan 2023 05:03:13 -0800 (PST) Received: from gollum.fritz.box ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id bt8-20020a170906b14800b007c0985aa6b0sm868747ejb.191.2023.01.24.05.03.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Jan 2023 05:03:13 -0800 (PST) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [Unstable/Lunar][PATCH] UBUNTU: [Packaging] debian/rules: Bring back 'editconfigs' Date: Tue, 24 Jan 2023 14:03:12 +0100 Message-Id: <20230124130312.854559-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" With the switch to the new annotations-only mechanism and the new annotations script, the 'editconfigs' target was dropped for some reason. It's usefull so bring it back. Signed-off-by: Juerg Haefliger --- debian/rules.d/1-maintainer.mk | 3 ++- debian/scripts/misc/kernelconfig | 14 +++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk index 4d327ec3c478..239af468df5d 100644 --- a/debian/rules.d/1-maintainer.mk +++ b/debian/rules.d/1-maintainer.mk @@ -9,6 +9,7 @@ help: @echo " updateconfigs : Update core arch configs" @echo " defaultconfigs : Update core arch configs using defaults" @echo " genconfigs : Generate core arch configs in CONFIGS/*" + @echo " editconfigs : Edit core arch configs" @echo " migrateconfigs : Automatically import old configs into annotations" @echo " printchanges : Print the current changelog entries (from git)" @echo " insertchanges : Insert current changelog entries (from git)" @@ -40,7 +41,7 @@ migrateconfigs: fi rm -rf build -configs-targets := updateconfigs defaultconfigs genconfigs +configs-targets := updateconfigs defaultconfigs genconfigs editconfigs .PHONY: $(configs-targets) $(configs-targets): diff --git a/debian/scripts/misc/kernelconfig b/debian/scripts/misc/kernelconfig index 0c412af2ec8e..555e5399bd8d 100755 --- a/debian/scripts/misc/kernelconfig +++ b/debian/scripts/misc/kernelconfig @@ -17,7 +17,7 @@ if [ -z "${gcc:-}" ] ; then fi if [ ${#} -ne 1 ] ; then - echo "Usage: $0 updateconfigs|defaultconfigs|genconfigs" + echo "Usage: $0 updateconfigs|defaultconfigs|genconfigs|editconfigs" exit 2 fi @@ -27,6 +27,7 @@ case "${mode}" in updateconfigs) target="syncconfig" ;; defaultconfigs) target="olddefconfig" ;; genconfigs) target="oldconfig" ;; + editconfigs) ;; # Target is set later based on user input *) echo "ERROR: Invalid mode: ${1}" >&2 exit 1 ;; esac @@ -77,6 +78,17 @@ EOF continue fi + if [ "${mode}" = "editconfigs" ] ; then + while true ; do + echo -n "Do you want to edit configs for ${arch}-${flavour}? [Y/n] " + read -r choice + case "${choice,,}" in + y|"") target="menuconfig" ; break ;; + n) target="syncconfig" ; break ;; + esac + done + fi + rm -rf build mkdir build