image_types.bbclass: add WIC_CREATE_EXTRA_ARGS

Submitted by Christopher Larson on May 3, 2016, 12:06 a.m. | Patch ID: 121413

Details

Message ID 1462233963-14800-1-git-send-email-kergoth@gmail.com
State Accepted
Commit 90b2738fb07e329cb6b867fb37a929d562f27d15
Headers show

Commit Message

Christopher Larson May 3, 2016, 12:06 a.m.
From: Christopher Larson <chris_larson@mentor.com>

This'll be of use to pass things like --bmap.

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 meta/classes/image_types.bbclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 19f89f3..385d47e 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -193,6 +193,8 @@  def wks_search(files, search_path):
             if searched:
                 return searched
 
+WIC_CREATE_EXTRA_ARGS ?= ""
+
 IMAGE_CMD_wic () {
 	out="${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}"
 	wks="${WKS_FULL_PATH}"
@@ -200,7 +202,7 @@  IMAGE_CMD_wic () {
 		bbfatal "No kickstart files from WKS_FILES were found: ${WKS_FILES}. Please set WKS_FILE or WKS_FILES appropriately."
 	fi
 
-	BUILDDIR="${TOPDIR}" wic create "$wks" --vars "${STAGING_DIR_TARGET}/imgdata/" -e "${IMAGE_BASENAME}" -o "$out/"
+	BUILDDIR="${TOPDIR}" wic create "$wks" --vars "${STAGING_DIR_TARGET}/imgdata/" -e "${IMAGE_BASENAME}" -o "$out/" ${WIC_CREATE_EXTRA_ARGS}
 	mv "$out/build/$(basename "${wks%.wks}")"*.direct "$out${IMAGE_NAME_SUFFIX}.wic"
 	rm -rf "$out/"
 }

Comments

Ed Bartosh May 3, 2016, 7:27 a.m.
Hi Christopher,

Thank you for the patch! I like the idea.

Would you mind adding or modifying wic oe-selftest to cover this?

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>

PS: You've mentioned --bmap as a possible use case scenario for this. I
don't think this is the case as it's simpler to use wic.bmap image
type to achieve this. It's implemented by this patchset:
http://lists.openembedded.org/pipermail/openembedded-core/2016-April/120644.html

On Mon, May 02, 2016 at 05:06:03PM -0700, Christopher Larson wrote:
> From: Christopher Larson <chris_larson@mentor.com>
> 
> This'll be of use to pass things like --bmap.
> 
> Signed-off-by: Christopher Larson <chris_larson@mentor.com>
> ---
>  meta/classes/image_types.bbclass | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
> index 19f89f3..385d47e 100644
> --- a/meta/classes/image_types.bbclass
> +++ b/meta/classes/image_types.bbclass
> @@ -193,6 +193,8 @@ def wks_search(files, search_path):
>              if searched:
>                  return searched
>  
> +WIC_CREATE_EXTRA_ARGS ?= ""
> +
>  IMAGE_CMD_wic () {
>  	out="${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}"
>  	wks="${WKS_FULL_PATH}"
> @@ -200,7 +202,7 @@ IMAGE_CMD_wic () {
>  		bbfatal "No kickstart files from WKS_FILES were found: ${WKS_FILES}. Please set WKS_FILE or WKS_FILES appropriately."
>  	fi
>  
> -	BUILDDIR="${TOPDIR}" wic create "$wks" --vars "${STAGING_DIR_TARGET}/imgdata/" -e "${IMAGE_BASENAME}" -o "$out/"
> +	BUILDDIR="${TOPDIR}" wic create "$wks" --vars "${STAGING_DIR_TARGET}/imgdata/" -e "${IMAGE_BASENAME}" -o "$out/" ${WIC_CREATE_EXTRA_ARGS}
>  	mv "$out/build/$(basename "${wks%.wks}")"*.direct "$out${IMAGE_NAME_SUFFIX}.wic"
>  	rm -rf "$out/"
>  }
> -- 
> 2.8.0
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
Christopher Larson May 3, 2016, 3:02 p.m.
On Tue, May 3, 2016 at 7:27 AM, Ed Bartosh <ed.bartosh@linux.intel.com>
wrote:

> Hi Christopher,
>
> Thank you for the patch! I like the idea.
>
> Would you mind adding or modifying wic oe-selftest to cover this?
>
> Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
>
> PS: You've mentioned --bmap as a possible use case scenario for this. I
> don't think this is the case as it's simpler to use wic.bmap image
> type to achieve this. It's implemented by this patchset:
>
> http://lists.openembedded.org/pipermail/openembedded-core/2016-April/120644.html
>

Ah! Thanks. Will do. Thanks for the feedback.