From patchwork Fri Jun 14 11:34:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 3609 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 14 Jun 2024 13:34:49 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f184.google.com (mail-lj1-f184.google.com [209.85.208.184]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 45EBYlm8032125 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 14 Jun 2024 13:34:47 +0200 Received: by mail-lj1-f184.google.com with SMTP id 38308e7fff4ca-2eae267d112sf3377251fa.1 for ; Fri, 14 Jun 2024 04:34:47 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1718364882; cv=pass; d=google.com; s=arc-20160816; b=VLLeknz6CigG9hpBd8lwL5mspzrX8pX8jkpvFBwXJPqMQKCltM+Aw9ujC2ZpEQZgbr M6p63FIKbDCSnF4hWO5LbmxIigizEUWZHCbk7Q04m25QURoMP3K9P1h0rVYvlDfbJvMw /tDLXWbN+fYrYbFCCXIdHRBSDNUrvP5tIVd3GBUofciCiHYMTZgfDn/6+0E91q/RnrqC 4CDxO0ZRH8QjzU7oEgAwLLG99zSYiCeqnohKUx9u99mI13LPUZmlL53jnOO7BEWZZXHQ 2unU1SqiSlCMRAfvHTJ1JXauYGYTY3ttUUmv6YeQoOtANMnU7RV4DlGakSm9A4KUgaqg 5SWg== 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=vkfC9lSo8iuGLb2Z9L6XEFiS4VxGLHsboyI3Hg2jqaI=; fh=UqU218yQs0gci8aKc5y1geIeTV0iAwkMnpqzOrGI4q0=; b=ECO0Lkh/cy7rkpr1+XKdrRULZLyHCZdF7buT8m4u5mc6Qkg8vsG6DY1BOuHKw9Zbri sIoxLdoxKoBTlh3I1GDXPTSiETcitEwwkoSz/Edk0u6vT2ilmj7eSV2HGM1qOqxYpr3m 7G/VICWqyrdHX3g236ZDHVldyIWeQiBpx77QoWcVrVHo9ibwcJZ+aHv7KK6l+13Q+gUi ukBDn1Sc9Cbv94LyF4R81UB0+cW46NO9nx6FooyesGcEQMM9VTlHURbkaHKuRv5b3YHY w5nn8YRVZoe0o3DCk4okonzmxQCNwu++baPuW2kaXyTYgmjdD4qK+WQIvbDcFBEzham3 FwXw==; 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=1718364882; x=1718969682; 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=vkfC9lSo8iuGLb2Z9L6XEFiS4VxGLHsboyI3Hg2jqaI=; b=ALpd/fhcFpOAKni0/RwAJR1yhuAK7NKK2sTvl+CYGktPXQRg3nUM9Uel20oJjMGYg3 onG7wXOHCubgvy4u9rgSeSsUyTA6T9x6VlRK2y38EGnN5VdHDLtyoELa7DcnBf6KxFxM XxU38g84lX/s5pfoTH4LofPNkpk16DBF1JKIVpk8gdZ+m9nzYJgvTlRYVU58HwalKam5 MIcJMQoBx6bkKRB5dJRGItkxhVkttgWujuDbxc1N154B918hmu5Owc/wtSaSkKjkx750 cRzyR8z4VGSTLSgogm4c/uPWvFdnyMVGBUNxLCDyXX+oDfBWCDnoWNPjpMagSvPeFoqT bPoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718364882; x=1718969682; 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=vkfC9lSo8iuGLb2Z9L6XEFiS4VxGLHsboyI3Hg2jqaI=; b=KdJB0jX2KA7itaObSqZKaKSEahjrXfp2Ysk1uJBHjvy6RjSgrssopXqnp6cDSpNK56 6qdgGa9tethurWSFNByYjM3/uPgcnSLrv79GoVHv5ZrXJ+APyJff+xQ2OJPNLft/QjCT WLzF1xHi65SG6AIEKZYGC9PYtMIPp9C4+ZZmMkofeaq3tYLMHhQfWubJrgNeGAu1U3CH TYXYGk1n5vKB+3UPRvDJDIN3z5fRKwwnPX7Sd89X+TAxTFt9mfB3aGrMNGmFA4g33lup jVndeRjOp3BvuuxfPb40Fo5ueaS8ico3qSSXIH8UP3h8IaPNRXhNJo7NTZ+i6y9YJVvG wJOg== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCVg5nEnc24XpXgGCwW4Lq2RA6ouj6a45YCbBM7xSx05SJN32R1dJAYBI6iBPFg94A7FC2J1epUEpoFhw0FG3j0Pj/shvtc= X-Gm-Message-State: AOJu0YwDhHSpVnrzxkVpbhNACdQK5O0lLMPXinhZ1n5P6IzUd75WaR8o VmShhDfak/CuPBDanCTLe/lOQk/vO8Ffh4POfXG2q3AIQke/SrSw X-Google-Smtp-Source: AGHT+IE9mcT9i6Ai1paPcyWw56nyhZ2WnMrAZmtSxp9/bgua4iizaIhl+VA1klLrh2PEAqQEpH3gXw== X-Received: by 2002:a05:6512:1051:b0:52c:af45:ed99 with SMTP id 2adb3069b0e04-52caf45ee94mr414810e87.0.1718364880919; Fri, 14 Jun 2024 04:34:40 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:753:b0:52c:842a:a28 with SMTP id 2adb3069b0e04-52ca050245cls1000891e87.0.-pod-prod-09-eu; Fri, 14 Jun 2024 04:34:39 -0700 (PDT) X-Received: by 2002:a05:6512:24c:b0:52c:84a5:6617 with SMTP id 2adb3069b0e04-52ca6e9eb89mr1410505e87.68.1718364878714; Fri, 14 Jun 2024 04:34:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718364878; cv=none; d=google.com; s=arc-20160816; b=nz/SqX/g5wm0V+9M1tWXujf2M42Ry2I4w87UYnDf9a9VdMjraVEWbJZfNnjA0yrqb6 Z7DOdD5lI47PqZMN3vRe44hiODq2mMTtFyI5w+ML9xbOr/y1mnRur/iESbpx3VGkJXI6 xsOhEfMC4YFLPVZaXF/Oh1RBojWhdUXlYhoKVTeKjAo6V1bVMzSHCOVheAkwcz7H9uIH K7TquBx+fcl2EWg/Wi3a8CxsgOp+ah3ybhPzKX+4p+O6ogZ/5dOpQkiOUZ1TSQxkkfJz lElg1PsMHFC+3KVM0L0u9OfEVRiTfmI5Gikj7cxgTBRiiy48sZHEgmQlLUQlyy/VkXXg /x0Q== 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=vi6da4/Db7htnChLx1vf7gUb+9xiUPQ+E45J3pdB96w=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=DnVl4hzUpfb3FwCphIT/hXeyKGN09c2VYOniWS3V2VKR6zcC+ditX/hLZXaKwpvlXH quacgPO1/VhdW7J5K2IDCBjD6cmGMx/izq963OLRqW7IE9K1vAcwMKpq+gZJm04BxTlB PNk2FsuzGNV3jJmmLydDaabLtkujfQwSl7BxSAIn+9/rd7NXa8XfE1SOOGCNurUyRUBK Nf9h/SrpsiCnWun99DAGzwI0MzECIQaw8L+j6Y0grNbCZjzxh2KOiD8hmaPj0jHPtIpI ht6ZCvD3RPj/KqLb/eRye28YNuGuNQQlVIJRhRJEcgu+LJEQmq9nee2OAsPByrsVfnZk 162w==; 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 2adb3069b0e04-52ca27c60e5si77722e87.0.2024.06.14.04.34.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 14 Jun 2024 04:34:38 -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 localhost.localdomain (r154-240-38-77-broadband.btv.lv [77.38.240.154] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 45EBYZP0032043 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 14 Jun 2024 13:34:37 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v9 3/8] meta: Allow selecting bootstrap providers Date: Fri, 14 Jun 2024 14:34:20 +0300 Message-Id: <20240614113425.122722-4-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240614113425.122722-1-amikan@ilbers.de> References: <20240614113425.122722-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 498fbfd6..f684e969 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