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

build: use PRODUCT_VERSION when we want to emulate REPO_VERSION

This commit is contained in:
Franco Fichtner 2021-09-03 20:04:12 +02:00
parent 91d8ff0c9a
commit 76b8afaa89
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/base.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh
# Copyright (c) 2014-2020 Franco Fichtner <franco@opnsense.org>
# Copyright (c) 2014-2021 Franco Fichtner <franco@opnsense.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@ -39,12 +39,12 @@ if [ -f "${BASESET}" -a -z "${1}" ]; then
fi
git_branch ${SRCDIR} ${SRCBRANCH} SRCBRANCH
if [ -z "${VERSION}" ]; then
if [ -z "${VERSION}" ]; then # XXX
git_describe ${SRCDIR}
VERSION=${REPO_VERSION}
PRODUCT_VERSION=${REPO_VERSION}
fi
BASESET=${SETSDIR}/base-${VERSION}-${PRODUCT_ARCH}${PRODUCT_DEVICE+"-${PRODUCT_DEVICE}"}.txz
BASESET=${SETSDIR}/base-${PRODUCT_VERSION}-${PRODUCT_ARCH}${PRODUCT_DEVICE+"-${PRODUCT_DEVICE}"}.txz
CLANGFIXUPFILE=${SRCDIR}/contrib/compiler-rt/lib/cfi/cfi_blacklist.txt
CLANGFIXUPDIR=/usr/lib/clang/8.0.1/share

2
build/common.sh
View File

@ -584,7 +584,7 @@ setup_version()
echo "${PRODUCT_ARCH}" > ${VERSIONDIR}/${3}.arch
# embed version for update checks
echo "${REPO_VERSION}" > ${VERSIONDIR}/${3}
echo "${PRODUCT_VERSION}" > ${VERSIONDIR}/${3}
# mtree generation must come LAST
echo "./var" > ${1}/mtree.exclude

8
build/kernel.sh
View File

@ -39,13 +39,13 @@ if [ -f "${KERNELSET}" -a -z "${1}" ]; then
fi
git_branch ${SRCDIR} ${SRCBRANCH} SRCBRANCH
if [ -z "${VERSION}" ]; then
if [ -z "${VERSION}" ]; then # XXX
git_describe ${SRCDIR}
VERSION=${REPO_VERSION}
PRODUCT_VERSION=${REPO_VERSION}
fi
KERNEL_DEBUG_SET=${SETSDIR}/kernel-dbg-${VERSION}-${PRODUCT_ARCH}${PRODUCT_DEVICE+"-${PRODUCT_DEVICE}"}.txz
KERNEL_RELEASE_SET=${SETSDIR}/kernel-${VERSION}-${PRODUCT_ARCH}${PRODUCT_DEVICE+"-${PRODUCT_DEVICE}"}.txz
KERNEL_DEBUG_SET=${SETSDIR}/kernel-dbg-${PRODUCT_VERSION}-${PRODUCT_ARCH}${PRODUCT_DEVICE+"-${PRODUCT_DEVICE}"}.txz
KERNEL_RELEASE_SET=${SETSDIR}/kernel-${PRODUCT_VERSION}-${PRODUCT_ARCH}${PRODUCT_DEVICE+"-${PRODUCT_DEVICE}"}.txz
if [ -f ${CONFIGDIR}/${PRODUCT_KERNEL} ]; then
cp "${CONFIGDIR}/${PRODUCT_KERNEL}" \

2
build/rename.sh
View File

@ -47,7 +47,6 @@ for ARG in ${@}; do
setup_set ${STAGEDIR}/work ${BASESET}
cp ${STAGEDIR}/work/usr/local/opnsense/version/base.obsolete \
${STAGEDIR}/obsolete
REPO_VERSION=${PRODUCT_VERSION}
setup_version ${STAGEDIR} ${STAGEDIR}/work ${ARG} ${STAGEDIR}/obsolete
rm ${BASESET}
generate_set ${STAGEDIR}/work ${BASESET}
@ -81,7 +80,6 @@ for ARG in ${@}; do
KERNEL_NAME="kernel"
fi
setup_set ${STAGEDIR}/work ${KERNELSET}
REPO_VERSION=${PRODUCT_VERSION}
setup_version ${STAGEDIR} ${STAGEDIR}/work ${ARG}
rm ${KERNELSET}
generate_set ${STAGEDIR}/work ${KERNELSET}