From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6739560601010307072 X-Received: by 2002:a05:6000:43:: with SMTP id k3mr19843686wrx.84.1569176234676; Sun, 22 Sep 2019 11:17:14 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:f5c1:: with SMTP id k1ls3642633wrp.0.gmail; Sun, 22 Sep 2019 11:17:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqz0HoJaqD1xkbw6UTUmieBIHFbLOMPoFtnyz6defqodjqDDHnIHsDYETY34RN2kwcSUpL7p X-Received: by 2002:a5d:4983:: with SMTP id r3mr18863320wrq.194.1569176234159; Sun, 22 Sep 2019 11:17:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569176234; cv=none; d=google.com; s=arc-20160816; b=uj8t0yJdj2LQfrRDBYqrE9WQJ1VKIZPyHTqeZepFA4fhwP0d4QobM7IttTutpQ1eLJ 5upAi5Zu8RscpbT3fezc/7gAriprtopQt0IAZj4ueKkCbTtY3/z7fUvhz0PetM3QQP7F MzLMqbzR2H7kqagg3odxA+Ja3ddnez8l2NyQY3UbPDap9yj/5Vwn5ILDKb83xB9rOZ5N 6mI2ZFgAMzXpwPDDWdgvTbR54X3mFWtUqs7wELerVolddnOBp8KcK52QYUSvjLccZJT/ tPl3lnfr6fB0e5IFjJsOj0v6MO+UBRXnCZXy2I8LQGx01KHxvmhg31ZOJ1XSkJcr+zrK 0gSQ== 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=R/3GrY1396qFww8ELgAXRKgCO4OhWiLZ0jpsk+5/f3U=; b=VLN6/StUXJq2L9uxYYDYxIKyjKssPFrKL/ZTHkOs4WO/eyeLWMbhJjvXipY17iMTki eSACLni/xW5ZNYIHUEEskka7pEb3RiKVVSqIIZ+JHC5Rl/dl8YwiGiItAbnix4luibaO 9Hi1y+M5w/fLmqiWXIV2DsY1js3Uj5jwReYlBENODFORefR5B9R+g7dnRDRisZRiU+Sv Gi4/w9hMfHi2tVxTLD2ArTWUeoBZi/bMFmBQfqnVCduuDz4L8bunvao3sWl97on8GHrL fNi+4zo8sqUOcQ5siWQ+WYf00IUzm3MwZgmjs5irAGgOzEre8Ajx7oNxlX7ozdxNUKP9 y8dA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 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 david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id u16si395232wmj.1.2019.09.22.11.17.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Sep 2019 11:17:14 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 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 david.siemens.de (8.15.2/8.15.2) with ESMTPS id x8MIHDHO015384 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sun, 22 Sep 2019 20:17:13 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.37.1]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x8MIHB8u005761 for ; Sun, 22 Sep 2019 20:17:13 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v5 08/27] Align WORKDIR structure with OE Date: Sun, 22 Sep 2019 20:16:52 +0200 Message-Id: <905af236f4874fcf37c5aae5a24e61e5733f0b94.1569176231.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: BYfpIFvXV5eU From: Jan Kiszka Pick up the OE pattern to have a per-PV-PR workdir under PN. It also aligns this with our STAMP setting. Signed-off-by: Jan Kiszka --- doc/user_manual.md | 2 +- meta/classes/image.bbclass | 2 +- meta/conf/bitbake.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/user_manual.md b/doc/user_manual.md index c40a214..47f0dd5 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -452,7 +452,7 @@ The user may use `met-isar/recipes-core-images` as a template for new image reci ### General Information The image recipe in Isar creates a folder with target root filesystem. Its default location is: ``` -tmp/work/${DISTRO}-${DISTRO_ARCH}/${MACHINE}/${IMAGE}/rootfs +tmp/work/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}-${IMAGE_TYPE}/${PV}-${PR}/rootfs ``` Every image type in Isar is implemented as a `bitbake` class. The goal of these classes is to pack root filesystem folder to appropriate format. diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 89cc5fe..0965f26 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -2,7 +2,7 @@ # Copyright (C) 2015-2017 ilbers GmbH # Make workdir and stamps machine-specific without changing common PN target -WORKDIR .= "-${MACHINE}-${IMAGE_TYPE}" +WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}-${IMAGE_TYPE}/${PV}-${PR}" STAMP = "${STAMPS_DIR}/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}-${IMAGE_TYPE}/${PV}-${PR}" STAMPCLEAN = "${STAMPS_DIR}/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}-${IMAGE_TYPE}/*-*" diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 9c9c7fe..bca1114 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -45,7 +45,7 @@ PERSISTENT_DIR = "${TMPDIR}/cache" GITPKGV = "${@bb.fetch2.get_srcrev(d, 'gitpkgv_revision')}" # isar specific config -WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PF}" +WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}/${PV}-${PR}" DEPLOY_DIR_BOOTSTRAP = "${DEPLOY_DIR}/bootstrap" DEPLOY_DIR_BUILDCHROOT = "${DEPLOY_DIR}/buildchroot" DEPLOY_DIR_SDKCHROOT = "${DEPLOY_DIR}/sdkchroot" -- 2.16.4