From 93df62224943d8db8ea253a54bf008eddd814f2a Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 20 Dec 2017 14:11:43 -0500 Subject: [PATCH] profiles: Enable usrmerge for non-SDK targets The usrmerge flag is Gentoo's method of unifying directories under /usr instead of splitting them into the root directory. It has the same goal as our symlink-usr flag, which is still used by the baselayout ebuild, so both flags are enabled. --- .../profiles/coreos/targets/generic/make.defaults | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults index f86d738d27..11b26cb160 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults @@ -1,7 +1,7 @@ # Copyright (c) 2012 The Chromium OS Authors. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -USE="cros-debug acpi usb symlink-usr cryptsetup policykit" +USE="cros-debug acpi usb symlink-usr usrmerge cryptsetup policykit" USE="${USE} -cros_host -expat -cairo -X -man" USE="${USE} -acl -gpm -python" USE="${USE} -fortran -abiword -perl -cups -poppler-data -nls"