File tree Expand file tree Collapse file tree 1 file changed +3
-8
lines changed Expand file tree Collapse file tree 1 file changed +3
-8
lines changed Original file line number Diff line number Diff line change @@ -16,19 +16,14 @@ rm -f "$TARGET/etc/init.d/S40xorg"
16
16
find " $TARGET /usr/lib/firmware/ti-connectivity" -iname " TIInit*.bts" ! -name " TIInit_11.8.32.bts" -type f -exec rm -f {} +
17
17
find " $TARGET /usr/lib/firmware/ti-connectivity" -iname " wl*.bin" ! -name " wl18xx-fw-4.bin" ! -name " wl18xx-conf.bin" -exec rm -f {} +
18
18
19
- # Try to generate a detailed firmware version number from git.
20
- # Fall back to the generic version number from the board config
21
- # if we are not building from a git repository, and abort the build
22
- # if we are building from git but the tag part of the version
23
- # number from git does not match the base version in
24
- # board/fischertechnik/TXT/rootfs/etc/fw-ver.txt
19
+ # Check if firmware version from the board version and tag match
25
20
GIT_VERSION=$( git -C $BR2_EXTERNAL_FTCOMMUNITY_TXT_PATH describe --tags --match=' v*' 2> /dev/null)
26
21
if [ -n " $GIT_VERSION " ] ; then
27
22
BASE_VERSION=$( cat $BR2_EXTERNAL_FTCOMMUNITY_TXT_PATH /board/fischertechnik/TXT/rootfs/etc/fw-ver.txt)
28
23
if [[ " ${GIT_VERSION} " == " v${BASE_VERSION} " * ]] ; then
29
- echo " ${GIT_VERSION # v} " > $TARGET /etc/fw-ver.txt
24
+ echo " v ${BASE_VERSION} is a regular release "
30
25
elif [ " ${BASE_VERSION#* -} " = " rc" ]; then
31
- echo " ${BASE_VERSION} + ${GIT_VERSION} " > $TARGET /etc/fw-ver.txt
26
+ echo " v ${BASE_VERSION} is an rc release "
32
27
else
33
28
echo " Version number $GIT_VERSION from 'git describe' does not match the base version $BASE_VERSION "
34
29
echo " Please fix the base version in board/fischertechnik/TXT/rootfs/etc/fw-ver.txt"
You can’t perform that action at this time.
0 commit comments