[PATCH 1/4] buildscript: Add variant variable, store variant in release-file
Fabian Bläse
fabian at blaese.de
Di Nov 19 21:19:37 CET 2019
The variant is read multiple times from selected_variant file.
Therefore a variant variable is introduced.
Signed-off-by: Fabian Bläse <fabian at blaese.de>
---
buildscript | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/buildscript b/buildscript
index 00f1874..0920b74 100755
--- a/buildscript
+++ b/buildscript
@@ -200,16 +200,18 @@ prebuild() {
done < <(find "${builddir}/files" -name '*.tpl' -print0)
#insert actual firware version informations into release file
+ variant=$(cat selected_variant)
version=$(git describe --tags --dirty)
if [ 0 -ne $? ]; then
version=$(git log -1 --pretty=format:%h)
fi
- if [ -n "$(cat selected_variant)" ]; then
- version="$(cat selected_variant)-$version"
+ if [ -n "$variant" ]; then
+ version="$variant-$version"
fi
{
echo "FIRMWARE_VERSION=\"$version\""
+ echo "VARIANT=\"$variant\""
echo "BUILD_DATE=\"build date: $(date)\""
echo "OPENWRT_CORE_REVISION=\"${OPENWRTREV}\""
echo "OPENWRT_FEEDS_PACKAGES_REVISION=\"${PACKAGEREV}\""
--
2.24.0
Mehr Informationen über die Mailingliste franken-dev