4 files changed, 9 insertions, 16 deletions

diff --git a/classes/bootfs-image.bbclass b/classes/bootfs-image.bbclass
index 2104b50..a0563ce 100644
--- a/classes/bootfs-image.bbclass
+++ b/classes/bootfs-image.bbclass
@@ -29,6 +29,7 @@
 
 BOOTFS_NAME = "${IMAGE_BASENAME}-boot-${MACHINE}-${DATETIME}"
 BOOTFS_LINK_NAME = "${IMAGE_BASENAME}-boot-${MACHINE}"
+BOOTFS_NAME[vardepsexclude] += "DATETIME"
 
 BOOTFS_DEPENDS ?= ""
 
diff --git a/classes/consistent_timestamps.bbclass b/classes/consistent_timestamps.bbclass
index 08cc401..1f560c2 100644
--- a/classes/consistent_timestamps.bbclass
+++ b/classes/consistent_timestamps.bbclass
@@ -28,8 +28,8 @@
 ############################################################################
 
 update_file_timestaps() {
-    # Update file timestamp to 0 seconds since Epoch time.
-    TZ=UTC find ${IMAGE_ROOTFS} -exec touch -h -m -t '197001010000' {} \;
+    # Update file timestamp to 1 second since Epoch time.
+    TZ=UTC find ${IMAGE_ROOTFS} -exec touch -h -m -t '197001010000.01' {} \;
 }
 
 ROOTFS_POSTINSTALL_COMMAND += "update_file_timestaps; "
diff --git a/classes/image-hdd.bbclass b/classes/image-hdd.bbclass
index 05fd847..1391be1 100644
--- a/classes/image-hdd.bbclass
+++ b/classes/image-hdd.bbclass
@@ -27,18 +27,13 @@
 ##
 ############################################################################
 
-# need to define the dependency and the ROOTFS for directdisk
-do_bootdirectdisk[depends] += "${PN}:do_rootfs"
-ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3"
-
-SYSLINUX_ROOT = "root=/dev/hda2 "
-SYSLINUX_PROMPT = "0"
-SYSLINUX_TIMEOUT = "1"
-SYSLINUX_LABELS = "boot"
-LABELS_append = " ${SYSLINUX_LABELS} "
+VM_ROOTFS_TYPE = "ext3"
+ROOT_VM = "root=/dev/hda2"
+LABELS_VM = "boot"
+AUTO_SYSLINUXMENU = "0"
 SYSLINUX_DEFAULT_CONSOLE = "console=ttyS0,115200"
 
-inherit image_types boot-directdisk
+inherit image_types image-vm
 
 create_hdd_image () {
     cd ${DEPLOY_DIR_IMAGE}
diff --git a/classes/populate_b2qt_sdk.bbclass b/classes/populate_b2qt_sdk.bbclass
index 75c6e55..2902f96 100644
--- a/classes/populate_b2qt_sdk.bbclass
+++ b/classes/populate_b2qt_sdk.bbclass
@@ -38,10 +38,7 @@ replace_sysroot_symlink() {
                 #check whether TARGET is inside the sysroot when not prepend the sysroot
                 TARGET=`echo ${TARGET} | grep "^${SYMLINK_SYSROOT}" || echo ${SYMLINK_SYSROOT}${TARGET}`
                 rm "${SOURCE}"
-                if [ -d "${TARGET}" ]; then
-                        cp -r "${TARGET}" "${SOURCE}"
-                        replace_sysroot_symlink ${SYMLINK_SYSROOT} ${SOURCE}
-                elif [ -f "${TARGET}" ]; then
+                if [ -f "${TARGET}" ]; then
                         cp "${TARGET}" "${SOURCE}"
                 elif [ -e "${TARGET}" ]; then
                         touch "${SOURCE}"