Merge pull request #2610 from bgilbert/generic

{eclass,profiles}: Drop some dead code
This commit is contained in:
Benjamin Gilbert 2017-06-21 13:28:28 -07:00 committed by GitHub
commit 8414312027
5 changed files with 4 additions and 91 deletions

View File

@ -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

View File

@ -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 <chromium-os-dev@chromium.org>
# 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
}

View File

@ -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.).

View File

@ -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.).

View File

@ -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.