From aee4faa83d55ee414686baa5fc6c3488b583d211 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Sun, 29 Mar 2015 14:41:12 -0700 Subject: [PATCH] profiles: block packages with distribution issues Gentoo has switched to using USE=bindist only for packages with optional features that cannot be distributed and RESTRICT=bindist otherwise. This change doesn't impact anything in our tree at the moment but we should follow along to avoid mistakes in the future. Also, block packages with mirror restrictions. This is just to call attention to anything that would otherwise be missing from our distfiles mirror. Nothing we ship should actually have such a restriction. --- .../coreos-overlay/profiles/coreos/base/make.defaults | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults index 260c89a170..1f8bc4c1af 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults @@ -18,9 +18,6 @@ ETCD_PROTOCOLS="1" # Extra use flags for CoreOS SDK USE="${USE} cros_host expat -introspection -cups -tcpd -pcre -berkdb" -# Enable bindist for both SDK and targets -USE="${USE} bindist" - # No need for zeroconf, that's a desktop world thing. # Namely dhcpcd shoudln't make up random ipv4 addresses using ipv4ll USE="${USE} -zeroconf" @@ -35,6 +32,10 @@ USE="$USE -python_targets_python3_3 -python_single_target_python3_3" BOOTSTRAP_USE="$BOOTSTRAP_USE -python_targets_python3_2" BOOTSTRAP_USE="$BOOTSTRAP_USE -python_targets_python3_3" +# Disable packages or optional features with distribution issues. +ACCEPT_RESTRICT="* -bindist -mirror" +USE="${USE} bindist" + # Default licenses that are accepted for ChromiumOS builds. # If you want to accept more, use the --accept_licenses flag # when running setup_board.