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

build/core: avoid tainting VERSION for composite steps 

Similar things could be done for src and ports handling, but this
one here is the most fragile.
This commit is contained in:
Franco Fichtner 2023-07-26 13:34:52 +02:00
parent a044594786
commit aef341c0ef
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -104,8 +104,8 @@ STAGEDIRPREFIX?=/usr/obj
EXTRABRANCH?= # empty
COREBRANCH?= stable/${ABI}
COREVERSION?= # empty
COREDIR?= ${ROOTDIR}/core
COREENV?= CORE_PHP=${PHP} CORE_ABI=${ABI} CORE_PYTHON=${PYTHON}

6
build/core.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh
# Copyright (c) 2014-2022 Franco Fichtner <franco@opnsense.org>
# Copyright (c) 2014-2023 Franco Fichtner <franco@opnsense.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@ -47,8 +47,8 @@ remove_packages ${STAGEDIR} ${@}
install_packages ${STAGEDIR} pkg git
lock_packages ${STAGEDIR}
if [ -n "${VERSION}" ]; then
CORE_PKGVERSION="CORE_PKGVERSION=${VERSION}"
if [ -n "${COREVERSION}" ]; then
CORE_PKGVERSION="CORE_PKGVERSION=${COREVERSION}"
fi
for BRANCH in ${EXTRABRANCH} ${COREBRANCH}; do