From patchwork Tue Mar 26 08:47:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schmidt, Adriaan" X-Patchwork-Id: 3454 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 26 Mar 2024 09:47:19 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-qv1-f56.google.com (mail-qv1-f56.google.com [209.85.219.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 42Q8lIDY016762 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 26 Mar 2024 09:47:19 +0100 Received: by mail-qv1-f56.google.com with SMTP id 6a1803df08f44-68f7572bc3dsf82975876d6.0 for ; Tue, 26 Mar 2024 01:47:18 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711442832; cv=pass; d=google.com; s=arc-20160816; b=dFyPtpAIh8jSsWrNb0bUCaIh0ORmfhaCXMbgvG7TYaza/LhhhB1jIkQbZKm6+kSV5i 9Geye0Faa9LEWuVDx2VS2mmAIxWDrEFaSHBEC3zNfqE9djVm+HDY1G7IijKuS+b7Jpej nvs0UqxVub0Sn1010p+/7UDpseIMBiklPbaNL94KUzm3OJk6w/rVH58lUfACv+3pMhVo LjPpOTYteWWWshszyAhdHNGZ+xNXw3Iq3r+ajZwPhEVWWIa5O4byJYWTKidw/R/N7KSb 6z1DTV5RrQkMbOY1ef0Nw/7E0CB+rovsyTcf6TZM76RT12nzdTkxtyWNpJO7bH7BzFii sA5Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=QIAkJUKWhqlv90aHAxEd3UmJccmb8O2qSySqaS1kswQ=; fh=UO6UcvCJBvTTHsoXZHWdXf7v7MkMBZmcAs7QJvAyF3Y=; b=jQcqkmkpObGg7kZ+z6cwjoqZUg4s7yxmIRafvlMJfHD3tTafgUtCFj/4wijo1Eo0E5 RcblduY8myzIw6Ds527RzeMR00bJ7eOzqTcQpMocZW3idBctw4udkzA+hHHuPOte9xAM b6kAH6NnyBDkac0LlyQvnZvJvCBey6y7JLyWSbdup8n/DUmUgG7J0yB6j9dB9hKHhld/ 8dwxpYutDR6gUPB/mfC+v2big7ddmMcZCs70O6m9CVRhjiG8dI+o4scPXU+Tyt9bKZJB LWIw498SXP95++gxDH5/jk86x4EX9wT6/hG/Y7KPJ9FCBbw0kBJnl+jNt9u6Cazs0TEs Mlpg==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=JRUWWrO0; spf=pass (google.com: domain of fm-526363-2024032608470995f0e8287d9c5dc38b-9_potj@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-526363-2024032608470995f0e8287d9c5dc38b-9_POtJ@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1711442832; x=1712047632; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=QIAkJUKWhqlv90aHAxEd3UmJccmb8O2qSySqaS1kswQ=; b=ppD3l5AS5O2IQrxI8VNZzYfk1adrJga0SwJbx6c8r0fSO/3LhhjJESI+Rh0Qw6pLDZ FFUfhw+q+GQpjlexY70fC8iwsDzHsOx+07m6rsjJHyeCWVy8csMXlYsiBZzZlYvEaPtD K2Q6GKxR+QYv64aBdCirwiFtcngX0ys2Jezy63u+iMT4kRNs1MX3Oo0VMlUV8uNvv6tz PdJ4NFWrWHnpqsJ/Q15HSAXMrJ9F230oeFX5mVKkwxWINJ+oj2p2Hnm36/GpdNvT08t8 3M8C58jbWivYOVmnW2ORQtbHepMlcNNhi4pjk+OFeXUJsXYtIbZtuxUW+pes/sX4FyKX U5og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711442832; x=1712047632; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:message-id:date:subject:cc:to:from:x-beenthere :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=QIAkJUKWhqlv90aHAxEd3UmJccmb8O2qSySqaS1kswQ=; b=tNNYxS7LNQmcfOUeJY3dsLdI+QMdKIvK4iMkE4ZYiD97dJFF1VRtmGbYtISMgvO2i3 DBvS9QkZsGWlLaf6LVGa5Iaoc62qVGM2ofmJEK5s3cr99kXjW0cUd10G033xTvytxU+i oYTM91gDDg3pnudEZnPV6qdeEqBJ0GiJjizY7JunbviCeX3D1Z9iiNvngUnnSFLx7uB/ rLAAqQ+NRo8mc4wca1T+QrMz5RhFEp2GhMUZiuRzMAFdI+0uWtQtgNKCfTJwA3flV9zG Q3ggDV8/vxxnqBSf+s17NCfcEDGCG+6rJ05ZQwUzmZrAVbFNuQVwvcEYGo/6SjsahDHZ wl0A== X-Forwarded-Encrypted: i=2; AJvYcCWCM2jvJRgeKhdg+KWxOWo3Jd+iFf4aze70yPhtexaeBE2eOeaQwNQKQWotfdoxKZk0heaql2ml1thGMxjjM5fvtGPy4AA= X-Gm-Message-State: AOJu0YxJKHo3Fh0Z51nzFELFCOjn7pJQ5uTw4GDALPkieWQglzgNjknb RgATQreq3h8zhz006gqrHZBIEzjiJolU7xWcsF8b04sEv0mrD8ix X-Google-Smtp-Source: AGHT+IGTPVvDm9MRrPcJ6sVOEg2Cvc44dg0elOx/7V7sUVCB0LdZnYMwMXJWZbEcQPgjiXDfWwPhtQ== X-Received: by 2002:a05:6214:1c45:b0:690:b8d3:97b9 with SMTP id if5-20020a0562141c4500b00690b8d397b9mr11732923qvb.59.1711442832596; Tue, 26 Mar 2024 01:47:12 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ad4:5ceb:0:b0:690:c950:c414 with SMTP id iv11-20020ad45ceb000000b00690c950c414ls7720839qvb.2.-pod-prod-09-us; Tue, 26 Mar 2024 01:47:11 -0700 (PDT) X-Received: by 2002:a05:6122:1b0a:b0:4d4:3ec6:421e with SMTP id er10-20020a0561221b0a00b004d43ec6421emr7008996vkb.4.1711442831600; Tue, 26 Mar 2024 01:47:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711442831; cv=none; d=google.com; s=arc-20160816; b=Kgz5yNamOQxqoKOOw3eFWJnoCssXzBq29iKZQU2Dd3FUobh7k6n7ssiKIoSxTqReHN aBoK1qYMrqH6Oj1T3In+JSBjkLLtZQ/OIZEWzTz7mMrET1znB1m0fAf+qbhuLqhv1N9L a1swKHyuE11XhnXwWUeqQsaXuMPeVXD2+0zBYbpp5KHRDBcA/I3LhxkMBsuwSOv2lY3w PEW1TgktfKpzBhMnB7lYCvG3Yh6gXAVgpFbEubGbtugq5KYnNn4ugVgv/Uw1pVXjDfL3 yuK1KgHbdIeTlCrRmeh7XJ0hn6KIbYklJv1HCnzJmUHygYS+ZyEoDr9iVAQpcLitGsPD 06WQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:message-id:date :subject:cc:to:from:dkim-signature; bh=F2rCkc+fRApAfivIV0EwIMSKqn4FhzFixcDFfH6BfSg=; fh=wTfLAPiT8iy63hccwzcZuLf6IB/ehBDfYt5BOmR3yPE=; b=RbipM7bcdx6TDcg/13HXvb5KAIWSNidz6BHYhpppf6XnzigrjGF3y/YhikVt/Bpx2M dyPFF0iMOB/59JSQ41DPG9T4/te8mRdEvBdJLmnVp4mFYtnmuP+oR7Q1bptl/mrF3bUA EDCj7FkFliit4PSwJUCzxDPxtcVtg2lNLy3oKG9IyaKNxTG/EcjfvmSS2qyb8tZkftKa +BDasISG+3B3WgYsEVsiVOm15SSqMQlteyTmyPniBpVK7WKYKiVDXL8RoICJPjOFNup9 nhFbdfBRDMnxyDcePEm64yREaIORpIq1HY7/tnxVinP/HZ9rsj5CDmBZELqPDJ7v5EFe LwWw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=JRUWWrO0; spf=pass (google.com: domain of fm-526363-2024032608470995f0e8287d9c5dc38b-9_potj@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-526363-2024032608470995f0e8287d9c5dc38b-9_POtJ@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net. [185.136.64.227]) by gmr-mx.google.com with ESMTPS id m15-20020a1fee0f000000b004d41fe2c37csi991212vkh.5.2024.03.26.01.47.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2024 01:47:11 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-526363-2024032608470995f0e8287d9c5dc38b-9_potj@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) client-ip=185.136.64.227; Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 2024032608470995f0e8287d9c5dc38b for ; Tue, 26 Mar 2024 09:47:10 +0100 X-Patchwork-Original-From: "'Adriaan Schmidt' via isar-users" From: "Schmidt, Adriaan" To: isar-users@googlegroups.com Cc: Adriaan Schmidt Subject: [PATCH 1/1] fix: trixie package exceptions Date: Tue, 26 Mar 2024 09:47:02 +0100 Message-Id: <20240326084702.1796722-1-adriaan.schmidt@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-526363:519-21489:flowmailer X-Original-Sender: adriaan.schmidt@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=JRUWWrO0; spf=pass (google.com: domain of fm-526363-2024032608470995f0e8287d9c5dc38b-9_potj@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-526363-2024032608470995f0e8287d9c5dc38b-9_POtJ@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Adriaan Schmidt Reply-To: Adriaan Schmidt Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= We have some cases of changing package names (originally between bullseye and bookworm), which were solved by adding explicit exceptions for bookworm. This adds the same exceptions for trixie. Signed-off-by: Adriaan Schmidt --- meta/conf/distro/debian-common.conf | 1 + meta/recipes-kernel/kselftest/kselftest.inc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/conf/distro/debian-common.conf b/meta/conf/distro/debian-common.conf index 1e1dfc83..c6b5d2cd 100644 --- a/meta/conf/distro/debian-common.conf +++ b/meta/conf/distro/debian-common.conf @@ -35,6 +35,7 @@ SYSLINUX_BOOTLOADER_INSTALL = "syslinux syslinux-common" SYSTEMD_BOOTLOADER_INSTALL = "systemd:${DISTRO_ARCH}" SYSTEMD_BOOTLOADER_INSTALL:bookworm = "systemd-boot-efi:${DISTRO_ARCH}" +SYSTEMD_BOOTLOADER_INSTALL:trixie = "systemd-boot-efi:${DISTRO_ARCH}" SYSTEMD_BOOTLOADER_INSTALL:sid = "systemd-boot-efi:${DISTRO_ARCH}" COMPAT_DISTRO_ARCH:amd64 = "i386" diff --git a/meta/recipes-kernel/kselftest/kselftest.inc b/meta/recipes-kernel/kselftest/kselftest.inc index 6196f825..ffd44e67 100644 --- a/meta/recipes-kernel/kselftest/kselftest.inc +++ b/meta/recipes-kernel/kselftest/kselftest.inc @@ -20,7 +20,7 @@ DEBIAN_BUILD_DEPENDS ?= " \ rsync, \ flex, \ bison, \ - ${@ 'fuse3' if d.getVar('BASE_DISTRO_CODENAME') == 'bookworm' else 'fuse'}, \ + ${@ 'fuse3' if d.getVar('BASE_DISTRO_CODENAME') in ['bookworm', 'trixie'] else 'fuse'}, \ libelf-dev:native, \ libcap-ng-dev:native, \ libpopt-dev:native, \