From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7291218501940805632 X-Received: by 2002:a19:ca45:0:b0:502:9fce:b6da with SMTP id h5-20020a19ca45000000b005029fceb6damr10235682lfj.21.1698836313206; Wed, 01 Nov 2023 03:58:33 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3c98:b0:507:999e:6d67 with SMTP id h24-20020a0565123c9800b00507999e6d67ls19954lfv.1.-pod-prod-09-eu; Wed, 01 Nov 2023 03:58:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFtb29RQnMm4VWv01ud/yScoSDeeeWbJzQDz+mv008+tPBbBhcR+Me3HwUId21HwVdeQxNS X-Received: by 2002:a05:6512:1599:b0:508:1470:6168 with SMTP id bp25-20020a056512159900b0050814706168mr14312637lfb.57.1698836311311; Wed, 01 Nov 2023 03:58:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698836311; cv=none; d=google.com; s=arc-20160816; b=okmqwNwhEngjxx8ty6GE8flqfXzNJT7ldEL9hUnZamxEyoElNL9JIr17osr+fFkFTT NAKcCuSQRiaI6nwPYgbfu3/kN1TDqtYbVVykaGSeqx2k1MLh0q46NHVekXFPTcGUcL/K ydyv9U4+hL3/MISGolZI2kAVPSiUHSnyQ8Zj4iG42qD9Rj5gQDsXgTQ7GCGsKo8rWsUq CqocCkqBmGSgMbh9dDVMpirQkLL65HcQaOx0ub5TlT+h3o8zqGnAycXq+n1tvbcYifmn 0dkEbHlh5nkNv/Q58ZygWyJeN9a2r/hTSHfzp3RXJaMH4V5sD80HtErRTy0uCdjdX8Ui vyzw== 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=1TE3LM9+2ASd175+KnEbNl3/ZyVRAIWciz++MBH+Yjg=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=herRB4F6NcUQDU25hCfkauPCRlppNigU65gLtXee8pC3pzQBbal3t45fOYUDn8aUn6 MncLCJMzX42CC0Rqjf8nsnfbXTtw01hP64/ACYZy/hFG5yBR1agtxCLcxLv63rtvC/+R FSLKlggmso2XWmXwyY8tGUL4+Vf3sAYN875R/iKYzCrZNZcVTJwxnztoB+ip+T5UlEox qzy8lb6ngI+2x3dX4Go3dSh36ADC1yPd7Y5cPbYo3gy5ZyvqQxwDzg5iyBRtHkAHGsvT wa+BcNUAZ2TQAHqvECWbsvktDDObxlgRYjVUC+jE51ZutPsCphNi7VC3pKq4+f7mUovL fQLQ== 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 d34-20020a0565123d2200b00508187603b1si80244lfv.6.2023.11.01.03.58.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Nov 2023 03:58:31 -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 3A1Aw4c7010660 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 1 Nov 2023 11:58:22 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v7 3/8] meta: Fix missing dpkg available Date: Wed, 1 Nov 2023 12:57:52 +0200 Message-Id: <20231101105757.1988498-4-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231101105757.1988498-1-amikan@ilbers.de> References: <20231101105757.1988498-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: MJOGcc8L4klm 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 22fb398f..8048521f 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