Merge pull request #1375 from jandryuk/deploy-installer-part2-no-rename

Use do_deploy for installer part2
OpenXT · Dec 11, 2020 · d15065f · d15065f
2 parents 7c175ad + 2f55795
commit d15065f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 51 deletions.
diff --git a/recipes-core/images/xenclient-installer-part2-image.bb b/recipes-core/images/xenclient-installer-part2-image.bb
diff --git a/recipes-openxt/xenclient-installer/xenclient-installer_git.bb b/recipes-openxt/xenclient-installer/xenclient-installer_git.bb
@@ -21,8 +21,6 @@ inherit allarch deploy
 do_install () {
     ${S}/install part1 ${D}/install
     ${S}/install part2 ${D}
-    # base-files provides a run directory and we should not conflict
-    mv -f ${D}/run ${D}/run.installer
 }
 
 do_deploy() {
@@ -37,6 +35,8 @@ do_deploy() {
         install -m 0644 "${WORKDIR}/${f}" "${DEPLOYDIR}/netboot/${f}"
     done
 
+    tar --exclude=./install \
+        -C ${D} -cjf ${DEPLOYDIR}/control.tar.bz2 .
 }
 addtask do_deploy after do_install before do_build