diff options
Diffstat (limited to 'meta/classes/image_types_wic.bbclass')
-rw-r--r-- | meta/classes/image_types_wic.bbclass | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass index b83308b45c..96ed0473ee 100644 --- a/meta/classes/image_types_wic.bbclass +++ b/meta/classes/image_types_wic.bbclass | |||
@@ -32,8 +32,7 @@ IMAGE_CMD_wic () { | |||
32 | if [ -z "$wks" ]; then | 32 | if [ -z "$wks" ]; then |
33 | bbfatal "No kickstart files from WKS_FILES were found: ${WKS_FILES}. Please set WKS_FILE or WKS_FILES appropriately." | 33 | bbfatal "No kickstart files from WKS_FILES were found: ${WKS_FILES}. Please set WKS_FILE or WKS_FILES appropriately." |
34 | fi | 34 | fi |
35 | 35 | BUILDDIR="${TOPDIR}" PSEUDO_UNLOAD=1 wic create "$wks" --vars "${STAGING_DIR}/${MACHINE}/imgdata/" -e "${IMAGE_BASENAME}" -o "$build_wic/" ${WIC_CREATE_EXTRA_ARGS} | |
36 | BUILDDIR="${TOPDIR}" wic create "$wks" --vars "${STAGING_DIR}/${MACHINE}/imgdata/" -e "${IMAGE_BASENAME}" -o "$build_wic/" ${WIC_CREATE_EXTRA_ARGS} | ||
37 | mv "$build_wic/$(basename "${wks%.wks}")"*.direct "$out${IMAGE_NAME_SUFFIX}.wic" | 36 | mv "$build_wic/$(basename "${wks%.wks}")"*.direct "$out${IMAGE_NAME_SUFFIX}.wic" |
38 | } | 37 | } |
39 | IMAGE_CMD_wic[vardepsexclude] = "WKS_FULL_PATH WKS_FILES TOPDIR" | 38 | IMAGE_CMD_wic[vardepsexclude] = "WKS_FULL_PATH WKS_FILES TOPDIR" |
@@ -86,6 +85,10 @@ python do_write_wks_template () { | |||
86 | bb.utils.copyfile(wks_file, "%s/%s" % (depdir, basename + '-' + os.path.basename(wks_file))) | 85 | bb.utils.copyfile(wks_file, "%s/%s" % (depdir, basename + '-' + os.path.basename(wks_file))) |
87 | } | 86 | } |
88 | 87 | ||
88 | do_flush_pseudodb() { | ||
89 | ${FAKEROOTENV} ${FAKEROOTCMD} -S | ||
90 | } | ||
91 | |||
89 | python () { | 92 | python () { |
90 | if d.getVar('USING_WIC'): | 93 | if d.getVar('USING_WIC'): |
91 | wks_file_u = d.getVar('WKS_FULL_PATH', False) | 94 | wks_file_u = d.getVar('WKS_FULL_PATH', False) |
@@ -139,6 +142,7 @@ python do_rootfs_wicenv () { | |||
139 | depdir = d.getVar('IMGDEPLOYDIR') | 142 | depdir = d.getVar('IMGDEPLOYDIR') |
140 | bb.utils.copyfile(os.path.join(outdir, basename) + '.env', os.path.join(depdir, basename) + '.env') | 143 | bb.utils.copyfile(os.path.join(outdir, basename) + '.env', os.path.join(depdir, basename) + '.env') |
141 | } | 144 | } |
145 | addtask do_flush_pseudodb after do_image before do_image_wic | ||
142 | addtask do_rootfs_wicenv after do_image before do_image_wic | 146 | addtask do_rootfs_wicenv after do_image before do_image_wic |
143 | do_rootfs_wicenv[vardeps] += "${WICVARS}" | 147 | do_rootfs_wicenv[vardeps] += "${WICVARS}" |
144 | do_rootfs_wicenv[prefuncs] = 'set_image_size' | 148 | do_rootfs_wicenv[prefuncs] = 'set_image_size' |