From patchwork Wed Nov 6 08:21:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 3896 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 06 Nov 2024 09:21:38 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f64.google.com (mail-lf1-f64.google.com [209.85.167.64]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 4A68Lbwp017041 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 6 Nov 2024 09:21:37 +0100 Received: by mail-lf1-f64.google.com with SMTP id 2adb3069b0e04-539ea0fcd4bsf4362608e87.2 for ; Wed, 06 Nov 2024 00:21:37 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1730881292; cv=pass; d=google.com; s=arc-20240605; b=gD6gYleb8ljtul39aBUAibMN5w2DeSrNvCZyoCe3/fYQ8MBugZgygQlMf3k1cpybfk BvLz5vAMZA9lkMnnE7zaU2pEY9PQkSOOnIzsHKjItlb7ek81rpMmGsHrKHCHJi9YN6uq HQIecyijC0bmZ4PRSlKQHnVGcKHNYizIeyz3a9t5BUdVHw32hMB95qU4JB1VCT/7flL0 VWZePI4uu/tbNrtkrCVFz6j4lXD28q7CjPbTL5VOnuu2YpDkR0I7XA5SkYrnrLA4PJLs qWvn8Rb04WQ2f14iUAeVqig+vS3fdk6NfYEzmjsBaa7t028b6IwidtkIpLLXaQh1+ZGi FPfA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=SrpCGGG/YELYoSGPY2fPek7098bS7QmmFigGylc796g=; fh=aQIRjz5UyFllxCPCfVkamW8n45TLdbUFXj09SpK0luE=; b=b9ind8KnH4LmPiPAHpZJzlp0v46t2p4zRmShJ8jmT+PC4DYH3zFySauv38T1oOKaB+ wNbZGPk28Yxc+853adMtPNGTfYtwa5l/eToyktx2AXGNSihDKk8hbWG5EZKCKyrRGqT5 fstn7qzY6tpvnkX8oemp+bHlbD09SvzqbHU8ltXm6M9xN/tmfjPmtJ+1R9Fx6PKT9fWK 6I0/p5Q03Z69pDkRn9fyV3xDE/zIzcqyzKnvMn7JWVZCnoCoqQheZ2WTgZpXEr8GCl2W N3r1XiHiS+NfA5xbThzaVKhNSZ7jpzc0ir/JFZ0NnO/Dt+jVuOxCAob7bg3Ic2WY64+3 wnvw==; 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=1730881292; x=1731486092; 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=SrpCGGG/YELYoSGPY2fPek7098bS7QmmFigGylc796g=; b=f8Aoz6ONrcpDm1yAEYiWS/FDFwDE4a06wmD2TxefHAwolL6tPPdPTe+NtpKMVwR/VL sAUHBipWVDb00xFDFNWRrSsZwMO6WWckSK2sAIgwYkHgCdVnwG3v4yQQ5xNigRR3vn6Q SsaUv6XuTB+p2XgmvDBD2Y44XD8lEPrPIItex77SkzI+eSdvNlH35x6PS46LR+UfzuC9 bOZz8gSCF3i9/X2XlTulBtt7R1CQA5pqkL5661vXs5/w4k6MOC1mH8p/9xoyY6MI6eWg cNLWbIbYpp6TZwTVMWP3YZlvBZ14XGK4Bfrf6rT+Onj3acXAkQFAgkEcsZeteRCNThBG A13Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730881292; x=1731486092; 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=SrpCGGG/YELYoSGPY2fPek7098bS7QmmFigGylc796g=; b=N40MQxyQbi1ckWPmtD0uHGnIQqxqU1PtAIlrDGb/TQv4B08Yx4ZeGCXoLl6q+HTqbx C32+IKR9QlcEFhCteY2zEsHM+HmOxb7IKk/Xvlr1lTMWsFkiuSYHwBBX7mZkRdcrlKJ5 xnBOjnctWoAY2XY/nlpJgNo49xXswQ0DJS0XPhcxnhmrK+sjjtFvlDNXSEpixLQQ92fP SIugdgfEjDo2MSlPps4ECx3u+BoIsocb1zhKrIJpSmWymORUKp6o2SrejfSJkeyhiA1i FWJM7q9Dr5inNUA8xiY6OOJ8iMxK3Ie9RDHuRERacyWn6RHpiYkZQYeo2Cq/LMXV0Uf5 F8Kw== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCXxdKaCpn4ZcLuW6vKANqGiKsZdAvJi5c5Wcw+rumAx+UlgEXucNPkflVNPbdcgRznGbSmIi0Q=@isar-build.org X-Gm-Message-State: AOJu0YxA53n+VdL2lBGozHowfsnwQOtzt4ez5A5ch/h9wOmKp4pSzSCg ULRrHpFtCbSKgkRHs4A+Os07e3zlE0xBsKqh5wf1G1Ai806MzBQ7 X-Google-Smtp-Source: AGHT+IGCxEr7kTjr0bPUpJOtLgzwkNJFJGncSzR7Xar0LeFadFIoGBlkNgw5dIJxbT2J/4ghml7sRA== X-Received: by 2002:a05:6512:23a9:b0:539:9f52:9e4 with SMTP id 2adb3069b0e04-53c79ea5736mr10904945e87.48.1730881291089; Wed, 06 Nov 2024 00:21:31 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:a84:b0:53c:7504:2de5 with SMTP id 2adb3069b0e04-53c7971e264ls663157e87.2.-pod-prod-03-eu; Wed, 06 Nov 2024 00:21:29 -0800 (PST) X-Received: by 2002:a2e:be2c:0:b0:2fb:57b7:5cd with SMTP id 38308e7fff4ca-2fdec4ca568mr106974971fa.7.1730881288805; Wed, 06 Nov 2024 00:21:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1730881288; cv=none; d=google.com; s=arc-20240605; b=kc0AhDNJdPAEyMzOmvP3ao8aYM4GkQQ6h9jc4/cYapfro6wPTDacOZSLu9Wm0U2UF4 wEbfucC6x9froo2l18m4miqZSQnPzMjwOKEf922u2Nnt9w7ZhGxAwQeHQFOmzXkZnUOU D5isznP7jQ5EIhJ6rcw9v2cO08baFM7xwl5VU/lXaFbMeeD/oBIXBurgufOhmYjI2Unu lJRepm81SE0amuge1N0KyqLDFJMm/X03rlCS31YS5ipwK7VuYb2XM85qCwk2aLFoDTlS goC7MP7DK+hUG6VSye94DQr4hoNdOhp8VV1CdOqQJSWEY88pxE9He3z+YH9GyLYdEmqn Zcvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=Rlre3fVu+/Oi4URRnZqDx7S4Bl41A3nSOqKZ52UtkAM=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=FUNWjGCvAdw6c1mWTJQfKSgKcJrkYp8qIe3OhFOYZH7t0olYVzYnBuqqiFwSDDerpS hgXgEwZkP8Ai2Np6DHA5ODblGATFfeehJjAkg700xNQ5wsCEd+cUnlM99ngs9+NiDfu+ Ry4G3uSS+XrXQ/s2f7MM0Ol6srEP6HegQNXH4v2J+U/KOQ9Q5nE15b2Olcyh/Lu00vb/ eGbLAIhNV/W4S8TzpHWPb5TVSn0iRweEZ8ADlidegeZ01hCySGcgzA+zMICl43P8sQQY ULm/nHbh6iQaAT707Sj257vQIXiZn2a25SFmbJcanbu02u6rAIQqy81oJ1u8Ug2eLsB0 Gj/w==; 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 38308e7fff4ca-2fdef8aab2asi2500161fa.5.2024.11.06.00.21.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 06 Nov 2024 00:21:28 -0800 (PST) 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 4A68LOjs016956 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 6 Nov 2024 09:21:27 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v11 3/8] meta: Allow selecting bootstrap providers Date: Wed, 6 Nov 2024 10:21:12 +0200 Message-Id: <20241106082117.1089554-4-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241106082117.1089554-1-amikan@ilbers.de> References: <20241106082117.1089554-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_DNSWL_BLOCKED,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?= Both isar-bootstrap or isar-mmdebstrap can be used for initial rootfs preparation. Signed-off-by: Anton Mikanovich --- meta-isar/conf/local.conf.sample | 4 ++++ meta/classes/rootfs.bbclass | 2 +- meta/conf/bitbake.conf | 3 +++ meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb | 2 ++ meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb | 2 ++ meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap-host.bb | 2 ++ meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap-target.bb | 2 ++ 7 files changed, 16 insertions(+), 1 deletion(-) diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample index 17455015..a7862352 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -221,3 +221,7 @@ USER_isar[flags] += "clear-text-password" # To know more details about this variable and how to set the value refer below # https://reproducible-builds.org/docs/source-date-epoch/ #SOURCE_DATE_EPOCH = + +# Uncomment this to use old isar-bootstrap provider for rootfs prepare +#PREFERRED_PROVIDER_bootstrap-host ?= "isar-bootstrap-host" +#PREFERRED_PROVIDER_bootstrap-target ?= "isar-bootstrap-target" diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index c7011508..e339d24f 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -227,7 +227,7 @@ rootfs_install_pkgs_install() { do_rootfs_install[root_cleandirs] = "${ROOTFSDIR}" do_rootfs_install[vardeps] += "${ROOTFS_CONFIGURE_COMMAND} ${ROOTFS_INSTALL_COMMAND}" do_rootfs_install[vardepsexclude] += "IMAGE_ROOTFS" -do_rootfs_install[depends] = "isar-bootstrap-${@'target' if d.getVar('ROOTFS_ARCH') == d.getVar('DISTRO_ARCH') else 'host'}:do_build" +do_rootfs_install[depends] = "bootstrap-${@'target' if d.getVar('ROOTFS_ARCH') == d.getVar('DISTRO_ARCH') else 'host'}:do_build" do_rootfs_install[recrdeptask] = "do_deploy_deb" do_rootfs_install[network] = "${TASK_USE_SUDO}" python do_rootfs_install() { diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 13966a62..289c90b7 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -195,3 +195,6 @@ include conf/machine/${MACHINE}.conf include conf/distro/${DISTRO}.conf PATCHRESOLVE ?= "noop" + +PREFERRED_PROVIDER_bootstrap-host ??= "isar-mmdebstrap-host" +PREFERRED_PROVIDER_bootstrap-target ??= "isar-mmdebstrap-target" diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb b/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb index 4f90fd01..12798488 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb @@ -9,6 +9,8 @@ Description = "Minimal host Debian root file system" DEPLOY_ISAR_BOOTSTRAP = "${DEPLOY_DIR_BOOTSTRAP}/${HOST_DISTRO}-host_${DISTRO}-${DISTRO_ARCH}" +PROVIDES += "bootstrap-host" + BOOTSTRAP_FOR_HOST = "1" require isar-bootstrap.inc diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb b/meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb index c66cb3b3..69e97b33 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap-target.bb @@ -9,4 +9,6 @@ Description = "Minimal target Debian root file system" DEPLOY_ISAR_BOOTSTRAP = "${DEPLOY_DIR_BOOTSTRAP}/${DISTRO}-${DISTRO_ARCH}" +PROVIDES += "bootstrap-target" + require isar-bootstrap.inc diff --git a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap-host.bb b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap-host.bb index 66c8d11e..6de9c21a 100644 --- a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap-host.bb +++ b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap-host.bb @@ -9,6 +9,8 @@ Description = "Minimal host Debian root file system" DEPLOY_ISAR_BOOTSTRAP = "${DEPLOY_DIR_BOOTSTRAP}/${HOST_DISTRO}-host_${DISTRO}-${DISTRO_ARCH}" +PROVIDES += "bootstrap-host" + BOOTSTRAP_FOR_HOST = "1" require isar-mmdebstrap.inc diff --git a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap-target.bb b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap-target.bb index 84a89ff1..227ff04c 100644 --- a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap-target.bb +++ b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap-target.bb @@ -9,4 +9,6 @@ Description = "Minimal target Debian root file system" DEPLOY_ISAR_BOOTSTRAP = "${DEPLOY_DIR_BOOTSTRAP}/${DISTRO}-${DISTRO_ARCH}" +PROVIDES += "bootstrap-target" + require isar-mmdebstrap.inc