make: populate CORE_MAKE command with proper env on stepping stones
`make upgrade' could forget what version it was running in the first place.
This commit is contained in:
parent
035dc45063
commit
ebfdeecdfe
25
Makefile
25
Makefile
|
@ -38,6 +38,7 @@ CORE_TYPE?= development
|
||||||
. if empty(CORE_${REPLACEMENT})
|
. if empty(CORE_${REPLACEMENT})
|
||||||
. warning Cannot build without CORE_${REPLACEMENT} set
|
. warning Cannot build without CORE_${REPLACEMENT} set
|
||||||
. endif
|
. endif
|
||||||
|
CORE_MAKE+= CORE_${REPLACEMENT}=${CORE_${REPLACEMENT}}
|
||||||
.endfor
|
.endfor
|
||||||
|
|
||||||
_CORE_NEXT= ${CORE_ABI:C/\./ /}
|
_CORE_NEXT= ${CORE_ABI:C/\./ /}
|
||||||
|
@ -260,8 +261,8 @@ scripts:
|
||||||
.endfor
|
.endfor
|
||||||
|
|
||||||
install:
|
install:
|
||||||
@${MAKE} -C ${.CURDIR}/contrib install DESTDIR=${DESTDIR}
|
@${CORE_MAKE} -C ${.CURDIR}/contrib install DESTDIR=${DESTDIR}
|
||||||
@${MAKE} -C ${.CURDIR}/src install DESTDIR=${DESTDIR} ${MAKE_REPLACE}
|
@${CORE_MAKE} -C ${.CURDIR}/src install DESTDIR=${DESTDIR} ${MAKE_REPLACE}
|
||||||
.if exists(${LOCALBASE}/opnsense/www/index.php)
|
.if exists(${LOCALBASE}/opnsense/www/index.php)
|
||||||
# try to update the current system if it looks like one
|
# try to update the current system if it looks like one
|
||||||
@touch ${LOCALBASE}/opnsense/www/index.php
|
@touch ${LOCALBASE}/opnsense/www/index.php
|
||||||
|
@ -276,19 +277,19 @@ collect:
|
||||||
done
|
done
|
||||||
|
|
||||||
bootstrap:
|
bootstrap:
|
||||||
@${MAKE} -C ${.CURDIR}/src install-bootstrap DESTDIR=${DESTDIR} \
|
@${CORE_MAKE} -C ${.CURDIR}/src install-bootstrap DESTDIR=${DESTDIR} \
|
||||||
NO_SAMPLE=please ${MAKE_REPLACE}
|
NO_SAMPLE=please ${MAKE_REPLACE}
|
||||||
|
|
||||||
plist:
|
plist:
|
||||||
@(${MAKE} -C ${.CURDIR}/contrib plist && \
|
@(${CORE_MAKE} -C ${.CURDIR}/contrib plist && \
|
||||||
${MAKE} -C ${.CURDIR}/src plist) | sort
|
${CORE_MAKE} -C ${.CURDIR}/src plist) | sort
|
||||||
|
|
||||||
plist-fix:
|
plist-fix:
|
||||||
@${MAKE} DESTDIR=${DESTDIR} plist > ${.CURDIR}/plist
|
@${CORE_MAKE} DESTDIR=${DESTDIR} plist > ${.CURDIR}/plist
|
||||||
|
|
||||||
plist-check:
|
plist-check:
|
||||||
@mkdir -p ${WRKDIR}
|
@mkdir -p ${WRKDIR}
|
||||||
@${MAKE} DESTDIR=${DESTDIR} plist > ${WRKDIR}/plist.new
|
@${CORE_MAKE} DESTDIR=${DESTDIR} plist > ${WRKDIR}/plist.new
|
||||||
@cat ${.CURDIR}/plist > ${WRKDIR}/plist.old
|
@cat ${.CURDIR}/plist > ${WRKDIR}/plist.old
|
||||||
@if ! diff -q ${WRKDIR}/plist.old ${WRKDIR}/plist.new > /dev/null ; then \
|
@if ! diff -q ${WRKDIR}/plist.old ${WRKDIR}/plist.new > /dev/null ; then \
|
||||||
diff -u ${WRKDIR}/plist.old ${WRKDIR}/plist.new || true; \
|
diff -u ${WRKDIR}/plist.old ${WRKDIR}/plist.new || true; \
|
||||||
|
@ -300,9 +301,9 @@ plist-check:
|
||||||
|
|
||||||
metadata:
|
metadata:
|
||||||
@mkdir -p ${DESTDIR}
|
@mkdir -p ${DESTDIR}
|
||||||
@${MAKE} DESTDIR=${DESTDIR} scripts
|
@${CORE_MAKE} DESTDIR=${DESTDIR} scripts
|
||||||
@${MAKE} DESTDIR=${DESTDIR} manifest > ${DESTDIR}/+MANIFEST
|
@${CORE_MAKE} DESTDIR=${DESTDIR} manifest > ${DESTDIR}/+MANIFEST
|
||||||
@${MAKE} DESTDIR=${DESTDIR} plist > ${DESTDIR}/plist
|
@${CORE_MAKE} DESTDIR=${DESTDIR} plist > ${DESTDIR}/plist
|
||||||
|
|
||||||
package-check:
|
package-check:
|
||||||
@if [ -f ${WRKDIR}/.mount_done ]; then \
|
@if [ -f ${WRKDIR}/.mount_done ]; then \
|
||||||
|
@ -315,10 +316,10 @@ package: plist-check package-check clean-wrksrc
|
||||||
@if ! ${PKG} info ${CORE_DEPEND} > /dev/null; then ${PKG} install -yfA ${CORE_DEPEND}; fi
|
@if ! ${PKG} info ${CORE_DEPEND} > /dev/null; then ${PKG} install -yfA ${CORE_DEPEND}; fi
|
||||||
.endfor
|
.endfor
|
||||||
@echo -n ">>> Generating metadata for ${CORE_NAME}-${CORE_PKGVERSION}..."
|
@echo -n ">>> Generating metadata for ${CORE_NAME}-${CORE_PKGVERSION}..."
|
||||||
@${MAKE} DESTDIR=${WRKSRC} metadata
|
@${CORE_MAKE} DESTDIR=${WRKSRC} metadata
|
||||||
@echo " done"
|
@echo " done"
|
||||||
@echo -n ">>> Staging files for ${CORE_NAME}-${CORE_PKGVERSION}..."
|
@echo -n ">>> Staging files for ${CORE_NAME}-${CORE_PKGVERSION}..."
|
||||||
@${MAKE} DESTDIR=${WRKSRC} install
|
@${CORE_MAKE} DESTDIR=${WRKSRC} install
|
||||||
@echo " done"
|
@echo " done"
|
||||||
@echo ">>> Generated version info for ${CORE_NAME}-${CORE_PKGVERSION}:"
|
@echo ">>> Generated version info for ${CORE_NAME}-${CORE_PKGVERSION}:"
|
||||||
@cat ${WRKSRC}/usr/local/opnsense/version/core
|
@cat ${WRKSRC}/usr/local/opnsense/version/core
|
||||||
|
|
|
@ -37,6 +37,8 @@ GITVERSION= ${.CURDIR}/Scripts/version.sh
|
||||||
_CORE_ARCH!= uname -p
|
_CORE_ARCH!= uname -p
|
||||||
CORE_ARCH?= ${_CORE_ARCH}
|
CORE_ARCH?= ${_CORE_ARCH}
|
||||||
|
|
||||||
|
CORE_MAKE= ${MAKE}
|
||||||
|
|
||||||
OPENSSL= ${LOCALBASE}/bin/openssl
|
OPENSSL= ${LOCALBASE}/bin/openssl
|
||||||
|
|
||||||
.if ! defined(CORE_FLAVOUR)
|
.if ! defined(CORE_FLAVOUR)
|
||||||
|
|
Loading…
Reference in New Issue