LocationsManager: Remove requirement of SYSROOT and ROOT to match.
For Chrome OS there are cases where this requirement needs to violated
such as for ./build_image. The SYSROOT is /build/${BOARD} but the target
root may be one of the different image partitions.
BUG=chromium:874977
TEST=./build_image --board=amd64-generic
Change-Id: Ic7c985b7a4830249d5ccf30fdba0bad51bac76d2
Reviewed-on: https://chromium-review.googlesource.com/c/1379065
Tested-by: Allen Webb <allenwebb@google.com>
Commit-Queue: Allen Webb <allenwebb@google.com>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
diff --git a/lib/portage/package/ebuild/_config/LocationsManager.py b/lib/portage/package/ebuild/_config/LocationsManager.py
index 7532025..36149ce 100644
--- a/lib/portage/package/ebuild/_config/LocationsManager.py
+++ b/lib/portage/package/ebuild/_config/LocationsManager.py
@@ -309,13 +309,6 @@
self.target_root = normalize_path(os.path.abspath(
self.target_root)).rstrip(os.path.sep) + os.path.sep
- if self.sysroot != "/" and self.sysroot != self.target_root:
- writemsg(_("!!! Error: SYSROOT (currently %s) must "
- "equal / or ROOT (currently %s).\n") %
- (self.sysroot, self.target_root),
- noiselevel=-1)
- raise InvalidLocation(self.sysroot)
-
ensure_dirs(self.target_root)
self._check_var_directory("ROOT", self.target_root)
