From 8210d0b43f2f603e048d9096fd48bb7de722dfd6 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Fri, 16 Jun 2017 19:08:42 -0700 Subject: [PATCH 1/4] eclass: Drop unused WIP class from 2013 Added in 0173e3f2cba17186d74382fd5939a005486c0cee. --- .../coreos-overlay/eclass/conflict.eclass | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/eclass/conflict.eclass diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/conflict.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/conflict.eclass deleted file mode 100644 index 516939f3c0..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/eclass/conflict.eclass +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -# @ECLASS-VARIABLE: CONFLICT_LIST -# @DESCRIPTION: -# Atoms mentioned in CONFLICT_LIST need to either be unmerged or upgraded -# prior to this package being installed, but we don't want to have an explicit -# dependency on that package. So instead, we do the following: -# 1. When we are installed, ensure that the old version is not installed. -# 2. If old version is installed, ask emerge to consider upgrading it. -# This consideration is listed as PDEPEND so that we don't add an -# explicit dependency on the other package. -for atom in $CONFLICT_LIST; do - DEPEND="$DEPEND !!<=$atom" - RDEPEND="$RDEPEND !!<=$atom" - PDEPEND="$PDEPEND || ( >$atom !!<=$atom )" -done From 740820489decd6fcac22202de5a9ba0e850cf733 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Fri, 16 Jun 2017 19:09:29 -0700 Subject: [PATCH 2/4] eclass: Drop unused class The last user was removed in 3d5e4758203c439e57740eb9897eeb7fa97c0415. --- .../coreos-overlay/eclass/cros-board.eclass | 67 ------------------- 1 file changed, 67 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/eclass/cros-board.eclass diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/cros-board.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/cros-board.eclass deleted file mode 100644 index d14a50dfe8..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/eclass/cros-board.eclass +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -# -# Original Author: The Chromium OS Authors -# Purpose: Library for handling building of ChromiumOS packages -# -# -# This class sets the BOARD environment variable. It is intended to -# be used by ebuild packages that need to have the board information -# for various reasons -- for example, to differentiate various -# hardware attributes at build time; see 'adhd' for an example of -# this. -# -# When set, the BOARD environment variable should conform to the -# syntax used by the CROS utilities. -# -# If an unknown board is encountered, this class deliberately fails -# the build; this provides an easy method of identifying a change to -# the build which might affect inheriting packages. -# -# For example, the ADHD (Google A/V daemon) package relies on the -# BOARD variable to determine which hardware should be monitored at -# runtime. If the BOARD variable is not set, the daemon will not -# monitor any specific hardware; thus, when a new board is added, the -# ADHD project must be updated. -# -[[ ${EAPI} != "4" ]] && die "Only EAPI=4 is supported" - -BOARD_USE_PREFIX="board_use_" -ALL_BOARDS=( - amd64-generic - amd64-host - arm64-generic -) - -# Add BOARD_USE_PREFIX to each board in ALL_BOARDS to create IUSE. -# Also add cros_host so that we can inherit this eclass in ebuilds -# that get emerged both in the cros-sdk and for target boards. -# See REQUIRED_USE below. -IUSE="${ALL_BOARDS[@]/#/${BOARD_USE_PREFIX}} cros_host" - -# Require one, and only one, of the board_use flags to be set if this eclass -# is used. This effectively makes any ebuild that inherits this eclass require -# a known valid board to be set. -REQUIRED_USE="^^ ( ${IUSE} )" - -# Echo the current board, with variant. -get_current_board_with_variant() -{ - local b - - for b in "${ALL_BOARDS[@]}"; do - if use ${BOARD_USE_PREFIX}${b}; then - echo ${b} - return - fi - done - - die "Unable to determine current board (with variant)." -} - -# Echo the current board, without variant. -get_current_board_no_variant() -{ - get_current_board_with_variant | cut -d '_' -f 1 -} From aecce704464470d8d573778b60de66e18077f5cd Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Fri, 16 Jun 2017 19:21:21 -0700 Subject: [PATCH 3/4] profiles: Drop unused USE_EXPAND variables Last use: U_BOOT_CONFIG_USE e3193b0081fd0a0306b7996fbc69127c9a3b25c6 U_BOOT_FDT_USE 089a6611440eb5d65aab3aec0f7f81677f69f978 BOARD_USE af3f6d8747bba0c304b8a2bb5839210abd962cdd --- .../coreos-overlay/profiles/coreos/base/make.defaults | 7 ++----- 1 file changed, 2 insertions(+), 5 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 5600dce43c..de05d59cce 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 @@ -1,12 +1,9 @@ # Copyright (c) 2011 The Chromium OS Authors. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -# ChromeOS-specific: BOARD_USE for accessing board value in cros-board.eclass -# CROS_WORKON_TREE for cros-workon +# ChromeOS-specific: CROS_WORKON_TREE for cros-workon # TESTS USE_EXPAND for autotest -# U_BOOT_CONFIG_USE for selecting U-Boot config -# U_BOOT_FDT_USE for selecting U-Boot device tree -USE_EXPAND="${USE_EXPAND} BOARD_USE CROS_WORKON_TREE TESTS U_BOOT_CONFIG_USE U_BOOT_FDT_USE" +USE_EXPAND="${USE_EXPAND} CROS_WORKON_TREE TESTS" USE_EXPAND_HIDDEN="${USE_EXPAND_HIDDEN} CROS_WORKON_TREE" # Use go_version_* flags to indicate which major version was used. From 4f46eacb878918b1650df6cc1c174e8c06b8ff36 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Fri, 16 Jun 2017 19:21:42 -0700 Subject: [PATCH 4/4] profiles: Update some docs referring to amd64-generic --- .../src/third_party/coreos-overlay/profiles/coreos/amd64/README | 2 +- .../src/third_party/coreos-overlay/profiles/coreos/arm64/README | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/README b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/README index 534127b07d..e7155fd5dd 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/README +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/README @@ -1,4 +1,4 @@ This profile (and its sub-profiles) should *only* contain amd64 architecture specific settings. Architecture independent settings should go under coreos/base (applies to everything) or coreos/targets/* -(applies to the sdk, amd64-generic, etc.). +(applies to the sdk, amd64-usr, etc.). diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/README b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/README index baaec7f6d8..0e500caef1 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/README +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/README @@ -1,4 +1,4 @@ This profile (and its sub-profiles) should *only* contain architecture specific settings. Architecture independent settings should go under coreos/base (applies to everything) or coreos/targets/* -(applies to the sdk, amd64-generic, etc.). +(applies to the sdk, amd64-usr, etc.).