From patchwork Mon Feb 6 07:14:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1738039 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=rm6indFb; 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 4P9HZs30shz23y3 for ; Mon, 6 Feb 2023 18:15:01 +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 1pOviH-0002fd-PM; Mon, 06 Feb 2023 07:14:53 +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 1pOviE-0002fI-Le for kernel-team@lists.ubuntu.com; Mon, 06 Feb 2023 07:14:50 +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 780953F194 for ; Mon, 6 Feb 2023 07:14:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1675667690; bh=U+Y/tkFQ5jn7/LKOSqlo5NrEuX6Ewdt2RwSxgtRzqw4=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=rm6indFb0faWGBtE8J6tpQaOgHfW5NEGiO7JQHI2uatyQnLc7QCpHLSOS92DEMxU+ oWTeZSQ/96F8DfZSV8rgXGkkJ1p0DFwf57nRKZEw6PWNq3tjPEY4C6xp8HapjbI2xw l6tlP28ysSMcW+7zRjzMQ2Q9lP6F24kqxPicNGf68fe4HEucVuOVRUrn20jyQZMcVs ubhjhkku3gcBWD7AMB/dg6YolPk0wap4dNDXm8vGqQZvWmNFVgJfrkCb5icXkTsTJu u/xqsbO9WkUj9Nm7N3iQcIoyOw+BCFZFBF/7j+QCwYO6zHUyDtiwh71Zzbxl1rm9lL 3IV1r8E+48KEQ== Received: by mail-ej1-f72.google.com with SMTP id qa17-20020a170907869100b0088ea39742c8so8038323ejc.13 for ; Sun, 05 Feb 2023 23:14:50 -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=U+Y/tkFQ5jn7/LKOSqlo5NrEuX6Ewdt2RwSxgtRzqw4=; b=jrTYgRyNQQzn/Kb5bzQkTKxKkAYwpWvYBNK84PiNBJoAANhLYA+OL8W+KpGMXMqcEI cB9gCn18dXn/+k7Zzu/g0OZ1alNnUn0HWY2HiS3iYpMqW9ZUvhZt4a1xKT0n7M2UVFSl FxxuntpXcoMgKt/BfBATzTqpkL/jVlygVlEvqc053yFeCzmurnUTaCdVDFmWirJrolUV dd+05w+XEKBORhvkBm6SY6cLNPIuQTslVamCFXbVaU0+1S1zptOdr4sQ1tYpDCPkuClW PySenMTxZnwnZyr6AksBd0me6erKWo03GQRkFM/V7HLozSdCiqtpJV4iwa3f9Ql6akns 4x9A== X-Gm-Message-State: AO0yUKUOYFR6u2X6BQiIfWdlOvQD4XARXSOv4vY6dm62u/ILR6f44HRQ HR5vv3wPNvqM9ihtJ/tyMqqDhp6GrSTDGWUkp0IHF+LoNdsBpWsCugQHiKCFxFBOhGNA7Skxs7a RWQxk9jEvLKHen8RJDYa3qgCR2Ur0FARv1mqO4LxPwQ== X-Received: by 2002:a17:907:d68c:b0:88f:8ae1:8bca with SMTP id wf12-20020a170907d68c00b0088f8ae18bcamr14585575ejc.62.1675667689719; Sun, 05 Feb 2023 23:14:49 -0800 (PST) X-Google-Smtp-Source: AK7set/2uCQpC07mEIZz+P8QE0Osw4amb2farVSaEccWEWOZZNnaN5PwzKDXn84J0xr9t5CfYktWlQ== X-Received: by 2002:a17:907:d68c:b0:88f:8ae1:8bca with SMTP id wf12-20020a170907d68c00b0088f8ae18bcamr14585562ejc.62.1675667689510; Sun, 05 Feb 2023 23:14:49 -0800 (PST) Received: from gollum.fritz.box ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id l2-20020a170906a40200b0084d35ffbc20sm5084180ejz.68.2023.02.05.23.14.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 23:14:49 -0800 (PST) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [Unstable/Lunar][PATCH v2 0/2] annotations: Handle single-line rules Date: Mon, 6 Feb 2023 08:14:46 +0100 Message-Id: <20230206071448.713716-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" The old annotations scheme allowed single-line rules like: CONFIG_FOO policy<{..}> note<..> With the switch to the new annotations script, we lost that capability. This patchset brings it back. Juerg Haefliger (2): UBUNTU: [Packaging] annotations: Handle single-line annoation rules UBUNTU: [Packaging] annotations: Preserve single-line annotation rules debian/scripts/misc/kconfig/annotations.py | 38 ++++++++++++++-------- 1 file changed, 24 insertions(+), 14 deletions(-)