From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6729358150130991104 X-Received: by 2002:a1c:c542:: with SMTP id v63mr19083729wmf.97.1566800794235; Sun, 25 Aug 2019 23:26:34 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:5506:: with SMTP id b6ls4144528wrv.4.gmail; Sun, 25 Aug 2019 23:26:33 -0700 (PDT) X-Google-Smtp-Source: APXvYqx9eWRz2oPZJ/iVCW3RWH88kR6t4y1LpEswTzqKj5WzoUHf5PCfpTfS++dV7z7Hbrnv7Gdt X-Received: by 2002:adf:e8c3:: with SMTP id k3mr20853499wrn.8.1566800793881; Sun, 25 Aug 2019 23:26:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566800793; cv=none; d=google.com; s=arc-20160816; b=gwCeCSth5IMady/B+/w536sLg8jb0M1YGkAMgDVrVB47kkfoJdSI6N0V53oef9NX+I V2IPcAyM8HkHPJsb/pCEqYRDnPFak4SEui03puYinyFCeN9cjdwaUbiOQYAPqkXDQVsz zoSUA8rwaex9OPuQKD0kRYwmeLOeY5M/ywZCIx3MuchG88+W6viu9OMlJ5d8UD49H/p7 qRDuhS1SGtQVvuOir3gII26WWv8slvf0XVhFBEVC4LRvS6XEVNF27cjUHJmkJnUTU6xB /Cp8m0tiXzIXs9lpg3GMV7zXtrPB6k5RIPl+z2k0sdEq5Tt8Ij8hDM7PdIyuQWf3xEJb K2YA== 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=ZvskHP82J7QkTjaO2thdfo0Cr6T+nn+EcGValacpSfM=; b=JW2sMnQC9icHhzbyhmQRVOfP66ZeOIr/nf260x7kSLu4kSoPsmMU8GQ4A3/THuq/6Y TKHUOnahVxeahqk3SoEVKpPvbGPYE7YNnrn5u6ufYGfxFOu2E13gCcyMZPNK2/fhqWNY UFiOl9PgBA8vVbhidTHty0qiQqgQm+9umBLAJp4Mh2cB3nbGmB7c7PvlSs0HtNdpS9QU OB5GU1fLdleVkrpmV9gMJCtXe4xq8wKQTxyu9elCExmLLwX9LfjyR/yO0QoLZcuqkoXc N+/HC4LFAIPNgwHn/nXO4LgYjfLh86VN2GUM1FZRe30vatIB7rtID1AkWw3eP11s3Jer wOug== 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 o4si591417wrp.4.2019.08.25.23.26.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 25 Aug 2019 23:26:33 -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 x7Q6QX8H025172 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 26 Aug 2019 08:26:33 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.35.99]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x7Q6QRHF015165 for ; Mon, 26 Aug 2019 08:26:32 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH 21/26] Align WORKDIR structure with OE Date: Mon, 26 Aug 2019 08:26:22 +0200 Message-Id: <6dcf2e826c07b379e9d4d06302747c95e0aa7301.1566800787.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: WSZC/e+AU1OS 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 289fd1d..eba5f0f 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