From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7380320960081035264 X-Received: by 2002:a19:ca06:0:b0:52c:891f:d732 with SMTP id 2adb3069b0e04-52ca6e97b18mr1330193e87.56.1718364881331; 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-Google-Smtp-Source: AGHT+IFjfE8sBUbiItpsbXfn6rkykCXleSBEILisUr2uX80IszhrJ3hD9kXYG4mucdOdTsA52RdT 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 Return-Path: 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; 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 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 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: 4KZjruGiun3f 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" \ -- 2.34.1