From patchwork Wed May 31 09:42:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1788208 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=ooz1ZoCQ; 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 4QWPS52wzgz20Py for ; Wed, 31 May 2023 19:42:13 +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 1q4ILG-0006pR-Um; Wed, 31 May 2023 09:42:06 +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 1q4ILF-0006pK-9D for kernel-team@lists.ubuntu.com; Wed, 31 May 2023 09:42:05 +0000 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) (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 359B941359 for ; Wed, 31 May 2023 09:42:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1685526124; bh=1APXkC8cOGH5rEE91NUHleeCLdRgMRTOna/jUk8RjLM=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=ooz1ZoCQadRWygK8Nny5vZZeszDhK+wPOgvKQyduxn7kT8JuV1w+17w5/ATnNu+nX 2FIv0XgOtLjiCedLqv+TDG2tys1BjUTKwC3ndup83q/WOA7waH+ewkSrTaL8TB8ZvF 5924Jr446V1VXn8W4hndvBMebjxZRY6kLATefkSpBLV6pVEIX37NXrnYVBhfstZVY/ S6qw0DQeUZijeBWCSo7AXZ+eiEdVp8zG79+6nkUyJqoALWyEp9a7Pci161hwOgnFF9 BMBMBVqjq6fZKi2AQBm/M6DZgPBxq42w7oQ6kLzkD9agRHQ9rqtbMasEg1zM0t0dqY 6iQKMh71yYdIw== Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-96feeddb1f8so599384566b.3 for ; Wed, 31 May 2023 02:42:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685526124; x=1688118124; 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=1APXkC8cOGH5rEE91NUHleeCLdRgMRTOna/jUk8RjLM=; b=XFT/u/fPxwduucANKWbRv/gNMSk3axaNfWuJRi53VGxWikNX6XzQRIlKMjqjRUjca2 cyK29uGRrHRG/f2GV+dUwLMj/L205AL/LNJyAZ4z1YH+NCBfndZkr6RQy03K/vA75/PT BS7zbVakJct/+3vYE1HTnEaZa6DGiPtaCu8nehKJVixNu8316LnRqkijazwEpnqJW2Db vh4SdXmDgvUjy7elV/CvAb/L+ls4TmRhgG7Br/umnLKQwaOQXDitdf7q4N5ZzeQQl6wN rOLXHkHIdXlrWlBLFpVCk8O9z6OfCV5DnuPSza8qHqejK+MxsDolrbc7X6+oxlg0IoHX HeNA== X-Gm-Message-State: AC+VfDwRaMibSnWfP0Xnbi4qH5FhQoRNTwmyOgJG6wgeLY9l7ZD+wAKv xsopvcT7Y6l49zeSOuhon4Ce9NmDVWU5PgJINPPrpxctpXI1VR4FfQap843lOYpRuw4+zs8MLHa WfT+OTwpWtNkMpCH3cq0vBWLw044BjCGF9YmaKZxStqVMFplxoA== X-Received: by 2002:a17:907:36c6:b0:973:d751:840f with SMTP id bj6-20020a17090736c600b00973d751840fmr4608956ejc.77.1685526124004; Wed, 31 May 2023 02:42:04 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6W4KrNBW5RTJ8L8ouJy16GCseisyBMWD5dHC82hNAVi7bPSJYoImVKIElAZ0RKv29CAgOivQ== X-Received: by 2002:a17:907:36c6:b0:973:d751:840f with SMTP id bj6-20020a17090736c600b00973d751840fmr4608942ejc.77.1685526123729; Wed, 31 May 2023 02:42:03 -0700 (PDT) Received: from localhost ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id w27-20020a170906481b00b0096a91ab434fsm8690304ejq.40.2023.05.31.02.42.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 May 2023 02:42:03 -0700 (PDT) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][J][PATCH] UBUNTU: [Packaging] config-check: Handle new annotations format 4 Date: Wed, 31 May 2023 11:42:02 +0200 Message-Id: <20230531094202.323914-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" For derivatives, we could end up in a situation where the master has already switched over to the new annotations format 4 but the derivative still wants to use the old scheme. In that case, the config-check script is still used and needs to properly handle the new annotations format 4 (in case the derivative includes the annotations from the master). Ignore: yes Signed-off-by: Juerg Haefliger Acked-by: Andrea Righi Acked-by: Andrei Gherzan --- debian/scripts/config-check | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/scripts/config-check b/debian/scripts/config-check index df0cd52069b4..6e64277da00b 100755 --- a/debian/scripts/config-check +++ b/debian/scripts/config-check @@ -58,12 +58,12 @@ sub read_annotations { die "$P: $filename: open failed -- $! -- aborting\n"; while (<$fd>) { if (/^# FORMAT: (\S+)/) { - die "$P: $1: unknown annotations format\n" if ($1 != 2 && $1 != 3); + die "$P: $1: unknown annotations format\n" if ($1 < 2 || $1 > 4); $form = $1; } - # Format #3 adds the include directive on top of format #2: - if ($form == 3 && /^\s*include(\s|$)/) { + # Format #3 and #4 add the include directive on top of format #2: + if ($form >= 3 && /^\s*include(\s|$)/) { # Include quoted or unquoted files: if (/^\s*include\s+"(.*)"\s*$/ || /^\s*include\s+(.*)$/) { # The include is relative to the current file