From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7350590995099025408 X-Forwarded-Encrypted: i=2; AJvYcCW3j9oIsMD/Rys4TjPNyVKxraFmZj7zPd/WBkWNpwWCX0z7lOcRsWKn9XM1UczC3MYGy/kvU4ZzLEDxne0ueBJuO21tT6Fy7G8+mv8= X-Received: by 2002:a05:651c:b06:b0:2d6:d9cd:ac8c with SMTP id b6-20020a05651c0b0600b002d6d9cdac8cmr3706544ljr.43.1711443653105; Tue, 26 Mar 2024 02:00:53 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:9012:0:b0:2d6:8ed0:8243 with SMTP id h18-20020a2e9012000000b002d68ed08243ls542909ljg.2.-pod-prod-09-eu; Tue, 26 Mar 2024 02:00:51 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUQQN9BZB56MNxIFj0ovJD0SWqvXewHQlaQOTvlgGFxEEzfhKdf0Ua+9DE4aAXOeW9RuzifaFlSChRjZTadG6t6YCDdhS/OFkm7Md4= X-Google-Smtp-Source: AGHT+IHDtTCUNLvBV9P344bQaPA/zEYNwvH+FpHxU1s6MsZTU20PbiAWG1h/Pr4JrCTgPC4YxzZR X-Received: by 2002:a2e:8947:0:b0:2d4:7777:b7fb with SMTP id b7-20020a2e8947000000b002d47777b7fbmr6600593ljk.17.1711443650712; Tue, 26 Mar 2024 02:00:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711443650; cv=none; d=google.com; s=arc-20160816; b=Ujw8WDFMYMbkEd4gQhA3QrjoSwiV4FxHj69g6l4IMhv8J4Z7nZOJ/kRtj6a/rcX1+d NNDqfHwr9/3QuPtA9Wm+hYLAF5MbrGKVZZFgAIFlNiW+mVBNBS46vbchXMIAz5G6KXKQ DPMWS4lgRIRBdUYZYZDuZsAAN9TfXMqIpnClhyk0V+WgZVotzAfhbkyYBBi+WtZh+l+0 XLXzqbobwOEuLqNGlLSbTFY/YZH2WWYm+YrJdML46btAe1c8kylIDpXYowsD9dOD2olm o3V/M576eS93HqmCo/joPHRRGR8z1weMlQ/3vf57s11uvKozI2HsuH3uNmbtFdxWjzhT rfSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id; bh=jTYUvNApwU/QOwtnlTuFcNcPOmjpCf2jqvagb1kuHMc=; fh=dfO0NjVjyTQruOkT3Q6mAQ6TmztBymNk0anynDrrOuA=; b=N/MzJDp5HNwM9cQfYhvQiU2JEk1AD5Kx0u1N7jlBZMhWfv/IebcXx/0vv2tUsebOkU 5WbF/CfKGxPPTHaYOqzfBm/jpRKpxp/6chm0SwGZIrT0hXqw92UeP2J5SqI9Ndxeqc0M T/zQUZcFOTMnC5LKaCEhJtC2rjvLxeyi+mT9Tz+3Golc4BvPnBbkEx1F4tE/RKlCas/S 35YYNpF8wunHh0SbsIUk+YmlFex+NHL8tF4x5WLvGE3mgTM0TRTi16ngqg3OHhB+A26D IFyA4qRajk62dRgjh7BBefPL+/Ex+Ozkq1Cp47r3d+Lu/qQqmdvMfONraGdaiQXtPxwB JpKQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id ay10-20020a05600c1e0a00b00414903c21b5si35710wmb.0.2024.03.26.02.00.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 26 Mar 2024 02:00:50 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from [127.0.0.1] (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 42Q90lWI016861 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 26 Mar 2024 10:00:48 +0100 Message-ID: <4d34a006-413f-4bac-938f-529737371f6e@ilbers.de> Date: Tue, 26 Mar 2024 11:00:47 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 1/1] fix: trixie package exceptions Content-Language: en-US, ru-RU To: Adriaan Schmidt , isar-users@googlegroups.com References: <20240326084702.1796722-1-adriaan.schmidt@siemens.com> From: Anton Mikanovich In-Reply-To: <20240326084702.1796722-1-adriaan.schmidt@siemens.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED 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-TUID: Q4O07VFrjLCI 26/03/2024 10:47, 'Adriaan Schmidt' via isar-users wrote: > 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}" Maybe its better to make systemd-boot-efi to be default and set overrides for Buster and Bullseye? This will not require adding new overrides for the next releases and will be easier to track when removing Buster and Bullseye in the future. > > 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, \