From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6463342265335021568 X-Received: by 10.28.217.12 with SMTP id q12mr254428wmg.30.1504886191260; Fri, 08 Sep 2017 08:56:31 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.70.5 with SMTP id t5ls90550wma.18.canary-gmail; Fri, 08 Sep 2017 08:56:30 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBhFqmWcOSiYlG6fJWxhDiivrMiVXJKnUo4bX0fP4m+kD71JOrpjjNcj4WdpusM/PVLRuxL X-Received: by 10.28.48.23 with SMTP id w23mr255813wmw.2.1504886190920; Fri, 08 Sep 2017 08:56:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504886190; cv=none; d=google.com; s=arc-20160816; b=aE9w3VRrn80oqF8PSIcs6/uS9JIVvFjO5bPmriR37k6uZUvtFFtswPGwzxCCt05sca gJ6aX4cbY/vwZYYSiLSxW55o81vX8QyYdVE6IT0a7jv5Wv3rq14+bo152lvgO7j+GnLp tufiannwW65kOlQKvmWmckzoh/xwaL4YgZCbThamD3k5hZFlvHFmBeLsHR3H9VJGPZvP WVsqQUqNEBYeRSi5eVP2EeSek5qfL3oLRJVW/GOq2Cg1HT6mrTRNMOozMYsHqlSIkwQk Q2Wgkqa2nlROhjvvBRgZgP3UDnrk1RNWvv2au5yXNxkxN7SpGQU3fZNRCzo4qAoAtD2v 6lFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=sbDnB8kqQnsYu2bkkHSKqijUyc2rRNngTbuEHSEg4QA=; b=jUue/d/p9pr0SZTdEH6m9WjoNosk/G2wWT9oE2s+PApr69UdC9KHYum7sJ32vYr/ZR WyFJrmbvXi8y7MJj4XjkpE57KawOyALTsDEb5N3zH2umK6Ja98ivl11X/NBq7jTfI1sp PxAYBOIl8J20VlvKbB3TjwRmZhNzD7XauKhYWTmX+KgdGt5lOrW+e7BVBIpdrRnOgMfI 31CJymzmqqImLFMUqkHlnB22XhS5B4EuRkPFYKUxEV1fhZkSXMinSFmqSdIBKYD/H827 x2bG01v7vQHdYdgkdUFye2LwWtS1f6CkuF9VD/ZGsYNdHdKjCCrA6kzKNtEWrIJg7RUu r91g== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=asmirnov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id e135si133485wmg.6.2017.09.08.08.56.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Sep 2017 08:56:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) client-ip=85.214.62.211; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=asmirnov@ilbers.de Received: from localhost.localdomain ([188.227.110.165]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id v88FuCGO011354 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 8 Sep 2017 17:56:19 +0200 From: Alexander Smirnov To: isar-users@googlegroups.com Cc: Alexander Smirnov Subject: [PATCH v2 2/5] isar: Change build folders tree Date: Fri, 8 Sep 2017 18:56:03 +0300 Message-Id: <20170908155606.7654-3-asmirnov@ilbers.de> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170908155606.7654-1-asmirnov@ilbers.de> References: <20170908155606.7654-1-asmirnov@ilbers.de> X-TUID: lrFwCW3IoLz5 Differentiate folders tree, that are generated during build on the highest possible level. So the overal tree now looks like the following: tmp/work/${DISTRO}-${DISTRO_ARCH}/${PF} This approach eliminates lots of subfolders to diffirentiate buildchroot and image for multiconfig builds. Now each configuration has private tree. Signed-off-by: Alexander Smirnov --- meta-isar/recipes-core/images/isar-image-base.bb | 8 ++++---- meta/conf/isar-bitbake.conf | 5 ++++- meta/recipes-devtools/buildchroot/buildchroot.bb | 8 ++++---- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/meta-isar/recipes-core/images/isar-image-base.bb b/meta-isar/recipes-core/images/isar-image-base.bb index 94cbc9e..cde506e 100644 --- a/meta-isar/recipes-core/images/isar-image-base.bb +++ b/meta-isar/recipes-core/images/isar-image-base.bb @@ -17,7 +17,7 @@ DEPENDS += "${IMAGE_INSTALL}" IMAGE_PREINSTALL += "apt \ dbus" -WORKDIR = "${TMPDIR}/work/${PN}/${MACHINE}/${DISTRO}" +WORKDIR_NAME = "${PN}" do_rootfs[stamp-extra-info] = "${MACHINE}-${DISTRO}" @@ -36,9 +36,9 @@ do_rootfs() { sed -i 's|##DISTRO_APT_SOURCE##|${DISTRO_APT_SOURCE}|' ${WORKDIR}/multistrap.conf sed -i 's|##DISTRO_SUITE##|${DISTRO_SUITE}|' ${WORKDIR}/multistrap.conf sed -i 's|##DISTRO_COMPONENTS##|${DISTRO_COMPONENTS}|' ${WORKDIR}/multistrap.conf - sed -i 's|##CONFIG_SCRIPT##|./tmp/work/${PN}/${MACHINE}/${DISTRO}/configscript.sh|' ${WORKDIR}/multistrap.conf - sed -i 's|##SETUP_SCRIPT##|./tmp/work/${PN}/${MACHINE}/${DISTRO}/setup.sh|' ${WORKDIR}/multistrap.conf - sed -i 's|##DIR_HOOKS##|./tmp/work/${PN}/${MACHINE}/${DISTRO}/hooks_multistrap|' ${WORKDIR}/multistrap.conf + sed -i 's|##CONFIG_SCRIPT##|./${WORKDIR_RELATIVE}/configscript.sh|' ${WORKDIR}/multistrap.conf + sed -i 's|##SETUP_SCRIPT##|./${WORKDIR_RELATIVE}/setup.sh|' ${WORKDIR}/multistrap.conf + sed -i 's|##DIR_HOOKS##|./${WORKDIR_RELATIVE}/hooks_multistrap|' ${WORKDIR}/multistrap.conf # Multistrap config use relative paths, so ensure that we are in the right folder cd ${TOPDIR} diff --git a/meta/conf/isar-bitbake.conf b/meta/conf/isar-bitbake.conf index f85f5cc..9f3ab27 100644 --- a/meta/conf/isar-bitbake.conf +++ b/meta/conf/isar-bitbake.conf @@ -18,9 +18,12 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. +WORKDIR_NAME ?= "${PF}" +WORKDIR_RELATIVE = "tmp/work/${DISTRO}-${DISTRO_ARCH}/${WORKDIR_NAME}" +WORKDIR = "${TOPDIR}/${WORKDIR_RELATIVE}" DEPLOY_DIR_DEB = "${TMPDIR}/deploy/deb/${MACHINE}" SSTATE_DIR ?= "${TMPDIR}/sstate-cache" -BUILDCHROOT_DIR = "${TOPDIR}/tmp/work/buildchroot/${DISTRO}-${DISTRO_ARCH}/rootfs" +BUILDCHROOT_DIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/buildchroot/rootfs" # Setup our default hash policy BB_SIGNATURE_HANDLER ?= "noop" diff --git a/meta/recipes-devtools/buildchroot/buildchroot.bb b/meta/recipes-devtools/buildchroot/buildchroot.bb index ccba683..3587aa1 100644 --- a/meta/recipes-devtools/buildchroot/buildchroot.bb +++ b/meta/recipes-devtools/buildchroot/buildchroot.bb @@ -21,7 +21,7 @@ BUILDCHROOT_PREINSTALL ?= "gcc \ apt \ automake" -WORKDIR = "${TMPDIR}/work/${PF}/${DISTRO}" +WORKDIR_NAME = "buildchroot" do_build[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" @@ -40,9 +40,9 @@ do_build() { sed -i 's|##DISTRO_APT_SOURCE##|${DISTRO_APT_SOURCE}|' ${WORKDIR}/multistrap.conf sed -i 's|##DISTRO_SUITE##|${DISTRO_SUITE}|' ${WORKDIR}/multistrap.conf sed -i 's|##DISTRO_COMPONENTS##|${DISTRO_COMPONENTS}|' ${WORKDIR}/multistrap.conf - sed -i 's|##CONFIG_SCRIPT##|./tmp/work/${PF}/${DISTRO}/configscript.sh|' ${WORKDIR}/multistrap.conf - sed -i 's|##SETUP_SCRIPT##|./tmp/work/${PF}/${DISTRO}/setup.sh|' ${WORKDIR}/multistrap.conf - sed -i 's|##DIR_HOOKS##|./tmp/work/${PF}/${DISTRO}/hooks_multistrap|' ${WORKDIR}/multistrap.conf + sed -i 's|##CONFIG_SCRIPT##|./${WORKDIR_RELATIVE}/configscript.sh|' ${WORKDIR}/multistrap.conf + sed -i 's|##SETUP_SCRIPT##|./${WORKDIR_RELATIVE}/setup.sh|' ${WORKDIR}/multistrap.conf + sed -i 's|##DIR_HOOKS##|./${WORKDIR_RELATIVE}/hooks_multistrap|' ${WORKDIR}/multistrap.conf # Multistrap config use relative paths, so ensure that we are in the right folder cd ${TOPDIR} -- 2.1.4