jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 13:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4148 from stefansaraev/builddir

Browse Source 
buildsys: add $OS_VERSION to builddir for dev builds
This commit is contained in:
Stefan Saraev 2015-05-14 22:47:57 +03:00
commit b1027e0e33
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/path
View File

@ -20,6 +20,10 @@ HOST_NAME=`$LOCAL_CC -dumpmachine`
TARGET_NAME=$(echo $TARGET_SUBARCH | sed -e "s,-,,")-openelec-linux-gnu${TARGET_ABI} TARGET_NAME=$(echo $TARGET_SUBARCH | sed -e "s,-,,")-openelec-linux-gnu${TARGET_ABI}
BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$OPENELEC_VERSION BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$OPENELEC_VERSION
if [ "$OPENELEC_VERSION" = "devel" ] ; then
BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$OS_VERSION-$OPENELEC_VERSION
fi
if [ -n "$BUILD_SUFFIX" ]; then if [ -n "$BUILD_SUFFIX" ]; then
BUILD=$BUILD-$BUILD_SUFFIX BUILD=$BUILD-$BUILD_SUFFIX
fi fi

5
scripts/image
View File

@ -37,11 +37,16 @@ if [ "$OPENELEC_VERSION" = devel ]; then
fi fi
GIT_HASH=$(git rev-parse HEAD) GIT_HASH=$(git rev-parse HEAD)
GIT_ABBREV=$(git log -1 --pretty=format:%h) GIT_ABBREV=$(git log -1 --pretty=format:%h)
DEVEL_VERSION=$OPENELEC_VERSION
OPENELEC_VERSION=$OPENELEC_VERSION-$BUILD_DATE-r$GIT_BUILD-g$GIT_ABBREV OPENELEC_VERSION=$OPENELEC_VERSION-$BUILD_DATE-r$GIT_BUILD-g$GIT_ABBREV
fi fi
TARGET_VERSION="$PROJECT.$TARGET_ARCH-$OPENELEC_VERSION" TARGET_VERSION="$PROJECT.$TARGET_ARCH-$OPENELEC_VERSION"
IMAGE_NAME="$DISTRONAME-$TARGET_VERSION" IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
if [ "$DEVEL_VERSION" = "devel" ] ; then
IMAGE_NAME="$DISTRONAME-$PROJECT.$TARGET_ARCH-$OS_VERSION-$OPENELEC_VERSION"
fi
if [ -n "$IMAGE_SUFFIX" ]; then if [ -n "$IMAGE_SUFFIX" ]; then
IMAGE_NAME="$IMAGE_NAME-$IMAGE_SUFFIX" IMAGE_NAME="$IMAGE_NAME-$IMAGE_SUFFIX"
fi fi