From 1b1322f5e5f08e7772a387953524b9c7434b773a Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Tue, 12 Oct 2021 20:28:34 -0500 Subject: meta-portwell: remove unusable neptune machine This machine is unbuildable and has not been updated in the requisite 2 months per https://lore.kernel.org/openbmc/YRUW7cazmCjW8VpP@heinlein/, so it is being deleted. Signed-off-by: Patrick Williams Change-Id: I447703c3bce985bbace4db4e43050c72ff5726f9 --- meta-portwell/MAINTAINERS | 46 ----- meta-portwell/OWNERS | 3 - .../meta-neptune/conf/bblayers.conf.sample | 20 -- meta-portwell/meta-neptune/conf/conf-notes.txt | 2 - meta-portwell/meta-neptune/conf/layer.conf | 11 -- meta-portwell/meta-neptune/conf/local.conf.sample | 218 --------------------- .../meta-neptune/conf/machine/neptune.conf | 21 -- .../recipes-kernel/linux/linux-aspeed/neptune.cfg | 5 - .../recipes-kernel/linux/linux-aspeed_%.bbappend | 2 - meta-portwell/meta-neptune/recipes.txt | 2 - 10 files changed, 330 deletions(-) delete mode 100644 meta-portwell/MAINTAINERS delete mode 100644 meta-portwell/OWNERS delete mode 100644 meta-portwell/meta-neptune/conf/bblayers.conf.sample delete mode 100644 meta-portwell/meta-neptune/conf/conf-notes.txt delete mode 100644 meta-portwell/meta-neptune/conf/layer.conf delete mode 100644 meta-portwell/meta-neptune/conf/local.conf.sample delete mode 100644 meta-portwell/meta-neptune/conf/machine/neptune.conf delete mode 100644 meta-portwell/meta-neptune/recipes-kernel/linux/linux-aspeed/neptune.cfg delete mode 100644 meta-portwell/meta-neptune/recipes-kernel/linux/linux-aspeed_%.bbappend delete mode 100644 meta-portwell/meta-neptune/recipes.txt diff --git a/meta-portwell/MAINTAINERS b/meta-portwell/MAINTAINERS deleted file mode 100644 index a27fe9035..000000000 --- a/meta-portwell/MAINTAINERS +++ /dev/null @@ -1,46 +0,0 @@ -How to use this list: - Find the most specific section entry (described below) that matches where - your change lives and add the reviewers (R) and maintainers (M) as - reviewers. You can use the same method to track down who knows a particular - code base best. - - Your change/query may span multiple entries; that is okay. - - If you do not find an entry that describes your request at all, someone - forgot to update this list; please at least file an issue or send an email - to a maintainer, but preferably you should just update this document. - -Description of section entries: - - Section entries are structured according to the following scheme: - - X: NAME - X: ... - . - . - . - - Where REPO_NAME is the name of the repository within the OpenBMC GitHub - organization; FILE_PATH is a file path within the repository, possibly with - wildcards; X is a tag of one of the following types: - - M: Denotes maintainer; has fields NAME ; - if omitted from an entry, assume one of the maintainers from the - MAINTAINERS entry. - R: Denotes reviewer; has fields NAME ; - these people are to be added as reviewers for a change matching the repo - path. - F: Denotes forked from an external repository; has fields URL. - - Line comments are to be denoted "# SOME COMMENT" (typical shell style - comment); it is important to follow the correct syntax and semantics as we - may want to use automated tools with this file in the future. - - A change cannot be added to an OpenBMC repository without a MAINTAINER's - approval; thus, a MAINTAINER should always be listed as a reviewer. - -START OF MAINTAINERS LIST -------------------------- - -M: Amithash Prasad -M: Patrick Williams diff --git a/meta-portwell/OWNERS b/meta-portwell/OWNERS deleted file mode 100644 index f0f5c4654..000000000 --- a/meta-portwell/OWNERS +++ /dev/null @@ -1,3 +0,0 @@ -owners: -- amithash@fb.com -- patrick@stwcx.xyz diff --git a/meta-portwell/meta-neptune/conf/bblayers.conf.sample b/meta-portwell/meta-neptune/conf/bblayers.conf.sample deleted file mode 100644 index 042e6dd0a..000000000 --- a/meta-portwell/meta-neptune/conf/bblayers.conf.sample +++ /dev/null @@ -1,20 +0,0 @@ -# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf -# changes incompatibly -LCONF_VERSION = "8" - -BBPATH = "${TOPDIR}" -BBFILES ?= "" - -BBLAYERS ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-poky \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-openembedded/meta-webserver \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-portwell/meta-neptune \ - " diff --git a/meta-portwell/meta-neptune/conf/conf-notes.txt b/meta-portwell/meta-neptune/conf/conf-notes.txt deleted file mode 100644 index 9b3c01a55..000000000 --- a/meta-portwell/meta-neptune/conf/conf-notes.txt +++ /dev/null @@ -1,2 +0,0 @@ -Common targets are: - obmc-phosphor-image diff --git a/meta-portwell/meta-neptune/conf/layer.conf b/meta-portwell/meta-neptune/conf/layer.conf deleted file mode 100644 index 652c8a85d..000000000 --- a/meta-portwell/meta-neptune/conf/layer.conf +++ /dev/null @@ -1,11 +0,0 @@ -# We have a conf and classes directory, add to BBPATH -BBPATH .= ":${LAYERDIR}" - -# We have recipes-* directories, add to BBFILES -BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ - ${LAYERDIR}/recipes-*/*/*.bbappend" - -BBFILE_COLLECTIONS += "neptune" -BBFILE_PATTERN_neptune = "" - -LAYERSERIES_COMPAT_neptune = "hardknott" diff --git a/meta-portwell/meta-neptune/conf/local.conf.sample b/meta-portwell/meta-neptune/conf/local.conf.sample deleted file mode 100644 index 504241448..000000000 --- a/meta-portwell/meta-neptune/conf/local.conf.sample +++ /dev/null @@ -1,218 +0,0 @@ -# -# This file is your local configuration file and is where all local user settings -# are placed. The comments in this file give some guide to the options a new user -# to the system might want to change but pretty much any configuration option can -# be set in this file. -# -# Lines starting with the '#' character are commented out and in some cases the -# default values are provided as comments to show people example syntax. Enabling -# the option is a question of removing the # character and making any change to the -# variable as required. - -# -# Machine Selection -# -MACHINE ??= "neptune" - -# -# Where to place downloads -# -# During a first build the system will download many different source code tarballs -# from various upstream projects. This can take a while, particularly if your network -# connection is slow. These are all stored in DL_DIR. When wiping and rebuilding you -# can preserve this directory to speed up this part of subsequent builds. This directory -# is safe to share between multiple builds on the same machine too. -# -# The default is a downloads directory under TOPDIR which is the build directory. -# -#DL_DIR ?= "${TOPDIR}/downloads" - -# -# Where to place shared-state files -# -# BitBake has the capability to accelerate builds based on previously built output. -# This is done using "shared state" files which can be thought of as cache objects -# and this option determines where those files are placed. -# -# You can wipe out TMPDIR leaving this directory intact and the build would regenerate -# from these files if no changes were made to the configuration. If changes were made -# to the configuration, only shared state files where the state was still valid would -# be used (done using checksums). -# -# The default is a sstate-cache directory under TOPDIR. -# -#SSTATE_DIR ?= "${TOPDIR}/sstate-cache" - -# -# Where to place the build output -# -# This option specifies where the bulk of the building work should be done and -# where BitBake should place its temporary files and output. Keep in mind that -# this includes the extraction and compilation of many applications and the toolchain -# which can use Gigabytes of hard disk space. -# -# The default is a tmp directory under TOPDIR. -# -#TMPDIR = "${TOPDIR}/tmp" - -# -# Default policy config -# -# The distribution setting controls which policy settings are used as defaults. -# The default value is fine for general Yocto project use, at least initially. -# Ultimately when creating custom policy, people will likely end up subclassing -# these defaults. -# -DISTRO ?= "openbmc-phosphor" -# As an example of a subclass there is a "bleeding" edge policy configuration -# where many versions are set to the absolute latest code from the upstream -# source control systems. This is just mentioned here as an example, its not -# useful to most new users. -# DISTRO ?= "poky-bleeding" - -# -# Package Management configuration -# -# This variable lists which packaging formats to enable. Multiple package backends -# can be enabled at once and the first item listed in the variable will be used -# to generate the root filesystems. -# Options are: -# - 'package_deb' for debian style deb files -# - 'package_ipk' for ipk files are used by opkg (a debian style embedded package manager) -# - 'package_rpm' for rpm style packages -# E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk" -# We default to ipk: -PACKAGE_CLASSES ?= "package_ipk" - -# -# SDK/ADT target architecture -# -# This variable specifies the architecture to build SDK/ADT items for and means -# you can build the SDK packages for architectures other than the machine you are -# running the build on (i.e. building i686 packages on an x86_64 host). -# Supported values are i686 and x86_64 -#SDKMACHINE ?= "i686" - -SANITY_TESTED_DISTROS_append ?= " *" - -# -# Extra image configuration defaults -# -# The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to the generated -# images. Some of these options are added to certain image types automatically. The -# variable can contain the following options: -# "dbg-pkgs" - add -dbg packages for all installed packages -# (adds symbol information for debugging/profiling) -# "dev-pkgs" - add -dev packages for all installed packages -# (useful if you want to develop against libs in the image) -# "ptest-pkgs" - add -ptest packages for all ptest-enabled packages -# (useful if you want to run the package test suites) -# "tools-sdk" - add development tools (gcc, make, pkgconfig etc.) -# "tools-debug" - add debugging tools (gdb, strace) -# "eclipse-debug" - add Eclipse remote debugging support -# "tools-profile" - add profiling tools (oprofile, exmap, lttng, valgrind) -# "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.) -# "debug-tweaks" - make an image suitable for development -# e.g. ssh root access has a blank password -# There are other application targets that can be used here too, see -# meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details. -# We default to enabling the debugging tweaks. -EXTRA_IMAGE_FEATURES = "debug-tweaks" - -# -# Additional image features -# -# The following is a list of additional classes to use when building images which -# enable extra features. Some available options which can be included in this variable -# are: -# - 'buildstats' collect build statistics -# - 'image-prelink' in order to prelink the filesystem image -# - 'image-swab' to perform host system intrusion detection -# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink -# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended -USER_CLASSES ?= "buildstats image-prelink" - -# -# Runtime testing of images -# -# The build system can test booting virtual machine images under qemu (an emulator) -# after any root filesystems are created and run tests against those images. To -# enable this uncomment this line. See classes/testimage(-auto).bbclass for -# further details. -#TEST_IMAGE = "1" -# -# Interactive shell configuration -# -# Under certain circumstances the system may need input from you and to do this it -# can launch an interactive shell. It needs to do this since the build is -# multithreaded and needs to be able to handle the case where more than one parallel -# process may require the user's attention. The default is iterate over the available -# terminal types to find one that works. -# -# Examples of the occasions this may happen are when resolving patches which cannot -# be applied, to use the devshell or the kernel menuconfig -# -# Supported values are auto, gnome, xfce, rxvt, screen, konsole (KDE 3.x only), none -# Note: currently, Konsole support only works for KDE 3.x due to the way -# newer Konsole versions behave -#OE_TERMINAL = "auto" -# By default disable interactive patch resolution (tasks will just fail instead): -PATCHRESOLVE = "noop" - -# -# Disk Space Monitoring during the build -# -# Monitor the disk space during the build. If there is less that 1GB of space or less -# than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully -# shutdown the build. If there is less that 100MB or 1K inodes, perform a hard abort -# of the build. The reason for this is that running completely out of space can corrupt -# files and damages the build in ways which may not be easily recoverable. -# It's necessary to monitor /tmp, if there is no space left the build will fail -# with very exotic errors. -BB_DISKMON_DIRS = "\ - STOPTASKS,${TMPDIR},1G,100K \ - STOPTASKS,${DL_DIR},1G,100K \ - STOPTASKS,${SSTATE_DIR},1G,100K \ - STOPTASKS,/tmp,100M,100K \ - ABORT,${TMPDIR},100M,1K \ - ABORT,${DL_DIR},100M,1K \ - ABORT,${SSTATE_DIR},100M,1K \ - ABORT,/tmp,10M,1K" - -# -# Shared-state files from other locations -# -# As mentioned above, shared state files are prebuilt cache data objects which can -# used to accelerate build time. This variable can be used to configure the system -# to search other mirror locations for these objects before it builds the data itself. -# -# This can be a filesystem directory, or a remote url such as http or ftp. These -# would contain the sstate-cache results from previous builds (possibly from other -# machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the -# cache locations to check for the shared objects. -# NOTE: if the mirror uses the same structure as SSTATE_DIR, you need to add PATH -# at the end as shown in the examples below. This will be substituted with the -# correct path within the directory structure. -#SSTATE_MIRRORS ?= "\ -#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \ -#file://.* file:///some/local/dir/sstate/PATH" - - -# -# Qemu configuration -# -# By default qemu will build with a builtin VNC server where graphical output can be -# seen. The two lines below enable the SDL backend too. This assumes there is a -# libsdl library available on your build system. -#PACKAGECONFIG_append_pn-qemu-native = " sdl" -#PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" -#ASSUME_PROVIDED += "libsdl-native" - - -# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to -# track the version of this file when it was generated. This can safely be ignored if -# this doesn't mean anything to you. -CONF_VERSION = "1" - -# Set the root password to '0penBmc' -# Defaults from meta-phosphor/conf/distro/include/phosphor-defaults.inc diff --git a/meta-portwell/meta-neptune/conf/machine/neptune.conf b/meta-portwell/meta-neptune/conf/machine/neptune.conf deleted file mode 100644 index 007495a61..000000000 --- a/meta-portwell/meta-neptune/conf/machine/neptune.conf +++ /dev/null @@ -1,21 +0,0 @@ -KMACHINE = "aspeed" -KERNEL_DEVICETREE = "${KMACHINE}-bmc-portwell-${MACHINE}.dtb" - -UBOOT_MACHINE = "ast_g5_ncsi_config" - -require conf/machine/include/ast2500.inc -require conf/machine/include/obmc-bsp-common.inc - -OBMC_MACHINE_FEATURES += "\ - obmc-phosphor-fan-mgmt \ - obmc-phosphor-chassis-mgmt \ - obmc-phosphor-flash-mgmt \ - obmc-host-ipmi \ - obmc-host-ctl \ - obmc-host-state-mgmt \ - obmc-chassis-state-mgmt \ - obmc-bmc-state-mgmt \ - " -FLASH_SIZE = "32768" -VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" - diff --git a/meta-portwell/meta-neptune/recipes-kernel/linux/linux-aspeed/neptune.cfg b/meta-portwell/meta-neptune/recipes-kernel/linux/linux-aspeed/neptune.cfg deleted file mode 100644 index 9fc33b300..000000000 --- a/meta-portwell/meta-neptune/recipes-kernel/linux/linux-aspeed/neptune.cfg +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG_SENSORS_TMP421=y -CONFIG_SENSORS_MAX31785=y -CONFIG_RTC_DRV_RV8803=y -CONFIG_TCG_TPM=y -CONFIG_TCG_TIS_I2C_INFINEON=y diff --git a/meta-portwell/meta-neptune/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-portwell/meta-neptune/recipes-kernel/linux/linux-aspeed_%.bbappend deleted file mode 100644 index 1420d15b4..000000000 --- a/meta-portwell/meta-neptune/recipes-kernel/linux/linux-aspeed_%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/linux-aspeed:" -SRC_URI += "file://neptune.cfg" diff --git a/meta-portwell/meta-neptune/recipes.txt b/meta-portwell/meta-neptune/recipes.txt deleted file mode 100644 index 3ec3f4a42..000000000 --- a/meta-portwell/meta-neptune/recipes.txt +++ /dev/null @@ -1,2 +0,0 @@ -recipes-kernel - The kernel and generic applications/libraries with strong kernel dependencies -recipes-phosphor - Phosphor OpenBMC applications and configuration -- cgit v1.2.3