From patchwork Mon Jul 8 06:17:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 3665 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:01 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f56.google.com (mail-wm1-f56.google.com [209.85.128.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 4686I0Qw030754 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 8 Jul 2024 08:18:00 +0200 Received: by mail-wm1-f56.google.com with SMTP id 5b1f17b1804b1-42666ed2d5fsf6659895e9.3 for ; Sun, 07 Jul 2024 23:18:00 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720419474; cv=pass; d=google.com; s=arc-20160816; b=bZRj329kd36X+WB+zERvs/T2U6SVaz5+9rX3aKcKD1NA7SmILQZ+magS6I9+0rWJie SpeqyaxCN/f5hbWVyvRwMURbXpxSzs0jFK/K+sIMkuJDSPdCA3+NvxxOV/JloTsClRhs 9ytm3i/N6fE+vNiBEoR1y7vtBpzyLM/NbaPvAJ6KSz9NvuHROF+5H8Vxh9LWGcQSlFTI rVlmt8mVZ7NpSZaSziccRhG4skFf22h1Yr/UP+gE7JbvTfS94D6ft4WTelTfLN2T3FK+ RXrH1jzNUl3z5bHZKvsgFI3W4Ig0owpvjTgCwHpRhculnigouqYoJSw64IEKCVQG4PlP LCtw== 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=qaTAvxfpFL/oaGCKzgCS4SCdkjfxwImwhsF2++lYCvA=; fh=VPe2DAycU4SXAMOmcnfK4UH7Jio83M1E388XPiUnOAM=; b=yFJQTK26sO6Xd2RkuQPWTnCIvdjA2qTCWP61Sb4uqv4QzYrkHcMOCq74GxKxljnd4i cCfwgn1TtO0b2p6EBXveUh8EFfFTvbEDtQxBZErIMA9vozRQ6dktAsq8y30lqmFBtzMb wfPnO5pW+ppTo3bmAWC2qQMZTqo3Cq+L+4t6yYizuiNGzbfww45x8myCdaqgG7AxGTUx ffgZVyDlM2HMKm3xAVCXG7PuPYX+Rb+P2NSP8scf5q6ZKmB0EADEyiYUu62hokNkGwQr WhIM5vB04Mc3FWWWh6KqigSB4zPaZYYew4RCwNHF0pbscUhWejbv5DL7pnjxlKI81C6O kb9w==; 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=1720419474; x=1721024274; 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=qaTAvxfpFL/oaGCKzgCS4SCdkjfxwImwhsF2++lYCvA=; b=w62Y49QnGPSdjwL+FCZwT7thSpZWqbIve+cm1Sjiynv07SgJGDxnLtMBfBfuY0w+4F uaLWX9wUv/tRdxd8HFuESk06sQhZ3Iob6wXuDUvS4Pk+ZdXRJOnnVVLLFoiTZK/s4HEu yf9jVIc6zhyToY+FbMtZMaFeB6LOiiLZOhgmECfRAQEf5LyPfpDfEzlTroUHp0714bmM otOaWsfDN/fkoIPyOwzU/mQEvucF40yVzLnuyqSQ8A43beF7jf8Rtv5OvUDB9/cykFP4 i9erqau7q9460NGWiMfc0iUOpv672inUAPCvHcL7Y3y88iUALktvX6RFiQ0CrK5U3Bub BL6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720419474; x=1721024274; 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=qaTAvxfpFL/oaGCKzgCS4SCdkjfxwImwhsF2++lYCvA=; b=G3JXrCaWDwyEU8CBuwSBNuafFZJxs2CKUFs0cGTeAp3xrJmfKPq1up0v84Fuc+vCDR qFgf+FsOLhWdzS4zdEbr6bfVZbH5I9tzrW1zGsJiVbRR16HAF6bY66L30NeECNMAc/q0 m4sINolEiA7qSyQZ4FOjBnsDfnXjQLZbnJtROB6Rt7FBKHbIVSKzDjoo2O3VMHC/BgLR 9wRuSCm/KBhLKxMH+5m7lcCDuq6a052YyinELx4KFO0HJXRkopXL58DmvlgW6P2HjhHc pt5toKU1wcCN5xG0R/v9PRhFmT4uIbFsNpy+2qHbkAFD+z/JNZisuve8T6srTS1iGemZ /GoQ== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCU5WAMQlyU9mWIub0zBiZHZfr82vRi1LNKHKXPsMsnR7jsjziMV1fSQRHUD30jQ9uAXpCdTbOJLpE6bSNNxTS3k3cU7xbQ= X-Gm-Message-State: AOJu0Yyi97Rr31odfjq1+iIjn0CISw9pB2X7kTqPPOU4xVBHqazbIZ20 5aBrBatpwGAxqBOcKxEdkfzgvH3OnM0YIrAQZL2ROM4+Vug0Ecvu X-Google-Smtp-Source: AGHT+IHNwLcJTQnq0e84vlE3RVrDRyIRElQ0Dzhn1qsYawfhvm9jTmQCk+aZ/Ix5S6GUewtAj/az+A== X-Received: by 2002:a05:600c:43c4:b0:426:5b28:3468 with SMTP id 5b1f17b1804b1-4265b283635mr45222635e9.12.1720419474266; Sun, 07 Jul 2024 23:17:54 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:511f:b0:426:68ce:c970 with SMTP id 5b1f17b1804b1-42668cece73ls2522025e9.1.-pod-prod-04-eu; Sun, 07 Jul 2024 23:17:52 -0700 (PDT) X-Received: by 2002:a05:600c:43c4:b0:426:5b28:3468 with SMTP id 5b1f17b1804b1-4265b283635mr45222165e9.12.1720419472443; Sun, 07 Jul 2024 23:17:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720419472; cv=none; d=google.com; s=arc-20160816; b=WG7B0Sqa2oinCXcn+s2l96xmLlg83E3FXu3YCFJVTff7484iNx64206cxce3WOWOsW j1Gbz4eLqncClGkkB9ikB3NFeLACpffGPKJAo/UQ1SAREsqiTJRdoAM+L9YvDwUndEta O2mE0kmXw3q0JSDvmw5c1/H+GZiSKMjYoxf1qrqaXplC99YyBGeKgcIuxIn81oJNemSb BlAOZtBEPIP88+SmAkgAyTPE+yJYDmUCtt3QE5So7BWRH74QK+h3mzMBMYzPcp18a5j+ 9wjgXfLh6lLJT/RkA7U3L+G3Bf6kIem2gXumbL+Dd4JHQBfe4XKlf6uEXQm8mmPoWHv3 +NBw== 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=iygpaPvr9s+HOaRDmyrAnyExbTTT2vl8cTlQAgoPvuc=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=m450AV+I1DcOKa55wLD3/NbQHJT3PG7yPYLm08tfH6cHve0SM0J+oWPaf122IHRIuQ +fTwI2YEaHdnAiV2d+AY7BZTsVc/QDLFLpake8wv5f6JNPXqtARsVngpFHq6ZzJe66Ef nAXLxqJIZbugqMop+LTP1mfJHS+LbpGT4YtuSGmcNL94jlq++hoBDAhJOPt+ULd63RZw wOkkDweKfBqV2H05561aPC0r5ZWZ6Q8e+Z4hmJWWYBuHcdjlrKASumaEX7Si+dUa3nuB DbLhfUSoM9vAQ22NOiyGS1ckGpKIph+tecSqy/yabgPvrqTVURDqb2XQ5F1fLvlf7L6E yiOg==; 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-42666fd630dsi1114635e9.1.2024.07.07.23.17.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 07 Jul 2024 23:17:52 -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 4686HmUt030688 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 8 Jul 2024 08:17:51 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v10 3/8] meta: Allow selecting bootstrap providers Date: Mon, 8 Jul 2024 09:17:33 +0300 Message-Id: <20240708061738.311938-4-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?= 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 2e091e0c..aa3f6baa 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -183,7 +183,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 4cfa8b10..faaeede3 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -193,3 +193,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