Actions
Bug #13673
open
WS_TOP assignment not work if a mercurial repo alongside openindiana userland
Start date:
Due date:
% Done:
0%
Estimated time:
Difficulty:
Bite-size
Tags:
Description
If there exists a mercurial repo (eg. mozilla firfox source) alongside the oi-userland tree, so 'hg root' will find a path, WS_TOP determining will end in a wrong path.
Because we do not use mercurial for oi-userland anymore, we can fix this by change the assignment, like:
diff --git a/make-rules/shared-macros.mk b/make-rules/shared-macros.mk index 7073dfc53..c28bb05b4 100644 --- a/make-rules/shared-macros.mk +++ b/make-rules/shared-macros.mk @@ -57,7 +57,7 @@ export DOWNLOAD_FALLBACK_PATH = $(DLC_ARCHIVE_MIRROR) # The workspace starts at the mercurial root ifeq ($(origin WS_TOP), undefined) export WS_TOP := \ - $(shell hg root 2>/dev/null || git rev-parse --show-toplevel) + $(shell git rev-parse --show-toplevel) endif USERLAND_ARCHIVES ?= $(WS_TOP)/archives/
No data to display
Actions