From patchwork Mon Jul 8 06:17:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 3667 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 08 Jul 2024 08:18:02 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f64.google.com (mail-wm1-f64.google.com [209.85.128.64]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 4686I1v4030766 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 8 Jul 2024 08:18:01 +0200 Received: by mail-wm1-f64.google.com with SMTP id 5b1f17b1804b1-4265f9cd54csf6596835e9.0 for ; Sun, 07 Jul 2024 23:18:01 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720419476; cv=pass; d=google.com; s=arc-20160816; b=Ih/YLOxJgSWtBHfbBQgP7Yn519eu0tWJ7uxNT7jhsPdOKJKoGtIwNOCte+v6Su7Aj+ M3YMBo3rZeN9skqhLcDjpmehsW5xmij0NBR2feIOxh6k7IhJp+/GXE2mBws6SctJa/y1 XCa3m8b7WBY86MO4mTNSTa1LSvnNZf5HriuU/UiOPmKTc+Oz+sMfsImYGl0eiJI/SGHw KWL8CeZObFaRrmPkDSgC0AQQYIsCI+z6OVIK5ILFl5YlDpDAFU00vBXd1zA2i6Idz/lw VGaDxZIm+6ITC6s7AMRTBvrom7nk9LaFiZYyFeYswXSUjqZHNi8GQSbNL/hHfqrD8bjf fPUQ== 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=mmB7gdKdlYGhQWLRBlai1TLm4Pa8yrPiWepBNhrveJU=; fh=ZIqoXvkOKgazGp5fK82NHbSxUFzHEL+FQn5lDCg7PO4=; b=DSoRkFgU20UGIJrouG4Wy5P5cm6x/LF9NPIHGjj0hzxHJXtQ8n1TiNobKzjFktocJn /e+xREbFAH0umezH9itYunogxEggUsJb5JiZrkYChE9sbGOu6UOpJxYoaaqqKSmGIs1o fo1Zg73fdz7gvv/Gr+oo9Pl1ZgPxTShER+ZUiZhOzZkLPiYs+5oCXKcrzZ9M8Ckbls9n Lkln5n4joiS4286rsrNCfxU7FZsdgOS3ps3OpxNIH5Bgzhp9Xn7WnP/lEDAq6/lRB+h/ pH9wGc3yj3AFZzlq1OqMyEoQo+EVmQsF+Av6LAWi4Inh7ShAdU5FvfTSp36j2aDd7YPx MyGg==; 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=1720419476; x=1721024276; 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=mmB7gdKdlYGhQWLRBlai1TLm4Pa8yrPiWepBNhrveJU=; b=D6BPNW1Xk3DZp1KP/d33A3tpuSWyQi/dzssgseqBRpEIh5asyh9cGkqF/9sO478Gs7 Rzw6c2ljOidJQcoYYC9fPab/k9jHD9mO+YrJAk5oUdReACHjWv6gYnu1ypLOQF1NsPiI SRZcNxiHWVjh+cLtTEtZXYGiCP4gpUN8uqwmZgG5u6zwhIjFoS+cy24FrYk+7luX08RU AZ4SdsDeR75dPPrRqFZaqsALXMkENZnfE+sj1GIiakvepihTIBEhce5PcGtlCtD3zAfe TVYBlcXvQ7Fj/hCtBoB/HLAZO57IdQeyh9dg/qHRH+KINiBFlgcHempsECYuABCbmU3S Xekw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720419476; x=1721024276; 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=mmB7gdKdlYGhQWLRBlai1TLm4Pa8yrPiWepBNhrveJU=; b=iglWqMiMojxLY+v89erulrpq8xeGDz7b8gi/pdb5Yjb8fcUNYhyL9qK5k1HxQLNoqD Lv9VhTPeLbdnQFo3P0nDI20rNZOGPwbNz2bJf6xcBc4Yv3NTdiOPI4SUw5WVVF+xzxot kaiaRX0yR2eYyg2XB4YnXGx1k6qLASeVRntEHGvm+MUFo0yDMJvSMCh7vCf7Jyx5ghP3 ijCcc1gVXHHwd3MP3ZGagVezXexThyMiSi4/voY90RFoVOCupmGoQoP7L9/nzikxIfQz YU2d+tiOyBx3+0pGAeFkDj1La6aQIsQH4zPbIC8k8BRJTbCXpAAD0CAnIv9K7QP/Vc3m YAvQ== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCWSnTGslfEdEX3AkyzWbmSeKaQ203fARP39pu/EC/Qa4F39tC5Zh5otcsA1zauJ3qqSI4F6gO76MBFkRhQAjpxi3SQMlwc= X-Gm-Message-State: AOJu0YzIuGILI5OeLNdWwy0vFP43zLnwiX41fsKEPBMHopD6t+PWl0Np bKEK21EE+xziKWMK/O55RIUuKCJwpRUy/6/UDjNMN3g3zoBGf4bE X-Google-Smtp-Source: AGHT+IGbwFxYmkQwlFHqw/PJYO/7I0Oj5ulNjjkF4EMYhIHUMegv5thGa+7aFuCKHIKYsn+wIUB6ag== X-Received: by 2002:a05:600c:4f42:b0:424:8be4:f2c with SMTP id 5b1f17b1804b1-4264b0cc4b0mr94723755e9.2.1720419475778; Sun, 07 Jul 2024 23:17:55 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:308a:b0:426:5216:9af1 with SMTP id 5b1f17b1804b1-42652169b58ls10522035e9.1.-pod-prod-00-eu; Sun, 07 Jul 2024 23:17:54 -0700 (PDT) X-Received: by 2002:a5d:6e5e:0:b0:363:337a:3e0 with SMTP id ffacd0b85a97d-3679f6c48ecmr8500441f8f.1.1720419473916; Sun, 07 Jul 2024 23:17:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720419473; cv=none; d=google.com; s=arc-20160816; b=u2UgK6gx9E76unfSisKvKssGJLG5GODnZT8tilUZUqRA81HshOVKltrPCmj6dX0ko2 Bx3vZbnchc3bryElr1/xARxawoefGL7+YmOJExfH/jgjBE3QyCJGam9mxe0LF66ONXrK eFOfqJoStiQjHavTkIFQ5RuC1dTKGippj46UGnowd9bpZSvwD37js1EB63dRtmBKTF33 VpAazLGFvB/dWEz086a3POTXDRWW+ekaolO/FvCbXBCPsjpVJPa01k6mDOiIU4Yro0uR +O3l6AOEXGg0VlkSPhU+zrd9jTdA7MWyu/MvioOzDkiqbNpMMDfsRCkFcHEFR0cr11QH bRnA== 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=laEpNwkq2Ny9nVXeUnrP2NGAWBOYM3kbU2mCWXQx/ioeF5mi0CnaYbahxiHwmr6ZOR 6k2ebWhpl8VKv2INmcc8YJ8mGOwSRzS2+R/NjSpGDbTmXtCJHIRoNuAFRSZakMfj/lJT g0iIDtwd2+hGzyCUlKQKAfS8I86gIShHrj8OjJ76avY/RJKz1Rv4QM0TMxRuBIzhMZjA XVp1rETLfaRmMQbaP+gHdgKYEZqv4uqTBlEHh+YjMedWPxBXUWv9a69Jh8l53CRHGZzx y0s2YFxxc6kgI0z+16yrm/VWs9mI8uC+xA3w5WwuzZZugf3hfe85TYbWmznT/7GAMQXl AKKQ==; 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-42662c6a252si1532715e9.0.2024.07.07.23.17.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 07 Jul 2024 23:17:53 -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 user-B660.promwad.corp ([159.148.83.114]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 4686HmUv030688 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 8 Jul 2024 08:17:53 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v10 5/8] mmdebstrap: Fix missing dpkg available Date: Mon, 8 Jul 2024 09:17:35 +0300 Message-Id: <20240708061738.311938-6-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240708061738.311938-1-amikan@ilbers.de> References: <20240708061738.311938-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" \