Mirrors/OpenSolo
1
0
Fork 0
mirror of https://github.com/OpenSolo/OpenSolo.git synced 2025-04-29 22:24:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

IMAGES: Version strings to 2.5-RC4 in core-images

Browse Source 
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.
This commit is contained in:
Matt 2017-12-16 16:17:48 -05:00
parent 5ba49f6b82
commit 0e6e2988f1
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
meta-3dr/recipes-core/images/3dr-controller.bb
View File

@ -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

11
meta-3dr/recipes-core/images/3dr-solo.bb
View File

@ -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:%' \