From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7354311262734385152 X-Received: by 2002:a05:600c:1550:b0:414:7bf0:973f with SMTP id f16-20020a05600c155000b004147bf0973fmr1682505wmg.9.1712309024026; Fri, 05 Apr 2024 02:23:44 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:5103:b0:414:8ac5:8ed with SMTP id o3-20020a05600c510300b004148ac508edls783610wms.2.-pod-prod-00-eu; Fri, 05 Apr 2024 02:23:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHoP+hkq+ae6rNF1ZsLWAv9D5JySUUAWK/m2VRYkpcwNQ4K2VglZuu1YmVCFIfL82aZnzJq X-Received: by 2002:a05:600c:4707:b0:416:2baf:60b0 with SMTP id v7-20020a05600c470700b004162baf60b0mr1079098wmo.12.1712309021646; Fri, 05 Apr 2024 02:23:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712309021; cv=none; d=google.com; s=arc-20160816; b=rhGFD5ygD1w3KzrZ9Akn4But17wvq7cRG5hWhX9lNzjrYyE7mZq+dJPz31VPzf3CED VdalYXx6MLPhdZhptGChkU6RvplV4tjBoHITdK5PDslZAyoD0t8/TH80neR8dtB0iFZt vvCEIpt5PWlKb1IVtIPjOrNL5A1DvM8ksHUQTSWq/8YAfVguCWFFzKVs1+FdFA5MWHtR RycXSDQ7wzOwMUlXTvSw9+qsqeXNAep+fpH77Bjhj3zZCbTL8k+0cCHxQ3mPicwWncQc xJRzq0HiW+3aJ9joufyDUILLkpkO1LLGinCgHxNTphj4bBau5CyGjMgz+DSfsYvFjhUG Q6ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from; bh=ndpiie1sykZeOtM8TaxynvuQtM8PkzGXvOKXyKG3dCw=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=LVBaHbTG0u5oq0MAa9NI0tGUokCDcPgiz0iV9RMlVyrNJc1lpAr6CNMOo0SBrCfGfw d2k3outIip/ypKnNZJBMkWkcJ8AakwVgGHgwiiNtNG/OZyCkSSWLK1U0/LF22UX6C9lI PmqQnEc9Sa1iMkWglGWb4+C7IL8BZ/axSWGQPglTwSQqyDmVVEY5VrVUJ59tbLCeNBms tx77ykTAu3eCfaqXGUYCcy0mLs6Q7AuJ2+9asBWhmRhl443T53VRrfEBa+pdKJBfbLtQ e6stQABIHaPFN/dQj9wr+HMmJ0xSpL8Jo5VbAe82pMjSSoTuoCoY2qMGLtVwyFmneP/E Hcpg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id k15-20020adfe3cf000000b00341d0b35c8dsi43768wrm.4.2024.04.05.02.23.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 Apr 2024 02:23:41 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@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 ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from home.promwad.com (44-208-124-178-static.mgts.by [178.124.208.44] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 4359NeBv001031 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 5 Apr 2024 11:23:40 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH] meta-test: Fix building focal/jammy qemuamd64 isar-image-ci Date: Fri, 5 Apr 2024 12:23:14 +0300 Message-ID: <20240405092335.13096-1-ubely@ilbers.de> X-Mailer: git-send-email 2.43.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: 6xngPOylmPRi After commit "fix: package exceptions for distro versions" systemd bootloader changed default value from "systemd" to "systemd-boot-efi". This requires appropriate changes for ":focal" and ":jammy" to make isar-image-ci local redefinitions work again. This change is to be applied on top of the patch mentioned above. Signed-off-by: Uladzimir Bely --- meta-isar/conf/distro/ubuntu-common.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-isar/conf/distro/ubuntu-common.inc b/meta-isar/conf/distro/ubuntu-common.inc index 9d8a843b..70893481 100644 --- a/meta-isar/conf/distro/ubuntu-common.inc +++ b/meta-isar/conf/distro/ubuntu-common.inc @@ -32,3 +32,6 @@ IMAGE_PREINSTALL += "init" IMAGE_PREINSTALL += "initramfs-tools" IMAGER_INSTALL:wic += "python3-distutils" + +SYSTEMD_BOOTLOADER_INSTALL:focal = "systemd:${DISTRO_ARCH}" +SYSTEMD_BOOTLOADER_INSTALL:jammy = "systemd:${DISTRO_ARCH}" -- 2.43.2