From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7186521206604955648 X-Received: by 2002:a05:600c:5488:b0:3d9:779e:976f with SMTP id iv8-20020a05600c548800b003d9779e976fmr2037620wmb.163.1673242359161; Sun, 08 Jan 2023 21:32:39 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:4aaf:b0:3d1:be63:3b63 with SMTP id b47-20020a05600c4aaf00b003d1be633b63ls4115839wmp.1.-pod-canary-gmail; Sun, 08 Jan 2023 21:32:38 -0800 (PST) X-Google-Smtp-Source: AMrXdXtedCgx2zmq8B+tSoK9RW/q2yeoWSgrhUWHCkfyu5OaUf50fqkZJWXIFu1CHTPC/oDvSF3P X-Received: by 2002:a05:600c:4f93:b0:3d9:e5f9:984c with SMTP id n19-20020a05600c4f9300b003d9e5f9984cmr4033082wmq.2.1673242357956; Sun, 08 Jan 2023 21:32:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673242357; cv=none; d=google.com; s=arc-20160816; b=GZf40Pkh2D8Ei6D165nQHNkDmtypwFDR1sBtk2zepIt3e4DGQ04iW+eEps9Z6pHDfM zjEMGGyOqSnCbFr2WInuSUP4PpzCdX6VAqXthFp2bW8NEon458k6PD+hc0FwsiAUq18X j1C5G4qB9aHkREtGvusw7nymnqUf43lecu4f+xYEuvezZ2k5tHsLOZHGyBYLqJtUIFgB zjzvDB/MAma8dSuWYb3ZGBHrCAx1G9edpQD1Fm+IEyqbg7O2/977I0/QJaq+V6fhZn/A tC+Bzw6JM4pQ00Ph5/kdAyC6jtc7ttsb7G2Ze7nxSGH13wcAfhlm6L6YFblInhz583gp DG8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:to:from:dkim-signature; bh=ZSECGIikuW5R0oMzGG40orX8F8WBAPLETzrafbwMTmE=; b=en6rhntlQbARwu1pwIiU+prNqIRGF//i8FR/rQcZgxlH5WQdMNAuD+BOSzDBVAA00y 1ehmN3Zgd+TaKtfPWWk6CvKKW7JnNHdMCCb6+bktql0lk74uXhW0LPL+wge7q4muWNXB C9KKTh8zRG2qnV7SSefwlcuaWp9gRhwz5kt6BVSUwGrDK1I2a27EWJPMTMZDBVuCs70k v+x1KsQvz9TF2hmB7LM36T6svj+MTgrU9sz8y6TlrC28XllxeMbWq0yjPric6I9YAcVQ dkFeEv5UM7HyI8e/KhIzq9bebPukWXGfF00sttWk+txI+LUZgC3Roq6T/Ue6LzMA0ngo iLSA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=iefcsAIk; spf=pass (google.com: domain of fm-294854-202301090532373e8174428f2fca76ea-qplxo_@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-294854-202301090532373e8174428f2fca76ea-QpLXO_@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net. [185.136.64.227]) by gmr-mx.google.com with ESMTPS id az13-20020a05600c600d00b003d9dfe01039si311352wmb.4.2023.01.08.21.32.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Jan 2023 21:32:37 -0800 (PST) Received-SPF: pass (google.com: domain of fm-294854-202301090532373e8174428f2fca76ea-qplxo_@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) client-ip=185.136.64.227; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=iefcsAIk; spf=pass (google.com: domain of fm-294854-202301090532373e8174428f2fca76ea-qplxo_@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-294854-202301090532373e8174428f2fca76ea-QpLXO_@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 202301090532373e8174428f2fca76ea for ; Mon, 09 Jan 2023 06:32:37 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:References:In-Reply-To; bh=ZSECGIikuW5R0oMzGG40orX8F8WBAPLETzrafbwMTmE=; b=iefcsAIknliFvGWzuMeGdmKz1XGi+147jFniEQj8nliN+pZnFt3oli/qyFTlpuBe7iSuNh JZYlOnL4EMgvrGG/FJpCk4Y3cilLuXzXBbwxF7fNjOfnioYlFN/kCFuMfkvqdBlseCtbi2g1 rwrhqlmLzyeP+dA6/chvb2r2bEYZU=; From: Jan Kiszka To: isar-users Subject: [PATCH 3/4] sbuild-chroot: Pre-install cross-compiler and libc6-dev Date: Mon, 9 Jan 2023 06:32:34 +0100 Message-Id: <386d288ca3eff0555ffe1a6b1267f9b926a7ee5c.1673242355.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-TUID: 91VSdt4cy8cS From: Jan Kiszka This saves build setup time by pre-installing not only build-essential but - for cross and compat-arch cases - also the cross-compiler as well as libc6-dev. The latter is coming via build-essential in the native case, it's not installed by crossbuild-essential but sbuild is pulling it. We can install libc6-dev:${DISTRO_ARCH} unconditionally as this becomes a not in the native case. Things brings sbuild on eye-level with buildchroot regarding the initial build environment, even goes beyond as buildchroot used to install only libc6:. Signed-off-by: Jan Kiszka --- .../sbuild-chroot/sbuild-chroot-host.bb | 11 +++++++++++ .../sbuild-chroot/sbuild-chroot-target.bb | 4 ++++ meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc | 10 ++++++---- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot-host.bb b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot-host.bb index a37e49b7..c0015721 100644 --- a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot-host.bb +++ b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot-host.bb @@ -12,3 +12,14 @@ require sbuild-chroot.inc ROOTFS_ARCH = "${HOST_ARCH}" ROOTFS_DISTRO = "${HOST_DISTRO}" ROOTFS_BASE_DISTRO = "${HOST_BASE_DISTRO}" + +SBUILD_CHROOT_PREINSTALL ?= " \ + ${SBUILD_CHROOT_PREINSTALL_COMMON} \ + crossbuild-essential-${DISTRO_ARCH} \ + " + +SBUILD_CHROOT_PREINSTALL_riscv64 ?= " \ + ${SBUILD_CHROOT_PREINSTALL_COMMON} \ + gcc-riscv64-linux-gnu \ + g++-riscv64-linux-gnu \ + dpkg-cross" diff --git a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot-target.bb b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot-target.bb index d75d783b..8f2da720 100644 --- a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot-target.bb +++ b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot-target.bb @@ -8,3 +8,7 @@ DESCRIPTION = "Isar sbuild/schroot filesystem for target" SBUILD_VARIANT = "target" require sbuild-chroot.inc + +SBUILD_CHROOT_PREINSTALL ?= " \ + ${SBUILD_CHROOT_PREINSTALL_COMMON} \ + " diff --git a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc index fa4a295c..08a2d55d 100644 --- a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc +++ b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc @@ -10,7 +10,13 @@ PV = "1.0" inherit rootfs +SBUILD_CHROOT_COMPAT_PREINSTALL_compat-arch = " \ + libc6-dev:${COMPAT_DISTRO_ARCH} \ + crossbuild-essential-${COMPAT_DISTRO_ARCH}" + SBUILD_CHROOT_PREINSTALL_COMMON = " \ + ${SBUILD_CHROOT_COMPAT_PREINSTALL} \ + libc6-dev:${DISTRO_ARCH} \ fakeroot \ build-essential \ debhelper \ @@ -19,10 +25,6 @@ SBUILD_CHROOT_PREINSTALL_COMMON = " \ equivs \ " -SBUILD_CHROOT_PREINSTALL ?= " \ - ${SBUILD_CHROOT_PREINSTALL_COMMON} \ -" - SBUILD_CHROOT_DIR = "${WORKDIR}/rootfs" ROOTFSDIR = "${SBUILD_CHROOT_DIR}" ROOTFS_PACKAGES = "${SBUILD_CHROOT_PREINSTALL}" -- 2.35.3