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

build: change naming a litte; derive packages version from ports

This commit is contained in:
Franco Fichtner 2015-07-24 07:40:53 +02:00
parent 22f90aaa71
commit ce779265e1
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/clean.sh
View File

@ -51,11 +51,11 @@ for ARG in ${@}; do
;;
packages)
echo ">>> Removing packages set"
rm -f ${SETSDIR}/packages-*_${PRODUCT_FLAVOUR}-${ARCH}.tar
rm -f ${SETSDIR}/packages-*-${PRODUCT_FLAVOUR}-${ARCH}.tar
;;
release)
echo ">>> Removing release set"
rm -f ${SETSDIR}/release-*_${PRODUCT_FLAVOUR}-${ARCH}.tar
rm -f ${SETSDIR}/release-*-${PRODUCT_FLAVOUR}-${ARCH}.tar
;;
esac
done

8
build/common.sh
View File

@ -98,7 +98,7 @@ if [ -z "${PRODUCT_NAME}" -o \
fi
# full name for easy use and actual config directory
export PRODUCT_RELEASE="${PRODUCT_NAME}-${PRODUCT_VERSION}_${PRODUCT_FLAVOUR}"
export PRODUCT_RELEASE="${PRODUCT_NAME}-${PRODUCT_VERSION}-${PRODUCT_FLAVOUR}"
# misc. foo
export CONFIG_PKG="/usr/local/etc/pkg/repos/origin.conf"
@ -270,7 +270,7 @@ extract_packages()
rm -rf ${BASEDIR}${PACKAGESDIR}/All
mkdir -p ${BASEDIR}${PACKAGESDIR}/All
PACKAGESET=$(ls ${SETSDIR}/packages-*_${PRODUCT_FLAVOUR}-${ARCH}.tar || true)
PACKAGESET=$(ls ${SETSDIR}/packages-*-${PRODUCT_FLAVOUR}-${ARCH}.tar || true)
if [ -f "${PACKAGESET}" ]; then
tar -C ${BASEDIR}${PACKAGESDIR} -xpf ${PACKAGESET}
fi
@ -356,6 +356,8 @@ bundle_packages()
{
sh ./clean.sh packages
git_describe ${PORTSDIR}
# rebuild expected FreeBSD structure
mkdir -p ${1}${PACKAGESDIR}-new/Latest
mkdir -p ${1}${PACKAGESDIR}-new/All
@ -378,7 +380,7 @@ bundle_packages()
echo -n ">>> Creating package mirror set for ${PRODUCT_RELEASE}... "
tar -C ${STAGEDIR}${PACKAGESDIR}-new -cf \
${SETSDIR}/packages-${PRODUCT_VERSION}_${PRODUCT_FLAVOUR}-${ARCH}.tar .
${SETSDIR}/packages-${REPO_VERSION}-${PRODUCT_FLAVOUR}-${ARCH}.tar .
echo "done"
}

3
build/release.sh
View File

@ -70,6 +70,5 @@ rm -rf tmp
echo "done"
echo -n ">>> Bundling images for ${PRODUCT_RELEASE}... "
tar -cf ${SETSDIR}/release-${PRODUCT_VERSION}_${PRODUCT_FLAVOUR}-${ARCH}.tar .
tar -cf ${SETSDIR}/release-${PRODUCT_VERSION}-${PRODUCT_FLAVOUR}-${ARCH}.tar .
echo "done"