From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6729358150130991104 X-Received: by 2002:adf:e801:: with SMTP id o1mr20797807wrm.45.1566800792827; Sun, 25 Aug 2019 23:26:32 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:a557:: with SMTP id o84ls5848812wme.3.gmail; Sun, 25 Aug 2019 23:26:32 -0700 (PDT) X-Google-Smtp-Source: APXvYqyKoJRh16W8g89nEamt9vf/iKg5JUkgJBhtrz/pIuZvLDAOyWTlxSuI4HPzurWR5tzjEB1s X-Received: by 2002:a7b:c3d0:: with SMTP id t16mr20669528wmj.25.1566800792283; Sun, 25 Aug 2019 23:26:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566800792; cv=none; d=google.com; s=arc-20160816; b=TFhwZF7VnuJRE+n3ePOyR4VzB2J4QERea6HqejV68FsubO5doPyRV7MUcYlp5GJyiC oujOrTtABvSmKZbjulfEyUExJIRUAmKCVVUuzznYWP+AWFNydZmQAYUla4mBSlLxTkbJ ckyqRzUcq3++uPvEBSiWQfJe+vxdq8jNWpNeupUAIYndivGRZd9zEKBsIJcEM0ZvpFbS iCEMoDyEk4ZOoWvLwUhM+4yGS+gEqk36+N0XEle5LptDcuewW/2tXJbSzhtaMTvG9Ial mIbxGMwkgwPtPvXXQRpusA0prsTY2a0DpX36MabTGQIdKDppK47VVxScGFlKUOITeHYd sZUg== 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=Piy/71HLO2Pe1mxFH3t9vNxwdBR5Kc4CjU9TM5YeYQM=; b=Uxc8VLC3DDLaT+vOIfu+iowwknOxzWeca+sbbCNr1KPQtv9tslPczuZQFNFQDxbz7V HQkqq9nw+yz1tqQX2KHMb+IY6TPt8X2y0jmMdHeCnEZgxSE6Lj3P2+80cj6CrSzuvrdO sh+kqZaZqqa/l0PpLXgewLq0WW2XUombFlxPozvWna8Gucphi9N5lzVf/+WRcwXPusq0 Hwim/tZchIYeHq4bXAs5yQ93ORUhdEWKetimwEpwxZ/Q5/jzKFmJPKQniVFdEVRPbVtX DVkK8u72LNJHpwtRiZyJwNpJ39NTUh1HH7D5V+KK11LSsjvvFK92pK+8NfmthAyYOLW2 xWtg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 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 thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id b15si599979wmg.1.2019.08.25.23.26.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 25 Aug 2019 23:26:32 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id x7Q6QVv4025089 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 26 Aug 2019 08:26:31 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.35.99]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x7Q6QRH8015165 for ; Mon, 26 Aug 2019 08:26:31 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH 14/26] buildchroot: Properly deploy the build result Date: Mon, 26 Aug 2019 08:26:15 +0200 Message-Id: <74d61c2a93e97929f162fc0558e51304f76bda88.1566800787.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: NASHI1UhYP35 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 2ba2cdd..a87e144 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