upstream/opnsense-tools
1
0
Fork 0
mirror of https://github.com/opnsense/tools.git synced 2026-05-28 04:35:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

composite: add and use load_core_version

Browse source
This commit is contained in:
Franco Fichtner 2025-10-28 14:48:06 +01:00
parent 5f14858e12
commit 7efc9bc87f
2 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
composite/distribution.sh
View file

@ -29,21 +29,6 @@
load_make_vars PRODUCT_ARCH PRODUCT_CORE SETSDIR
PACKAGESET=$(find ${SETSDIR} -name "packages-*-${PRODUCT_ARCH}.tar")
CORE_VERSION=$(load_core_version ${SETSDIR} ${PRODUCT_ARCH} ${PRODUCT_CORE})
if [ ! -f "${PACKAGESET}" ]; then
echo ">>> Cannot continue without packages set"
exit 1
fi
COREFILE=$(tar -tf ${PACKAGESET} | grep -x "\./All/${PRODUCT_CORE}-[0-9].*\.pkg")
if [ -z "${COREFILE}" ]; then
echo ">>> Cannot continue without core package: ${PRODUCT_CORE}"
exit 1
fi
COREFILE=$(basename ${COREFILE%.pkg})
COREFILE=$(basename ${COREFILE%_*})
make clean-obj,release,images release VERSION=${COREFILE##*-}
make clean-obj,release,images release VERSION=${CORE_VERSION}

22
composite/util.sh
View file

@ -25,12 +25,32 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
load_core_version()
{
PACKAGESET=$(find ${1} -name "packages-*-${2}.tar")
if [ ! -f "${PACKAGESET}" ]; then
echo ">>> Cannot continue without packages set" >&2
exit 1
fi
COREFILE=$(tar -tf ${PACKAGESET} | grep -x "\./All/${3}-[0-9].*\.pkg")
if [ -z "${COREFILE}" ]; then
echo ">>> Cannot continue without core package: ${3}" >&2
exit 1
fi
COREFILE=$(basename ${COREFILE%.pkg})
COREFILE=${COREFILE%_*}
echo ${COREFILE##*-}
}
load_make_vars()
{
for VAR in ${*}; do
RESULT=$(make print-${VAR} 2> /dev/null)
if [ -z "${RESULT}" ]; then
echo "Variable '${VAR}' could not be loaded" >&2
echo ">>> Variable '${VAR}' could not be loaded" >&2
exit 1
fi
eval "${RESULT}"