mirror of
https://git.freebsd.org/src.git
synced 2026-01-11 19:57:22 +00:00
release: Use make's :H rather than /..
Some checks are pending
Cross-build Kernel / aarch64 ubuntu-22.04 (clang-15) (push) Waiting to run
Cross-build Kernel / amd64 ubuntu-22.04 (clang-15) (push) Waiting to run
Cross-build Kernel / amd64 ubuntu-24.04 (clang-18) (push) Waiting to run
Cross-build Kernel / aarch64 ubuntu-24.04 (clang-18) (push) Waiting to run
Cross-build Kernel / amd64 macos-latest (clang-18) (push) Waiting to run
Cross-build Kernel / aarch64 macos-latest (clang-18) (push) Waiting to run
Some checks are pending
Cross-build Kernel / aarch64 ubuntu-22.04 (clang-15) (push) Waiting to run
Cross-build Kernel / amd64 ubuntu-22.04 (clang-15) (push) Waiting to run
Cross-build Kernel / amd64 ubuntu-24.04 (clang-18) (push) Waiting to run
Cross-build Kernel / aarch64 ubuntu-24.04 (clang-18) (push) Waiting to run
Cross-build Kernel / amd64 macos-latest (clang-18) (push) Waiting to run
Cross-build Kernel / aarch64 macos-latest (clang-18) (push) Waiting to run
In general we want to strip subdir components, rather than appending `..`s. Reviewed by: lwhsu Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54373
This commit is contained in:
parent
138e74cead
commit
3949c2b8c4
2 changed files with 3 additions and 3 deletions
|
|
@ -40,7 +40,7 @@
|
|||
# TARGET/TARGET_ARCH: architecture of built release
|
||||
#
|
||||
|
||||
WORLDDIR?= ${.CURDIR}/..
|
||||
WORLDDIR?= ${.CURDIR:H}
|
||||
PORTSDIR?= /usr/ports
|
||||
|
||||
.include "${WORLDDIR}/share/mk/bsd.compat.pre.mk"
|
||||
|
|
@ -62,7 +62,7 @@ DISTDIR= dist
|
|||
# Define OSRELEASE by using newvers.sh
|
||||
.if !defined(OSRELEASE) || empty(OSRELEASE)
|
||||
.for _V in TYPE BRANCH REVISION
|
||||
${_V}!= eval $$(awk '/^${_V}=/{print}' ${.CURDIR}/../sys/conf/newvers.sh); echo $$${_V}
|
||||
${_V}!= eval $$(awk '/^${_V}=/{print}' ${.CURDIR:H}/sys/conf/newvers.sh); echo $$${_V}
|
||||
.endfor
|
||||
.for _V in ${TARGET_ARCH}
|
||||
.if !empty(TARGET:M${_V})
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ CLOUDWARE?= ${CLOUDWARE_GEN}
|
|||
|
||||
.for _V in TYPE BRANCH REVISION
|
||||
. if !defined(${_V}) || empty(${_V})
|
||||
${_V}!= eval $$(awk '/^${_V}=/{print}' ${.CURDIR}/../sys/conf/newvers.sh); echo $$${_V}
|
||||
${_V}!= eval $$(awk '/^${_V}=/{print}' ${.CURDIR:H}/sys/conf/newvers.sh); echo $$${_V}
|
||||
. endif
|
||||
.endfor
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue