1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter.git synced 2025-03-09 15:40:20 +00:00

Merge pull request #107 from Ysurac/develop

Fix version in build
This commit is contained in:
suyuan 2022-02-08 15:26:28 +08:00 committed by GitHub
commit ca349066ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -193,7 +193,7 @@ if [ -f $OMR_TARGET_CONFIG ]; then
CONFIG_VERSIONOPT=y
CONFIG_VERSION_DIST="$OMR_DIST"
CONFIG_VERSION_REPO="$OMR_REPO"
CONFIG_VERSION_NUMBER="$(git -C "$OMR_FEED" describe --tags `git rev-list --tags --max-count=1` | tail -1 | cut -d '-' -f1)"
CONFIG_VERSION_NUMBER="${OMR_RELEASE}-${OMR_KERNEL}"
EOF
else
cat config -> "$OMR_TARGET/source/.config" <<-EOF
@ -201,7 +201,7 @@ else
CONFIG_VERSIONOPT=y
CONFIG_VERSION_DIST="$OMR_DIST"
CONFIG_VERSION_REPO="$OMR_REPO"
CONFIG_VERSION_NUMBER="$(git -C "$OMR_FEED" describe --tags `git rev-list --tags --max-count=1` | tail -1 | cut -d '-' -f1)-$(git -C "$OMR_FEED" rev-parse --short HEAD)"
CONFIG_VERSION_NUMBER="${OMR_RELEASE}-${OMR_FEED_SRC}-$(git -C "$OMR_FEED" rev-parse --short HEAD)"
EOF
fi
#if [ "$OMR_KERNEL" = "5.14" ]; then