From bb4c4f5f45b6798f5c9658e0e862077c404c675c Mon Sep 17 00:00:00 2001 From: Michael Haubenwallner Date: Mon, 13 May 2019 16:48:16 +0200 Subject: [PATCH] prefix-stack: ROOTPATH needs EPREFIX before BROOT For both EPREFIX and BROOT, portage does add some default PATH before the env.d ROOTPATH. Since bug 667662, anything found in env.d ROOTPATH is not added any more, so env.d ROOTPATH needs to contain BROOT as well, or we end up with BROOT path before EPREFIX path in ROOTPATH. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8ee5e70..de01a1f 100644 --- a/Makefile +++ b/Makefile @@ -131,9 +131,9 @@ gen-etc.prefix-guest/env.d/99host: ; } > $@ gen-etc.prefix-stack/env.d/99host: - # Query PATH,MANPATH from base prefix + # Query PATH,ROOTPATH,MANPATH from base prefix $(INSTALL_DIR) $(@D) - sed -n -E '/^export (PATH|MANPATH)=/{s/^export //;p}' '$(BROOT)'/etc/profile.env > $@ + sed -n -E '/^export (PATH|ROOTPATH|MANPATH)=/{s/^export //;p}' '$(BROOT)'/etc/profile.env > $@ gen-etc.prefix-stack/env.d/00host: # Query EDITOR,PAGER from base prefix