From patchwork Fri Jun 14 11:34:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 3612 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 14 Jun 2024 13:34:51 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f187.google.com (mail-lj1-f187.google.com [209.85.208.187]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 45EBYoDf032156 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 14 Jun 2024 13:34:50 +0200 Received: by mail-lj1-f187.google.com with SMTP id 38308e7fff4ca-2ebd962eb88sf2257311fa.3 for ; Fri, 14 Jun 2024 04:34:50 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1718364882; cv=pass; d=google.com; s=arc-20160816; b=sk7mzaUA8ChQO8lixnce9N/sWjJJ89hrOJri0E2BNO0W+R7OUzlYnDere9gdCsx2Ll BM5vEcSIqZOJHE36l3+XXwTdvrbDn3p/E4eHKQC7Ab6c/jjGzRqH82q4noH/XTQygPtL jNAGHqccVx5n/P0iNUD2JXLvRCP6DBEwtDgKhTnrhvPeK2Fon3Z1h4rqPpyiRDkr09nm OjfosdkjV4eh3qErmGNl6iFL3BTrCfx4PUUSNfUU6pHFFH86o77wid8geKj/vRObRkeb rW7aksFxaD9kz42fMo/6qgeiUhtRuTn7bKqVdqSVPpWnGeXp6pJYZ27ca8nCvJBUi+zb Wm8w== 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:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=dKBk9d0jGzcoB8yi61SgQTXWfj7gpVPEcCokmdM+Obo=; fh=XLaVIgjAG4L9gSPDwHmINZqGyKNelhk/UTUaMTnNESI=; b=AK+y4ZCkkH59n4aDGyfV911kpHFGAnLIuoRqB75H80GIqVNpgjtMOstzci16vyLpzO isRp8WEVTRyLzfKVhMTIbyu06p5GdlHBpSMN6G4qc0kBZda6OO9MT0SeSB4rc7c0mOtQ EBfH4T/2Z/J3Q0aptLYzjmwI3wRQt0wviNjMjzHcpRndXSsGi7UiugER8I5M5ZyZEAye UwqFciaCJOKnUPVNkDmrl7UhmjXaIKoWascb725EmIrh9JMLh0nGSg4kuv1yptsH3cug rSzLF/FBuW+WMCOP9q3cjzRHncp4FNOJUWdXPFczIeCnVkS4oyAa7CYcMqWEHtcYTn4K b1Ew==; 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=20230601; t=1718364882; x=1718969682; 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=dKBk9d0jGzcoB8yi61SgQTXWfj7gpVPEcCokmdM+Obo=; b=HUrQJHaVpNJR9JTGfpquR3CHQbHTAMYz+Nkk5BFTLtz/aQID2Ttxo6rvpXAFWa1nh2 JbdJ/J8l4OS3fEJZKPqyijyNX5NwUoMBH50ml4Q7uRLf5H8VRAnpIZQkggj0lCqgacyl SVzbqi7oweTEizYq6Gh8WhhnUmW6iMwpTXgvnMLSgfwilDudkZTyC5siH9rNlwW9nzVx g60dm/wS6o9DB15In1WfqydPsjJGZ5AyDFDEhmMW3IrBo6RGrqGOikH+jBCIxEe5shvt If17yuz78YZI7CK5GqJgEKAK58hTVmO9oW1GIU7aysK4Zo3xFPZL1goeptNTMRUfBc4/ 13wA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718364882; x=1718969682; 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=dKBk9d0jGzcoB8yi61SgQTXWfj7gpVPEcCokmdM+Obo=; b=ppWVqwQthjotEFHzPdRMGshbhvOZgQHzTCipC/EYR1+pxj1toUQYEyfuR9u2envj2i KMznvSrbLwx2nJ6E24MHh2jNzjDXSN45vrd76LKhmVHPyYlTVzh+ah9SlQaPeDybvicq 6TNda/hWxaPRp4Vo33C1oLHYYFiDBu78HZFLr+32TGboGYWYx+xX1Kis6DQ65WD/1cqN 4f5w9dXUYwOaUUz3SDGaLuI0kOGNCO815p+7VWpvBCEuGsibJq8lF2mxYQDjM0STy1OR p4LkSSIaREydbwQ+ML+zr5ZT3t1/6llbIF9mPNkdG9Lcg+TFJPBqj3J56W7rFtWWXEM+ XI0A== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCXT5yGX2xoFVCAzB4At0/HN+TGLD6vJlM9QMKrM4etOiXfBwrnEqo73URPDGRcU/OiNNbeF8OFWrUnMuFZ77xpnBEoGKqI= X-Gm-Message-State: AOJu0YzyIeHeaRpJ0QQjrV2DT2dtU2FfwbR0dMtGxlL5cdHNtRlgPW7V qNRYePxtmJce4QDscGDSe4Nmj7O7sQxCy1Uy5eWh0B+zTa/E105+ X-Google-Smtp-Source: AGHT+IG6BlABYcID3KsjkZCvYkSmB6+UCyN/ULXfoIS/TnXclIgk7gcjHmUPaY7Y5o0lSz1xPqbwFg== X-Received: by 2002:ac2:5ec9:0:b0:52b:bde6:2dba with SMTP id 2adb3069b0e04-52ca6ec43dfmr1261349e87.6.1718364881176; Fri, 14 Jun 2024 04:34:41 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:4506:b0:422:27b5:8477 with SMTP id 5b1f17b1804b1-422b8ca9598ls9563645e9.2.-pod-prod-07-eu; Fri, 14 Jun 2024 04:34:39 -0700 (PDT) X-Received: by 2002:a05:600c:5251:b0:421:c211:a57e with SMTP id 5b1f17b1804b1-4230485a5c6mr21828295e9.35.1718364879259; Fri, 14 Jun 2024 04:34:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718364879; cv=none; d=google.com; s=arc-20160816; b=g9evURf8i7NsAQPza7um3qp9G6B8DhYcW1/Kmg4qxYjwbsIKS8rdKY3LTM40gW1Pgg 2iG8GbBrqosxnYRHC56LbGv3OauGnrvk+a/asR22MZm2tXEix4PxWltGOnBSnPjSUSPc ECIyMxDxXrVZle4yk5Zcl5s2RXAz9Syq56kPis+Xc1rdBVwjf00+qj0w1feubJ6KdEoA eIjZMJwRWC/xxQMajvrsybk3qfLTgETizZKzgNouKD1ZIqhGAA7VNnxDznOHz3W5VL4x zdU+9B/Pg5q7qSFinC5BqHjTjXsw+o0PdDLeBYyrWR/+NaXQB3uFYpejkBtydGxhvDuZ LlZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=3Lz6cPDKcV5Rgf80zj6VnfUs8knvXQN69JfYYVHa8yY=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=uxsNNaRsVwaqQF1mDWqzIADnR2jz3LpPnaXQqKg3fkFhS7W0OOLwDwYMy34YkKnabg hkaKC48AXFkI2RnGS0Mv0dqKI004pX63BEjXvKqlJkN6KfRyPfrvD8LbbgaX2tHmu1P1 IcoWXKRZcnQyxDx2AbladzLxlofo+NiHhctgCW/TRf+f+2g2BuWVkCSDrz6WzSpq5Qr0 EXnVLFQdQcnTaOz67uKpCqHSeFsW5pgtZVLlfxEUiosl4gS6wKyrbL39YN97+C4cbBcy 1MqeAjtWhR3p3NJAsuYkZXY3mmmXHmkrcRrldWxbgSWwd6RVDXf18M6pGYx3g0OGaVDb 4ppA==; 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-422874def6bsi1185675e9.2.2024.06.14.04.34.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 14 Jun 2024 04:34:39 -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 localhost.localdomain (r154-240-38-77-broadband.btv.lv [77.38.240.154] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 45EBYZP2032043 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 14 Jun 2024 13:34:38 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v9 5/8] mmdebstrap: Fix missing dpkg available Date: Fri, 14 Jun 2024 14:34:22 +0300 Message-Id: <20240614113425.122722-6-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240614113425.122722-1-amikan@ilbers.de> References: <20240614113425.122722-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_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?= In some distros /var/lib/dpkg/available is required for do_rootfs_install task. The fix for it is present in jessie-or-older mmdebstrap hook in Bookworm and later, but maybe-jessie-or-older wrapper do not handle distro version check correctly. That's why we need to check and apply hook manually or create /var/lib/dpkg/available by hand for older distros. Signed-off-by: Anton Mikanovich --- meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc index 72096ae2..4f56a0b8 100644 --- a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc +++ b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc @@ -17,6 +17,14 @@ DISTRO_BOOTSTRAP_BASE_PACKAGES:append:gnupg = ",gnupg" DISTRO_BOOTSTRAP_BASE_PACKAGES:append:https-support = ",ca-certificates" BOOTSTRAP_TMPDIR = "${WORKDIR}/tempdir" +# Fix for /var/lib/apt/available while maybe-jessie-or-older hook do not work +MM_HOOK_JESSIE = "/usr/share/mmdebstrap/hooks/jessie-or-older" +DPKG_HOOKS ?= "${@'--hook-dir='+d.getVar('MM_HOOK_JESSIE') \ + if os.path.isdir(d.getVar('MM_HOOK_JESSIE')) \ + else '--customize-hook=\'touch /var/lib/dpkg/available\''}" +MMHOOKS:ubuntu-focal ?= "${DPKG_HOOKS}" +MMHOOKS:debian-buster ?= "${DPKG_HOOKS}" + def get_distro_primary_source_entry(d): for source in generate_distro_sources(d): if source[0] == "deb": @@ -98,6 +106,7 @@ do_bootstrap() { sudo TMPDIR="${BOOTSTRAP_TMPDIR}" mmdebstrap $bootstrap_args \ $arch_param \ --mode=unshare \ + ${MMHOOKS} \ ${@get_distro_components_argument(d)} \ "${@get_distro_suite(d)}" \ "${WORKDIR}/rootfs.tar.zst" \