From patchwork Tue Mar 19 06:31:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Portia Stephens X-Patchwork-Id: 1913376 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 4TzMLy5SRfz1yWs for ; Tue, 19 Mar 2024 17:31:38 +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 1rmT0Q-0001uO-O1; Tue, 19 Mar 2024 06:31:27 +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 1rmT0F-0001sB-K0 for kernel-team@lists.ubuntu.com; Tue, 19 Mar 2024 06:31:16 +0000 Received: from mail-oi1-f199.google.com (mail-oi1-f199.google.com [209.85.167.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 3E48A3F29F for ; Tue, 19 Mar 2024 06:31:15 +0000 (UTC) Received: by mail-oi1-f199.google.com with SMTP id 5614622812f47-3c378d63244so3571146b6e.2 for ; Mon, 18 Mar 2024 23:31:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710829872; x=1711434672; 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=Ff0ZlNH79wNhliHTSFAJ8YCSlseDmi7JdBTZIholwSc=; b=ae4RzxRCGl1TRxzEboLDodHDxneXPJBCBerdEb/GXZYeKZB6UAKAkz37JIRK2N9yfI DqMPQJ/ioIO+MiyidsX0t+aN2KIPRHrn90yAU/gaEm9RH7JzHlHRw9P/Buxjd1+DSy5D jgUvak3JfGFKxIcAk1vcFb8D0w/JVRckW3I1BktMwUyeV/mrPn8GozkgDxYBXyZZ3ef8 UzrgVi3YXMMwLkqGcw8ZsOIlTELivtIprBC1RFtxkyiDcLvcpQ1n4VXddvwar6+vXUj8 4rZbPTM2/mnBUnslmJBjPutRwoYtgbW4mj5cAnJbYWRlJMSTFz5ZwCy/V3lSulKpmDZg yJdg== X-Gm-Message-State: AOJu0YxNFHlBkAqks/fpHG/zaiDscq8XIESxd7Shtjz94V3T5+vQhIWf 0dKOps5liPulyeEeYpT9fLvXCI9VgZnrnzefog8B9QXMleYJJG7T50+TZYpiLQ0F5wl2U79VWuE GrFMte8pNwSKoFoYlGx+GapB30NzqIwNDqmj+vtOJyxct44abATj8uiYXQUWivMXLn5N/mQjpqv J863LGO++JOw== X-Received: by 2002:a05:6808:11c5:b0:3c2:5195:8314 with SMTP id p5-20020a05680811c500b003c251958314mr15032042oiv.26.1710829872529; Mon, 18 Mar 2024 23:31:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFbd/YvklLQmODGvUkRBZWgUckROn3+OpTt5l/ejFkK5AqPNPlKz+9kZKxC6ZtVOoMouw7UjQ== X-Received: by 2002:a05:6808:11c5:b0:3c2:5195:8314 with SMTP id p5-20020a05680811c500b003c251958314mr15032035oiv.26.1710829872229; Mon, 18 Mar 2024 23:31:12 -0700 (PDT) Received: from localhost ([159.196.41.205]) by smtp.gmail.com with ESMTPSA id a25-20020a631a19000000b005e852f50bb5sm800991pga.47.2024.03.18.23.31.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 23:31:10 -0700 (PDT) From: Portia Stephens To: kernel-team@lists.ubuntu.com, portia.stephens@canonical.com Subject: [SRU][jammy:linux-xilinx-zynqmp][PATCH v2 1/1] UBUNTU: [Packaging] Add breaks on flash-kernel older than 3.104ubuntu20 Date: Tue, 19 Mar 2024 16:31:02 +1000 Message-Id: <20240319063102.1303450-2-portia.stephens@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240319063102.1303450-1-portia.stephens@canonical.com> References: <20240319063102.1303450-1-portia.stephens@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/2058321 flash-kernel uses the model string in the kernel's device tree to determine what platform is running. Thus there is a dependency between the two packages. A change in the model string for KR platforms was made to support revB which breaks older versions of flash-kernel. Signed-off-by: Portia Stephens --- debian.zynqmp/control.d/flavour-control.stub | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian.zynqmp/control.d/flavour-control.stub b/debian.zynqmp/control.d/flavour-control.stub index fe08e02e1541..7e0a8736c3d5 100644 --- a/debian.zynqmp/control.d/flavour-control.stub +++ b/debian.zynqmp/control.d/flavour-control.stub @@ -29,7 +29,7 @@ Priority: optional Provides: linux-image, fuse-module, =PROVIDES=${linux:rprovides} Depends: ${misc:Depends}, ${shlibs:Depends}, kmod, linux-base (>= 4.5ubuntu1~16.04.1), linux-modules-PKGVER-ABINUM-FLAVOUR Recommends: BOOTLOADER, initramfs-tools | linux-initramfs-tool -Breaks: flash-kernel (<< 3.90ubuntu2) [arm64 armhf], s390-tools (<< 2.3.0-0ubuntu3) [s390x] +Breaks: flash-kernel (<< 3.104ubuntu20) [arm64 armhf], s390-tools (<< 2.3.0-0ubuntu3) [s390x] Conflicts: linux-image=SIGN-PEER-PKG=-PKGVER-ABINUM-FLAVOUR Suggests: fdutils, linux-doc | SRCPKGNAME-source-PKGVER, SRCPKGNAME-tools, linux-headers-PKGVER-ABINUM-FLAVOUR, linux-modules-extra-PKGVER-ABINUM-FLAVOUR Description: Linux kernel image for version PKGVER on DESC