From patchwork Fri Apr 5 09:23:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 3477 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 05 Apr 2024 11:23:51 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f60.google.com (mail-wm1-f60.google.com [209.85.128.60]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 4359NpJ2001043 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 5 Apr 2024 11:23:51 +0200 Received: by mail-wm1-f60.google.com with SMTP id 5b1f17b1804b1-4147ddecd52sf10020235e9.0 for ; Fri, 05 Apr 2024 02:23:51 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1712309026; cv=pass; d=google.com; s=arc-20160816; b=zYaj0NtQxPFOSRIBGLpzjSp/gfudyXA7YhgGEkGu+bN3+dIvmKEQdCXhX1Z9kMvMmg S/F0Be4QxySVpOHrYiDV4TDJOFsSb5A7yoqHUUVDnz2iR4Kw0HFFmgxszLrqsJI5CZMr ou149BYMk/nhDt/0y4AqvRNdJiUd8obs3kSZs+NVZWqLzo6aFi0vlrdHORlypQlA+mUq 1F93VwUB9Y5EZiumxaEOL4vgCmVQxmCxFrWlVXjuEp5Hy9aaYyr3kt+s9uGOYwyFUBDY 18/rCkNhxyZQZbcsRZJ4VmEZeFyDSRyT1Z02H6YsRKNiJe4AKSA9B9yV5cOLZzcTmoH6 p5WQ== 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:mime-version:message-id:date :subject:to:from:sender:dkim-signature; bh=UPBwJoQc1B/9D/aLtvMtsW9LMWorATwqFXY2T1EvVMY=; fh=PwzFj0jpqKRB7uxa0JT0AmUDi/xp2QrbkEkYaRJbyWY=; b=Fm6OeLDdEADKgC1uXw4DlRItgOqCya3j4rZ52vu8Cpn7sRsVT3ZLmJNcrvQ5PHIOzj hRrwQ2IGFWafBIukhD+qPkLIbFrjHibQ7XSfXRpjiuFvBL7sYXt5FZQEPp9wTXT/JYut GXg3kvkaTcCw1dY7oTnT2sM7cKajiKtD3MK++masfdnLgfkFlDcVWU2IRvfRVAwphzzt yU5YM1gdOzzTix3K9rAEBao2tR/MC0khup5YVqbL61zMjAWGwbo+tGJcgDHNtjbzBT0Q UmmHPY1r41ADWARPkNEKznv0yo5/xRb2CrT/4Z8GcQyWMYYJ2SiQGpUnS/9v6/DoNMAx g3Hg==; darn=isar-build.org ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1712309026; x=1712913826; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:to:from :sender:from:to:cc:subject:date:message-id:reply-to; bh=UPBwJoQc1B/9D/aLtvMtsW9LMWorATwqFXY2T1EvVMY=; b=Lbic8vOHZeCL3ODlmkpPHfwhZ8G5qM5V8D2BgdL2UFOseOYIUrNGW0O3+PdGBAsFTx gG21dyOx+kbadyAzwHYU1CVOf1ZBTBhxO1KwK9W0eXXnCPLKemjG0eFTaTNRrNd3R2ej VeV59LaU2W8oIAmqS6GcXodXWjf8lR5tgo4I/D7uXOHlja4mbKt9hNl8zcK0HV7sBTdI eQ2VkHln5y4LxZSDzf8hH4CLVdiJjxxYvIJf4iWisJ4c0HjIBcHNZ6bqknUSMmcl7X/W iJL+R9DMH6E1VCkFU9NUN+Xk2lQ3/bOxN9lW8noHYN8rXyvCseuA8XnFaCzGXwcUQ1cJ NaLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712309026; x=1712913826; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:to:from:x-beenthere:x-gm-message-state :sender:from:to:cc:subject:date:message-id:reply-to; bh=UPBwJoQc1B/9D/aLtvMtsW9LMWorATwqFXY2T1EvVMY=; b=E7WT05KKvjlpiU7BWZdAznzhXW1dWDYBII1kuLFExVkyXZt1CoSiyMyO9Bil5nOiB6 Gmuk0OtMjuL1TlFKIlsmQjo+wj6z511BVeQCvAHRBa5rOI4n3OrQZTX6XjRGaOxozLRM bOgoXzWVr9zvyau6g7Gql6pTIRkZFjHKYmcj3M11qSYwO6vANFPYlujRzHO6llBkJtWH 8OsmYnfPO9KARpcvipIg8nm7icdjc/7sYjRsdLA4r0ulzUiwk6HQ4/E/6eVR+NZ93Rz2 5XQnp4obyv+XkJp+8bcF6zt8/1KypuBa0QPaq1WL/D/EClrrTtAd3rqe3GWsNltFMjm/ rc7A== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCU34uFmt5bHOzfBrZiNkb27RiIK06lcHC+E7QqpBwQ3cx3enSy1Uk1Qrr7hWQNkkEHHMkKrngVwJJtuiqoYmsxgCoLWsW8= X-Gm-Message-State: AOJu0YzwkraPMf43BkCmFcnnazGk5Fy/cUiWZcMeMWVxFVmoQbV3pwCm +IsZLx9sIE2tizU3xWpTo4phLjN9zfLOGRRnPsTSY6OvlqN0bZ6t X-Google-Smtp-Source: AGHT+IEjz5CStI9sLqXfJSRBXYdvpiTAr6uQBKjwjkzaFeD62t1FYhggrmJdhMJ8d/Ic1ka7omll0A== X-Received: by 2002:a05:600c:1d07:b0:416:2aed:1dc8 with SMTP id l7-20020a05600c1d0700b004162aed1dc8mr1111983wms.1.1712309023897; Fri, 05 Apr 2024 02:23:43 -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-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 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; 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 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, 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-Original-Sender: ubely@ilbers.de X-Original-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 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= 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}"