upstream/opnsense-core
1
0
Fork 0
mirror of https://github.com/opnsense/core.git synced 2026-02-03 20:39:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

make: pretty up previous, use tools.git wording

Browse source
This commit is contained in:
Franco Fichtner 2026-01-28 22:24:48 +01:00
parent 8c1a820340
commit 1e1a6a37f6
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Makefile
View file

@ -205,7 +205,7 @@ CORE_CONFLICTS:= ${CORE_CONFLICTS:S/^/os-/g:O}
mount:
@if [ ! -f ${WRKDIR}/.mount_done ]; then \
echo -n "Enabling core live mount..."; \
echo -n ">>> Enabling core live mount..."; \
sed ${SED_REPLACE} ${.CURDIR}/src/${VERSIONFILE}.in > \
${.CURDIR}/src/${VERSIONFILE}; \
mount_unionfs ${.CURDIR}/src ${LOCALBASE}; \
@ -216,7 +216,7 @@ mount:
umount:
@if [ -f ${WRKDIR}/.mount_done ]; then \
echo -n "Disabling core live mount..."; \
echo -n ">>> Disabling core live mount..."; \
umount -f "<above>:${.CURDIR}/src"; \
rm ${WRKDIR}/.mount_done; \
echo "done"; \
@ -227,7 +227,7 @@ manifest-check:
# check if all annotations are in the version file
.for REPLACEMENT in ${REPLACEMENTS}
@grep -q '\"${REPLACEMENT}\": \"%%${REPLACEMENT}%%\"' ${.CURDIR}/src/${VERSIONFILE}.in || \
(echo "Could not find ${REPLACEMENT} in version file"; exit 1)
(echo ">>> Could not find ${REPLACEMENT} in version file" >&2; exit 1)
.endfor
manifest:
@ -333,11 +333,13 @@ package: lint-plist manifest-check package-check clean-wrksrc
upgrade-check:
@if ! ${PKG} info ${CORE_NAME} > /dev/null; then \
REAL_NAME=$$(pkg which -q /usr/local/opnsense/version/core); \
echo ">>> Cannot find installed package. Use CORE_NAME=$${REAL_NAME%-*} instead." >&2; \
echo ">>> Upgrade cannot continue without installed package" >&2; \
echo ">>> To continue anyway set CORE_NAME=$${REAL_NAME%-*}" >&2; \
exit 1; \
fi
@if [ "$$(${VERSIONBIN} -vH)" = "${CORE_PKGVERSION} ${CORE_HASH}" ]; then \
echo "Installed version already matches ${CORE_PKGVERSION} ${CORE_HASH}" >&2; \
echo ">>> Installed version already matches ${CORE_PKGVERSION} ${CORE_HASH}" >&2; \
echo ">>> To continue anyway set CORE_HASH=<something>" >&2; \
exit 1; \
fi