From 5b6bc4b7255a0ed12261c1fa55c48ecee71c5c93 Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 28 Jun 2018 14:03:41 +0000 Subject: [PATCH] profiles: Replace usrmerge with Gentoo's split-usr --- .../profiles/coreos/targets/generic/make.defaults | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 f013ceb858..e1adc647ca 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,8 +1,8 @@ # 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 usrmerge cryptsetup policykit" -USE="${USE} -cros_host -expat -cairo -X -man" +USE="cros-debug acpi usb symlink-usr cryptsetup policykit" +USE="${USE} -split-usr -cros_host -expat -cairo -X -man" USE="${USE} -acl -gpm -python" USE="${USE} -fortran -abiword -perl -cups -poppler-data -nls"