Openembedded Core Discussions
 help / color / mirror / Atom feed
From: Ed Bartosh <ed.bartosh@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 6/8] image_types: use correct output directory
Date: Tue, 24 Jan 2017 15:43:54 +0200	[thread overview]
Message-ID: <308ceeb669cbbf1c272fb626b0e373d55bdb48bb.1485264964.git.ed.bartosh@linux.intel.com> (raw)
In-Reply-To: <cover.1485264964.git.ed.bartosh@linux.intel.com>

Wic put result images into <output dir>/build, which was confusing.
Now it's fixed in wic code and images are put into output directory.
Changed code in image_types to reflect this.

[YOCTO #10783]

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
 meta/classes/image_types.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 5b1746a..c457f38 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -217,7 +217,7 @@ IMAGE_CMD_wic () {
 	fi
 
 	BUILDDIR="${TOPDIR}" wic create "$wks" --vars "${STAGING_DIR}/imgdata/" -e "${IMAGE_BASENAME}" -o "$out/" ${WIC_CREATE_EXTRA_ARGS}
-	mv "$out/build/$(basename "${wks%.wks}")"*.direct "$out${IMAGE_NAME_SUFFIX}.wic"
+	mv "$out/$(basename "${wks%.wks}")"*.direct "$out${IMAGE_NAME_SUFFIX}.wic"
 	rm -rf "$out/"
 }
 IMAGE_CMD_wic[vardepsexclude] = "WKS_FULL_PATH WKS_FILES"
-- 
2.1.4



  parent reply	other threads:[~2017-01-24 14:07 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-24 13:43 [PATCH 0/8] Fix for #10783 wic should not be writing out to /var/tmp/wic Ed Bartosh
2017-01-24 13:43 ` [PATCH 1/8] wic: change default output directory Ed Bartosh
2017-01-24 13:43 ` [PATCH 2/8] wic: get rid of baseimager inheritance Ed Bartosh
2017-01-24 13:43 ` [PATCH 3/8] wic: make workdir a temporary directory Ed Bartosh
2017-01-24 13:43 ` [PATCH 4/8] wic: remove unused API DirectImageCreator.get_disk_names Ed Bartosh
2017-01-24 13:43 ` [PATCH 5/8] wic: direct.py: get rid of names with two underscores Ed Bartosh
2017-01-24 13:43 ` Ed Bartosh [this message]
2017-01-24 13:43 ` [PATCH 7/8] selftest: wic: explicitly specify output directory Ed Bartosh
2017-01-24 13:43 ` [PATCH 8/8] selftest: wic: test default " Ed Bartosh

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=308ceeb669cbbf1c272fb626b0e373d55bdb48bb.1485264964.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