From patchwork Wed Jul 21 22:13:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 1508479 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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: 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=vWScx8YM; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GVVGl11XDz9sXN; Thu, 22 Jul 2021 08:13:50 +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 1m6KTL-0007Jn-23; Wed, 21 Jul 2021 22:13:47 +0000 Received: from smtp-relay-canonical-1.internal ([10.131.114.174] helo=smtp-relay-canonical-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 1m6KTH-0007Io-Ih for kernel-team@lists.ubuntu.com; Wed, 21 Jul 2021 22:13:43 +0000 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (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-canonical-1.canonical.com (Postfix) with ESMTPS id 621593F229 for ; Wed, 21 Jul 2021 22:13:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1626905623; bh=DYv+7gmWGyWNskR5RFsTIGryZCfUpikQvsUcnYmMT90=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=vWScx8YMY1HYv2XCVd3T0JTLMgsf3rhlY/PeFwDBwLk9d84Jx0eEWVv+Gms0hZ7q9 ZwlsVTx3s21dftHSAGXEWMd46rCQNnFaVDjrbym7La3C0k58lnVYoKwwrTlmQfqylC otVRiGvp4MfqSteaSjqnt3dNxpIag62P1FevjGnpsSKZ7XYkn7Du1r5/G6qlAO71Hy EqHRv1CZ3FoZqW/Si5eLgoMRxCf78Fd8kW6tbUTMmoB9JDpoUFzxKBncjRWeG4A6bf eUKLzVbkdTZA3wcz9MmriyOD9MMyBJCqwdh3M+vc8FsT0Ywgvtj7peQ1vZQ058kLD/ rZu1vhZ3uUwiw== Received: by mail-wr1-f70.google.com with SMTP id p4-20020a5d63840000b0290126f2836a61so1567104wru.6 for ; Wed, 21 Jul 2021 15:13:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DYv+7gmWGyWNskR5RFsTIGryZCfUpikQvsUcnYmMT90=; b=GNvJz1R/L8O/3VXTFYtj7mo/5rcQqfDZqyqAQyfmQd2b2q9pkyRt2nQLbSDd6DmvT9 AB8FF+zxJcjt6MZcrRlk/PEpswLzBBZtoXsls7dQRdGd8pEZdSbcchMdFaAwbchg9eIu an9QUE3YPdILbyLOy6+sSHjgJeqSGVk88q5z3vhQIzQcBq+XH2+OabI5sGhhLAMzUcDd pfivED3tFKVil2/vBIa+F2uNRB54G8I5r8dD9a/mv0Aqq/MqxHzBtnlFYEyOWpbxvRL8 vjjahXCO4GXYK+XZaet9PDqgkEvE2D4NLb0c2R3n8SpmaPE9j4Yxd7zekG0HDg1bHJiN i77Q== X-Gm-Message-State: AOAM532kFIb1SvZoO0JaHMP72+FsHfsbWzLX9yzKuw5T75SLYtUTvTSs YzzVvj245wsXvocAeY5ArVmU31zHUItPwcT4dR08PjuR5bCIDcCVMImjRitQ0zPDwCeEG7jQnTc P4jD3y9DHp+45znk7TaxuCIXCC9h6X4nzVMymhZ6m5g== X-Received: by 2002:a1c:4d14:: with SMTP id o20mr5804203wmh.89.1626905622911; Wed, 21 Jul 2021 15:13:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyoqjGjF9KOS8UieV3Q+kutDGoQJTyKeidM7t9fpNzCVXgw/ursq7AeiaQf8AanR9deKtuvYA== X-Received: by 2002:a1c:4d14:: with SMTP id o20mr5804190wmh.89.1626905622706; Wed, 21 Jul 2021 15:13:42 -0700 (PDT) Received: from localhost ([2001:470:6973:2:4cac:2286:3b31:9ac5]) by smtp.gmail.com with ESMTPSA id q81sm1248470wme.18.2021.07.21.15.13.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Jul 2021 15:13:42 -0700 (PDT) From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/4] UBUNTU: [Packaging] update-version -- copy over tracking-bug information Date: Wed, 21 Jul 2021 23:13:36 +0100 Message-Id: <20210721221338.159114-3-apw@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210721221338.159114-1-apw@canonical.com> References: <20210721221338.159114-1-apw@canonical.com> 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: , Cc: Andy Whitcroft Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Copy over the debian/tracking-bug information as this (will) contain the SRU cycle number. BugLink: https://bugs.launchpad.net/bugs/1928921 Signed-off-by: Andy Whitcroft --- update-version | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/update-version b/update-version index 2e8130c..21d35c6 100755 --- a/update-version +++ b/update-version @@ -53,8 +53,14 @@ fi # Update things from the primary package. if [ "$no_update" = 'false' ]; then + thing='debian/tracking-bug' + cp -p "$master_dir/$branch/tracking-bug" "$thing" || exit 1 + if ! git diff --exit-code -- "$thing" >/dev/null; then + git commit -m "UBUNTU: $thing -- update from master" -s -- "$thing" + else + echo "$thing: no changes from master" + fi for thing in \ - debian/dkms-versions \ debian/scripts/misc/git-ubuntu-log \ debian/scripts/dkms-build \ debian/scripts/dkms-build--nvidia-N \