From patchwork Fri Mar 1 08:25:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 1906584 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=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (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 4TmLlm1Njqz23fC for ; Fri, 1 Mar 2024 19:26:28 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1rfyDh-0001cF-JL; Fri, 01 Mar 2024 08:26:17 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1rfyDQ-0001Ur-OW for kernel-team@lists.ubuntu.com; Fri, 01 Mar 2024 08:26:00 +0000 Received: from mail-il1-f200.google.com (mail-il1-f200.google.com [209.85.166.200]) (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 A917B3F275 for ; Fri, 1 Mar 2024 08:25:59 +0000 (UTC) Received: by mail-il1-f200.google.com with SMTP id e9e14a558f8ab-36424431577so21925045ab.3 for ; Fri, 01 Mar 2024 00:25:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709281558; x=1709886358; 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=VifIWG5G/ptmakpDY/gtGbkwdxfMaMF79ZtXTCTH8Mg=; b=rE+kFqUS3Z+YeqbLBZdndupULTB4/hE8esRsVwi70DqJmQx+aNGVmF0jU0xamGHpSr J5lNNRR1ssLC43o0dSXDuk0y97oOYEE9mFtOnnWdCX5w3uvYnpErbxzyVPSLxcI/I8MA PKsISSacSZyAiuLb2cixNBQz5HmoBmy2OfbG1KBxYths5kj4ye1Ui/uk1B9bZjeNnjhm ctHmtY97Jab5l0FM5Q/G3zjLKeSuQpQXIUE8YMyuE4osnM6OW4+BTR3UM/sQ8cVnzchY DJNvNFJS6HhCgIzPShpLLJwPZZrfj7ucXGScBAuMd5NHBsT6xyf5g/gJ0ir6jVfJ+VDU U9LA== X-Gm-Message-State: AOJu0Yw1cToDkQhKMUZYhm9tGeommPC/eIGOjILKsaR2tx2IXZ7d/SKE f+73MoskZfymS7U2smrqfFUaJmvU5TzYS6yLVsNazXJCBa7iXgwV4oOydBuL3yqwHseReCaerg1 dfg71RYRbsUUamUXsCNNJKwGajmClfKumxUFAqPGMlQYEDH/jSaJGDUIDvWua7HkwY7uXQxfirH gQTbeob/BezQ== X-Received: by 2002:a05:6e02:1d97:b0:365:1459:e1ed with SMTP id h23-20020a056e021d9700b003651459e1edmr1058841ila.4.1709281558336; Fri, 01 Mar 2024 00:25:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IEM9k7bDg+QgXEypSBhItxZtVGbS/xlHlizee+tA9dlmDsfBoaZqGwohoJlFD91SyfzqIdIkQ== X-Received: by 2002:a05:6e02:1d97:b0:365:1459:e1ed with SMTP id h23-20020a056e021d9700b003651459e1edmr1058834ila.4.1709281558054; Fri, 01 Mar 2024 00:25:58 -0800 (PST) Received: from zoe.. ([2001:f74:8f00:c00:6aff::1001]) by smtp.gmail.com with ESMTPSA id e3-20020aa79803000000b006e5667793d4sm2444568pfl.66.2024.03.01.00.25.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Mar 2024 00:25:57 -0800 (PST) From: Masahiro Yamada To: kernel-team@lists.ubuntu.com Subject: [Unstable/Noble PATCH 0/2] Fix annotation mismatch when bash is used (plan-A: keep arch-has-odm-enabled.sh) Date: Fri, 1 Mar 2024 17:25:51 +0900 Message-Id: <20240301082553.1138917-1-masahiro.yamada@canonical.com> X-Mailer: git-send-email 2.40.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" If /bin/sh is a symlink to /bin/bash, the annotation check fails because debian/scripts/misc/arch-has-odm-enabled.sh always fails. I am not sure if debian/scripts/misc/arch-has-odm-enabled.sh is necessary in the first place, but if so, we can fix it. This patch set fixes the issues in that shell script. Masahiro Yamada (2): UBUNTU: [packaging] do not use 'return' outside functions of shell script UBUNTU: [packaging] do not parse removed debian.*/rules.d/hooks.mk debian/scripts/misc/arch-has-odm-enabled.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)