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

build: clean up REPO_VERSION usage enabling VERSION override everywhere

This commit is contained in:
Franco Fichtner 2021-09-06 12:10:47 +02:00
parent bc5487b6b5
commit 1633ef27eb
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
build/common.sh
View File

@ -968,7 +968,10 @@ bundle_packages()
exit 1
fi
git_describe ${PORTSDIR}
if [ -z "${VERSION}" ]; then # XXX
git_describe ${PORTSDIR}
PRODUCT_VERSION=${REPO_VERSION}
fi
# clean up in case of partial run
rm -rf ${BASEDIR}${PACKAGESDIR}-new
@ -1023,15 +1026,15 @@ bundle_packages()
sh ./clean.sh packages
REPO_RELEASE="${REPO_VERSION}-${PRODUCT_FLAVOUR}-${PRODUCT_ARCH}"
echo -n ">>> Creating package mirror set for ${REPO_RELEASE}... "
tar -C ${BASEDIR}${PACKAGESDIR}-new -cf \
${SETSDIR}/packages-${REPO_RELEASE}.tar .
PACKAGEVER="${PRODUCT_VERSION}-${PRODUCT_FLAVOUR}-${PRODUCT_ARCH}"
PACKAGESET="${SETSDIR}/packages-${PACKAGEVER}.tar"
echo -n ">>> Creating package mirror set for ${PACKAGEVER}... "
tar -C ${BASEDIR}${PACKAGESDIR}-new -cf ${PACKAGESET} .
echo "done"
generate_signature ${SETSDIR}/packages-${REPO_RELEASE}.tar
generate_signature ${PACKAGESET}.tar
(cd ${SETSDIR}; ls -lah packages-${REPO_RELEASE}.*)
(cd ${SETSDIR}; ls -lah packages-${PACKAGEVER}.*)
if [ -f ${BASEDIR}/.pkg-warn ]; then
echo ">>> WARNING: The build may have integrity issues!"

7
build/distfiles.sh
View File

@ -68,7 +68,10 @@ setup_clone ${STAGEDIR} ${SRCDIR}
setup_chroot ${STAGEDIR}
setup_distfiles ${STAGEDIR}
git_describe ${PORTSDIR}
if [ -z "${VERSION}" ]; then # XXX
git_describe ${PORTSDIR}
PRODUCT_VERSION=${REPO_VERSION}
fi
sh ./make.conf.sh > ${STAGEDIR}/etc/make.conf
echo "CLEAN_FETCH_ENV=yes" >> ${STAGEDIR}/etc/make.conf
@ -105,7 +108,7 @@ sh ./clean.sh ${SELF}
echo -n ">>> Creating distfiles set... "
tar -C ${STAGEDIR}${PORTSDIR} -cf \
${SETSDIR}/distfiles-${REPO_VERSION}.tar distfiles
${SETSDIR}/distfiles-${PRODUCT_VERSION}.tar distfiles
echo "done"
if [ -z "${PORTSLIST}" ]; then

7
build/xtools.sh
View File

@ -44,9 +44,12 @@ if [ -f "${XTOOLSET}" -a -z "${1}" ]; then
fi
git_branch ${SRCDIR} ${SRCBRANCH} SRCBRANCH
git_describe ${SRCDIR}
if [ -z "${VERSION}" ]; then # XXX
git_describe ${SRCDIR}
PRODUCT_VERSION=${REPO_VERSION}
fi
XTOOLSET=${SETSDIR}/xtools-${REPO_VERSION}-${PRODUCT_ARCH}.txz
XTOOLSET=${SETSDIR}/xtools-${PRODUCT_VERSION}-${PRODUCT_ARCH}.txz
sh ./clean.sh ${SELF}