opensourcemirror
/
opnsense-tools
mirror of https://github.com/opnsense/tools.git
1
0
Fork 0
Code Issues Releases Wiki Activity

core: for tags, assume release state too 

This makes it possible to run a single batch build for:

    # make core-master,stable/16.1,16.1.6
This commit is contained in:
Franco Fichtner 2016-03-14 09:22:56 +01:00
parent 94ba41dfe9
commit 3791a3e9c2
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/common.sh
View File

@ -188,6 +188,8 @@ git_describe()
VERSION=$(git -C ${1} describe --abbrev=0 --always)
REVISION=$(git -C ${1} rev-list ${VERSION}.. --count)
COMMENT=$(git -C ${1} rev-list HEAD --max-count=1 | cut -c1-9)
REFTYPE=$(git -C ${1} cat-file -t ${VERSION})
if [ "${REVISION}" != "0" ]; then
# must construct full version string manually
VERSION=${VERSION}_${REVISION}
@ -195,6 +197,7 @@ git_describe()
export REPO_VERSION=${VERSION}
export REPO_COMMENT=${COMMENT}
export REPO_REFTYPE=${TYPE}
}
git_tag()

12
build/core.sh
View File

@ -49,14 +49,20 @@ else
fi
for CORE_TAG in ${CORE_TAGS}; do
CORE_ARGS=
CORE_ARGS="CORE_NAME=${CORE_NAME} CORE_FAMILY=${CORE_FAMILY}"
if [ -n "${*}" ]; then
setup_copy ${STAGEDIR} ${COREDIR}
git_checkout ${STAGEDIR}${COREDIR} ${CORE_TAG}
git_describe ${STAGEDIR}${COREDIR}
if [ "${REPO_REFTYPE}" != tag ]; then
CORE_ARGS=
fi
CORE_NAME=$(make -C ${STAGEDIR}${COREDIR} name)
else
CORE_ARGS="CORE_NAME=${CORE_NAME} CORE_FAMILY=${CORE_FAMILY}"
fi
CORE_DEPS=$(make -C ${STAGEDIR}${COREDIR} depends)
remove_packages ${STAGEDIR} ${CORE_NAME}
install_packages ${STAGEDIR} git gettext-tools ${CORE_DEPS}