From patchwork Fri Mar 1 15:06:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roxana Nicolescu X-Patchwork-Id: 1906744 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 4TmWfQ4qp9z23l2 for ; Sat, 2 Mar 2024 02:07:25 +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 1rg4Th-0002zs-DL; Fri, 01 Mar 2024 15:07:13 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1rg4Td-0002zQ-Dv for kernel-team@lists.ubuntu.com; Fri, 01 Mar 2024 15:07:09 +0000 Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) (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 1B33C3F280 for ; Fri, 1 Mar 2024 15:07:09 +0000 (UTC) Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-1dc0cf01899so20545415ad.2 for ; Fri, 01 Mar 2024 07:07:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709305628; x=1709910428; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9yJANfoRd9abJUFlMtvqb6W4h0QaYJ1JIVkVIDSkV6A=; b=wSqzDlD1JFzwEpiEPJ4vTGnOcnsV9e/+riWPLOZvfy9dZhvfDO0ocTyuMZXzdLDd4A tMRcKFq1yPTpmjBKmeJO7QOMRSpWd3ehFW4tzwQhc44SMg/za96yjMhQq5VYHzeySe2T LqcPc9GFi8wTYOkl3FjlOm7OqEe9gJQz1RzG3B6qXCSufbm4VK53kcf5JBX6a0vmV6+r XHZuB8aibWqtllO0L3SiiBzgFinJYyZc3xdEpXwZn+LwdbXvT/a1nUer7DU/hQtx4R2C mbwVUsfpQK1LuSoRbDtyLtTjn7dXcSsZQ5ibsJ95vlE4qjgh1irLjpfJEiOlAIYtStPU YOZw== X-Gm-Message-State: AOJu0Yynp+KNbIzEKgaaH8xOfsMQ9JkSMsVOn1esumk+5lFqCzzovEh+ 5fy+Nsb0/x2d0Cj3pugpT6IueZJmt1tGNaN34STmq2vnN/eykMSidWpD263QNe8RWX2X2aTXIKH /hjRoS2saQgLyxrG0S3xch1LvAIpe1LU1Cor7RPCMeXqKUL3lE95exldeVSv7hP1kSz6aeiZG3F tnQtP99ZJ1B0zq1jA= X-Received: by 2002:a17:902:f687:b0:1d8:ee44:629d with SMTP id l7-20020a170902f68700b001d8ee44629dmr1860847plg.30.1709305627714; Fri, 01 Mar 2024 07:07:07 -0800 (PST) X-Google-Smtp-Source: AGHT+IF7sjL+cFNKkdQqFZzUijpcr6CbsFiXmCy19LXJGVpzy7unrTYihGLPyCCflML+tHMbXUuF3A== X-Received: by 2002:a17:902:f687:b0:1d8:ee44:629d with SMTP id l7-20020a170902f68700b001d8ee44629dmr1860822plg.30.1709305627319; Fri, 01 Mar 2024 07:07:07 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c490]) by smtp.gmail.com with ESMTPSA id mj16-20020a1709032b9000b001db519cb710sm3553442plb.246.2024.03.01.07.07.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Mar 2024 07:07:06 -0800 (PST) From: Roxana Nicolescu To: kernel-team@lists.ubuntu.com Subject: [SRU][M, J, F][PATCH 1/3] UBUNTU: [Packaging] remove update-dkms-versions Date: Fri, 1 Mar 2024 16:06:48 +0100 Message-Id: <20240301150652.107814-2-roxana.nicolescu@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240301150652.107814-1-roxana.nicolescu@canonical.com> References: <20240301150652.107814-1-roxana.nicolescu@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: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/2055685 This will be replaced by cranky update-dkms-versions Signed-off-by: Roxana Nicolescu --- update-dkms-versions | 195 ------------------------------------------- 1 file changed, 195 deletions(-) delete mode 100755 update-dkms-versions diff --git a/update-dkms-versions b/update-dkms-versions deleted file mode 100755 index e0ab5898ac36..000000000000 --- a/update-dkms-versions +++ /dev/null @@ -1,195 +0,0 @@ -#!/bin/bash - -remote_repo='' -remote_branch='main' -sru_cycle= -while : -do - if [ "$1" = "--remote-repo" ]; then - remote_repo="$2" - shift 2 - - elif [ "$1" = "--remote-branch" ]; then - remote_branch="$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]*$//' -e 's/^kernel-sru-cycle-//') - - #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 - c[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 - -# -# kernel-versoins repository dkms-version mapping see below for details: -# https://git.launchpad.net/~canonical-kernel/+git/kernel-versions/plain/README -# -kv_repo="$HOME/.cache/kernel-versions-bare" - -# 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 - 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 -} - -present=$(cat_file -t "$remote_name/$remote_branch:devel/" 2>/dev/null) -if [ "$present" ]; then - git_base_devel="$remote_name/$remote_branch:devel/" -else - git_base_devel="$remote_name/$remote_branch:tip/" -fi -git_base="$remote_name/$remote_branch:$sru_cycle/" -git_human="$remote_name/$sru_cycle" - -# Determine if we have this cycle. -present=$(cat_file -t "$git_base" 2>/dev/null) -if [ "$present" = "" ]; then - # If we don't have the cycle in the development cycle then - # fall back to master. - case "$sru_cycle" in - d*) git_base="$git_base_devel" ;; - *) echo "$sru_cycle: cycle not found in $remote_repo" 2>&1 - exit 1 - ;; - esac -fi - -# Determine our series and mainline version from our own changelog. -our_series=$(LC_ALL=C dpkg-parsechangelog -l"$DEBIAN/changelog" -SDistribution) -if [ "$our_series" = "UNRELEASED" ]; then - our_series=$(LC_ALL=C dpkg-parsechangelog -l"$DEBIAN/changelog" -o1 -c1 -SDistribution) -fi -our_mainline=$(LC_ALL=C dpkg-parsechangelog -l"$DEBIAN/changelog" -SVersion | sed -e 's/-.*//') -our_package=$(LC_ALL=C dpkg-parsechangelog -l"$DEBIAN/changelog" -SSource) -our_source=$(echo "$our_package" | sed -e 's/-restricted-modules//') -case "$our_package" in -linux-restricted-modules*) our_type="lrm" ;; -*) our_type="main" ;; -esac - -# 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. - -# Try and find a package specific dkms-versions fragment. Try: -# handle+type -# series+type -# mainline+type -# series - backwards compatibility -# mainline - backwards compatibility -for versions_path_tail in \ - "$our_series:$our_source:$our_type" \ - "$our_series:$our_mainline:$our_type" \ - "$our_series:$our_type" \ - "$our_mainline:$our_type" \ - "$our_series" \ - "$our_mainline" -do - echo "II: trying $versions_path_tail ..." - versions_paths=$(echo $(cat_file -p "${git_base}map/dkms-versions/$versions_path_tail" 2>/dev/null)) - [ -n "$versions_paths" ] && break -done - -if [ -z "$versions_paths" ]; then - echo "$0: unable to identify dkms-versions mapping" 1>&2 - exit 1 -fi - -echo "git_base<$git_base> versions_paths<$versions_paths>" -echo "II: grabbing dkms-versions from $sru_cycle $versions_paths" - -: ">debian/dkms-versions.new" -for versions_path in $versions_paths -do - cat_file -p "$git_base$versions_path" >>"debian/dkms-versions.new" - if [ "$?" -ne 0 ]; then - echo "$0: unable to download an updated dkms-versions file" 1>&2 - exit 1 - fi -done -mv "debian/dkms-versions.new" "debian/dkms-versions" - -thing="debian/dkms-versions" -if ! git diff --exit-code -- "$thing" >/dev/null; then - git commit -m "UBUNTU: $thing -- update from kernel-versions ($git_human)" \ - -m "BugLink: https://bugs.launchpad.net/bugs/1786013" \ - -s -- "$thing" -else - echo "$thing: no changes from kernel-versions" -fi - -exit 0 From patchwork Fri Mar 1 15:06:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roxana Nicolescu X-Patchwork-Id: 1906742 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 4TmWfQ4Fksz23fC for ; Sat, 2 Mar 2024 02:07:25 +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 1rg4Tj-00031d-Mj; Fri, 01 Mar 2024 15:07:15 +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 1rg4Tg-0002zr-P5 for kernel-team@lists.ubuntu.com; Fri, 01 Mar 2024 15:07:12 +0000 Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) (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 8EF773F282 for ; Fri, 1 Mar 2024 15:07:12 +0000 (UTC) Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-1dbde5c4d68so19562695ad.2 for ; Fri, 01 Mar 2024 07:07:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709305631; x=1709910431; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7NdQm67RG2Jn9sPJMaGzJVypYKvwfbtf9ThJ8hTpf70=; b=C56Ojwyax7T2MbknZevaMYwUNx9R2jT5boDw3yZ0amRB3sSl4uHpTMhRzH5flo8tts WTtsCTr/YLNp7MIRrMGSW2H13F21unYVPmPWv410Hfb2XG+Zzg/xrrNL78HKdorwBABV MqZhvAU5UvhoiXPAL9LTyoA5r6rkEtnrTHdgIApSJ8RUCLCmKS2Jdmwj459dbStKny44 j9tPMqNuLBN4gh4Vn7ZzMXjhGGgH0T2b4N01Zfze4IRYLrip1hLRvEKvHtVfBuUXWkWE ctWtLageKWKaSUTMqYNVQSpmia1aOMD1r70JFS2U/2KxJ1BIAADMANucPaTTQmS5Cfe1 9gbA== X-Gm-Message-State: AOJu0YxAWr2QNzdAA8u/tk4GzvEZP/1ZGZXzxsLnd97RuTaIrlkEtpEZ PTSGJf7OWBCBCi1y7HDcwIj6EFkEZTK+wGbYFaWi7+LLNQ7sRb3CwaYm4pPVf1d3QdieHpne3pj l7xpHAOolSyhPo4mHnbnkH4e1HuhVs5mhldst717s4uHAUtmUp4rCTfikzJ7Tmh6iWMiIPFGoch JujqfU+waM4BAmDiQ= X-Received: by 2002:a17:902:e805:b0:1db:d2f7:68a4 with SMTP id u5-20020a170902e80500b001dbd2f768a4mr2048460plg.24.1709305631208; Fri, 01 Mar 2024 07:07:11 -0800 (PST) X-Google-Smtp-Source: AGHT+IH9MgihK3f9pofbDRjxJZGFohOS0qHzzyahtwzJxedhcPlVZWahgmsf+PEP55isrgQooriCZw== X-Received: by 2002:a17:902:e805:b0:1db:d2f7:68a4 with SMTP id u5-20020a170902e80500b001dbd2f768a4mr2048438plg.24.1709305630929; Fri, 01 Mar 2024 07:07:10 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c490]) by smtp.gmail.com with ESMTPSA id mj16-20020a1709032b9000b001db519cb710sm3553442plb.246.2024.03.01.07.07.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Mar 2024 07:07:10 -0800 (PST) From: Roxana Nicolescu To: kernel-team@lists.ubuntu.com Subject: [SRU][M, J, F][PATCH 2/3] UBUNTU: Move debian/dkms-versions to debian.master/dkms-versions Date: Fri, 1 Mar 2024 16:06:49 +0100 Message-Id: <20240301150652.107814-3-roxana.nicolescu@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240301150652.107814-1-roxana.nicolescu@canonical.com> References: <20240301150652.107814-1-roxana.nicolescu@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: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/2055685 Signed-off-by: Roxana Nicolescu --- {debian => debian.master}/dkms-versions | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {debian => debian.master}/dkms-versions (100%) diff --git a/debian/dkms-versions b/debian.master/dkms-versions similarity index 100% rename from debian/dkms-versions rename to debian.master/dkms-versions From patchwork Fri Mar 1 15:06:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roxana Nicolescu X-Patchwork-Id: 1906745 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 4TmWfg14KWz23fC for ; Sat, 2 Mar 2024 02:07:39 +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 1rg4Tq-000350-BW; Fri, 01 Mar 2024 15:07:22 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1rg4Tj-00031f-O5 for kernel-team@lists.ubuntu.com; Fri, 01 Mar 2024 15:07:15 +0000 Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.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-1.canonical.com (Postfix) with ESMTPS id 7834F3F281 for ; Fri, 1 Mar 2024 15:07:15 +0000 (UTC) Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-1dbde5c4d68so19563125ad.2 for ; Fri, 01 Mar 2024 07:07:15 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709305634; x=1709910434; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ve6GVhU2c2DkPT0ag9hS6CRyi5zMMZ0gj5OBC3X3PZs=; b=CjzyznB/eVscUMQDMfxO68JurXzCymoD/MOD7QDJBBLal+k3qAbbtMUFvwvQmoWuam l54uV+AhxP1WGC7M8eaLlEXnR0HyOD3+CUMQMuH7acJKldQm9y2Dt3Um3ldaDi3m6zfh B42pnL0druAMQYgEYjt9WJaTA7ukwo9U+21UNqwfX48eze4Qw3ILESmC2UVwwBYPaHaN v8npJHg/WiTvfH6kO2JaMgyrD0CFi34JlfflZ7V9KNEqol48P101px/u28uIEsdyMmkI Kq3knRKEKUrMfYhz6VjzZX7w6lD9f/bopp0fHJSY53hMv1nG7lnsJS1ml2vp2a48akGp xejA== X-Gm-Message-State: AOJu0YznWwVr/4HD+C+77SJTwoM8caB3gJNGPxM8mH05TgsSPreK4xlG BAg7cNOzU550t1N0Fle/oSNT72pdR/EL9fLnK2Oyh5zdLbqT2HE0YnQRsW38i3bFVvD5Q0YiT1m kiE+ntZoL6BtXTImVjDzAgpJxK0ZY7JZvKJAf4L2O31qIAfw9ch+bcPzSoVav8a5jvFC+WAWUDL U3QqbBkMC2fWoiRQY= X-Received: by 2002:a17:902:c3c4:b0:1dc:cd2e:fc68 with SMTP id j4-20020a170902c3c400b001dccd2efc68mr1735722plj.27.1709305634019; Fri, 01 Mar 2024 07:07:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IHnP09SQa5y9ZREyOgYuCh9i8e0CgotQz5fSRkwc5C07lz397Gq3JfiwlD2cGtarA37d4k97g== X-Received: by 2002:a17:902:c3c4:b0:1dc:cd2e:fc68 with SMTP id j4-20020a170902c3c400b001dccd2efc68mr1735698plj.27.1709305633661; Fri, 01 Mar 2024 07:07:13 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c490]) by smtp.gmail.com with ESMTPSA id mj16-20020a1709032b9000b001db519cb710sm3553442plb.246.2024.03.01.07.07.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Mar 2024 07:07:13 -0800 (PST) From: Roxana Nicolescu To: kernel-team@lists.ubuntu.com Subject: [SRU][M][PATCH 3/3] UBUNTU: [Packaging] Replace debian/dkms-versions with $(DEBIAN)/dkms-versions Date: Fri, 1 Mar 2024 16:06:50 +0100 Message-Id: <20240301150652.107814-4-roxana.nicolescu@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240301150652.107814-1-roxana.nicolescu@canonical.com> References: <20240301150652.107814-1-roxana.nicolescu@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: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/2055685 debian/dkms-versions has moved to debian./dkms-versions Signed-off-by: Roxana Nicolescu --- debian/rules | 4 ++-- debian/rules.d/0-common-vars.mk | 2 +- debian/scripts/control-create | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/rules b/debian/rules index b78aff60ce24..e68922aef201 100755 --- a/debian/rules +++ b/debian/rules @@ -118,8 +118,8 @@ $(foreach _m,$(all_built-in_dkms_modules), \ do_any_tools=$(sort $(filter-out false,$(do_linux_tools) $(do_cloud_tools))) # NVIDIA DKMS package gross series split into desktop and server. -nvidia_desktop_series=$(shell sed -n -e 's/^nvidia-graphics-drivers-\([0-9][0-9]*\) .*/\1/p' debian/dkms-versions) -nvidia_server_series=$(shell sed -n -e 's/^nvidia-graphics-drivers-\([0-9][0-9]*-server\) .*/\1/p' debian/dkms-versions) +nvidia_desktop_series=$(shell sed -n -e 's/^nvidia-graphics-drivers-\([0-9][0-9]*\) .*/\1/p' $(DEBIAN)/dkms-versions) +nvidia_server_series=$(shell sed -n -e 's/^nvidia-graphics-drivers-\([0-9][0-9]*-server\) .*/\1/p' $(DEBIAN)/dkms-versions) # Debian Build System targets .PHONY: binary diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk index 1dc77bcf78e5..c65f3d12a694 100644 --- a/debian/rules.d/0-common-vars.mk +++ b/debian/rules.d/0-common-vars.mk @@ -276,7 +276,7 @@ all_dkms_modules = subst_paired = $(subst $(firstword $(subst =, ,$(1))),$(lastword $(subst =, ,$(1))),$(2)) recursive_call = $(if $(2),$(call recursive_call,$(1),$(wordlist 2,$(words $(2)),$(2)),$(call $(1),$(firstword $(2)),$(3))),$(3)) -$(foreach _line,$(shell gawk '{ OFS = "!"; $$1 = $$1; print }' $(DROOT)/dkms-versions), \ +$(foreach _line,$(shell gawk '{ OFS = "!"; $$1 = $$1; print }' $(DEBIAN)/dkms-versions), \ $(eval _params = $(subst !, ,$(_line))) \ $(eval _deb_pkgname = $(firstword $(_params))) \ $(eval _deb_version = $(word 2,$(_params))) \ diff --git a/debian/scripts/control-create b/debian/scripts/control-create index 5d0e3e46556c..243e74d9624e 100755 --- a/debian/scripts/control-create +++ b/debian/scripts/control-create @@ -64,4 +64,4 @@ do -e "s#ARCH#$arch#g" \ -e "s#MODULE#$module#g" \ -e "s#FLAVOUR#$flavour#g" -done <"debian/dkms-versions" +done <"${DEBIAN}/dkms-versions"