From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 18 Feb 2025 07:48:23 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f56.google.com (mail-wm1-f56.google.com [209.85.128.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 51I6mNHJ026804 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 18 Feb 2025 07:48:23 +0100 Received: by mail-wm1-f56.google.com with SMTP id 5b1f17b1804b1-439858c5911sf8315455e9.2 for ; Mon, 17 Feb 2025 22:48:23 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1739861298; cv=pass; d=google.com; s=arc-20240605; b=ILvdHmOIJhXqgNwJkUGpCIGS6//fim4NGJX4jK4PTOZpPpBvS/+E4senxSp5VGfUY3 7GaVDUE2FMGFmmfkXxZJY5YjntCWHU2N2Uc6X5u6NKJjhV3tFk+Tx0/PZrRJ5jO4rDKy uBtm6qKERJ+IIajFZvKroANBJnox/uISCpYuO9E7bxOtPL0TOBDHODr9hBRf4sH1MIfl Lms4/UqNgONtdBGJhU5XTdL7230P9E90HHu8giZFEW+oJFwm99cieIwFF86lkzOQj14z EnfVI09VkCyGJC/JpzP6u0hoO5mBPj2KGrvdrPVj95/IaoC4a97OBVBQ3uszsvMis25l SwxQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:user-agent :content-transfer-encoding:autocrypt:references:in-reply-to:date:to :from:subject:message-id:sender:dkim-signature; bh=LXiaNNs3mI/yGDkSK70fMr9+IyTRFNfF7scpkozez5c=; fh=x6pZOzdUHdeOQPcV8tCqy0IQrH9Yh3LC5V7t2tS6LZ4=; b=hnEIO202Xq9Sp72WFSixONJoQKi2+/d0HgQoLY63FqOcAvjkmmSEmC58nKCnqkxEMC V+V/JSmZiJmvbQGI/+jzpYzNCBUWOB9O4dBgd3pmg29cxmI8pGvfDHvueO7BmhhVHa3g vP981B0P30//A0lhyRKvz/TGb3/p+w9jK4Y7kEsGEmDKeTt6y31H0y94yapiNeK7ztft Vj7WONC1FxlRSjNYSEV/ubZYhKaXkWmJ+/4zAyJNq+oPtj+b15oqSdMIWHYQnBCiOBcA bOGyxGO+V+RPYJBcuOLo+RLH9ioyNunCa5192mqmcokOrty+kSpZ+mtwFO8VMJxHwLSb JUEQ==; darn=ilbers.de 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=1739861298; x=1740466098; darn=ilbers.de; 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:user-agent:content-transfer-encoding :autocrypt:references:in-reply-to:date:to:from:subject:message-id :sender:from:to:cc:subject:date:message-id:reply-to; bh=LXiaNNs3mI/yGDkSK70fMr9+IyTRFNfF7scpkozez5c=; b=PBazaX/dFHtK1MxaQB/h6sbn8GiUmNYVr50JdglL/5ogN7L0/J5ptAGMBgOjqGofCe uiIjuHNV0g7OgAfTYJ9mw7NGDc6oh4gZaL6lqEovow62VhOGRFd6hsf+R0UjY1XlBB0+ loloGx3ksjTY+MWdgFQa6zGULJR2ye97DlTRaePn+ZEhihnejmXbD7gEli0wtadwhgxY bRHMJ/ouZGQpN/4IoMdC5cRqo+k3K5xOeEMXenuscgaCBGMbGylWnE4riJpl8oWvSDsJ jyzwQ4Ef0NyAU/1L6dqsWokdZG7aJPaV6dSV3rcRLonnH7fv+03IM2jpIdbc+QXJNTX+ TOZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739861298; x=1740466098; 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 :user-agent:content-transfer-encoding:autocrypt:references :in-reply-to:date:to:from:subject:message-id:x-beenthere :x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=LXiaNNs3mI/yGDkSK70fMr9+IyTRFNfF7scpkozez5c=; b=VqjRzNbVbSqm3eDUgwZ2Q0QJ7f6WcVw9azfRW5OSEcbs1A+0vMazkq1AZor0/i+Omq ipTV65dbL+DCja/eXkBAc0h80CVpsh4yBWMnSw51gOm3SVY9u8lPJ82/W3Zph/+lJtBs 1+PkZEiJPxPj4B6ZVs5icKyJcNkiY7qXdnxcC/R0gbiVOxcGMBMizdqGRAfSYfJ5DQHA sq03Im4a5sbq8f1nA9B7qztq95vXBjlGIJO5czG+oP0x3OtCnUcyJ8IrPi92OsJeVwoe ZQkJGy48RSHDVrqOktjpA8ZetidNnf7JDEjqZEvHJghgCSLrZRDMFnLJQ0THctICCRTo e1fw== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCV+LMPVS7xmqkaGtaxm7xam03mEGIKZuzVrEBdKTpBag47QZXavJ6TE57qv5Kn0kmvOKF5W@ilbers.de X-Gm-Message-State: AOJu0YzqvY0YPH8FndlfM5c1b2TXdBMmdiWbaumVggdbNVhwduJLp1yJ xAfUP8UkW+zm1SXwFjS1tNymrdYi7AeCqI8Dwi9WHIWtFMKVtfGH X-Google-Smtp-Source: AGHT+IFiKEIqnkQLnMHRYijJIKWfPAQi1NCZhHFZZhZgvlPfMJUoq2ZGs9FahsQ6Fg7KKJPqAjJEUQ== X-Received: by 2002:a05:600c:1989:b0:439:873a:111b with SMTP id 5b1f17b1804b1-439873a1363mr48938175e9.12.1739861296440; Mon, 17 Feb 2025 22:48:16 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h=Adn5yVEhmFgjaewsZVt37qvmn+oS4CiRV5AGKRQdeIhkJkpAAw== Received: by 2002:a05:600c:2212:b0:436:faf1:9bc with SMTP id 5b1f17b1804b1-439603bb8d8ls3803405e9.1.-pod-prod-08-eu; Mon, 17 Feb 2025 22:48:14 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVKJnz/O5B1tq3kReXHFKv4RctwfAM4B+hgadMY4Ncn5foseRXozVwgSaiYa5tfjNAImYlAyVi8hidk@googlegroups.com X-Received: by 2002:a5d:598c:0:b0:38d:c2d4:2399 with SMTP id ffacd0b85a97d-38f33f53463mr13520021f8f.41.1739861293885; Mon, 17 Feb 2025 22:48:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1739861293; cv=none; d=google.com; s=arc-20240605; b=Qt51RyAUfH4T6ChNGhIA3rzglRwru1DcGm8oi7h/U5eKpxhGMcwbGjOKFlTaD0CnBi xqtnvNoU8CcZjpk76a4tl6nnxtTbSRXmQCWccz9uS0UMYVIxbSZ3Of8AIdVjruaVoOu0 DzoNeyQPAKRty1bUksWE75xSdISKGrQRnxcKBShLBz5LAje2Yi572GdYzkqWJxf/tdsn wx17HDyyRQqE9yCgDobEL9IrQ3EqJxuXgBDdzpvwVys4iWxsRl0uaOyKjJIczVMMYbHC xypt0Bt+sIey9Lou2FY3s/gzbqT8JLWuo2HnZvgzKS/PPAwN+5v0z5zGZYzsTUxCK3RY AbiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=mime-version:user-agent:content-transfer-encoding:autocrypt :references:in-reply-to:date:to:from:subject:message-id; bh=yr4n4iRKRDQ3aAPAxVIKTqL8LZgs8xcPHuTscLWdtR4=; fh=IxbeHM4vWxalf1XNf2rnGcQL+r1v0Lr0C6ICsGNNkYw=; b=DUFlpl+fRaQFwNVhKqQ7Npn0x7n5MZriTiL9IBUjsltixtzJSC8/9/ukF0ko5l2Z6s Xs4gosCCEgcnkiL6bxfarF3d5ye36CNF+DuTfVirbIJLof3GglkGDQDRDKpT/y7haKME pLG9N1AldRi4lEq8Wpi0L7Fu3bAXx+U+CsGnQrLuednEsjsjehdF1eJngGGKExbKpfQD OXJ+MwfukvuMDmAd/AD3lPnUAX1zMQJWXEm4fU/kBurVwz4Rvvtles8/4CALg8pevwrs FsqKDbYTd/YITtt3VSbhhq1xufQKuxPmo7TKWlg6P3NzNT4oOgTKWh2kFQp/23gSudsD Gu3w==; 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 ffacd0b85a97d-38f2589a46fsi138447f8f.2.2025.02.17.22.48.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 17 Feb 2025 22:48:13 -0800 (PST) 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 [IPv6:::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 51I6mB8p026796 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 18 Feb 2025 07:48:12 +0100 Message-ID: Subject: Re: [PATCH] image: Account for differences with mmdebstrap From: Uladzimir Bely To: Jan Kiszka , isar-users Date: Tue, 18 Feb 2025 09:48:11 +0300 In-Reply-To: References: Autocrypt: addr=ubely@ilbers.de; prefer-encrypt=mutual; keydata=mQENBGO2eUkBCACtT+T3OrPVSExBmqfgXT3lp9XcdxRzjYp26wezkgYjjBXaf36bxtaAf S471VoQtpar0RVeFfW7WDDdfX9ZclSj36zBQe+RVSJzoNoNQfjOXWuSHb5Z+cpAFtqBY4muxK4+ia IlLJd6CN3ejOsLHATtCeHHq8wi0z2T+KdLQO+wQRgo2hjj0Lp9pGTrKJry50HP/o7Vbdu14dOx2xq r8+wPc6SQbBIrcqaa4MqCQC00vQG7eXvo+k2MOw59FDdpMH0KR9mHgp3u/s4I+4YRBArukt9G9xz/ rsEFmxAIBC6N/a6Hzwg4puc91n7ABDsPg8Vp+X3MDraujN0dvR6OKVNtABEBAAG0IFVsYWR6aW1pc iBCZWx5IDx1YmVseUBpbGJlcnMuZGU+iQFOBBMBCAA4FiEEJqPNVhVGyk12Eh+PAUQYBM/2FkoFAm O2eUkCGwMFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQAUQYBM/2FkprlAgAmuna8Hm9EyoEtTl DBGDg6Zm4ZLp5ffvZBE946h92jepDrteoxsJ7pSzJVC2HmDLa4iZUao7lLLbDsUj5x45/iLJcqBZK k3YnAxP2r6a+kI+1VVQY1pxdG1nlJAbdNzoojm/qmezNPSrqni61KVMQKsXBCWhIjSXDSM9CsBj21 a+9qaVqfxovJGTn9lgrZO+xzKQNMKZeOouJlscVuFj21P0ww3/YENiU/nMeTSuYypO76mDtAd08Jo nc3yuHa9MJGei5ixN3wT+IrGR2aL2hdw2M6NgH7sYbL2Zi4ugD6RXHJai1Bh2yvFSVqSQ+M6QOInT 4ud7wslm1XRB065dXtA== Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.54.3 (by Flathub.org) 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: 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-TUID: bt+1gT6Ikh/C On Mon, 2025-02-10 at 13:49 +0100, 'Jan Kiszka' via isar-users wrote: > From: Jan Kiszka >=20 > Only legacy debootstrap needed moving of sources-list. With > mmdebstrap, > we are now creating the list twice, and apt will complain about that > on > the target. >=20 > Furthermore, the cleaning prior to installing custom lists needs to > take > the different filenames with mmdebstrap into account. >=20 > Fixes: d0fd18ef87d2 ("meta: Allow selecting bootstrap providers") > Signed-off-by: Jan Kiszka > --- >=20 > Please double-check, I didn't test the custom lists path. >=20 > =C2=A0meta/classes/image.bbclass | 8 ++++++-- > =C2=A01 file changed, 6 insertions(+), 2 deletions(-) >=20 > diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass > index 49861b75..56eca202 100644 > --- a/meta/classes/image.bbclass > +++ b/meta/classes/image.bbclass > @@ -416,12 +416,16 @@ do_rootfs_finalize() { > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0 -maxdepth 1 -name 'qemu-*-static' -type f -delete > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 fi > =C2=A0 > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if [ -e "${ROOTFSDIR}/etc/apt= /sources-list" ] && [ -d > "${ROOTFSDIR}/etc/apt/sources.list.d" ]; then > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 # needed only for debootstrap= , mmdebstrap leave a > 0000bootstrap.list behind > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if [ -e "${ROOTFSDIR}/etc/apt= /sources-list" ] && \ > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 [ -d "${ROO= TFSDIR}/etc/apt/sources.list.d" ] && \ > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 [ -z "$(fin= d ${ROOTFSDIR}/etc/apt/sources.list.d - > mindepth 1)" ]; then > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 = mv "${ROOTFSDIR}/etc/apt/sources-list" \ > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0 "${ROOTFSDIR}/etc/apt/sources.list.d/bootstrap.lis= t" > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 fi > + > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if [ -n "${IMAGE_LISTS}"= ]; then > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 rm -f > "${ROOTFSDIR}/etc/apt/sources.list.d/bootstrap.list" > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 find = "${ROOTFSDIR}/etc/apt/sources.list.d/" ! -type d - > exec rm -f {} \; > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 = for l in ${IMAGE_LISTS}; do > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0 cp "${WORKDIR}"/${l} > "${ROOTFSDIR}/etc/apt/sources.list.d/" > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 = done > --=20 > 2.43.0 >=20 Applied to next, thanks. --=20 Best regards, Uladzimir. --=20 You received this message because you are subscribed to the Google Groups "= isar-users" group. To unsubscribe from this group and stop receiving emails from it, send an e= mail to isar-users+unsubscribe@googlegroups.com. To view this discussion visit https://groups.google.com/d/msgid/isar-users/= af3abe28090c1873b0fb8efc1e46e986a78a6586.camel%40ilbers.de.