From patchwork Mon Mar 4 09:33:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roxana Nicolescu X-Patchwork-Id: 1907472 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 4TpD7L5TF1z23l2 for ; Mon, 4 Mar 2024 20:34:54 +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 1rh4ib-000361-60; Mon, 04 Mar 2024 09:34:45 +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 1rh4hz-0002nF-DR for kernel-team@lists.ubuntu.com; Mon, 04 Mar 2024 09:34:07 +0000 Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) (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 26B023F15F for ; Mon, 4 Mar 2024 09:34:07 +0000 (UTC) Received: by mail-pg1-f199.google.com with SMTP id 41be03b00d2f7-5dc91de351fso3335158a12.0 for ; Mon, 04 Mar 2024 01:34:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709544845; x=1710149645; 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=/leYgrDOhDL+JXQEBp6ux0uULZvJ9X2OwCqrK6eOlkE=; b=Qi3FUULQOhv7Cmnuw+Zd6ChgUcEToMQYsKZbN1MwWIK4jRXUlzEfTM2Ne7PEWTQicV BXdhD0/vNNEFlFnvkLQTjbfzAgJIMFWumy9xEINOmXH2w4drfAaGcFyUrcZKQxhG7L7o AUEsL9ssEgtyT/iQaB0XigksaKCUSgw+hToxSueMwLZCQ2vQPT6msE8V0si06q1vSg/n RWo4okTx8VnoTa/jc84SOmpJSeif2hNAOLjLEjRAEdmWmEobwItdit2smIH130itPQeA dD2cytKkSKMAFUDFclHLUfYshj/mA5umyKKYeBVlVcL3UpDQ5hMYl+Asqs4mUeIjt6+t mgtA== X-Gm-Message-State: AOJu0YyM8pPYkk3CyG3keJybcPBoQ8kYfhgvQ81NVPQ4r+vW3tRKhtZE cURojz5uhbAcrlCn5xI91lgncDotNTcfeHRApRgnnPa64RFVp14aqcxtDSRv0WErhrdaUsgTi5f yGHeCI/zc1XZl61UN5BZBK2yfNm2umNrCALqPqojXDJ4s9txPovN29mfYz8xlCgIkqqQHfvvZE7 XPUCGPAf/bYo7m X-Received: by 2002:a05:6a20:d80d:b0:1a1:2b5:f85b with SMTP id iv13-20020a056a20d80d00b001a102b5f85bmr16613061pzb.1.1709544845619; Mon, 04 Mar 2024 01:34:05 -0800 (PST) X-Google-Smtp-Source: AGHT+IGyukGGEGKvnZuBC253SkEb4J2YwxF+BesLOCw2iSZqIHiEO27F5BDf+BZVtclduDx5rlJI3A== X-Received: by 2002:a05:6a20:d80d:b0:1a1:2b5:f85b with SMTP id iv13-20020a056a20d80d00b001a102b5f85bmr16613043pzb.1.1709544845222; Mon, 04 Mar 2024 01:34:05 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c490]) by smtp.gmail.com with ESMTPSA id g1-20020a633741000000b005e47afd5c5dsm7135520pgn.37.2024.03.04.01.34.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 01:34:04 -0800 (PST) From: Roxana Nicolescu To: kernel-team@lists.ubuntu.com Subject: [SRU][M, J, F][PATCH 1/4 v2] UBUNTU: [Packaging] remove update-dkms-versions Date: Mon, 4 Mar 2024 10:33:46 +0100 Message-Id: <20240304093352.38900-2-roxana.nicolescu@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240304093352.38900-1-roxana.nicolescu@canonical.com> References: <20240304093352.38900-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 Acked-by: Stefan Bader --- 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 Mon Mar 4 09:33:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roxana Nicolescu X-Patchwork-Id: 1907468 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 4TpD6n6dJyz23l2 for ; Mon, 4 Mar 2024 20:34: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 1rh4i8-0002qA-FI; Mon, 04 Mar 2024 09:34:16 +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 1rh4i1-0002nO-1o for kernel-team@lists.ubuntu.com; Mon, 04 Mar 2024 09:34:09 +0000 Received: from mail-oi1-f198.google.com (mail-oi1-f198.google.com [209.85.167.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 E25183F125 for ; Mon, 4 Mar 2024 09:34:08 +0000 (UTC) Received: by mail-oi1-f198.google.com with SMTP id 5614622812f47-3c1a1cc1014so7150303b6e.2 for ; Mon, 04 Mar 2024 01:34:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709544848; x=1710149648; 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=VL5x9ufUb6kGimwbQRfLuN5uZgrGl38g+q5Uk9dOyKM=; b=uUvyzdQAsKlNGVFnSHYzTrqJX5LpQkgDAuCDTF26Cdt8hWAuqEuS1Srj06WGcN5LXg JoxMf2JCg9AT/L9HO9xQqn6G4UuKudQy692ugvXP+4IJUH/JkX5u19IghSYcQnlFmPH/ +xRRzJHEL48aFk3Mu85vYbJPyFYQUSWwvS54q6Ep3sIYbacPCVztq+1YNetFPIy00LHe mjoQTW5tVf7Ljg2oe464i5xSssWojBtGgp4IImVFM7Ym2UB0nGy6HVJ+ZjtQZBBeq/QE 3W0mmnyU/cGnKYxFKjgLTDlkI+ns2TBlLEmTinLTismLg79MMmoK4QxfdQw1jDne0EMr IHWQ== X-Gm-Message-State: AOJu0Yxhg4iP5oXfybZ0kuEqLSyNbJAxcVc+gWh/BDfZSkEdfCkV6RmL L5OjAaaxqLfCGpECFBKYlRK3n0roNlwKVTir6GXvWIoKO5adlcP+yAEod/OASrcUZZ0hPuYXalc LyL5HGOg/odr1Xhy1tjIR0DwoE6z2amOTO7BYKGbCuIWZMWbrN7W6RB6V5RchXCc1wOh3fMLQm3 f2KqQVrR8QmX/5 X-Received: by 2002:a05:6808:23cf:b0:3c1:cd07:54af with SMTP id bq15-20020a05680823cf00b003c1cd0754afmr11332045oib.46.1709544847902; Mon, 04 Mar 2024 01:34:07 -0800 (PST) X-Google-Smtp-Source: AGHT+IH9e3Z47c0vSz0sVlnD8Dn4qPFvno6DATYxdtu6FDGR3CBLTCHTN0xzwllBPKzGUPrKbO01mA== X-Received: by 2002:a05:6808:23cf:b0:3c1:cd07:54af with SMTP id bq15-20020a05680823cf00b003c1cd0754afmr11332038oib.46.1709544847647; Mon, 04 Mar 2024 01:34:07 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c490]) by smtp.gmail.com with ESMTPSA id g1-20020a633741000000b005e47afd5c5dsm7135520pgn.37.2024.03.04.01.34.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 01:34:07 -0800 (PST) From: Roxana Nicolescu To: kernel-team@lists.ubuntu.com Subject: [SRU][M, J, F][PATCH 2/4 v2] UBUNTU: Move debian/dkms-versions to debian.master/dkms-versions Date: Mon, 4 Mar 2024 10:33:47 +0100 Message-Id: <20240304093352.38900-3-roxana.nicolescu@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240304093352.38900-1-roxana.nicolescu@canonical.com> References: <20240304093352.38900-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 Acked-by: Stefan Bader --- {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 Mon Mar 4 09:33: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: 1907469 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 4TpD6x2g76z23l2 for ; Mon, 4 Mar 2024 20:34:33 +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 1rh4iE-0002tb-7Y; Mon, 04 Mar 2024 09:34: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 1rh4i3-0002om-QB for kernel-team@lists.ubuntu.com; Mon, 04 Mar 2024 09:34:11 +0000 Received: from mail-oi1-f200.google.com (mail-oi1-f200.google.com [209.85.167.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 7FDB23F125 for ; Mon, 4 Mar 2024 09:34:11 +0000 (UTC) Received: by mail-oi1-f200.google.com with SMTP id 5614622812f47-3c195196808so5570741b6e.1 for ; Mon, 04 Mar 2024 01:34:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709544850; x=1710149650; 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=r7Qf7UB/R1gQVcyAYRxSfC+LT2AFgDiA9zFNehc9c+Y=; b=JteaJ1S/LVfXHHuCJt2RPtot9RA620nwENBzPyGBUnAKqKiZrws4hoJX20TMuOJ8Vy /TRA53rofdC/JvUjzL7xVg6try0dlhZQALYN3TNiQnT4eTCFoiGU0+MTXCAfiz77Y9fd pjI2jcI9M+00U2SeDgcBATL9ccNw2w4zXKprBDZ/2e6FcMdKZIHqWsfc382aJ1IEQT1S MCNKPfU66T+6ZHn19DBEHFtn2DFP6XO5Xe1G3Z/ynapLEsWaoGHKHGSz0c1q9tP46FHM xoI5ihl4sUrATUfVncJRJoGVutod7KcqrFpPpCKC4EOpBf2AyjPBa/ag+jiuBgecKLGE 4oAg== X-Gm-Message-State: AOJu0Yw9P2GZ67gj1j0MyNOnGmEwe0QzKN5nGgh7ymVbal9pJ5gs5EQO tVwC+QORWapOXZ+MApzf63r8nYDZEPedGMjFtpDInrWjE1D4YvNxqMtnFBW1y0ka1bovbGA1q5d sWjcmHJpEj2PHNbeSye+hMfKVw/tIN0V9y7HVuHp6t1IWOzLpTGp6iOAej/iE841rPvdPHw2DlP OF0pujW3pJx8c2 X-Received: by 2002:a05:6808:2023:b0:3c1:e277:6efd with SMTP id q35-20020a056808202300b003c1e2776efdmr6851318oiw.49.1709544850320; Mon, 04 Mar 2024 01:34:10 -0800 (PST) X-Google-Smtp-Source: AGHT+IFkRp2cJcTAuhuk0p4CczF5/OYwrzaJBNecUJX5XER158aSHuMjzo0zkk8gA2DQIZDvhO9rEw== X-Received: by 2002:a05:6808:2023:b0:3c1:e277:6efd with SMTP id q35-20020a056808202300b003c1e2776efdmr6851309oiw.49.1709544850048; Mon, 04 Mar 2024 01:34:10 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c490]) by smtp.gmail.com with ESMTPSA id g1-20020a633741000000b005e47afd5c5dsm7135520pgn.37.2024.03.04.01.34.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 01:34:09 -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: Mon, 4 Mar 2024 10:33:48 +0100 Message-Id: <20240304093352.38900-4-roxana.nicolescu@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240304093352.38900-1-roxana.nicolescu@canonical.com> References: <20240304093352.38900-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 Acked-by: Stefan Bader --- 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" From patchwork Mon Mar 4 09:33:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roxana Nicolescu X-Patchwork-Id: 1907471 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 4TpD7F4gfYz23l2 for ; Mon, 4 Mar 2024 20:34:49 +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 1rh4iQ-00031L-0A; Mon, 04 Mar 2024 09:34:34 +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 1rh4iD-0002sz-B6 for kernel-team@lists.ubuntu.com; Mon, 04 Mar 2024 09:34:21 +0000 Received: from mail-oi1-f200.google.com (mail-oi1-f200.google.com [209.85.167.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 20F723F275 for ; Mon, 4 Mar 2024 09:34:21 +0000 (UTC) Received: by mail-oi1-f200.google.com with SMTP id 5614622812f47-3c03ea9cde0so5332894b6e.3 for ; Mon, 04 Mar 2024 01:34:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709544860; x=1710149660; 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=oxjTr1eEYKBv2tYmoBM5oKLhuIFmGce5qvdzSKW/Fqg=; b=VMdulxlTslJR/5N7EhE7T+7nWuPsUNEOpFFDV+xi6vTnCLu5M187W9+FJuE+uJDnJr BnzLCYWCTOjXWm7nGx0qKgy90e3wCOxZsSs/rF9QzkrgVebSA4IM8CsQSpEDMGSShiEC FemPiqh9RAF/PADDpWg1ImpYbj9l6G0hBI/iJzvNMxEqa0jl0tJ3aIkzUQ/6GYQiPvwl UPGqb7OkLKpWXy/FK5J5rxt3OK7eHO3o15Np+vDKADAjhsvKavivcVGww+jnBZj3ZOYq lMsdsgk+q6f+hAVIKNuXn+79JQaEPJ6/pmuiClCrAd/l8MqmkhWcePUe3ujmsURZjooe Mr+A== X-Gm-Message-State: AOJu0Yx6p6AQgB3lcuWmU2sihb9EgUJHDBpThTQR1pxtOyVkUhtZ7rCa eCMlYMl4GzpCYXbCyQeXMbXc+mv8pZz9L3OQkaZZkJQKivuJ9M0hFbSx5/1Eo1WEaIgOVowgNOt cFaK+9nBErT00erx+UxxQ0YTKreAlUEFAlrb/FwuwcamSGaJSjH/AtKh62mZHeWA2tmZsET8YwT rQgIDxO6/3EU9o X-Received: by 2002:a05:6808:1646:b0:3c1:cbe5:c317 with SMTP id az6-20020a056808164600b003c1cbe5c317mr9723583oib.39.1709544860010; Mon, 04 Mar 2024 01:34:20 -0800 (PST) X-Google-Smtp-Source: AGHT+IEM1tZ8RXxGJS9u85XnXUpfkSpi7NNkaKcs8eyistaoyiVJQUcxBRO//mjp/up5/EiG6cU/4A== X-Received: by 2002:a05:6808:1646:b0:3c1:cbe5:c317 with SMTP id az6-20020a056808164600b003c1cbe5c317mr9723573oib.39.1709544859764; Mon, 04 Mar 2024 01:34:19 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c490]) by smtp.gmail.com with ESMTPSA id g1-20020a633741000000b005e47afd5c5dsm7135520pgn.37.2024.03.04.01.34.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 01:34:19 -0800 (PST) From: Roxana Nicolescu To: kernel-team@lists.ubuntu.com Subject: [SRU][J][PATCH 4/4 v2] UBUNTU: [Packaging] remove update-version-dkms Date: Mon, 4 Mar 2024 10:33:52 +0100 Message-Id: <20240304093352.38900-8-roxana.nicolescu@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240304093352.38900-1-roxana.nicolescu@canonical.com> References: <20240304093352.38900-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 is not used anymore. Signed-off-by: Roxana Nicolescu Acked-by: Stefan Bader --- update-version-dkms | 4 ---- 1 file changed, 4 deletions(-) delete mode 100755 update-version-dkms diff --git a/update-version-dkms b/update-version-dkms deleted file mode 100755 index a266fecc06f8..000000000000 --- a/update-version-dkms +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -echo "EE: run update-dkms-versions after link-to-tracker" 1>&2 -exit 1