From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6739560601010307072 X-Received: by 2002:a1c:f01a:: with SMTP id a26mr10890676wmb.84.1569176232967; Sun, 22 Sep 2019 11:17:12 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a7b:c8d9:: with SMTP id f25ls3339800wml.5.gmail; Sun, 22 Sep 2019 11:17:12 -0700 (PDT) X-Google-Smtp-Source: APXvYqyBE8amOwnf6eueHKjXNYRlcjIeOYg4LtZyaVknQgyEWQ7YcF1SXwq/VkiYN6oGWbj6j+8W X-Received: by 2002:a1c:48d5:: with SMTP id v204mr11564065wma.109.1569176232440; Sun, 22 Sep 2019 11:17:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569176232; cv=none; d=google.com; s=arc-20160816; b=jo9JEqbRcRMgrFZSw8+iWo4IvTRCl5nHR7/SVQZpjbzv1hNmkLZ9yUC+yFutr5+Z+G zS+wdJK6FJp6XuKYXDHpMzzDVYDpBrm4DwvNep075oLpJZwoBFRfYLhgEZW5iuFmwIyW zv1VskGPHW0COPz0OXklwpIFFBxTOO2z8lxPyAa717gGrreg+XjHMJbKsXgRVBpx6RzL bEStcMvSUfzDqeDjOptVMAzxPa/ZwcxzwR9tsSBslEY1yvyUhqmjD73pvP1QdPXqDTlX 8z871maqrJtpDZfSZKoksHC5KL1eZHLBmmo1c/w9M1Yf74eXMWC5s0LbusheU1SLdB2U GnEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:to:from; bh=+2YAa8Kkr/diFte0L20tgnllVGT+Gd6FzAD5X/OBbAk=; b=eRQ1+rYVroTqzvmk8YqPiGk7CoJwkWxEJ4r2Ttep0C7TSmYTnoWARvCk4xE0FQzOsk ChoVb720aYVP2kq4U+Sg2LEJJjEm2gADQY6QJB1kPKxwjdjJmRowpJQjC9BAMu/4G12C 6DHyic+9OUx0zaIBjMHTuT2shCakGh7eaYB4jIWw1lgMWta+FsjVzvYWMifxbJcyw4Sz f8NE+de5B4sFIGERSrGeoiU/F0avcf6P+Ta0J7slCc1Ag1ggXRCKVOBaNGqkAnBYG0Jn AvKO1xjMUTJ9xbKIsX/Kw1eQBC/A16VeTo1Nfxxc1rbbffClL8zPUWpHS4Lg234mne3T rL+Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id y3si520736wmj.0.2019.09.22.11.17.12 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Sep 2019 11:17:12 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id x8MIHCtY027385 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sun, 22 Sep 2019 20:17:12 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.37.1]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x8MIHB8n005761 for ; Sun, 22 Sep 2019 20:17:11 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v5 01/27] buildchroot: Properly deploy the build result Date: Sun, 22 Sep 2019 20:16:45 +0200 Message-Id: <75933efe71b10aea7097dd4283d9237349ff7a53.1569176231.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: mz0YIFRbCgj2 From: Jan Kiszka This follows the pattern used for isar-bootstrap already: Establish a stable link to the rootfs in the workdir from a folder in DEPLOY_DIR. This is cleaner than pointing directly into the workdir via BUILDCHROOT_HOST/TARGET_DIR, and it avoid having to mess with PF. Signed-off-by: Jan Kiszka --- meta/classes/buildchroot.bbclass | 2 +- meta/conf/bitbake.conf | 5 +++-- meta/recipes-devtools/buildchroot/buildchroot-host.bb | 2 ++ meta/recipes-devtools/buildchroot/buildchroot-target.bb | 2 ++ meta/recipes-devtools/buildchroot/buildchroot.inc | 13 +++++++++++++ 5 files changed, 21 insertions(+), 3 deletions(-) diff --git a/meta/classes/buildchroot.bbclass b/meta/classes/buildchroot.bbclass index b48b72c..64ac450 100644 --- a/meta/classes/buildchroot.bbclass +++ b/meta/classes/buildchroot.bbclass @@ -21,7 +21,7 @@ python __anonymous() { d.setVar('BUILDCHROOT_DIR', rootfs) } -MOUNT_LOCKFILE = "${BUILDCHROOT_DIR}/mount.lock" +MOUNT_LOCKFILE = "${BUILDCHROOT_DIR}.lock" buildchroot_do_mounts() { sudo -s <<'EOSUDO' diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 1b9f92b..f25b20f 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -47,11 +47,12 @@ GITPKGV = "${@bb.fetch2.get_srcrev(d, 'gitpkgv_revision')}" # isar specific config WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PF}" DEPLOY_DIR_BOOTSTRAP = "${DEPLOY_DIR}/bootstrap" +DEPLOY_DIR_BUILDCHROOT = "${DEPLOY_DIR}/buildchroot" DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" DL_DIR ?= "${TOPDIR}/downloads" SSTATE_DIR ?= "${TMPDIR}/sstate-cache" -BUILDCHROOT_HOST_DIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/buildchroot-host-${HOST_DISTRO}-${HOST_ARCH}-${DISTRO_ARCH}/rootfs" -BUILDCHROOT_TARGET_DIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/buildchroot-target-${DISTRO}-${DISTRO_ARCH}/rootfs" +BUILDCHROOT_HOST_DIR = "${DEPLOY_DIR_BUILDCHROOT}-host/${HOST_DISTRO}-${HOST_ARCH}_${DISTRO}-${DISTRO_ARCH}" +BUILDCHROOT_TARGET_DIR = "${DEPLOY_DIR_BUILDCHROOT}-target/${DISTRO}-${DISTRO_ARCH}" CACHE = "${TMPDIR}/cache" OVERRIDES = "${DISTRO_ARCH}:${MACHINE}:${DISTRO}:forcevariable" diff --git a/meta/recipes-devtools/buildchroot/buildchroot-host.bb b/meta/recipes-devtools/buildchroot/buildchroot-host.bb index 121992c..40a37ea 100644 --- a/meta/recipes-devtools/buildchroot/buildchroot-host.bb +++ b/meta/recipes-devtools/buildchroot/buildchroot-host.bb @@ -6,6 +6,8 @@ DESCRIPTION = "Isar development filesystem for host" PF = "${PN}-${HOST_DISTRO}-${HOST_ARCH}-${DISTRO_ARCH}" +BUILDCHROOT_VARIANT = "host" + require buildchroot.inc ROOTFS_ARCH = "${HOST_ARCH}" ROOTFS_DISTRO = "${HOST_DISTRO}" diff --git a/meta/recipes-devtools/buildchroot/buildchroot-target.bb b/meta/recipes-devtools/buildchroot/buildchroot-target.bb index 5a01258..3b96977 100644 --- a/meta/recipes-devtools/buildchroot/buildchroot-target.bb +++ b/meta/recipes-devtools/buildchroot/buildchroot-target.bb @@ -6,6 +6,8 @@ DESCRIPTION = "Isar development filesystem for target" PF = "${PN}-${DISTRO}-${DISTRO_ARCH}" +BUILDCHROOT_VARIANT = "target" + require buildchroot.inc BUILDCHROOT_PREINSTALL ?= "gcc \ diff --git a/meta/recipes-devtools/buildchroot/buildchroot.inc b/meta/recipes-devtools/buildchroot/buildchroot.inc index 40fc8b0..e704137 100644 --- a/meta/recipes-devtools/buildchroot/buildchroot.inc +++ b/meta/recipes-devtools/buildchroot/buildchroot.inc @@ -46,3 +46,16 @@ buildchroot_install_files() { sudo chroot ${BUILDCHROOT_DIR} /configscript.sh $USER_ID $GROUP_ID } + +DEPLOY_BUILDCHROOT = "${@d.getVar('BUILDCHROOT_' + d.getVar('BUILDCHROOT_VARIANT').upper() + '_DIR')}" + +do_buildchroot_deploy[dirs] = "${DEPLOY_DIR_BUILDCHROOT}-${BUILDCHROOT_VARIANT}" +do_buildchroot_deploy() { + ln -Tfsr "${ROOTFSDIR}" "${DEPLOY_BUILDCHROOT}" +} +addtask buildchroot_deploy before do_build after do_rootfs + +CLEANFUNCS = "clean_deploy" +clean_deploy() { + rm -f "${DEPLOY_BUILDCHROOT}" +} -- 2.16.4