Machine: use the changed machinename colibri-vf

7 files changed, 9 insertions, 14 deletions

diff --git a/recipes/base-files/base-files/colibri-vf50/fstab b/recipes/base-files/base-files/colibri-vf/fstab
index fea4501..fea4501 100644
--- a/recipes/base-files/base-files/colibri-vf50/fstab
+++ b/recipes/base-files/base-files/colibri-vf/fstab
diff --git a/recipes/base-files/base-files/colibri-vf50/profile b/recipes/base-files/base-files/colibri-vf/profile
index c1ee240..c1ee240 100644
--- a/recipes/base-files/base-files/colibri-vf50/profile
+++ b/recipes/base-files/base-files/colibri-vf/profile
diff --git a/recipes/images/angstrom-lxde-image.bb b/recipes/images/angstrom-lxde-image.bb
index 0744fda..4753f4f 100644
--- a/recipes/images/angstrom-lxde-image.bb
+++ b/recipes/images/angstrom-lxde-image.bb
@@ -12,8 +12,7 @@ IMAGE_NAME_colibri-t20 = "Colibri_T20_LinuxImage"
 IMAGE_NAME_colibri-t30 = "Colibri_T30_LinuxImage"
 IMAGE_NAME_apalis-t30 = "Apalis_T30_LinuxImage"
 IMAGE_NAME_colibri-pxa = "Colibri_PXA_LinuxImage"
-IMAGE_NAME_colibri-vf50 = "Colibri_VF50_LinuxImage"
-IMAGE_NAME_colibri-vf61 = "Colibri_VF61_LinuxImage"
+IMAGE_NAME_colibri-vf = "Colibri_VF_LinuxImage"
 IMAGE_NAME = "${MACHINE}_LinuxImage"
 
 #create the deployment directory-tree
@@ -39,7 +38,7 @@ DEPENDS_tegra += "nvsamples"
 
 IMAGE_BROWSER = "firefox"
 #keep the rootfs size small
-IMAGE_BROWSER_colibri-vf50 = "midori"
+IMAGE_BROWSER_colibri-vf = "midori"
 
 # this recommends from midori pulls in 8Meg of icons
 BAD_RECOMMENDATIONS += " gnome-icon-theme "
@@ -82,7 +81,7 @@ GSTREAMER = " \
     gst-plugins-good-wavparse \
     gst-plugins-ugly-asf \
 "
-GSTREAMER_colibri-vf50 = ""
+GSTREAMER_colibri-vf = ""
 
 IMAGE_INSTALL += " \
     gconf \
diff --git a/recipes/images/console-trdx-image.bb b/recipes/images/console-trdx-image.bb
index 995db1a..3fe52b3 100644
--- a/recipes/images/console-trdx-image.bb
+++ b/recipes/images/console-trdx-image.bb
@@ -12,8 +12,7 @@ IMAGE_NAME_colibri-t20 = "Colibri_T20_LinuxConsoleImage"
 IMAGE_NAME_colibri-t30 = "Colibri_T30_LinuxConsoleImage"
 IMAGE_NAME_apalis-t30 = "Apalis_T30_LinuxConsoleImage"
 IMAGE_NAME_colibri-pxa = "Colibri_PXA_LinuxConsoleImage"
-IMAGE_NAME_colibri-vf50 = "Colibri_VF50_LinuxConsoleImage"
-IMAGE_NAME_colibri-vf61 = "Colibri_VF61_LinuxConsoleImage"
+IMAGE_NAME_colibri-vf = "Colibri_VF_LinuxConsoleImage"
 IMAGE_NAME = "${MACHINE}_LinuxConsoleImage"
 
 #create the deployment directory-tree
diff --git a/recipes/images/qt4e-demo-image.bb b/recipes/images/qt4e-demo-image.bb
index 82b92f8..8d7b974 100644
--- a/recipes/images/qt4e-demo-image.bb
+++ b/recipes/images/qt4e-demo-image.bb
@@ -9,8 +9,7 @@ PR = "r0"
 
 #start of the resulting deployable tarball name
 IMAGE_NAME_colibri-pxa = "Colibri_PXA_LinuxImage-qte"
-IMAGE_NAME_colibri-vf50 = "Colibri_VF50_LinuxImage-qte"
-IMAGE_NAME_colibri-vf61 = "Colibri_VF61_LinuxImage-qte"
+IMAGE_NAME_colibri-vf = "Colibri_VF_LinuxImage-qte"
 IMAGE_NAME = "${MACHINE}_LinuxImage-qte"
 
 #create the deployment directory-tree
diff --git a/recipes/images/trdx-extra.inc b/recipes/images/trdx-extra.inc
index c6fe6bb..9526395 100644
--- a/recipes/images/trdx-extra.inc
+++ b/recipes/images/trdx-extra.inc
@@ -58,9 +58,7 @@ IMAGE_INSTALL_MACHINE_apalis-t30 = "${IMAGE_INSTALL_T20_T30} \
     kernel-module-videobuf2-memops \
 "
 
-IMAGE_INSTALL_MACHINE_colibri-vf50 = "${IMAGE_INSTALL_VF}"
-
-IMAGE_INSTALL_MACHINE_colibri-vf61 = "${IMAGE_INSTALL_VF}"
+IMAGE_INSTALL_MACHINE_colibri-vf = "${IMAGE_INSTALL_VF}"
 
 IMAGE_INSTALL_MACHINE = ""
 
diff --git a/recipes/images/trdx-image-fstype.inc b/recipes/images/trdx-image-fstype.inc
index e91ee65..eeb39b1 100644
--- a/recipes/images/trdx-image-fstype.inc
+++ b/recipes/images/trdx-image-fstype.inc
@@ -6,7 +6,7 @@ S = "${WORKDIR}/burnflash"
 
 IMAGE_ROOTFS = "${WORKDIR}/${IMAGE_NAME}${PV}/rootfs"
 U_BOOT_EXT = "bin"
-U_BOOT_EXT_colibri-vf50 = "imx"
+U_BOOT_EXT_colibri-vf = "imx"
 
 do_rootfs_prepend() {
     tar -C ${WORKDIR} -xf ${BURNFLASH} 
@@ -15,9 +15,9 @@ do_rootfs_prepend() {
 }
 
 #we need the native ubi tools for machines using ubifs
-DEPENDS_colibri-vf50 = "mtd-utils-native"
+DEPENDS_colibri-vf = "mtd-utils-native"
 CP_MKUBIFS=""
-CP_MKUBIFS_colibri-vf50="MKUBIFS=`which mkfs.ubifs` ; mkdir ${IMAGE_ROOTFS}/../vf_flash/ ; cp ${MKUBIFS} ${IMAGE_ROOTFS}/../vf_flash/ ; ${BUILD_STRIP} ${IMAGE_ROOTFS}/../vf_flash/mkfs.ubifs"
+CP_MKUBIFS_colibri-vf="MKUBIFS=`which mkfs.ubifs` ; mkdir ${IMAGE_ROOTFS}/../vf_flash/ ; cp ${MKUBIFS} ${IMAGE_ROOTFS}/../vf_flash/ ; ${BUILD_STRIP} ${IMAGE_ROOTFS}/../vf_flash/mkfs.ubifs"
 
 do_rootfs_append() {
     # put u-boot, kernel into the bin directories, remove the kernel from the rootfs/boot