From patchwork Mon Jun 29 09:46:19 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 5201 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 29 Jun 2026 11:46:47 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f64.google.com (mail-wm1-f64.google.com [209.85.128.64]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 65T9kkKr023690 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 29 Jun 2026 11:46:46 +0200 Received: by mail-wm1-f64.google.com with SMTP id 5b1f17b1804b1-49246459bc4sf23011075e9.2 for ; Mon, 29 Jun 2026 02:46:46 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1782726398; cv=pass; d=google.com; s=arc-20260327; b=hln8TUon8mZj8anwz5e7wahBRghbeUX9ef+B1wos/FFUllalL32pXe1crRAretcMWa PlEQKhwGhaaJl7DbSqEMVJb+gjPJ0ro1fGUsvsxS3i2hSQv30Znk/NwIqU41AT8xTlbo 3p497sEl9g/PnAxma/mLdkAKCI9ykc9FNhFmy/t9S4Fv+IF0rqGkMPK0GGmxw1/7gz9x h/pkEXRDjPo7b4thFUe9+hQlkCvz0M9GYg4d3vLmf2C/O7BIAmt61CqENNfNzD8Ncmqc ooiAMNTPimHwBiPOo27PJnH/DfuZvCu2iemUahjutgVeLAHTgdm+OQ7FCjuxSKMoDIG4 Tbhg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=p6wUhS4dqNrFndNayoJnz2MFpbU9o0kH0JyiCDAm8S8=; fh=fDM1cEg/3Oe8PnRyjwAJWcDlnyzzBcFtAuM233Sii9Q=; b=XZHpT3YM1xvrjAfZVUOe5trVUey21q9lXatF+5RR9zskeSunYLe4a4qvNH8JPNe8Si 1nBZpHmlFm96kM/zG1dSRBfzoC/WIppj+hfEUjpJsXZijdnxMDIT2rjgmI3iQfFLfRYY Wb5JFxjqNfXj15UYlxtL8o/3nXSC5phBl7iy2jntroxAxHTHeNy4vsFAN2O1jYDnF1k7 HZLlM49QDkVKi0aAmD4xX+CBoKUvo/Nv+qnOHH78WRT4Nhq0z2euUPeWksGL6BwVf+Bc gQwgTExhUu7uSpIppa94aJ81d8qi3EGICfEgJZz34CQFbEMZu99d3VbCI4uFbeVqpfx5 1WhA==; darn=isar-build.org ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20251104; t=1782726398; x=1783331198; 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:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=p6wUhS4dqNrFndNayoJnz2MFpbU9o0kH0JyiCDAm8S8=; b=l7sffMk8Nq/4+T9bXlH5h2foMzd+AGcdm3FpT2aZrHINwYDOyBOc8xJfuycf3iUnEU jk4s6ZXxeFl7iCHU2w6eUuIECCGX+OQlW23tVwJjNYHCWCfm0YaDra6bs83JlvHyhlW1 rMDCJmm2Wn1TbVgUpIjrhd57v0p7jarxDQKHNGpcHjVJa7jLwU8anFDqV4XhT5aD+8j4 c7VMetJQZP4Usxdbwrkqlr4ya2iwSJw/0r85iFpmCfrhJ5ybukWAHIt3MsG0yNnhyFHB N4Y3yWIHl0CrWqd5SLbwiakOVljTZ0WJMc3XbLkSNtjNclVNLKJAUsTz2xNiyF+/YUAg YrdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782726398; x=1783331198; 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 :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=p6wUhS4dqNrFndNayoJnz2MFpbU9o0kH0JyiCDAm8S8=; b=Fx8974+YhnzWkDJHHDn056btLNoLGr/OgEsbj8ZMHMxPdmd+AMsVtKrf31muOByKUc S794BGBiBf4p2fXXV6Ty/NXXkJKQVttgY4VZBgRC3vAE/uM6WNRsdWUsVnq3/hgmy/KG kk/YufEBIxXewxRq6yjOUVL0wfLB+Irss7p4hJ78gaymVH/wkfmiOoh686sVvQQ6y2Mr v7n3mSwpXmqUP1vr2tLgChMK+pETt9APZlW3VZUlnH6uKqXZTLFD9ihryojzb+eN8LEz VuUFcIsYfymUP1Rbw8xeh8R0qmPe8BrEIwAbmCNhN26YyM0hoQfLxBS0W6h7vmm3FY6M r43g== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AFNElJ9gHbYoHi8cyu/ly96jceEC2dDuFG3bKXoFR43ieQv3vIWt0+fsLawvrCZHCeOWVYg5bHR5L9U=@isar-build.org X-Gm-Message-State: AOJu0YyIDJyaABFeM0i6rfaTX4TcqC4R2icKfQFdvMc/zgVltMlOv3Xc eVLE83PbC9F/eG/lg3bMa6GGq3Ni+gk99LeIg1zd2aVMjFs+ntuHBZTX X-Received: by 2002:a05:600c:8119:b0:492:488c:f630 with SMTP id 5b1f17b1804b1-493b71d7d9dmr57085e9.34.1782726398259; Mon, 29 Jun 2026 02:46:38 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="AX0PUUdNf7uV9kV6G3Ov2pCpFCjLHCj5Dc487nek4hqSsG4IJw==" Received: by 2002:a05:600c:3b28:b0:490:3dcb:31d9 with SMTP id 5b1f17b1804b1-49237e3a1cels102297295e9.2.-pod-prod-03-eu; Mon, 29 Jun 2026 02:46:36 -0700 (PDT) X-Received: by 2002:a05:600c:37ca:b0:492:7015:bced with SMTP id 5b1f17b1804b1-493b71c061bmr198435e9.18.1782726396417; Mon, 29 Jun 2026 02:46:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1782726396; cv=none; d=google.com; s=arc-20260327; b=nH2nna8ZQKNCP/KQZF4+kSAbyBBMS3rqsqO4NCiP7YEdLSsg6KY77j/XPZ1ImpP6xN uR39jYUioc1eA9/mts19KgPUuIZ2pHVxsToLciDLQiFERNH3y8z3sK/Ol2LTGrFYnQVO suYFVwshSOo6fO/2Mjd1RGLSMcOxmleyvfTSMfKyYtWHgnqr8rbGpa8GUA6LgS41DMVx 3sou67po1uq2n6pVGLJD6CLmcSX8dYTZcFQc95ImN8fnasZvGHmZatL4D9y0ihYHhFv6 aOs9L6Uw7XXfhdEDM9lOqqwKskt9pQJFTaCyRCazxIAtXCaQ9ZDEQ4sILyOAdaIxzOOD vwDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=W3eIUde+C+d+xm87J/jlHGOg3AN9bMz4d7rB2T1v/MU=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=N1bLN6m4nJU2xRuhcAJUXfKJMEhmQh8Fs9L/jAujjWqFRHQVyFwxi1meH5MDhrzzwi nTtB/PMlnnXWoRXBhBP3sr4v4xmLiqbLDGMil6LSWXbBQ2rMtbtfbtywaoRha2J33Dit TB5h5am46tmfH3Ga3/sJZv9OYumRg6vbdDvb0fZPRZO98yOJEL5R3OwwSWmJNvYx8XjN 15vTs2LEOdD+klwGuKAfuJbpFyy5FdpfxkwT6z/+7gSmF3pcEW3cB20+zOucJxbzYg3o qx7hBdwinFHTjeR6YH1xZRauURApM2I8vP0YlWmMUCpoP6008hFYYux3oWzlB/GrBi0o Ti8Q==; 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 Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-4926c28c358si1177725e9.2.2026.06.29.02.46.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 29 Jun 2026 02:46:36 -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; Received: from user-B660.promwad.corp ([159.148.83.123]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 65T9kVVA023553 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 29 Jun 2026 11:46:35 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v2 06/11] trixie: Split missing drivers hook recipes Date: Mon, 29 Jun 2026 12:46:19 +0300 Message-Id: <20260629094624.855927-7-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260629094624.855927-1-amikan@ilbers.de> References: <20260629094624.855927-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_RP_CERTIFIED,RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,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: amikan@ilbers.de X-Original-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 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?= Because missing driver is different for different machines, recipe metadata is also different. It results in running several instances of the recipe build in the same workdir for multiconfig setup. Split it into 2 separate recipes with different names (and workdirs). Fixes: f4cbcd7b ("trixie: Workaround with missing drivers in initramfs") Signed-off-by: Anton Mikanovich --- meta-isar/conf/multiconfig/bananapi-trixie.conf | 7 +++++-- meta-isar/conf/multiconfig/nanopi-neo-trixie.conf | 8 ++++++-- meta-isar/conf/multiconfig/qemuarm-trixie.conf | 3 ++- ...rixie-armhf-hook_0.1.bb => initramfs-missing-hook.inc} | 6 +++--- .../initramfs-sunxi-mmc-hook_0.2.bb | 8 ++++++++ .../initramfs-virtio-blk-hook_0.2.bb | 8 ++++++++ 6 files changed, 32 insertions(+), 8 deletions(-) rename meta-isar/recipes-initramfs/initramfs-trixie-armhf-hook/{initramfs-trixie-armhf-hook_0.1.bb => initramfs-missing-hook.inc} (92%) create mode 100644 meta-isar/recipes-initramfs/initramfs-trixie-armhf-hook/initramfs-sunxi-mmc-hook_0.2.bb create mode 100644 meta-isar/recipes-initramfs/initramfs-trixie-armhf-hook/initramfs-virtio-blk-hook_0.2.bb diff --git a/meta-isar/conf/multiconfig/bananapi-trixie.conf b/meta-isar/conf/multiconfig/bananapi-trixie.conf index c2a9c667..400900b6 100644 --- a/meta-isar/conf/multiconfig/bananapi-trixie.conf +++ b/meta-isar/conf/multiconfig/bananapi-trixie.conf @@ -1,7 +1,10 @@ # This software is a part of Isar. -# Copyright (C) 2025 ilbers GmbH +# Copyright (C) 2025-2026 ilbers GmbH +# +# SPDX-License-Identifier: MIT MACHINE ?= "bananapi" DISTRO ?= "debian-trixie" -IMAGE_INSTALL += "initramfs-trixie-armhf-hook" +# Workaround for missing drivers +IMAGE_INSTALL += "initramfs-sunxi-mmc-hook" diff --git a/meta-isar/conf/multiconfig/nanopi-neo-trixie.conf b/meta-isar/conf/multiconfig/nanopi-neo-trixie.conf index ee53e68d..e283c635 100644 --- a/meta-isar/conf/multiconfig/nanopi-neo-trixie.conf +++ b/meta-isar/conf/multiconfig/nanopi-neo-trixie.conf @@ -1,7 +1,11 @@ -# This software is a part of ISAR. +# This software is a part of Isar. # Copyright (C) 2025 Siemens AG +# Copyright (C) 2026 ilbers GmbH +# +# SPDX-License-Identifier: MIT MACHINE ?= "nanopi-neo" DISTRO ?= "debian-trixie" -IMAGE_INSTALL += "initramfs-trixie-armhf-hook" +# Workaround for missing drivers +IMAGE_INSTALL += "initramfs-sunxi-mmc-hook" diff --git a/meta-isar/conf/multiconfig/qemuarm-trixie.conf b/meta-isar/conf/multiconfig/qemuarm-trixie.conf index 5ec903a5..ba93774c 100644 --- a/meta-isar/conf/multiconfig/qemuarm-trixie.conf +++ b/meta-isar/conf/multiconfig/qemuarm-trixie.conf @@ -6,4 +6,5 @@ MACHINE ?= "qemuarm" DISTRO ?= "debian-trixie" -IMAGE_INSTALL += "initramfs-trixie-armhf-hook" +# Workaround for missing drivers +IMAGE_INSTALL += "initramfs-virtio-blk-hook" diff --git a/meta-isar/recipes-initramfs/initramfs-trixie-armhf-hook/initramfs-trixie-armhf-hook_0.1.bb b/meta-isar/recipes-initramfs/initramfs-trixie-armhf-hook/initramfs-missing-hook.inc similarity index 92% rename from meta-isar/recipes-initramfs/initramfs-trixie-armhf-hook/initramfs-trixie-armhf-hook_0.1.bb rename to meta-isar/recipes-initramfs/initramfs-trixie-armhf-hook/initramfs-missing-hook.inc index b0e4e697..2b15f1ee 100644 --- a/meta-isar/recipes-initramfs/initramfs-trixie-armhf-hook/initramfs-trixie-armhf-hook_0.1.bb +++ b/meta-isar/recipes-initramfs/initramfs-trixie-armhf-hook/initramfs-missing-hook.inc @@ -58,6 +58,6 @@ inherit initramfs-hook # initramfs-tools. # ----------------------------------------------------------------------------- -HOOK_ADD_MODULES:append:qemuarm:debian-trixie = "virtio-blk" -HOOK_ADD_MODULES:append:bananapi:debian-trixie = "sunxi_mmc" -HOOK_ADD_MODULES:append:nanopi-neo:debian-trixie = "sunxi_mmc" +MISSING_DRIVER ?= "" + +HOOK_ADD_MODULES:append = "${MISSING_DRIVER}" diff --git a/meta-isar/recipes-initramfs/initramfs-trixie-armhf-hook/initramfs-sunxi-mmc-hook_0.2.bb b/meta-isar/recipes-initramfs/initramfs-trixie-armhf-hook/initramfs-sunxi-mmc-hook_0.2.bb new file mode 100644 index 00000000..afcc2cca --- /dev/null +++ b/meta-isar/recipes-initramfs/initramfs-trixie-armhf-hook/initramfs-sunxi-mmc-hook_0.2.bb @@ -0,0 +1,8 @@ +# This software is a part of Isar. +# Copyright (C) 2026 ilbers GmbH +# +# SPDX-License-Identifier: MIT + +require initramfs-missing-hook.inc + +MISSING_DRIVER = "sunxi_mmc" diff --git a/meta-isar/recipes-initramfs/initramfs-trixie-armhf-hook/initramfs-virtio-blk-hook_0.2.bb b/meta-isar/recipes-initramfs/initramfs-trixie-armhf-hook/initramfs-virtio-blk-hook_0.2.bb new file mode 100644 index 00000000..1d6d48f1 --- /dev/null +++ b/meta-isar/recipes-initramfs/initramfs-trixie-armhf-hook/initramfs-virtio-blk-hook_0.2.bb @@ -0,0 +1,8 @@ +# This software is a part of Isar. +# Copyright (C) 2026 ilbers GmbH +# +# SPDX-License-Identifier: MIT + +require initramfs-missing-hook.inc + +MISSING_DRIVER = "virtio_blk"