From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7345128867348086784 X-Received: by 2002:a05:600c:358f:b0:412:dc89:20bf with SMTP id p15-20020a05600c358f00b00412dc8920bfmr5044362wmq.31.1710171083690; Mon, 11 Mar 2024 08:31:23 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:5113:b0:413:7d2:8087 with SMTP id o19-20020a05600c511300b0041307d28087ls2278457wms.0.-pod-prod-02-eu; Mon, 11 Mar 2024 08:31:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFtE4szVr++VL/1Aexko/Hov267kDeBzltenFGTEWvLtWVGPj6ZP84JUX4O+uvDHGa78qJy X-Received: by 2002:a05:600c:3550:b0:412:e0a2:5b72 with SMTP id i16-20020a05600c355000b00412e0a25b72mr4743738wmq.29.1710171081532; Mon, 11 Mar 2024 08:31:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710171081; cv=none; d=google.com; s=arc-20160816; b=dlF+V3dBo2KVXOnrM+KNLfnfsskQwyUqu3qhZ5x0yO8rhLqEh0y2bBFJw85KxO9qW1 uEOXhpONboFo3gvAljWwoV1y8cN+AKMdCTG6H6l3i23/2YVNdYo4koCs15VRjeprUc6Q 356JNOZVcTx+Fv4MbjP/Tv4X7tYGFR93DT8V5zV7Vg+Vd79scLGp1WAXLlCK//U0M86+ oRXklmSYUdyeG/kvRUdOEVJsfRd0X24kgVtGH882DKG8WsnCmWoeDSFiBXm1wev/BsZp pcDtkyP/dB1r975HfoGJYGC+Mi5kkt97p+dGplOi/GQQu52YtRuLi3IXP+WAoS/i5Y2n 1RLg== 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=+6HDYYtVnHhja6ljIjX8I6xNRNvxaebG3agRzobGZz4=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=EOwHBx/eAtOlbq9drG5zk8bQJpvsLxOcnbQYAia/nv12X8K9E5h45S2yoBa4pl1TEC rEvSCw/baONl7IvY+IVC18wJ48fFksMwavcZrQXvJe4POOmBUqCc3krTCIETZAqfUoCA f4G24nn4iq26/CGQOL1T8IH54h+o/lP+7pqFFwi2ieUuKBY3u0XrjROO8B+j+VBGbjzY jV9nJ8IuXrWQm0Syd9V53gejqRI+99kVAlTT2kqwkA/22nUtC5Uz1kVZUzlNSvrG8owQ pZvI6CfKDzjABBgpxMioF5YmF/L+gYYOGdGde7SzrUJmWDnqJJruv24dzj2nCA3qnRPO hvKA==; 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 j12-20020a05600c190c00b004131f588dccsi324665wmq.1.2024.03.11.08.31.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Mar 2024 08:31:21 -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 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 42BFVHan007311 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 11 Mar 2024 16:31:20 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v8 3/8] meta: Fix missing dpkg available Date: Mon, 11 Mar 2024 17:31:06 +0200 Message-Id: <20240311153111.3772144-4-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240311153111.3772144-1-amikan@ilbers.de> References: <20240311153111.3772144-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: vdYVSjmGlnA4 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 80a7e90d..9c161aab 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -37,6 +37,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() @@ -303,6 +314,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