From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7291218501940805632 X-Received: by 2002:a50:d5dc:0:b0:53d:fe06:3bb2 with SMTP id g28-20020a50d5dc000000b0053dfe063bb2mr7650647edj.8.1698128656177; Mon, 23 Oct 2023 23:24:16 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:f28:b0:53d:b3c3:2112 with SMTP id i40-20020a0564020f2800b0053db3c32112ls375319eda.2.-pod-prod-01-eu; Mon, 23 Oct 2023 23:24:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IERPFvPOb3FALsdtX6UEzfAvQp56sWZPR/4i3jFC+0IflCU5i6Zg1cUSunn3dkwho1XeI3V X-Received: by 2002:a05:6402:270d:b0:53e:eed5:d8e2 with SMTP id y13-20020a056402270d00b0053eeed5d8e2mr9354497edd.31.1698128654425; Mon, 23 Oct 2023 23:24:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698128654; cv=none; d=google.com; s=arc-20160816; b=JKA8xH3YsKkPvV1542QQfqL8xjbdgjEhIc6DXnrCi92jWNY6o8YRvAqXZrc1hMRFTO PfmyVu2u7B6jxZrtz/HESXPDiPJRye642pQEVek25nXSp+mmK+gM+Lnn6JPMsMkKOxOF 6T2+6n6UkCsjJ7FeYxkXPGxD0GI5y4MM5mfra0bZv0QvmMfj5iK9jk3lbkCHAnhif6SG Z4W86YNwgoAIvtMPGtKWaapnjzAj5Etg/g2lqkFLSkqVr0qVG03lr/5AehD/QIXYCAJV 8eyjKII8SzOYK/RyM9s/DHwwiNuAD7+Q/fksKYwj4lvGetYdkGsGZcU2Zh0+zIMz60qC gObA== 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=v9GDjvSRoRE/hh+7lGtxOKMt6O8/r/WQHxu++CLp8Bk=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=lE4+RwArVVwATShvQ0GD9k/ljGi5XrED9kwKSWnQw/EPvPiGNNrL66HlXwkVQsxp7X FoTL/JBRvbg/FzEXIgadB9QNrXYf5GE7sS1DEV+4Kjo0/+ofyIrxBayn03nwSy7qiCQU 2yFN4d06O46LpFGrl3Xk/umSy5DkK89Ls+vOP06yyOOz+LzFWXkHNt6AzFkKVqtJY53+ OJRhpoD4MN/rZuoD8CZ7tnUHb+Pk3UE4ZgV3MKs1xKAoo+L6Wzanb6Q/aZGH6Cv0Ur7y RKau+ZecjqezIreh8OnUOTOlMKI/1L1000wYsXgsgjGkM2WwX726HCFWo6rFl09akpyZ bE1A== 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 cx16-20020a05640222b000b0053e26876354si261416edb.5.2023.10.23.23.24.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 Oct 2023 23:24:14 -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 39O6O5WF024986 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 24 Oct 2023 08:24:13 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v6 8/8] meta: Fix missing dpkg available Date: Tue, 24 Oct 2023 09:23:58 +0300 Message-Id: <20231024062358.252053-9-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231024062358.252053-1-amikan@ilbers.de> References: <20231024062358.252053-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: fRs+nvSUg0I2 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-bootstrap/isar-bootstrap.inc | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index 98345755..03237c6c 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -34,6 +34,17 @@ FILESEXTRAPATHS:append = ":${BBPATH}" inherit deb-dl-dir +# 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_suite(d): + return get_distro_primary_source_entry(d)[1] + python () { distro_bootstrap_keys = (d.getVar("DISTRO_BOOTSTRAP_KEYS") or "").split() third_party_apt_keys = (d.getVar("THIRD_PARTY_APT_KEYS") or "").split() @@ -351,6 +362,7 @@ do_bootstrap() { sudo TMPDIR="${BOOTSTRAP_TMPDIR}" mmdebstrap $bootstrap_args \ $arch_param \ --mode=unshare \ + ${MMHOOKS} \ --setup-hook='mkdir -p "$1/var/cache/apt/archives/"' \ --setup-hook="$extra_setup" \ --setup-hook='upload "${APTPREFS}" /etc/apt/preferences.d/bootstrap' \ -- 2.34.1