From patchwork Fri Mar 1 15:06: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: 1906743 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 4TmWfQ4vQFz23l3 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 1rg4Tf-0002za-GB; Fri, 01 Mar 2024 15:07:11 +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 1rg4Tc-0002zH-D4 for kernel-team@lists.ubuntu.com; Fri, 01 Mar 2024 15:07:08 +0000 Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) (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 282C53F275 for ; Fri, 1 Mar 2024 15:07:06 +0000 (UTC) Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-1dbc6ff68ffso25162145ad.1 for ; Fri, 01 Mar 2024 07:07:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709305625; x=1709910425; 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=lvtOVC1R4LqAU73Mw3eoMIKdJU0/jVVwqh8acjCTjnU=; b=IF63b8MIwjJFFhOL3484j7zX5OboLQ4jF9fly4ywSsM0nAU55hd3JcCRgTr1f2QnCy LRLkxW68Q3o2sHgUEoCiCcGUOb9OZrjeFk5qYGh+pUvx/A4NErowpZfc3cJYe9lPN0+T 4gwafULgAvxfBuaq56wW2az/qOaSKNvqC7n4c9i16csdyXOSGfnEkVoNgF848zSR+SK6 w/0o3ytRWzMVwt8UeHbfGzSUCfK20c4wXj0B3gNEukDv7R2xnB/frWEkwyk/5MbU+JX6 U3dwxW5W2wH1G5CRts9htjIqDZCL7tK1h9ELUT61QgVG+mLkG4VMbGMuROpX8iHN7lSQ y6Gg== X-Gm-Message-State: AOJu0Yxig3zTgbH2LB5P0ZSF0+EeDgEnVOHucBiK5o25Nd4epZtVZQ/K 4uaGtm1iN0Mr0ns1iEgpZ6Vio8yp2N+V1zwFfVUsOI7/Lp38JqxmYUPzI/+Vrdrqi36QiuU2QzY eh057LmaU/DPEMLPM2XpxPrrBE8JOQ1sRapt7SpPH8/CA8hUBul6p2TX9W3RQ53VeADh93EwK1O uvK+A+5fpe2Y7MI0c= X-Received: by 2002:a17:902:da87:b0:1dc:8ba1:edc3 with SMTP id j7-20020a170902da8700b001dc8ba1edc3mr2333228plx.9.1709305624870; Fri, 01 Mar 2024 07:07:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IFOTeGhSbggf1nnngp3yaMl4eQrhKYUEqXtlkcGFqDb+J3+fcXPf+GbBeYuMdtC6Wp3AAkK0A== X-Received: by 2002:a17:902:da87:b0:1dc:8ba1:edc3 with SMTP id j7-20020a170902da8700b001dc8ba1edc3mr2333203plx.9.1709305624562; Fri, 01 Mar 2024 07:07:04 -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.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Mar 2024 07:07:04 -0800 (PST) From: Roxana Nicolescu To: kernel-team@lists.ubuntu.com Subject: [SRU][M,J,F][PATCH 0/3] Cranky update-dkms-versions rollout Date: Fri, 1 Mar 2024 16:06:47 +0100 Message-Id: <20240301150652.107814-1-roxana.nicolescu@canonical.com> X-Mailer: git-send-email 2.34.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" BugLink: https://bugs.launchpad.net/bugs/2055685 SRU Justification [Impact] Having a common file for dkms-versions between main kernels and derivatives causes a lot of conflicts during rebase. Solution is to have a dkms-versions per kernels, under debian./dkms-version. While at it, instead of running ./update-dkms-version script, cranky update-dkms-versions was introduced. [Fix] This is needed only in the main kernels. 1. remove update-dkms-version script 2. rename debian/dkms-version with debian.master/dkms-versions 3. Replace debian/dkms-versions references in debian scripts and rules with $(DEBIAN)/dkms-versions The 3rd fix required separate patches because the scripts are a bit different. Note for derivatives: These changes will be inherited from the parent during cranky rebase. The only change to the cranky process is: instead of using ./update-dkms-versions script, cranky-update-dkms-versions should be used [Test] Build test on cbd. No issue found. [Regression pottential] Owners have tried this last cycle in derivatives and no issues were found. We may see build failures due to wrong dkms versions, but it will be fixed along the way. Roxana Nicolescu (3): UBUNTU: [Packaging] remove update-dkms-versions UBUNTU: Move debian/dkms-versions to debian.master/dkms-versions UBUNTU: [Packaging] Replace debian/dkms-versions with $(DEBIAN)/dkms-versions Acked-by: Stefan Bader