From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6449247988281769984 X-Received: by 10.46.84.8 with SMTP id i8mr1114321ljb.12.1501582560759; Tue, 01 Aug 2017 03:16:00 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.25.17.211 with SMTP id 80ls191220lfr.47.gmail; Tue, 01 Aug 2017 03:16:00 -0700 (PDT) X-Received: by 10.25.25.83 with SMTP id 80mr1715981lfz.21.1501582560378; Tue, 01 Aug 2017 03:16:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501582560; cv=none; d=google.com; s=arc-20160816; b=eLoGsaqSxXzDPI8tvyZo2GDrbLkmjP+KyoSldaNpXQaH+Mxm1kf0d2whHBdP+/5uh3 FfIwbcojmetT0mIePvTUDGTSRi6Vy0HtAPMWYiC8Vr3wuvOboaRaGoWHk0npltcdDEMm VzWtafkGWidLM/mktjxY4wkNXdJ5tuwsQM7Heo8OvUeXUIdmbyvf/QkZJdXEPMsz4SUv A/tR1u6ldqHpkidZ1uh3z1+bxcRooLD0s1J3UN8ROGtEnyy4z/WDYhk958a1yeLyBVwp O+3D9WLLE+dDoGtLnTp+GpAOHjuHr/PQjKJNhQVwbkyfYf4IEeG4TTKLUsYyHFnWaZ8p uJew== 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:cc:to:from:arc-authentication-results; bh=W0ZoYH4yhIIJCyhl9lkx1IwUiljG15xAVSmb6dYknhE=; b=Qi6s8yOQrn+LQnTBBsDdVHU+YjOgAPbsdDob5SjkkBNFhtoQxXIDhyxuQav8OWpFQe gGzv62NzOqzJK+VjszqYR4aFtQ8QUi56Ezp0JkSWjXy4Nog8dzQjknDob4FC2VcAVbp3 6MJfz2DjfPvKTbnYS42+Dgsy8mvGgVP8ZAqan3uhQ+48m/I3Xdyll27tHfyZOyGY8d/X 3QwM9+xJ/b8MJsOjfIAgkswed+C65Jtkgw7mrGFT45pJQoOyiSi1ITS1kTH6z3iHon6O 4WhD1sDRUiZVhQnvBWDYKkVAxexNXCztroPSH3X8gJE1nk3vhIPGNksMp2V9NK5SV7KD WiMg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 192.35.17.14 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id v142si70636wmv.8.2017.08.01.03.16.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 Aug 2017 03:16:00 -0700 (PDT) Received-SPF: neutral (google.com: 192.35.17.14 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 192.35.17.14 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) smtp.mailfrom=henning.schild@siemens.com Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id v71AFxpA020654 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 1 Aug 2017 12:15:59 +0200 Received: from md1em3qc.ww002.siemens.net ([139.25.68.40]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id v71AFx62016179; Tue, 1 Aug 2017 12:15:59 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH 07/16] classes: use WORKDIR and get rid of BUILDROOT Date: Tue, 1 Aug 2017 12:17:25 +0200 Message-Id: <048e88d5072fc038c8bd6207334e9967d5a29e0c.1501582237.git.henning.schild@siemens.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: References: In-Reply-To: References: X-TUID: Xe9DfkGpsv2w Signed-off-by: Henning Schild --- meta/classes/dpkg.bbclass | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index 3d7aafb..1d0132b 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -10,9 +10,7 @@ do_unpack[deptask] = "do_build" # Each package should have its own unique build folder, so use # recipe name as identifier PP = "/home/builder/${PN}" -BUILDROOT = "${BUILDCHROOT_DIR}/${PP}" - -do_fetch[dirs] = "${DL_DIR}" +WORKDIR = "${BUILDCHROOT_DIR}/${PP}" # Fetch package from the source link python do_fetch() { @@ -28,10 +26,10 @@ python do_fetch() { } addtask fetch before do_build +do_fetch[dirs] = "${DL_DIR}" -do_unpack[dirs] = "${BUILDROOT}" do_unpack[stamp-extra-info] = "${DISTRO}" -S ?= "${BUILDROOT}" +S ?= "${WORKDIR}" # Unpack package and put it into working directory in buildchroot python do_unpack() { @@ -39,16 +37,15 @@ python do_unpack() { if len(src_uri) == 0: return - rootdir = d.getVar('BUILDROOT', True) - try: fetcher = bb.fetch2.Fetch(src_uri, d) - fetcher.unpack(rootdir) + fetcher.unpack(d.getVar('WORKDIR', True)) except bb.fetch2.BBFetchException as e: raise bb.build.FuncFailed(e) } addtask unpack after do_fetch before do_build +do_unpack[dirs] = "${WORKDIR}" do_build[stamp-extra-info] = "${DISTRO}" @@ -62,7 +59,7 @@ do_install[stamp-extra-info] = "${MACHINE}" # Install package to dedicated deploy directory do_install() { install -d ${DEPLOY_DIR_DEB} - install -m 755 ${BUILDROOT}/*.deb ${DEPLOY_DIR_DEB}/ + install -m 755 ${WORKDIR}/*.deb ${DEPLOY_DIR_DEB}/ } addtask do_install after do_build -- 2.13.0