public inbox for openembedded-core@lists.openembedded.org
 help / color / mirror / Atom feed
From: Ed Bartosh <ed.bartosh@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 11/18] rootfs.py: use DEPLOYDIR instead of DEPLOY_DIR_IMAGE
Date: Tue, 30 Aug 2016 12:29:44 +0300	[thread overview]
Message-ID: <1f8d8e14b217e600e8ba5ab4bf21626f63c3eefb.1472548574.git.ed.bartosh@linux.intel.com> (raw)
In-Reply-To: <cover.1472548574.git.ed.bartosh@linux.intel.com>
In-Reply-To: <cover.1472548574.git.ed.bartosh@linux.intel.com>

Updated the code of Rootfs class to use DEPLOYDIR variable
as it's now used as a new deployment destination.

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
 meta/lib/oe/rootfs.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index 7c620e9..076bc33 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -19,7 +19,7 @@ class Rootfs(object, metaclass=ABCMeta):
         self.d = d
         self.pm = None
         self.image_rootfs = self.d.getVar('IMAGE_ROOTFS', True)
-        self.deploy_dir_image = self.d.getVar('DEPLOY_DIR_IMAGE', True)
+        self.deploydir = self.d.getVar('DEPLOYDIR', True)
         self.progress_reporter = progress_reporter
 
         self.install_order = Manifest.INSTALL_ORDER
@@ -182,12 +182,12 @@ class Rootfs(object, metaclass=ABCMeta):
 
         bb.utils.mkdirhier(self.image_rootfs)
 
-        bb.utils.mkdirhier(self.deploy_dir_image)
+        bb.utils.mkdirhier(self.deploydir)
 
         shutil.copytree(postinst_intercepts_dir, intercepts_dir)
 
         shutil.copy(self.d.expand("${COREBASE}/meta/files/deploydir_readme.txt"),
-                    self.deploy_dir_image +
+                    self.deploydir +
                     "/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt")
 
         execute_pre_post_process(self.d, pre_process_cmds)
-- 
2.1.4



  parent reply	other threads:[~2016-08-30  9:31 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-30  9:29 [PATCH 00/18] Provide list of deployment artifacts Ed Bartosh
2016-08-30  9:29 ` [PATCH 01/18] image-live.bbclass: deploy images to DEPLOYDIR Ed Bartosh
2016-08-30  9:29 ` [PATCH 02/18] image-vm.bbclass: " Ed Bartosh
2016-08-30  9:29 ` [PATCH 03/18] image.bbclass: " Ed Bartosh
2016-08-30  9:29 ` [PATCH 04/18] " Ed Bartosh
2016-08-30  9:29 ` [PATCH 05/18] image_types_uboot.bbclass: " Ed Bartosh
2016-08-30  9:29 ` [PATCH 06/18] syslinux.bbclass: deploy bootloader " Ed Bartosh
2016-08-30  9:29 ` [PATCH 07/18] build-appliance-image: process images in DEPLOYDIR Ed Bartosh
2016-08-30  9:29 ` [PATCH 08/18] populate_sdk_base.bbclass: deploy sdk artifacts to DEPLOYDIR Ed Bartosh
2016-08-30  9:29 ` [PATCH 09/18] rootfs-postcommands.bbclass: generate manifest in DEPLOYDIR Ed Bartosh
2016-08-30  9:29 ` [PATCH 10/18] selftest: renamed variable Ed Bartosh
2016-08-30  9:29 ` Ed Bartosh [this message]
2016-08-30  9:29 ` [PATCH 12/18] image.bbclass: put image_complete under sstate control Ed Bartosh
2016-08-30  9:29 ` [PATCH 13/18] image.bbclass: cleanup DEPLOYDIR Ed Bartosh
2016-08-30  9:29 ` [PATCH 14/18] populate_sdk_base: put populate_sdk under sstate control Ed Bartosh
2016-08-30  9:29 ` [PATCH 15/18] sstate.bbclass: skip packaging if SSTATE_SKIP_CREATION is set Ed Bartosh
2016-08-30  9:29 ` [PATCH 16/18] image: populate_sdk_base: skip sstate creation Ed Bartosh
2016-08-30  9:29 ` [PATCH 17/18] image: populate_sdk_base: set stamp-extra-info flag Ed Bartosh
2016-08-30  9:29 ` [PATCH 18/18] toaster: fire TaskArtifacts event Ed Bartosh
2016-08-30 10:08 ` [PATCH 00/18] Provide list of deployment artifacts Richard Purdie
2016-08-30 10:21 ` Otavio Salvador
2016-08-30 10:35   ` Ed Bartosh
2016-08-30 10:58     ` Otavio Salvador
2016-08-30 11:21       ` Ed Bartosh
2016-08-30 13:36         ` Otavio Salvador
2016-08-30 14:06           ` Richard Purdie

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1f8d8e14b217e600e8ba5ab4bf21626f63c3eefb.1472548574.git.ed.bartosh@linux.intel.com \
    --to=ed.bartosh@linux.intel.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox