Patchwork [RFC,1/1] bbclass: remove more nostamps for image generation

login
register
mail settings
Submitter Robert Yang
Date May 10, 2013, 2:31 a.m.
Message ID <9f338ccfac379193ada0c814cdb83c2710c74223.1368153038.git.liezhi.yang@windriver.com>
Download mbox | patch
Permalink /patch/49677/
State Accepted
Commit 45c7dab5d51065c7b24ab5292f8e9d3104eb0626
Headers show

Comments

Robert Yang - May 10, 2013, 2:31 a.m.
We have removed the nostamps for do_rootfs and do_build, so it seems
reasonable to remove the stamps for do_bootimg, do_bootdirectdisk and
do_vmdkimg.

The current problem is that the do_vmdkimg always re-run, but the
do_rootfs may not, so the code like below in the do_rootfs function
doesn't re-run and cause problems (the symlink exists when the
do_vmdkimg creates the symlink again):

    if d.getVar('IMAGE_LINK_NAME', True):
        cmds += "\trm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.*"

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/classes/boot-directdisk.bbclass | 1 -
 meta/classes/bootimg.bbclass         | 1 -
 meta/classes/image-vmdk.bbclass      | 1 -
 3 files changed, 3 deletions(-)

Patch

diff --git a/meta/classes/boot-directdisk.bbclass b/meta/classes/boot-directdisk.bbclass
index d265485..2a8823d 100644
--- a/meta/classes/boot-directdisk.bbclass
+++ b/meta/classes/boot-directdisk.bbclass
@@ -97,4 +97,3 @@  python do_bootdirectdisk() {
 }
 
 addtask bootdirectdisk before do_build
-do_bootdirectdisk[nostamp] = "1"
diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
index 117929e..90a241d 100644
--- a/meta/classes/bootimg.bbclass
+++ b/meta/classes/bootimg.bbclass
@@ -198,4 +198,3 @@  python do_bootimg() {
 }
 
 addtask bootimg before do_build
-do_bootimg[nostamp] = "1"
diff --git a/meta/classes/image-vmdk.bbclass b/meta/classes/image-vmdk.bbclass
index 6f7df3f..089d019 100644
--- a/meta/classes/image-vmdk.bbclass
+++ b/meta/classes/image-vmdk.bbclass
@@ -28,7 +28,6 @@  python do_vmdkimg() {
 
 #addtask vmdkimg after do_bootimg before do_build
 addtask vmdkimg after do_bootdirectdisk before do_build
-do_vmdkimg[nostamp] = "1"
 
 do_vmdkimg[depends] += "qemu-native:do_populate_sysroot"