From patchwork Wed Jul 21 22:13:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 1508477 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=MoMGdPXI; 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 4GVVGk3ktXz9sX5; Thu, 22 Jul 2021 08:13:49 +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 1m6KTH-0007Iu-Sk; Wed, 21 Jul 2021 22:13:43 +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 1m6KTG-0007IY-8J for kernel-team@lists.ubuntu.com; Wed, 21 Jul 2021 22:13:42 +0000 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.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-canonical-1.canonical.com (Postfix) with ESMTPS id 1C8B63F328 for ; Wed, 21 Jul 2021 22:13:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1626905622; bh=n65g05Dbp7p1yQGRsFc14+50z2nhMsGFGOypHdte6VU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=MoMGdPXIft+4Ny9uQQL3WdgGoR+1n779mgZTnZbefSx/dxHrmZHPi3BKaL6mpqLBz 3QH3GkcJ3Z5TPELlsiyCQ2RiMAS2rsCIa3bs3lVZdFnsNXrxWdqwbNpn73KVBO62yC wYYC3jIOx71/rw+NSSVfD+bdc+LWbHvXVXhWBJadTjJcfzEivi07ViU5eL1flvbQnb DbXw2h7a75PQtg0/ts+vLDRMqf3GkieZ/J7EcLSm9Dz9FG3R80Sxqx5Su+Me7tg3Wm jF8b5o8IyWAGUUgq2nzwMiB9coVukAjE6HF5p4/NkWIbk3hloFRkG9FQFmBFs+PbZQ PbAxlF6n1bPfA== Received: by mail-wm1-f71.google.com with SMTP id y5-20020a1c4b050000b02901d849b41038so251067wma.7 for ; Wed, 21 Jul 2021 15:13:42 -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=n65g05Dbp7p1yQGRsFc14+50z2nhMsGFGOypHdte6VU=; b=CEOVV6k5DPqVR9+ilUDFAAWhd1Nz9Oj8xL+T/iiOzeNmEJymaw/YVP9WYJAY3NpnjF 7X0eLjZ1ZqH1jbL0/v3KhnKX6H4XKelFiNV3m6yYA/VN8tMVOX6VbQyVi051tfjlwV94 q1H2GzSxbOFuBb7eUujIWGIsN1wwn/wzNR+eiIXK4GBI/S8m7qmhlOW7Z/0O2OYz80Gg K66Scvq9I2AUY+bPG7fNQmW9UnX0A1k9dSbVspC1C4vq1ykiZWB/eSoCTZ394UYu7eIh bYMVae158u+lAlMGff6k6OUSwQ+KUrSpl3lVr4wCzVZ5WPZNeCtwm2GnwQOW4QzSRvT3 Khrg== X-Gm-Message-State: AOAM531qvxrm4WfpfBZJIWI3MK0PHJ6pPV8LXaYV0syjlXQDmLj1lryY XnyyTDXpnGtU6lyckcfEa9QIsomxMk9/FueA0+DSjJLO0SVpj61zfY6Y/+73iQwjyZPGif3mO2F V/jWvXLlKHkVrW8c06MG+3+Lw6s+Ry1ozT5SkYBTNZg== X-Received: by 2002:a7b:cd15:: with SMTP id f21mr40422120wmj.148.1626905621577; Wed, 21 Jul 2021 15:13:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwYKIP7HYUlfWjEnuc9/c29d9qf5zjFZLFa2DIlrsH9DblKnIT44iclhMIFS5AIWCspvKgA7g== X-Received: by 2002:a7b:cd15:: with SMTP id f21mr40422103wmj.148.1626905621341; Wed, 21 Jul 2021 15:13:41 -0700 (PDT) Received: from localhost ([2001:470:6973:2:4cac:2286:3b31:9ac5]) by smtp.gmail.com with ESMTPSA id l23sm13839983wme.22.2021.07.21.15.13.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Jul 2021 15:13:40 -0700 (PDT) From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/4] UBUNTU: [Packaging] update-dkms-versions -- update from kernel-versions Date: Wed, 21 Jul 2021 23:13:35 +0100 Message-Id: <20210721221338.159114-2-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" Update our internal debian/dkms-versions files from the common kernel-versions dataset. BugLink: https://bugs.launchpad.net/bugs/1928921 Signed-off-by: Andy Whitcroft --- update-dkms-versions | 150 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 150 insertions(+) create mode 100755 update-dkms-versions diff --git a/update-dkms-versions b/update-dkms-versions new file mode 100755 index 0000000..ea807a6 --- /dev/null +++ b/update-dkms-versions @@ -0,0 +1,150 @@ +#!/bin/bash + +remote_repo='' +sru_cycle= +while : +do + if [ "$1" = "--remote-repo" ]; then + remote_repo="$2" + shift 2 + + elif [ "$1" = "--sru-cycle" ]; then + sru_cycle="$2" + shift 2 + + else + break + fi +done +if [ "$#" -ne 0 ]; then + { + echo "Usage: $0 []" + echo " --remote-repo " + echo " --sru-cycle " + } 1>&2 + exit 1 +fi + +default_sru_cycle() +{ + local tracking_bug + local version + + # Pick out the cycle from the tracking bug file. + if [ -f "$DEBIAN/tracking-bug" ]; then + read tracking_bug sru_cycle X <"$DEBIAN/tracking-bug" + fi + + if [ -z "$sru_cycle" ]; then + echo "$0: sru-cycle not found via debian/tracking-bug; specify --sru-cycle" 1>&2 + exit 1 + fi + + sru_cycle=$(echo "$sru_cycle" | sed -e 's/-[0-9][0-9]*$//') + + #echo "default_sru_cycle: version<$version> sru_cycle<$sru_cycle>" +} + +# Determine where our changelog is. +DEBIAN=debian +[ -f 'debian/debian.env' ] && . 'debian/debian.env' + +[ -z "$sru_cycle" ] && default_sru_cycle +if [ -z "$remote_repo" ]; then + case "$sru_cycle" in + s[0-9][0-9][0-9][0-9].[0-9][0-9].[0-9][0-9]) + remote_repo='security' ;; + *) + remote_repo='main' ;; + esac +fi +case "$remote_repo" in +security) + remote_repo='ssh+git://git.launchpad.net/~canonical-kernel-security-team/canonical-kernel-private/+git/kernel-versions' + remote_name='security' + ;; +main) + remote_repo='git://git.launchpad.net/~canonical-kernel/+git/kernel-versions' + remote_name='main' + ;; +*) + remote_name='adhoc' + ;; +esac + +kv_repo="$HOME/.kernel-versions" +git_base="$remote_name/$sru_cycle" + +# Now we know where our repo is and what it called update it. +# We maintain "persistent" remotes for main and security, but assume +# any manually supplied entries are transient. +( + [ ! -d "$kv_repo" ] && mkdir -p "$kv_repo" + cd "$kv_repo" || exit 1 + [ ! -f config ] && git init -q --bare --initial-branch master + current_url=$(git config "remote.$remote_name.url") + if [ -z "$current_url" ]; then + git remote add "$remote_name" "$remote_repo" + elif [ "$current_url" != "$remote_repo" ]; then + git config "remote.$remote_name.url" "$remote_repo" + fi + git fetch -q -p "$remote_name" +) || exit 1 + +cat_file() +{ + (cd "$kv_repo" && git cat-file "$@") || exit 1 +} + +# Determine if we have this cycle. +present=$(cat_file -t "$git_base" 2>/dev/null) +if [ "$present" = "" ]; then + echo "$sru_cycle: cycle not found in $remote_repo" 2>&1 + exit 1 +fi + +# Determine our series and mainline version from our own changelog. +our_series=$(LC_ALL=C dpkg-parsechangelog -l"$DEBIAN/changelog" -SDistribution) +if [ "$series" = "UNRELEASED" ]; then + our_series=$(LC_ALL=C dpkg-parsechangelog -l"$DEBIAN/changelog" -c1 -SDistribution) +fi +our_mainline=$(LC_ALL=C dpkg-parsechangelog -l"$DEBIAN/changelog" -SVersion | sed -e 's/-.*//') + +# Update rules are complex. We update development series kernels to the +# versions in development. For stable series we update versions against +# the series in which our prime kernel was built. This is expressed +# via the map/dkms-versions namespace. Attempt to map via our series +# and then our mainline-version. + +# Attempt to map via our series, if that works assume we are development. +versions_path=$(cat_file -p "$git_base:map/dkms-versions/$our_series" 2>/dev/null) + +# If we do not yet have a mapping re-map using our mainline version. +if [ -z "$versions_path" ]; then + versions_path=$(cat_file -p "$git_base:map/dkms-versions/$our_mainline") +fi + +echo "git_base<$git_base> versions_path<$versions_path>" +echo "II: grabbing dkms-versions from $sru_cycle $versions_path" + +cat_file -p "$git_base:$versions_path" >"debian/dkms-versions.new" +rc="$?" +if [ "$rc" -ne 0 ]; then + echo "$0: unable to download an updated dkms-versions file" 1>&2 + exit 1 + +elif [ "$rc" -eq 0 ]; then + mv "debian/dkms-versions.new" "debian/dkms-versions" + +else + rm -f "debian/dkms-versions.new" +fi + +thing="debian/dkms-versions" +if ! git diff --exit-code -- "$thing" >/dev/null; then + git commit -m "UBUNTU: $thing -- update from kernel-versions ($git_base)" -s -- "$thing" +else + echo "$thing: no changes from kernel-versions" +fi + +exit "$rc" 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 \ From patchwork Wed Jul 21 22:13:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 1508480 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=PNQEzvUN; 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 4GVVGl28PMz9sfR; 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-0007K5-9O; 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 1m6KTJ-0007JL-2B for kernel-team@lists.ubuntu.com; Wed, 21 Jul 2021 22:13:45 +0000 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.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-canonical-1.canonical.com (Postfix) with ESMTPS id C06AE3F328 for ; Wed, 21 Jul 2021 22:13:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1626905624; bh=HUAsehKi7gzLIxbLYfhdkmXJBR7RCEj57NyPvxYJ0Tc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=PNQEzvUNpnLZjQjFTJu/LrDjc5ZdgzBrZbz4X4VfaKi+oe+3kIovjqrhWfcYpirJS obC9SyCEBtYCuCCHJ0Hjplqkxyvmnlwm3Xv+4+tdgLCcn0vJWw9RsdI3RarMMvrWvj ttWLA+njkUAtEVZZACYPzVaE9N/fvqUmrqod1+JOeNsgtvLYVE72Fpf9bkFUiopiXb y4tOwL3qnl5Cs+fEynM4Ay4auAW9/2ppuJpu3lMtrMA967rv3Wn3zKs9PYhQLhXsrS hlhQYIIuokdztjDDh9qqvs8BQec897JGydR2LUa/8bEzob6XMIpU79+lMBbRbkJssy urof4g7JJ8ZaA== Received: by mail-wm1-f71.google.com with SMTP id j11-20020a05600c190bb02902190142995dso253824wmq.4 for ; Wed, 21 Jul 2021 15:13:44 -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=HUAsehKi7gzLIxbLYfhdkmXJBR7RCEj57NyPvxYJ0Tc=; b=YDWDCUR9Ymn0q8Sn0JIzbbg1oSo1zlXZZfKqyOYlU4rfp+45YtGMApaQrdYf29t/LZ JsHe1YQqwUO1ivVikD1r6nZV1w+XEfrwcz90WCs3lBzJHx5WrGfveEhauaUeUN4Qgi4X oPfYbiDWe2LZcISXB7mDSAs//qHMZPAnYcIjB75QOI7nMtIhMHpnzPE/SSznD65xaE0l j8KirSslg9PmYE4rAopdr9N0xt/UJf3S4Z4pKT1bdUZ/utzn3j6sslEoS+6ETifyGVE/ /crcUnPUWANO63CctD6xPzGoItIwn1dqW8srqmuY8n/5onCw9+x6Aag1zw0ke/y+MF32 tcsw== X-Gm-Message-State: AOAM532ZJYVsP7QVsTwNc7fR2yu3EpqjvMCjwCTLbxTohovaN6fFDWv+ CB6NGteBqL4joGIibWiGJNsvaAQkQlsQXqRrq5IilyZXM/EtYuYc77Dl6EqcJV/0lXbiGpJsOd6 gg3c9TCZslz+vx+ar4u2sb2FYCaS8nDTYcq2++r3lTw== X-Received: by 2002:a1c:c90f:: with SMTP id f15mr6128518wmb.142.1626905624312; Wed, 21 Jul 2021 15:13:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy8npgGVe1TlkPAvTpEjGw6DK+ISDmzWC4bovjcP2rpStmuo+mrLJ3qfDf/+fSjWEnmg2sVDA== X-Received: by 2002:a1c:c90f:: with SMTP id f15mr6128508wmb.142.1626905624124; Wed, 21 Jul 2021 15:13:44 -0700 (PDT) Received: from localhost ([2001:470:6973:2:4cac:2286:3b31:9ac5]) by smtp.gmail.com with ESMTPSA id v9sm23783057wml.36.2021.07.21.15.13.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Jul 2021 15:13:43 -0700 (PDT) From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [PATCH 3/4] UBUNTU: [Packaging] update-version -- call out to update-dkms-versions Date: Wed, 21 Jul 2021 23:13:37 +0100 Message-Id: <20210721221338.159114-4-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" Ensure we update our dkms-versions from kernel-versions when doing general updates. BugLink: https://bugs.launchpad.net/bugs/1928921 Signed-off-by: Andy Whitcroft --- update-version | 3 +++ 1 file changed, 3 insertions(+) diff --git a/update-version b/update-version index 21d35c6..82794e8 100755 --- a/update-version +++ b/update-version @@ -1,5 +1,7 @@ #!/bin/bash +here=$(dirname $(readlink -f "$0")) + tag_prefix=`dpkg-parsechangelog -S Source | sed 's/linux-restricted-modules/Ubuntu/'`- commit=: @@ -60,6 +62,7 @@ if [ "$no_update" = 'false' ]; then else echo "$thing: no changes from master" fi + "$here/update-dkms-versions" for thing in \ debian/scripts/misc/git-ubuntu-log \ debian/scripts/dkms-build \ From patchwork Wed Jul 21 22:13:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 1508481 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=h3feQatN; 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 4GVVGl65dNz9sjD; Thu, 22 Jul 2021 08:13:51 +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-0007KR-HE; Wed, 21 Jul 2021 22:13:47 +0000 Received: from smtp-relay-canonical-0.internal ([10.131.114.83] helo=smtp-relay-canonical-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 1m6KTK-0007Jf-El for kernel-team@lists.ubuntu.com; Wed, 21 Jul 2021 22:13:46 +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-0.canonical.com (Postfix) with ESMTPS id 4F8AC3F235 for ; Wed, 21 Jul 2021 22:13:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1626905626; bh=nOXhSBxHnBKedH2IZoyPJWrw5wumFHDba7iNN1zz+Lw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=h3feQatNNd27YjENCCkp0mvcy+CbGJdbHNuDUWrFv4vTaFONMm+YbOF0T7L44+XPm mgIsym6fWOA58p+NxvwtTGVslU6OjbiIIRWPrno7R+cejcoiNhV/yMV93sWX0qkM97 LQJ/9cKe1ohpxJ2a+mdva5G6GzJX7vQ2DsiKLYdhGYTxnGSrRFbLcb9/lmNOFGoA2B UZQeN2vmx9t5Wd4HKyTiuF2bpbM0X4zXQuDM8dp5wCmvc9k7N7uoMmaTRKu/lW4dmR kkTSKzB4vsj077RbLfHNronH9bTmTbIIsLjLuKkx6KbDTW1sDDRRvglCu76tWiRBTl bA5tY4GUVGyjQ== Received: by mail-wr1-f70.google.com with SMTP id p4-20020a5d63840000b0290126f2836a61so1567153wru.6 for ; Wed, 21 Jul 2021 15:13:46 -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=nOXhSBxHnBKedH2IZoyPJWrw5wumFHDba7iNN1zz+Lw=; b=R2IEAUc6JxGODSgbFp5z/hcUEKqje7JplEehSaQwMBD7A4D+4nR9PTEAB6SjNNAhop BHRG0om8EMR5b52dTf5Yr11RTdJ1Y5D+bUlkeGQvgP8crG2M0ErUapXro03Dv5/15OzU 2xTXPT9VCASCfuk9ki7J8ag/xPPoMTEeXpJGawMFY/1tqASep0kqXrHVkz7R4WwBAtad dhgbPdrP4S3+a+TK2v9gJ66bJM/2qOfNIQnwaml2OgdPJZIQ7pPEVjELAvokCPg/tjKA VaqEVw5n93M+Iod5YrTYD5H7NR1CcOYfM6lvmiFR+Ystq6c+7SbtTaYxM9CQJpVrdL/L 0dAA== X-Gm-Message-State: AOAM531qZ3kg+Wpbi6udGg6HXanvgbdGmP98xUdDiZisxAY2jYtqSKgp edE6XnSoF5adFqQTR2Uv2PEQ5tZyNUAibSBzsX83ORP17DRgmzbZj8vsD1AMyHQYaq5I01fbbJO jiUn9daP+UHqMzFYQrtLSqgwsyi+KRnlx5f+/TwrvQA== X-Received: by 2002:a05:600c:2197:: with SMTP id e23mr39734684wme.101.1626905625843; Wed, 21 Jul 2021 15:13:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyKTGRDldikqg46Wybvg+6bEvyLkvuyE511U0KASGBJfAfcF2scIiVaYgs/61aTmazp6r+d7w== X-Received: by 2002:a05:600c:2197:: with SMTP id e23mr39734674wme.101.1626905625600; Wed, 21 Jul 2021 15:13:45 -0700 (PDT) Received: from localhost ([2001:470:6973:2:4cac:2286:3b31:9ac5]) by smtp.gmail.com with ESMTPSA id n23sm22159179wms.4.2021.07.21.15.13.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Jul 2021 15:13:45 -0700 (PDT) From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [PATCH 4/4] UBUNTU: [Packaging] update-version -- allow specification of the master version Date: Wed, 21 Jul 2021 23:13:38 +0100 Message-Id: <20210721221338.159114-5-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" Allow the caller to supply the master version so we do not need to go look for it in the primary kernel. This is used during LRM only respins. BugLink: https://bugs.launchpad.net/bugs/1928921 Signed-off-by: Andy Whitcroft --- update-version | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/update-version b/update-version index 82794e8..cc55c39 100755 --- a/update-version +++ b/update-version @@ -6,6 +6,8 @@ tag_prefix=`dpkg-parsechangelog -S Source | sed 's/linux-restricted-modules/Ubun commit=: no_update=false +master_version= +master_dir= while : do if [ "$1" = "--commit" ]; then @@ -16,25 +18,33 @@ do shift no_update=true + elif [ "$1" = "--master-version" ]; then + master_version="$2" + shift 2 + else break fi done -if [ "$#" -ne 1 ]; then - echo "Usage: $0 " 1>&2 - exit 1 -fi -master_dir="$1" +if [ "$master_version" = "" ]; then + if [ "$#" -ne 1 ]; then + echo "Usage: $0 " 1>&2 + exit 1 + fi + master_dir="$1" -# Work out the master kernel version. -if [ -f "$master_dir/debian/debian.env" ]; then - branch=`sed -ne 's/DEBIAN=//p' <"$master_dir/debian/debian.env"` - changelog="-l$branch/changelog" + # Work out the master kernel version. + if [ -f "$master_dir/debian/debian.env" ]; then + branch=`sed -ne 's/DEBIAN=//p' <"$master_dir/debian/debian.env"` + changelog="-l$branch/changelog" + else + changelog="" + fi + master_version=`(cd "$master_dir" && LC_ALL=C dpkg-parsechangelog -SVersion $changelog)` else - changelog="" + no_update=true fi -master_version=`(cd "$master_dir" && LC_ALL=C dpkg-parsechangelog -S Version $changelog)` # Work out our current version taking into account closed sections. here_series=$( LC_ALL=C dpkg-parsechangelog -S Distribution )