From 0e6e2988f13ff8687d5e2397a4b9d94608afe5b6 Mon Sep 17 00:00:00 2001 From: Matt Date: Sat, 16 Dec 2017 16:17:48 -0500 Subject: [PATCH] IMAGES: Version strings to 2.5-RC4 in core-images Increment version strings for 2.5-RC4. Since the legacy 3DR Solo app cannot handle letters in the version sting, it will show v2.5.94 in the app. --- meta-3dr/recipes-core/images/3dr-controller.bb | 7 ++++++- meta-3dr/recipes-core/images/3dr-solo.bb | 11 +++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/meta-3dr/recipes-core/images/3dr-controller.bb b/meta-3dr/recipes-core/images/3dr-controller.bb index 51758a6..cc20f2f 100644 --- a/meta-3dr/recipes-core/images/3dr-controller.bb +++ b/meta-3dr/recipes-core/images/3dr-controller.bb @@ -3,7 +3,9 @@ include recipes-core/images/core-image-base.bb # created from image_types_fsl; creates additional logging partition inherit image_types_3dr -PV = "2.4.2" +PV = "2.4.94" +VER_NAME = "Open Solo 2.5-RC4" +BUILD_DATE = "Build Date: $(date "+%Y%m%d%H%M%S")" do_rootfs[depends] += "virtual/kernel:do_bundle_initramfs" @@ -82,6 +84,9 @@ update_config_files() { # Put a "Version" file in the root partition echo "${PV}" >> ${IMAGE_ROOTFS}/VERSION echo ${IMAGE_NAME} >> ${IMAGE_ROOTFS}/VERSION + echo ${VER_NAME} >> ${IMAGE_ROOTFS}/VERSION + echo ${BUILD_DATE} >> ${IMAGE_ROOTFS}/VERSION + #Check the artoo version at boot and update if necessary #Always run this; it is what clears the "updating system" screen echo "#!/bin/sh" > ${IMAGE_ROOTFS}/etc/rcS.d/S60updateArtoo.sh diff --git a/meta-3dr/recipes-core/images/3dr-solo.bb b/meta-3dr/recipes-core/images/3dr-solo.bb index 41cb437..904c113 100644 --- a/meta-3dr/recipes-core/images/3dr-solo.bb +++ b/meta-3dr/recipes-core/images/3dr-solo.bb @@ -3,7 +3,9 @@ include recipes-core/images/core-image-base.bb # created from image_types_fsl; creates additional logging partition inherit image_types_3dr -PV = "2.4.2" +PV = "2.4.94" +VER_NAME = "Open Solo 2.5-RC4" +BUILD_DATE = "Build Date: $(date "+%Y%m%d%H%M%S")" do_rootfs[depends] += "virtual/kernel:do_bundle_initramfs" @@ -45,7 +47,8 @@ IMAGE_INSTALL += " \ shotmanager \ rpm \ util-linux \ - pixhawk-firmware \ + pixhawk-stock-fw \ + pixhawk-green-fw \ gimbal-firmware \ e2fsprogs-e2fsck \ dosfstools \ @@ -83,6 +86,10 @@ update_config_files() { # Put a "Version" file in the root partition echo "${PV}" >> ${IMAGE_ROOTFS}/VERSION echo ${IMAGE_NAME} >> ${IMAGE_ROOTFS}/VERSION + echo ${VER_NAME} >> ${IMAGE_ROOTFS}/VERSION + echo ${BUILD_DATE} >> ${IMAGE_ROOTFS}/VERSION + + #Password is TjSDBkAu sed 's%^root:[^:]*:%root:I8hkLIWAASD4Q:%' \