diff --git a/CMakeLists.txt b/CMakeLists.txt index c62367298..c1d4e5ac7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,8 +10,6 @@ message(STATUS "OpenTX ${VERSION}") set(SDCARD_REVISION "0003") set(SDCARD_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}V${SDCARD_REVISION}) -file(WRITE radio/sdcard/horus/opentx.sdcard.version ${SDCARD_VERSION}) -file(WRITE radio/sdcard/taranis/opentx.sdcard.version ${SDCARD_VERSION}) cmake_minimum_required(VERSION 2.8) cmake_policy(SET CMP0020 NEW) diff --git a/radio/sdcard/horus/opentx.sdcard.version b/radio/sdcard/horus/opentx.sdcard.version deleted file mode 100644 index 6ba40298c..000000000 --- a/radio/sdcard/horus/opentx.sdcard.version +++ /dev/null @@ -1 +0,0 @@ -2.2V0003 \ No newline at end of file diff --git a/radio/sdcard/taranis/opentx.sdcard.version b/radio/sdcard/taranis/opentx.sdcard.version deleted file mode 100644 index 6ba40298c..000000000 --- a/radio/sdcard/taranis/opentx.sdcard.version +++ /dev/null @@ -1 +0,0 @@ -2.2V0003 \ No newline at end of file diff --git a/tools/nightly22/build-sdcard.sh b/tools/nightly22/build-sdcard.sh index ae41dffa9..80d985cab 100755 --- a/tools/nightly22/build-sdcard.sh +++ b/tools/nightly22/build-sdcard.sh @@ -1,5 +1,5 @@ #!/bin/bash - + set -e branch=next @@ -7,10 +7,12 @@ workdir=/home/opentx/nightly22 output=/var/www/html/2.2/nightly # Handle opentx.sdcard.version +grep 'set(SDCARD_REVISION' ${workdir}/code/CMakeLists.txt | grep -o '".*"' | sed 's/"//g' > ${workdir}/code/radio/sdcard/horus/opentx.sdcard.version +grep 'set(SDCARD_REVISION' ${workdir}/code/CMakeLists.txt | grep -o '".*"' | sed 's/"//g' > ${workdir}/code/radio/sdcard/taranis/opentx.sdcard.version if cmp --silent ${workdir}/code/radio/sdcard/horus/opentx.sdcard.version ${workdir}/opentx.sdcard.version then exit -else +else cp -r ${workdir}/code/radio/sdcard/horus/opentx.sdcard.version ${workdir} cd ${workdir}