diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-31 06:25:51 -0400 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-09-06 07:44:12 -0400 |
| commit | ff075f6ee795a590b244d70a90cc312ba1f2d83d (patch) | |
| tree | a617790bdbfdeef960665ba0242e1f0c93e5301a /meta-phosphor/common | |
| parent | 3e4da38c127bb7e7641adc2fc41f4c33744cb918 (diff) | |
| download | talos-openbmc-ff075f6ee795a590b244d70a90cc312ba1f2d83d.tar.gz talos-openbmc-ff075f6ee795a590b244d70a90cc312ba1f2d83d.zip | |
meta-phosphor: Move layer content from common/
Adopt a more conventional directory hierarchy. meta-phosphor is still
a _long_ way from suitable for hosting on yoctoproject.org but things
like this don't help.
(From meta-phosphor rev: 471cfcefa74b8c7ceb704cb670e6d915cf27c63b)
Change-Id: I3f106b2f6cdc6cec734be28a6090800546f362eb
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor/common')
405 files changed, 0 insertions, 12264 deletions
diff --git a/meta-phosphor/common/recipes-connectivity/net-snmp/net-snmp_%.bbappend b/meta-phosphor/common/recipes-connectivity/net-snmp/net-snmp_%.bbappend deleted file mode 100644 index 03c5c8878..000000000 --- a/meta-phosphor/common/recipes-connectivity/net-snmp/net-snmp_%.bbappend +++ /dev/null @@ -1,13 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -EXTRA_OECONF += "--disable-mib-loading --disable-agent --disable-applications \ ---disable-manuals --disable-scripts --disable-mibs --disable-embedded-perl \ ---disable-perl-cc-checks --disable-libtool-lock --disable-debugging \ ---disable-snmpv1 --disable-des --disable-privacy --disable-md5 \ ---disable-snmptrapd-subagent --disable-set-support --disable-deprecated" - -do_install_append() { - rm -f ${D}${libdir}/libnetsnmpmibs.so.* - rm -f ${D}${libdir}/libnetsnmphelpers.so.* - rm -f ${D}${libdir}/libnetsnmpagent.so.* -} diff --git a/meta-phosphor/common/recipes-connectivity/openssl/openssl_%.bbappend b/meta-phosphor/common/recipes-connectivity/openssl/openssl_%.bbappend deleted file mode 100644 index 44898f0de..000000000 --- a/meta-phosphor/common/recipes-connectivity/openssl/openssl_%.bbappend +++ /dev/null @@ -1,16 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -# General config settings. -EXTRA_OECONF_append = " shared no-hw no-err no-psk no-srp no-engines " - -# Disable SSL (keep TLS only). -EXTRA_OECONF_append = " no-ssl2 no-ssl3 " - -# Disable various algorithms. -EXTRA_OECONF_append = " no-idea no-md2 no-mdc2 no-rc5 no-md4 \ - no-ripemd160 no-rmd160 no-whirlpool no-sha0 no-camellia \ - no-rc2 no-rc4 no-bf no-cast no-seed no-gost " - -do_configure_append() { - oe_runmake depend -} diff --git a/meta-phosphor/common/recipes-core/base-files/base-files/fstab b/meta-phosphor/common/recipes-core/base-files/base-files/fstab deleted file mode 100644 index 4a0766876..000000000 --- a/meta-phosphor/common/recipes-core/base-files/base-files/fstab +++ /dev/null @@ -1,9 +0,0 @@ -# openbmc fstab - -/dev/root / auto defaults 1 1 -proc /proc proc defaults 0 0 -devpts /dev/pts devpts mode=0620,gid=5 0 0 -tmpfs /run tmpfs mode=0755,nodev,nosuid,strictatime 0 0 -tmpfs /var/volatile tmpfs defaults 0 0 -tmpfs /media tmpfs defaults 0 0 -/var/persist/home /home none bind 0 0 diff --git a/meta-phosphor/common/recipes-core/base-files/base-files_%.bbappend b/meta-phosphor/common/recipes-core/base-files/base-files_%.bbappend deleted file mode 100644 index 4b48dc78b..000000000 --- a/meta-phosphor/common/recipes-core/base-files/base-files_%.bbappend +++ /dev/null @@ -1,7 +0,0 @@ -FILESEXTRAPATHS_prepend_df-obmc-ubi-fs := "${THISDIR}/${PN}:" - -RDEPENDS_${PN}_append_df-obmc-ubi-fs = " preinit-mounts" - -do_install_append() { - install -d ${D}/srv -} diff --git a/meta-phosphor/common/recipes-core/busybox/busybox/0001-Stop-watchdog-first-on-startup.patch b/meta-phosphor/common/recipes-core/busybox/busybox/0001-Stop-watchdog-first-on-startup.patch deleted file mode 100644 index 7128b8108..000000000 --- a/meta-phosphor/common/recipes-core/busybox/busybox/0001-Stop-watchdog-first-on-startup.patch +++ /dev/null @@ -1,63 +0,0 @@ -From a4c493ae42926ab36fdc805a5da9f0682bb98b45 Mon Sep 17 00:00:00 2001 -From: Matt Spinler <spinler@us.ibm.com> -Date: Tue, 13 Jun 2017 15:26:49 -0500 -Subject: [PATCH] Stop watchdog first on startup - -Some watchdog implementations may do things other than issue -a reboot on a watchdog timeout. In this case, there's the -possibility of restarting this program from the state of -the watchdog device not being properly stopped (done by writing -a 'V' and closing the device). Since it wasn't stopped, the -driver may not be able to restart the watchdog when this program -reopens it and starts pinging it. - -To fix this, the code will always first issue the stop when it -starts up. - -Signed-off-by: Matt Spinler <spinler@us.ibm.com> ---- - miscutils/watchdog.c | 21 +++++++++++++++++++-- - 1 file changed, 19 insertions(+), 2 deletions(-) - -diff --git a/miscutils/watchdog.c b/miscutils/watchdog.c -index 07ae64e52..223e3c32d 100644 ---- a/miscutils/watchdog.c -+++ b/miscutils/watchdog.c -@@ -53,6 +53,24 @@ static void watchdog_shutdown(int sig UNUSED_PARAM) - _exit(EXIT_SUCCESS); - } - -+static void watchdog_open(const char* device) -+{ -+ static const char magic_value = 'V'; -+ -+ /* If the watchdog driver can do something other than cause a reboot -+ * on a timeout, then it's possible this program may be starting from -+ * a state when the watchdog hadn't been previously stopped with -+ * the magic write followed by a close. In this case the driver may -+ * not start properly, so always do the proper stop first just in case. -+ */ -+ -+ /* Use known fd # - avoid needing global 'int fd' */ -+ xmove_fd(xopen(device, O_WRONLY), 3); -+ write(3, &magic_value, 1); -+ close(3); -+ xmove_fd(xopen(device, O_WRONLY), 3); -+} -+ - int watchdog_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; - int watchdog_main(int argc, char **argv) - { -@@ -88,8 +106,7 @@ int watchdog_main(int argc, char **argv) - - bb_signals(BB_FATAL_SIGS, watchdog_shutdown); - -- /* Use known fd # - avoid needing global 'int fd' */ -- xmove_fd(xopen(argv[argc - 1], O_WRONLY), 3); -+ watchdog_open(argv[argc - 1]); - - /* WDIOC_SETTIMEOUT takes seconds, not milliseconds */ - htimer_duration = htimer_duration / 1000; --- -2.11.0 - diff --git a/meta-phosphor/common/recipes-core/busybox/busybox/busybox.cfg b/meta-phosphor/common/recipes-core/busybox/busybox/busybox.cfg deleted file mode 100644 index 99e83dbd9..000000000 --- a/meta-phosphor/common/recipes-core/busybox/busybox/busybox.cfg +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG_DEVMEM=y -CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y -CONFIG_FEATURE_LESS_TRUNCATE=y -CONFIG_FEATURE_LESS_REGEXP=y -CONFIG_WATCHDOG=y -CONFIG_EXPAND=y diff --git a/meta-phosphor/common/recipes-core/busybox/busybox/flash.cfg b/meta-phosphor/common/recipes-core/busybox/busybox/flash.cfg deleted file mode 100644 index 39ba10d74..000000000 --- a/meta-phosphor/common/recipes-core/busybox/busybox/flash.cfg +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_FLASHCP=y -CONFIG_FLASH_LOCK=y -CONFIG_FLASH_UNLOCK=y -CONFIG_FLASH_ERASEALL=y diff --git a/meta-phosphor/common/recipes-core/busybox/busybox/mountpoint.cfg b/meta-phosphor/common/recipes-core/busybox/busybox/mountpoint.cfg deleted file mode 100644 index 8b009511a..000000000 --- a/meta-phosphor/common/recipes-core/busybox/busybox/mountpoint.cfg +++ /dev/null @@ -1 +0,0 @@ -CONFIG_MOUNTPOINT=y diff --git a/meta-phosphor/common/recipes-core/busybox/busybox_%.bbappend b/meta-phosphor/common/recipes-core/busybox/busybox_%.bbappend deleted file mode 100644 index e6678fc8a..000000000 --- a/meta-phosphor/common/recipes-core/busybox/busybox_%.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI += "file://busybox.cfg" -SRC_URI += "file://flash.cfg" -SRC_URI += "file://mountpoint.cfg" -SRC_URI += "file://0001-Stop-watchdog-first-on-startup.patch" diff --git a/meta-phosphor/common/recipes-core/dropbear/dropbear/0001-Only-load-dropbear-default-host-keys-if-a-key-is-not.patch b/meta-phosphor/common/recipes-core/dropbear/dropbear/0001-Only-load-dropbear-default-host-keys-if-a-key-is-not.patch deleted file mode 100644 index e32baec83..000000000 --- a/meta-phosphor/common/recipes-core/dropbear/dropbear/0001-Only-load-dropbear-default-host-keys-if-a-key-is-not.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 95eff1ca0beea55259c2cdc7f1bb9f930bf57bc8 Mon Sep 17 00:00:00 2001 -From: CamVan Nguyen <ctnguyen@us.ibm.com> -Date: Tue, 13 Feb 2018 15:37:47 -0600 -Subject: [PATCH 1/1] Only load dropbear default host keys if a key is not - specified - ---- - svr-runopts.c | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/svr-runopts.c b/svr-runopts.c -index 8f60059..c5c2148 100644 ---- a/svr-runopts.c -+++ b/svr-runopts.c -@@ -488,17 +488,21 @@ void load_all_hostkeys() { - m_free(hostkey_file); - } - -+ /* Only load default host keys if a host key is not specified by the -+ * user */ -+ if (0 == svr_opts.num_hostkey_files) { - #ifdef DROPBEAR_RSA -- loadhostkey(RSA_PRIV_FILENAME, 0); -+ loadhostkey(RSA_PRIV_FILENAME, 0); - #endif - - #ifdef DROPBEAR_DSS -- loadhostkey(DSS_PRIV_FILENAME, 0); -+ loadhostkey(DSS_PRIV_FILENAME, 0); - #endif - - #ifdef DROPBEAR_ECDSA -- loadhostkey(ECDSA_PRIV_FILENAME, 0); -+ loadhostkey(ECDSA_PRIV_FILENAME, 0); - #endif -+ } - - #ifdef DROPBEAR_DELAY_HOSTKEY - if (svr_opts.delay_hostkey) { --- -1.8.2.2 - diff --git a/meta-phosphor/common/recipes-core/dropbear/dropbear/0001-dropbear-Add-c-command-option-to-force-a-specific-co.patch b/meta-phosphor/common/recipes-core/dropbear/dropbear/0001-dropbear-Add-c-command-option-to-force-a-specific-co.patch deleted file mode 100644 index 88d0ac0bb..000000000 --- a/meta-phosphor/common/recipes-core/dropbear/dropbear/0001-dropbear-Add-c-command-option-to-force-a-specific-co.patch +++ /dev/null @@ -1,91 +0,0 @@ -From b4e094381ec846f4387dc6a3c210c2205a8db58a Mon Sep 17 00:00:00 2001 -From: Jeremy Kerr <jk@ozlabs.org> -Date: Tue, 12 Apr 2016 11:11:40 +0800 -Subject: [PATCH] dropbear: Add -c <command> option to force a specific command - -This change adds a -c option to dropbear, to force the session to use a -specific command, in a similar fashion to OpenSSH's ForceCommand -configuration option. - -This is useful to provide a simple fixed service over ssh, without -requiring an authorized key file for the per-key forced_command option. - -This setting takes precedence over the channel session's provided -command, and the per-key forced_command setting. - -Signed-off-by: Jeremy Kerr <jk@ozlabs.org> ---- - runopts.h | 2 ++ - svr-chansession.c | 12 ++++++++++-- - svr-runopts.c | 5 +++++ - 3 files changed, 17 insertions(+), 2 deletions(-) - -diff --git a/runopts.h b/runopts.h -index f7c869d..ffb573e 100644 ---- a/runopts.h -+++ b/runopts.h -@@ -114,6 +114,8 @@ typedef struct svr_runopts { - buffer * banner; - char * pidfile; - -+ char * command; -+ - } svr_runopts; - - extern svr_runopts svr_opts; -diff --git a/svr-chansession.c b/svr-chansession.c -index bfaf7f6..d6c9330 100644 ---- a/svr-chansession.c -+++ b/svr-chansession.c -@@ -671,8 +671,16 @@ static int sessioncommand(struct Channel *channel, struct ChanSess *chansess, - } - } - -- /* take public key option 'command' into account */ -- svr_pubkey_set_forced_command(chansess); -+ -+ /* take global command into account */ -+ if (svr_opts.command) { -+ chansess->original_command = chansess->cmd ? : m_strdup(""); -+ chansess->cmd = m_strdup(svr_opts.command); -+ } else { -+ /* take public key option 'command' into account */ -+ svr_pubkey_set_forced_command(chansess); -+ } -+ - - #ifdef LOG_COMMANDS - if (chansess->cmd) { -diff --git a/svr-runopts.c b/svr-runopts.c -index 8f60059..f845300 100644 ---- a/svr-runopts.c -+++ b/svr-runopts.c -@@ -79,6 +79,7 @@ static void printhelp(const char * progname) { - #ifdef ENABLE_SVR_REMOTETCPFWD - "-k Disable remote port forwarding\n" - "-a Allow connections to forwarded ports from any host\n" -+ "-c command Force executed command\n" - #endif - "-p [address:]port\n" - " Listen on specified tcp port (and optionally address),\n" -@@ -125,6 +126,7 @@ void svr_getopts(int argc, char ** argv) { - /* see printhelp() for options */ - svr_opts.bannerfile = NULL; - svr_opts.banner = NULL; -+ svr_opts.command = NULL; - svr_opts.forkbg = 1; - svr_opts.norootlogin = 0; - svr_opts.noauthpass = 0; -@@ -177,6 +179,9 @@ void svr_getopts(int argc, char ** argv) { - case 'b': - next = &svr_opts.bannerfile; - break; -+ case 'c': -+ next = &svr_opts.command; -+ break; - case 'd': - case 'r': - next = &keyfile; --- -2.5.0 - diff --git a/meta-phosphor/common/recipes-core/dropbear/dropbear/dropbearkey.service b/meta-phosphor/common/recipes-core/dropbear/dropbear/dropbearkey.service deleted file mode 100644 index dfeb17f41..000000000 --- a/meta-phosphor/common/recipes-core/dropbear/dropbear/dropbearkey.service +++ /dev/null @@ -1,18 +0,0 @@ -[Unit] -Description=SSH Key Generation - -[Service] -# Set the default RSA key path then load environment variables from the -# environment file, which might override the default RSA key path. -Environment="DROPBEAR_RSAKEY_DIR=/etc/dropbear" -EnvironmentFile=-/etc/default/dropbear -Type=oneshot -ExecStart=@BASE_BINDIR@/sh -c \ - "if [[ ! -f ${DROPBEAR_RSAKEY_DIR}/dropbear_rsa_host_key ]]; then \ - @BASE_BINDIR@/mkdir -p ${DROPBEAR_RSAKEY_DIR}; \ - @SBINDIR@/dropbearkey -t rsa -f ${DROPBEAR_RSAKEY_DIR}/dropbear_rsa_host_key; \ - fi" -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/meta-phosphor/common/recipes-core/dropbear/dropbear_%.bbappend b/meta-phosphor/common/recipes-core/dropbear/dropbear_%.bbappend deleted file mode 100644 index 80714977b..000000000 --- a/meta-phosphor/common/recipes-core/dropbear/dropbear_%.bbappend +++ /dev/null @@ -1,7 +0,0 @@ -# 0001-Only-load-dropbear-default-host-keys-if-a-key-is-not.patch -# has been upstreamed. This patch can be removed once we upgrade -# to yocto 2.5 or later which will pull in the latest dropbear code. -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI += "file://dropbearkey.service \ - file://0001-dropbear-Add-c-command-option-to-force-a-specific-co.patch \ - file://0001-Only-load-dropbear-default-host-keys-if-a-key-is-not.patch" diff --git a/meta-phosphor/common/recipes-core/glib-2.0/glib-2.0%.bbappend b/meta-phosphor/common/recipes-core/glib-2.0/glib-2.0%.bbappend deleted file mode 100644 index f003a6b43..000000000 --- a/meta-phosphor/common/recipes-core/glib-2.0/glib-2.0%.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -## We do not currently use any gio-modules, set clear this variable to prevent -## the postinstall hook from being done. The postinstall hook prevents -## the read-only-rootfs IMAGE_FEATURE. -GIO_MODULE_PACKAGES = "" diff --git a/meta-phosphor/common/recipes-core/os-release/os-release.bbappend b/meta-phosphor/common/recipes-core/os-release/os-release.bbappend deleted file mode 100644 index 77249fc50..000000000 --- a/meta-phosphor/common/recipes-core/os-release/os-release.bbappend +++ /dev/null @@ -1,35 +0,0 @@ -# WARNING! -# -# These modifications to os-release disable the bitbake parse -# cache (for the os-release recipe only). Before copying -# and pasting into another recipe ensure it is understood -# what that means! - -def run_git(d, cmd): - try: - oeroot = d.getVar('COREBASE', True) - return bb.process.run("git --work-tree %s --git-dir %s/.git %s" - % (oeroot, oeroot, cmd))[0].strip('\n') - except: - pass - -python() { - version_id = run_git(d, 'describe --dirty --long') - if version_id: - d.setVar('VERSION_ID', version_id) - versionList = version_id.split('-') - version = versionList[0] + "-" + versionList[1] - d.setVar('VERSION', version) - - build_id = run_git(d, 'describe --abbrev=0') - if build_id: - d.setVar('BUILD_ID', build_id) -} - -OS_RELEASE_FIELDS_append = " BUILD_ID" - -# Ensure the git commands run every time bitbake is invoked. -BB_DONT_CACHE = "1" - -# Make os-release available to other recipes. -SYSROOT_DIRS_append = " ${sysconfdir}" diff --git a/meta-phosphor/common/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend b/meta-phosphor/common/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend deleted file mode 100644 index 96236ca73..000000000 --- a/meta-phosphor/common/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend +++ /dev/null @@ -1,6 +0,0 @@ -RDEPENDS_${PN}_append = " \ - nativesdk-autoconf-archive \ - nativesdk-phosphor-dbus-interfaces-yaml \ - nativesdk-sdbus++ \ - nativesdk-phosphor-logging-elog \ - " diff --git a/meta-phosphor/common/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend b/meta-phosphor/common/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend deleted file mode 100644 index 7eef4f9bb..000000000 --- a/meta-phosphor/common/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend +++ /dev/null @@ -1 +0,0 @@ -RRECOMMENDS_${PN}_append = " gtest sdbusplus phosphor-logging libstdc++-staticdev" diff --git a/meta-phosphor/common/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend b/meta-phosphor/common/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend deleted file mode 100644 index 78b78e40b..000000000 --- a/meta-phosphor/common/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend +++ /dev/null @@ -1,12 +0,0 @@ -RDEPENDS_${PN}_remove = " \ - lttng-tools \ - lttng-ust \ - lttng-modules \ - powertop \ - latencytop \ - " - -RRECOMMENDS_${PN}_remove = " \ - perf \ - trace-cmd \ - " diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets.bb b/meta-phosphor/common/recipes-core/systemd/obmc-targets.bb deleted file mode 100644 index ac7835e6b..000000000 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets.bb +++ /dev/null @@ -1,91 +0,0 @@ -SUMMARY = "Phosphor Systemd targets" -DESCRIPTION = "Provides well known Systemd synchronization points for OpenBMC." -HOMEPAGE = "http://github.com/openbmc" -PR = "r1" - -inherit obmc-phosphor-systemd -inherit obmc-phosphor-license -inherit allarch - -# Chassis power synchronization targets -# - start-pre: Services to run before we start power on process -# - start: Services to run to do the chassis power on -# - on: Services to run once power is on -# - stop-pre,stop,off: Same as above but applied to powering off -# - reset-on: Services to check if chassis power is on after bmc reset -CHASSIS_SYNCH_TARGETS = "start-pre start on stop-pre stop off reset-on" - -# Chassis action power targets -# - on: Services to run to power on the chassis -# - off: Services to run to power off the chassis -# - powered-off: Services to run once chassis power is off -# - reset: Services to check chassis power state and update chassis "on" target -# - hard-off: Services to force an immediate power off of the chassis -CHASSIS_ACTION_TARGETS = "poweron poweroff powered-off powerreset hard-poweroff" - -# Track all host synchronization point targets -# - start-pre: Services to run before we start host boot -# - starting: Services to run to do the host boot -# - started: Services to run once the host is booted -# - stop-pre,stopping,stopped: Same as above but applied to shutting down the host -# - reset-running: Services to check if host is running after bmc reset -HOST_SYNCH_TARGETS = "start-pre starting started stop-pre stopping stopped reset-running" - -# Track all host action targets -# - start: Will run startmin target, this target used for any additional -# services that user needs for an initial power on of host. -# For example, resetting the host reboot count could be put in -# this target so on any fresh power on, this count is reset. -# - startmin: Minimum services required to start the host. This target will -# be called by reboot and start target. -# - stop: Services to run to shutdown the host -# - quiesce: Target to enter on host boot failure -# - shutdown: Tell host to shutdown, then stop system -# - reset: Services to check if host is running and update host "start" target -# - crash: Target to run when host crashes. it is very much similar to -# quiesce target but the only delta is that this target contains -# multiple services and one of them is the quiesce target. -# - timeout: Target to run when host watchdog times out -# - reboot: Reboot the host -HOST_ACTION_TARGETS = "start startmin stop quiesce reset shutdown crash timeout reboot" - -CHASSIS_SYNCH_FMT = "obmc-power-{0}@.target" -CHASSIS_ACTION_FMT = "obmc-chassis-{0}@.target" -HOST_SYNCH_FMT = "obmc-host-{0}@.target" -HOST_ACTION_FMT = "obmc-host-{0}@.target" - -CHASSIS_LINK_SYNCH_FMT = "${CHASSIS_SYNCH_FMT}:obmc-power-{0}@{1}.target" -CHASSIS_LINK_ACTION_FMT = "${CHASSIS_ACTION_FMT}:obmc-chassis-{0}@{1}.target" -HOST_LINK_SYNCH_FMT = "${HOST_SYNCH_FMT}:obmc-host-{0}@{1}.target" -HOST_LINK_ACTION_FMT = "${HOST_ACTION_FMT}:obmc-host-{0}@{1}.target" -FAN_LINK_FMT = "obmc-fan-control-ready@.target:obmc-fan-control-ready@{0}.target" - -# Targets to be executed on checkstop and watchdog timeout -HOST_ERROR_TARGETS = "crash timeout" - -QUIESCE_TMPL = "obmc-host-quiesce@.target" -CRASH_TIMEOUT_TGTFMT = "obmc-host-{0}@{1}.target" -QUIESCE_INSTFMT = "obmc-host-quiesce@{1}.target" -QUIESCE_FMT = "../${QUIESCE_TMPL}:${CRASH_TIMEOUT_TGTFMT}.wants/${QUIESCE_INSTFMT}" - -SYSTEMD_SERVICE_${PN} += " \ - obmc-mapper.target \ - obmc-webserver-pre.target \ - obmc-fans-ready.target \ - obmc-fan-control.target \ - obmc-fan-control-ready@.target \ - obmc-fan-watchdog-takeover.target \ - obmc-standby.target \ - " - -SYSTEMD_SERVICE_${PN} += "${@compose_list(d, 'CHASSIS_SYNCH_FMT', 'CHASSIS_SYNCH_TARGETS')}" -SYSTEMD_SERVICE_${PN} += "${@compose_list(d, 'CHASSIS_ACTION_FMT', 'CHASSIS_ACTION_TARGETS')}" -SYSTEMD_SERVICE_${PN} += "${@compose_list(d, 'HOST_SYNCH_FMT', 'HOST_SYNCH_TARGETS')}" -SYSTEMD_SERVICE_${PN} += "${@compose_list(d, 'HOST_ACTION_FMT', 'HOST_ACTION_TARGETS')}" - -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'CHASSIS_LINK_SYNCH_FMT', 'CHASSIS_SYNCH_TARGETS', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'CHASSIS_LINK_ACTION_FMT', 'CHASSIS_ACTION_TARGETS', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'HOST_LINK_SYNCH_FMT', 'HOST_SYNCH_TARGETS', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'HOST_LINK_ACTION_FMT', 'HOST_ACTION_TARGETS', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FAN_LINK_FMT', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'QUIESCE_FMT', 'HOST_ERROR_TARGETS', 'OBMC_HOST_INSTANCES')}" diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-hard-poweroff@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-hard-poweroff@.target deleted file mode 100644 index 48fc44169..000000000 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-hard-poweroff@.target +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Chassis%i (Hard Power Off) -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} -Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service -After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service -Conflicts=obmc-chassis-poweron@%i.target -Conflicts=obmc-chassis-powerreset@%i.target -Conflicts=obmc-host-shutdown@%i.target -Conflicts=xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service -RefuseManualStop=yes diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powered-off@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powered-off@.target deleted file mode 100644 index 84c1ddab1..000000000 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powered-off@.target +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Chassis%i (Powered Off) -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} -Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service -After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service -Conflicts=obmc-chassis-poweron@%i.target -Conflicts=obmc-chassis-powerreset@%i.target -RefuseManualStop=yes diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target deleted file mode 100644 index 080d72456..000000000 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Chassis%i (Power Off) -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} -Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service -After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service -Conflicts=obmc-chassis-poweron@%i.target -Conflicts=obmc-chassis-powerreset@%i.target -RefuseManualStop=yes diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target deleted file mode 100644 index 55f6d919b..000000000 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Chassis%i (Power On) -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} -Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service -After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service -Wants=mapper-subtree-remove@-xyz-openbmc\x5fproject-software\x3Axyz.openbmc_project.Software.ActivationBlocksTransition.service -After=mapper-subtree-remove@-xyz-openbmc\x5fproject-software\x3Axyz.openbmc_project.Software.ActivationBlocksTransition.service -Conflicts=obmc-chassis-poweroff@%i.target -RefuseManualStop=yes -OnFailure=obmc-chassis-poweroff@%i.target -OnFailureJobMode=flush diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target deleted file mode 100644 index 8d7c47e6b..000000000 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-powerreset@.target +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=Chassis%i (Reset Check) -Conflicts=obmc-chassis-poweroff@%i.target -RefuseManualStop=yes - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-fan-control-ready@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-fan-control-ready@.target deleted file mode 100644 index e041a5508..000000000 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-fan-control-ready@.target +++ /dev/null @@ -1,4 +0,0 @@ -[Unit] -Description=Fan Control Ready -RefuseManualStop=yes -Conflicts=obmc-chassis-powered-off@%i.target diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-fan-control.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-fan-control.target deleted file mode 100644 index 50665db4a..000000000 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-fan-control.target +++ /dev/null @@ -1,4 +0,0 @@ -[Unit] -Description=Fan Control -RefuseManualStart=yes -RefuseManualStop=yes diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-fan-watchdog-takeover.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-fan-watchdog-takeover.target deleted file mode 100644 index 803408334..000000000 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-fan-watchdog-takeover.target +++ /dev/null @@ -1,6 +0,0 @@ -#The system implementation should start this target when dynamic fan control -#is no longer desired or possible. It should also add units to this target -#that enabled continued operation after dynamic fan control is no longer -#desired or possible. -[Unit] -Description=Fan watchdog takeover target diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-fans-ready.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-fans-ready.target deleted file mode 100644 index 59e61c626..000000000 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-fans-ready.target +++ /dev/null @@ -1,4 +0,0 @@ -[Unit] -Description=Fans Ready -RefuseManualStart=yes -RefuseManualStop=yes diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-crash@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-crash@.target deleted file mode 100644 index ea3798b52..000000000 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-crash@.target +++ /dev/null @@ -1,4 +0,0 @@ -[Unit] -Description=Host instance %i crashed -Conflicts=obmc-chassis-poweroff@%i.target -RefuseManualStop=yes diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-quiesce@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-quiesce@.target deleted file mode 100644 index 4f10419ab..000000000 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-quiesce@.target +++ /dev/null @@ -1,6 +0,0 @@ -[Unit] -Description=Quiesce Target -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} -RefuseManualStop=yes -Conflicts=obmc-chassis-poweroff@%i.target diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reboot@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reboot@.target deleted file mode 100644 index dc280ea65..000000000 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reboot@.target +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Reboot Host%i -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} -Wants=mapper-wait@-org-openbmc-control-chassis%i.service -After=mapper-wait@-org-openbmc-control-chassis%i.service -Conflicts=obmc-host-startmin@%i.target -RefuseManualStop=yes -OnFailure=obmc-chassis-poweroff@%i.target -OnFailureJobMode=flush diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reset-running@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reset-running@.target deleted file mode 100644 index 94bb2b130..000000000 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reset-running@.target +++ /dev/null @@ -1,5 +0,0 @@ -[Unit] -Description=Host%i running after reset -Conflicts=obmc-host-stop@%i.target -RefuseManualStart=yes -RefuseManualStop=yes diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reset@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reset@.target deleted file mode 100644 index ca95d843c..000000000 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-reset@.target +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=Host%i (Reset Check) -Conflicts=obmc-host-stop@%i.target -RefuseManualStop=yes - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-shutdown@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-shutdown@.target deleted file mode 100644 index 4768a567f..000000000 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-shutdown@.target +++ /dev/null @@ -1,6 +0,0 @@ -[Unit] -Description=Power%i Host Off -Wants={SYSTEMD_DEFAULT_TARGET} -RefuseManualStop=yes -OnFailure=obmc-chassis-poweroff@%i.target -OnFailureJobMode=flush diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target deleted file mode 100644 index 2bc270c14..000000000 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start-pre@.target +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=Start Host%i (Pre) -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} -Conflicts=obmc-host-stop@%i.target -RefuseManualStart=yes -RefuseManualStop=yes diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start@.target deleted file mode 100644 index 144b63387..000000000 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-start@.target +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Start Host%i -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} -Wants=mapper-wait@-org-openbmc-control-chassis%i.service -After=mapper-wait@-org-openbmc-control-chassis%i.service -Conflicts=obmc-host-stop@%i.target -RefuseManualStop=yes -OnFailure=obmc-host-quiesce@%i.target -OnFailureJobMode=flush diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target deleted file mode 100644 index eb0a9383b..000000000 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-started@.target +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=Host%i (Started) -Wants={SYSTEMD_DEFAULT_TARGET} -After=obmc-host-starting@%i.target -Conflicts=obmc-host-stop@%i.target -RefuseManualStart=yes -RefuseManualStop=yes diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-starting@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-starting@.target deleted file mode 100644 index 408139dd4..000000000 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-starting@.target +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=Host%i (Starting) -Wants={SYSTEMD_DEFAULT_TARGET} -After=obmc-host-start-pre@%i.target -Conflicts=obmc-host-stop@%i.target -RefuseManualStart=yes -RefuseManualStop=yes diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-startmin@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-startmin@.target deleted file mode 100644 index 6e924adcd..000000000 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-startmin@.target +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Start Host%i Minimum -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} -Wants=mapper-wait@-org-openbmc-control-chassis%i.service -After=mapper-wait@-org-openbmc-control-chassis%i.service -Conflicts=obmc-host-stop@%i.target -RefuseManualStop=yes -OnFailure=obmc-host-quiesce@%i.target -OnFailureJobMode=flush diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target deleted file mode 100644 index e88d3ea58..000000000 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stop-pre@.target +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Stop Host%i (Pre) -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} -Before=obmc-host-stopping@%i.target -Conflicts=obmc-host-startmin@%i.target -RefuseManualStart=yes -RefuseManualStop=yes diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stop@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stop@.target deleted file mode 100644 index 8e99bccdb..000000000 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stop@.target +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Stop Host%i -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} -Wants=mapper-wait@-org-openbmc-control-chassis%i.service -After=mapper-wait@-org-openbmc-control-chassis%i.service -After=obmc-chassis-poweroff@%i.target -Conflicts=obmc-host-startmin@%i.target -RefuseManualStop=yes -OnFailure=obmc-chassis-poweroff@%i.target -OnFailureJobMode=flush diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target deleted file mode 100644 index 74039fc25..000000000 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopped@.target +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Host%i (Stopped) -Wants={SYSTEMD_DEFAULT_TARGET} -Wants=obmc-host-stopping@%i.target -After=obmc-host-stopping@%i.target -Before=obmc-power-stop-pre@%i.target -Conflicts=obmc-host-startmin@%i.target -RefuseManualStart=yes -RefuseManualStop=yes diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target deleted file mode 100644 index f087dea72..000000000 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-stopping@.target +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Host%i (Stopping) -Wants={SYSTEMD_DEFAULT_TARGET} -Wants=obmc-host-stop-pre@%i.target -After=obmc-host-stop-pre@%i.target -Before=obmc-host-stopped@%i.target -Conflicts=obmc-host-startmin@%i.target -Conflicts=obmc-host-starting@%i.target -RefuseManualStart=yes -RefuseManualStop=yes diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-timeout@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-timeout@.target deleted file mode 100644 index b87507bf1..000000000 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-host-timeout@.target +++ /dev/null @@ -1,4 +0,0 @@ -[Unit] -Description=Host instance %i timed out refreshing Watchdog -Conflicts=obmc-chassis-poweroff@%i.target -RefuseManualStop=yes diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-mapper.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-mapper.target deleted file mode 100644 index 5e52f4cd5..000000000 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-mapper.target +++ /dev/null @@ -1,4 +0,0 @@ -[Unit] -Description=Phosphor Object Mapper -RefuseManualStart=yes -RefuseManualStop=yes diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-off@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-off@.target deleted file mode 100644 index c47b21e47..000000000 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-off@.target +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=Power%i (Off) -Wants={SYSTEMD_DEFAULT_TARGET} -After=obmc-power-stop@%i.target -Conflicts=obmc-chassis-poweron@%i.target -RefuseManualStart=yes -RefuseManualStop=yes diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-on@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-on@.target deleted file mode 100644 index 52135ffc9..000000000 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-on@.target +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=Power%i (On) -Wants={SYSTEMD_DEFAULT_TARGET} -After=obmc-power-start@%i.target -Conflicts=obmc-chassis-poweroff@%i.target -RefuseManualStart=yes -RefuseManualStop=yes diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-reset-on@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-reset-on@.target deleted file mode 100644 index d24d401bf..000000000 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-reset-on@.target +++ /dev/null @@ -1,5 +0,0 @@ -[Unit] -Description=Chassis%i power on after reset -Conflicts=obmc-chassis-poweroff@%i.target -RefuseManualStart=yes -RefuseManualStop=yes diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-start-pre@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-start-pre@.target deleted file mode 100644 index 1a1ea6319..000000000 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-start-pre@.target +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=Power%i On (Pre) -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} -Conflicts=obmc-chassis-poweroff@%i.target -RefuseManualStart=yes -RefuseManualStop=yes diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-start@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-start@.target deleted file mode 100644 index a977d5ad3..000000000 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-start@.target +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=Power%i On -After=obmc-power-start-pre@%i.target -Wants={SYSTEMD_DEFAULT_TARGET} -Conflicts=obmc-chassis-poweroff@%i.target -RefuseManualStart=yes -RefuseManualStop=yes diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target deleted file mode 100644 index 50d5050bb..000000000 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Power%i Off (Pre) -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} -Wants=obmc-host-stopped@%i.target -After=obmc-host-stopped@%i.target -Conflicts=obmc-chassis-poweron@%i.target -RefuseManualStart=yes -RefuseManualStop=yes diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-stop@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-stop@.target deleted file mode 100644 index f0429d786..000000000 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-stop@.target +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Power%i Off -Wants=obmc-power-stop-pre@%i.target -After=obmc-power-stop-pre@%i.target -Wants={SYSTEMD_DEFAULT_TARGET} -Conflicts=obmc-chassis-poweron@%i.target -Conflicts=fsi-disable.service -RefuseManualStart=yes -RefuseManualStop=yes diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-standby.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-standby.target deleted file mode 100644 index 95044a404..000000000 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-standby.target +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Phosphor System - Standby -Requires=multi-user.target -RefuseManualStart=yes -RefuseManualStop=yes -AllowIsolate=yes - -[Install] -WantedBy=multi-user.target diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-webserver-pre.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-webserver-pre.target deleted file mode 100644 index ea5200c00..000000000 --- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-webserver-pre.target +++ /dev/null @@ -1,2 +0,0 @@ -[Unit] -Description=Webserver (pre) diff --git a/meta-phosphor/common/recipes-core/systemd/systemd/0001-sd-bus-Don-t-automatically-add-ObjectManager.patch b/meta-phosphor/common/recipes-core/systemd/systemd/0001-sd-bus-Don-t-automatically-add-ObjectManager.patch deleted file mode 100644 index f8f5b08a9..000000000 --- a/meta-phosphor/common/recipes-core/systemd/systemd/0001-sd-bus-Don-t-automatically-add-ObjectManager.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 44562e33655668033a8ee0a7a686671226da2110 Mon Sep 17 00:00:00 2001 -From: Brad Bishop <bradleyb@fuzziesquirrel.com> -Date: Tue, 13 Mar 2018 15:34:30 -0400 -Subject: [PATCH] sd-bus: Don't automatically add ObjectManager - -Even though sdbus helps manage org.freedesktop.DBus.ObjectManager -it must still be explicitly enabled by a library client. - -As such do not automatically add ObjectManager to GetManagedObjects -method call responses or InterfacesAdded/Removed signals. Bus -service client applications can potentially react to the appearance -of ObjectManager in these messages and follow up with a method call -on the interface, which isn't actually implemented on the objects -within the subtree, below the manager. ---- - src/libsystemd/sd-bus/bus-objects.c | 10 ---------- - 1 file changed, 10 deletions(-) - -diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c -index 6e00255b2..59f698402 100644 ---- a/src/libsystemd/sd-bus/bus-objects.c -+++ b/src/libsystemd/sd-bus/bus-objects.c -@@ -1076,10 +1076,6 @@ static int object_manager_serialize_path( - if (r < 0) - return r; - -- r = sd_bus_message_append(reply, "{sa{sv}}", "org.freedesktop.DBus.ObjectManager", 0); -- if (r < 0) -- return r; -- - found_something = true; - } - -@@ -2302,9 +2298,6 @@ static int object_added_append_all(sd_bus *bus, sd_bus_message *m, const char *p - if (r < 0) - return r; - r = sd_bus_message_append(m, "{sa{sv}}", "org.freedesktop.DBus.Properties", 0); -- if (r < 0) -- return r; -- r = sd_bus_message_append(m, "{sa{sv}}", "org.freedesktop.DBus.ObjectManager", 0); - if (r < 0) - return r; - -@@ -2473,9 +2466,6 @@ static int object_removed_append_all(sd_bus *bus, sd_bus_message *m, const char - if (r < 0) - return r; - r = sd_bus_message_append(m, "s", "org.freedesktop.DBus.Properties"); -- if (r < 0) -- return r; -- r = sd_bus_message_append(m, "s", "org.freedesktop.DBus.ObjectManager"); - if (r < 0) - return r; - --- -2.14.3 - diff --git a/meta-phosphor/common/recipes-core/systemd/systemd/0003-basic-Factor-out-string-checking-from-name_to_prefix.patch b/meta-phosphor/common/recipes-core/systemd/systemd/0003-basic-Factor-out-string-checking-from-name_to_prefix.patch deleted file mode 100644 index cd4dcad16..000000000 --- a/meta-phosphor/common/recipes-core/systemd/systemd/0003-basic-Factor-out-string-checking-from-name_to_prefix.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 899173e241f781ad4dfb6b40e7c5f35104164435 Mon Sep 17 00:00:00 2001 -From: Brad Bishop <bradleyb@fuzziesquirrel.com> -Date: Thu, 12 Jan 2017 09:56:54 -0500 -Subject: [PATCH 1/2] basic: Factor out string checking from - name_to_prefix/instance - -Add two new functions: string_to_prefix/instance that enable -prefix/instance extraction from a name before the name is -mangled. - -Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com> ---- - src/basic/unit-name.c | 48 +++++++++++++++++++++++++++++++----------------- - 1 file changed, 31 insertions(+), 17 deletions(-) - -diff --git a/src/basic/unit-name.c b/src/basic/unit-name.c -index 0a6efa4..93c4838 100644 ---- a/src/basic/unit-name.c -+++ b/src/basic/unit-name.c -@@ -135,42 +135,46 @@ bool unit_suffix_is_valid(const char *s) { - return true; - } - --int unit_name_to_prefix(const char *n, char **ret) { -+static int string_to_prefix(const char *s, char **ret) { - const char *p; -- char *s; -+ char *r; - -- assert(n); -+ assert(s); - assert(ret); - -- if (!unit_name_is_valid(n, UNIT_NAME_ANY)) -- return -EINVAL; -- -- p = strchr(n, '@'); -+ p = strchr(s, '@'); - if (!p) -- p = strrchr(n, '.'); -+ p = strrchr(s, '.'); - - assert_se(p); - -- s = strndup(n, p - n); -- if (!s) -+ r = strndup(s, p - s); -+ if (!r) - return -ENOMEM; - -- *ret = s; -+ *ret = r; - return 0; - } - --int unit_name_to_instance(const char *n, char **instance) { -- const char *p, *d; -- char *i; -- -+int unit_name_to_prefix(const char *n, char **ret) { - assert(n); -- assert(instance); -+ assert(ret); - - if (!unit_name_is_valid(n, UNIT_NAME_ANY)) - return -EINVAL; - -+ return string_to_prefix(n, ret); -+} -+ -+static int string_to_instance(const char *s, char **instance) { -+ const char *p, *d; -+ char *i; -+ -+ assert(s); -+ assert(instance); -+ - /* Everything past the first @ and before the last . is the instance */ -- p = strchr(n, '@'); -+ p = strchr(s, '@'); - if (!p) { - *instance = NULL; - return 0; -@@ -190,6 +194,16 @@ int unit_name_to_instance(const char *n, char **instance) { - return 1; - } - -+int unit_name_to_instance(const char *n, char **instance) { -+ assert(n); -+ assert(instance); -+ -+ if (!unit_name_is_valid(n, UNIT_NAME_ANY)) -+ return -EINVAL; -+ -+ return string_to_instance(n, instance); -+} -+ - int unit_name_to_prefix_and_instance(const char *n, char **ret) { - const char *d; - char *s; --- -1.8.3.1 - diff --git a/meta-phosphor/common/recipes-core/systemd/systemd/0004-basic-Use-path-escaping-when-mangling-path-instances.patch b/meta-phosphor/common/recipes-core/systemd/systemd/0004-basic-Use-path-escaping-when-mangling-path-instances.patch deleted file mode 100644 index fca28de59..000000000 --- a/meta-phosphor/common/recipes-core/systemd/systemd/0004-basic-Use-path-escaping-when-mangling-path-instances.patch +++ /dev/null @@ -1,69 +0,0 @@ -From b7565b3f2d3b13c4ae5734407a2c3f27658c7b4b Mon Sep 17 00:00:00 2001 -From: Brad Bishop <bradleyb@fuzziesquirrel.com> -Date: Thu, 12 Jan 2017 08:52:42 -0500 -Subject: [PATCH 2/2] basic: Use path escaping when mangling path instances - -Allow path instances with dashes in them to be unescaped -properly. - -Fixes systemd/systemd#5072 - -Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com> ---- - src/basic/unit-name.c | 18 ++++++++++++++++++ - src/test/test-unit-name.c | 3 +++ - 2 files changed, 21 insertions(+) - -diff --git a/src/basic/unit-name.c b/src/basic/unit-name.c -index 93c4838..c91b0e7 100644 ---- a/src/basic/unit-name.c -+++ b/src/basic/unit-name.c -@@ -684,6 +684,8 @@ static char *do_escape_mangle(const char *f, UnitNameMangle allow_globs, char *t - * If @allow_globs, globs characters are preserved. Otherwise, they are escaped. - */ - int unit_name_mangle_with_suffix(const char *name, UnitNameMangle allow_globs, const char *suffix, char **ret) { -+ _cleanup_free_ char *instance = NULL; -+ _cleanup_free_ char *prefix = NULL; - char *s, *t; - int r; - -@@ -723,6 +725,22 @@ int unit_name_mangle_with_suffix(const char *name, UnitNameMangle allow_globs, c - return r; - } - -+ r = string_to_instance(name, &instance); -+ if(r < 0 && r != -EINVAL) -+ return r; -+ -+ if(instance && path_is_absolute(instance)) { -+ r = string_to_prefix(name, &prefix); -+ if(r < 0 && r != -EINVAL) -+ return r; -+ -+ r = unit_name_from_path_instance(prefix, instance, suffix, ret); -+ if (r >= 0) -+ return 1; -+ if (r != -EINVAL) -+ return r; -+ } -+ - s = new(char, strlen(name) * 4 + strlen(suffix) + 1); - if (!s) - return -ENOMEM; -diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c -index 2fd83f3..f2cb047 100644 ---- a/src/test/test-unit-name.c -+++ b/src/test/test-unit-name.c -@@ -192,6 +192,9 @@ static void test_unit_name_mangle(void) { - test_unit_name_mangle_one(UNIT_NAME_GLOB, "foo", "foo.service", 1); - test_unit_name_mangle_one(UNIT_NAME_GLOB, "foo*", "foo*", 0); - test_unit_name_mangle_one(UNIT_NAME_GLOB, "ü*", "\\xc3\\xbc*", 1); -+ test_unit_name_mangle_one(UNIT_NAME_GLOB, "foo@/bar.service", "foo@bar.service", 1); -+ test_unit_name_mangle_one(UNIT_NAME_GLOB, "foo@/bar/baz-boo.service", "foo@bar-baz\\x2dboo.service", 1); -+ test_unit_name_mangle_one(UNIT_NAME_GLOB, "foo@bar/baz-boo.service", "foo@bar-baz-boo.service", 1); - } - - static int test_unit_printf(void) { --- -1.8.3.1 - diff --git a/meta-phosphor/common/recipes-core/systemd/systemd/0005-dont-return-error-if-unable-to-create-network-namespace.patch b/meta-phosphor/common/recipes-core/systemd/systemd/0005-dont-return-error-if-unable-to-create-network-namespace.patch deleted file mode 100644 index d83bf72ef..000000000 --- a/meta-phosphor/common/recipes-core/systemd/systemd/0005-dont-return-error-if-unable-to-create-network-namespace.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 870b79559cd5841b3f680c914b4b2e770a9961cf Mon Sep 17 00:00:00 2001 -From: Ratan Gupta <ratagupt@in.ibm.com> -Date: Thu, 20 Jul 2017 11:59:14 +0530 -Subject: [PATCH] Don't return the error if unable to create the network - namespace - -On systems where kernel is not configured with namespace support -then don't return error during setting up network namespace. - -Signed-off-by: Ratan Gupta <ratagupt@in.ibm.com> ---- - src/core/namespace.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/core/namespace.c b/src/core/namespace.c -index 1195e9a..f30dacf 100644 ---- a/src/core/namespace.c -+++ b/src/core/namespace.c -@@ -986,7 +986,7 @@ int setup_netns(int netns_storage_socket[2]) { - /* Nothing stored yet, so let's create a new namespace */ - - if (unshare(CLONE_NEWNET) < 0) { -- r = -errno; -+ r = 0; - goto fail; - } - -@@ -994,7 +994,7 @@ int setup_netns(int netns_storage_socket[2]) { - - netns = open("/proc/self/ns/net", O_RDONLY|O_CLOEXEC|O_NOCTTY); - if (netns < 0) { -- r = -errno; -+ r = 0; - goto fail; - } - --- -1.9.1 - diff --git a/meta-phosphor/common/recipes-core/systemd/systemd/default.network b/meta-phosphor/common/recipes-core/systemd/systemd/default.network deleted file mode 100644 index c75c3d60d..000000000 --- a/meta-phosphor/common/recipes-core/systemd/systemd/default.network +++ /dev/null @@ -1,4 +0,0 @@ -[Match] -Name=eth* -[Network] -DHCP=ipv4 diff --git a/meta-phosphor/common/recipes-core/systemd/systemd_%.bbappend b/meta-phosphor/common/recipes-core/systemd/systemd_%.bbappend deleted file mode 100644 index b403069a5..000000000 --- a/meta-phosphor/common/recipes-core/systemd/systemd_%.bbappend +++ /dev/null @@ -1,22 +0,0 @@ -FILES_${PN}-catalog-extralocales = \ - "${exec_prefix}/lib/systemd/catalog/*.*.catalog" -PACKAGES =+ "${PN}-catalog-extralocales" -PACKAGECONFIG_append = " networkd coredump" -PACKAGECONFIG_remove = "machined hibernate ldconfig binfmt backlight localed \ - quotacheck kdbus ima smack polkit logind bootchart utmp \ - manpages" -FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" -SRC_URI += "file://default.network" -SRC_URI += "file://0001-sd-bus-Don-t-automatically-add-ObjectManager.patch" -SRC_URI += "file://0003-basic-Factor-out-string-checking-from-name_to_prefix.patch" -SRC_URI += "file://0004-basic-Use-path-escaping-when-mangling-path-instances.patch" -#TODO upstream the below patch via below issue -#https://github.com/openbmc/openbmc/issues/2016 -SRC_URI += "file://0005-dont-return-error-if-unable-to-create-network-namespace.patch" - -RRECOMMENDS_${PN} += "obmc-targets" -FILES_${PN} += "${systemd_unitdir}/network/default.network" - -do_install_append() { - install -m 644 ${WORKDIR}/default.network ${D}${systemd_unitdir}/network/ -} diff --git a/meta-phosphor/common/recipes-devtools/i2c-tools/i2c-tools/0001-4-byte-read-support-466.patch b/meta-phosphor/common/recipes-devtools/i2c-tools/i2c-tools/0001-4-byte-read-support-466.patch deleted file mode 100644 index 31031119d..000000000 --- a/meta-phosphor/common/recipes-devtools/i2c-tools/i2c-tools/0001-4-byte-read-support-466.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 933e887fe2d9a0924a8e05efa6bc3b530b40976d Mon Sep 17 00:00:00 2001 -From: Sergey Solomin <sergey.solomin@us.ibm.com> -Date: Tue, 6 Sep 2016 15:36:43 -0500 -Subject: [PATCH 1/1] 4 byte read support 466 - ---- - tools/i2cdump.c | 34 ++++++++++++++++++++++++++++++++++ - 1 file changed, 34 insertions(+) - -diff --git a/tools/i2cdump.c b/tools/i2cdump.c -index a7bba72..99c79be 100644 ---- a/tools/i2cdump.c -+++ b/tools/i2cdump.c -@@ -25,6 +25,7 @@ - #include <string.h> - #include <stdio.h> - #include <stdlib.h> -+#include <stdint.h> - #include <unistd.h> - #include <linux/i2c.h> - #include <linux/i2c-dev.h> -@@ -33,6 +34,8 @@ - #include "util.h" - #include "../version.h" - -+#define I2C_SMBUS_DWORD 7 -+ - static void help(void) - { - fprintf(stderr, -@@ -46,6 +49,7 @@ static void help(void) - " s (SMBus block)\n" - " i (I2C block)\n" - " c (consecutive byte)\n" -+ " d (double word)\n" - " Append p for SMBus PEC\n"); - } - -@@ -184,6 +188,9 @@ int main(int argc, char *argv[]) - } else if (!strncmp(argv[flags+3], "c", 1)) { - size = I2C_SMBUS_BYTE; - pec = argv[flags+3][1] == 'p'; -+ } else if (!strncmp(argv[flags+3], "d", 1)) { -+ size = I2C_SMBUS_DWORD; -+ pec = argv[flags+3][1] == 'p'; - } else if (!strcmp(argv[flags+3], "i")) - size = I2C_SMBUS_I2C_BLOCK_DATA; - else { -@@ -285,6 +292,7 @@ int main(int argc, char *argv[]) - size == I2C_SMBUS_BLOCK_DATA ? "smbus block" : - size == I2C_SMBUS_I2C_BLOCK_DATA ? "i2c block" : - size == I2C_SMBUS_BYTE ? "byte consecutive read" : -+ size == I2C_SMBUS_DWORD ? "double word" : - size == I2C_SMBUS_BYTE_DATA ? "byte" : "word"); - if (pec) - fprintf(stderr, "PEC checking enabled.\n"); -@@ -313,6 +321,32 @@ int main(int argc, char *argv[]) - } - } - -+ /* handle mode 'd' (double word read) */ -+ if (size == I2C_SMBUS_DWORD) { -+ unsigned char buff[sizeof(uint32_t)]; -+ struct i2c_rdwr_ioctl_data msgset; -+ struct i2c_msg msg[1]; -+ -+ msg[0].addr = address; -+ msg[0].flags = I2C_M_RD; -+ msg[0].len = sizeof(buff); -+ msg[0].buf = buff; -+ -+ msgset.msgs = msg; -+ msgset.nmsgs = 1; -+ -+ if (ioctl( file, I2C_RDWR, &msgset ) < 0) { -+ fprintf(stderr, "Error: Could not read " -+ "double word. %s\n", strerror(errno)); -+ exit(1); -+ } -+ for (uint8_t n = 0; n < sizeof(buff); n++) { -+ printf ("%02x ", buff[n]); -+ } -+ printf ("\n"); -+ exit(0); -+ } -+ - /* See Winbond w83781d data sheet for bank details */ - if (bank && size != I2C_SMBUS_BLOCK_DATA) { - res = i2c_smbus_read_byte_data(file, bankreg); --- -1.8.2.2 - diff --git a/meta-phosphor/common/recipes-devtools/i2c-tools/i2c-tools/0001-i2cget-Add-support-for-i2c-block-data.patch b/meta-phosphor/common/recipes-devtools/i2c-tools/i2c-tools/0001-i2cget-Add-support-for-i2c-block-data.patch deleted file mode 100644 index fc918efe9..000000000 --- a/meta-phosphor/common/recipes-devtools/i2c-tools/i2c-tools/0001-i2cget-Add-support-for-i2c-block-data.patch +++ /dev/null @@ -1,160 +0,0 @@ -From d0c1fc6394b99ae4306704692910e1e158b56dcc Mon Sep 17 00:00:00 2001 -From: Crestez Dan Leonard <leonard.crestez@intel.com> -Date: Fri, 13 May 2016 21:54:25 +0300 -Subject: [PATCH] i2cget: Add support for i2c block data - -This adds mode 'i' for I2C_SMBUS_I2C_BLOCK_DATA. This is the same mode -letter from i2cdump. - -Length is optional and defaults to 32 (maximum). - -The indended use is debugging i2c devices with shell commands. - -Signed-off-by: Crestez Dan Leonard <leonard.crestez@intel.com> ---- - tools/i2cget.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++---------- - 1 file changed, 51 insertions(+), 10 deletions(-) - -diff --git a/tools/i2cget.c b/tools/i2cget.c -index 2503942..5d8dfe7 100644 ---- a/tools/i2cget.c -+++ b/tools/i2cget.c -@@ -41,14 +41,16 @@ static void help(void) __attribute__ ((noreturn)); - static void help(void) - { - fprintf(stderr, -- "Usage: i2cget [-f] [-y] I2CBUS CHIP-ADDRESS [DATA-ADDRESS [MODE]]\n" -+ "Usage: i2cget [-f] [-y] I2CBUS CHIP-ADDRESS [DATA-ADDRESS [MODE] [LENGTH]]\n" - " I2CBUS is an integer or an I2C bus name\n" - " ADDRESS is an integer (0x03 - 0x77)\n" - " MODE is one of:\n" - " b (read byte data, default)\n" - " w (read word data)\n" - " c (write byte/read byte)\n" -- " Append p for SMBus PEC\n"); -+ " i (read I2C block data)\n" -+ " Append p for SMBus PEC\n" -+ " LENGTH is length for block data reads\n"); - exit(1); - } - -@@ -89,6 +91,13 @@ static int check_funcs(int file, int size, int daddress, int pec) - return -1; - } - break; -+ -+ case I2C_SMBUS_I2C_BLOCK_DATA: -+ if (!(funcs & I2C_FUNC_SMBUS_READ_I2C_BLOCK)) { -+ fprintf(stderr, MISSING_FUNC_FMT, "SMBus read I2C block data"); -+ return -1; -+ } -+ break; - } - - if (pec -@@ -101,7 +110,7 @@ static int check_funcs(int file, int size, int daddress, int pec) - } - - static int confirm(const char *filename, int address, int size, int daddress, -- int pec) -+ int length, int pec) - { - int dont = 0; - -@@ -132,11 +141,14 @@ static int confirm(const char *filename, int address, int size, int daddress, - fprintf(stderr, "current data\naddress"); - else - fprintf(stderr, "data address\n0x%02x", daddress); -- fprintf(stderr, ", using %s.\n", -- size == I2C_SMBUS_BYTE ? (daddress < 0 ? -- "read byte" : "write byte/read byte") : -- size == I2C_SMBUS_BYTE_DATA ? "read byte data" : -- "read word data"); -+ if (size == I2C_SMBUS_I2C_BLOCK_DATA) -+ fprintf(stderr, ", %d bytes using read I2C block data.\n", length); -+ else -+ fprintf(stderr, ", using %s.\n", -+ size == I2C_SMBUS_BYTE ? (daddress < 0 ? -+ "read byte" : "write byte/read byte") : -+ size == I2C_SMBUS_BYTE_DATA ? "read byte data" : -+ "read word data"); - if (pec) - fprintf(stderr, "PEC checking enabled.\n"); - -@@ -159,6 +171,8 @@ int main(int argc, char *argv[]) - int pec = 0; - int flags = 0; - int force = 0, yes = 0, version = 0; -+ int length; -+ __u8 block_data[I2C_SMBUS_BLOCK_MAX]; - - /* handle (optional) flags first */ - while (1+flags < argc && argv[1+flags][0] == '-') { -@@ -208,6 +222,7 @@ int main(int argc, char *argv[]) - case 'b': size = I2C_SMBUS_BYTE_DATA; break; - case 'w': size = I2C_SMBUS_WORD_DATA; break; - case 'c': size = I2C_SMBUS_BYTE; break; -+ case 'i': size = I2C_SMBUS_I2C_BLOCK_DATA; break; - default: - fprintf(stderr, "Error: Invalid mode!\n"); - help(); -@@ -215,13 +230,27 @@ int main(int argc, char *argv[]) - pec = argv[flags+4][1] == 'p'; - } - -+ if (argc > flags + 5) { -+ if (size != I2C_SMBUS_I2C_BLOCK_DATA) { -+ fprintf(stderr, "Error: Length only valid for I2C block data!\n"); -+ help(); -+ } -+ length = strtol(argv[flags+5], &end, 0); -+ if (*end || length < 1 || length > I2C_SMBUS_BLOCK_MAX) { -+ fprintf(stderr, "Error: Length invalid!\n"); -+ help(); -+ } -+ } else { -+ length = I2C_SMBUS_BLOCK_MAX; -+ } -+ - file = open_i2c_dev(i2cbus, filename, sizeof(filename), 0); - if (file < 0 - || check_funcs(file, size, daddress, pec) - || set_slave_addr(file, address, force)) - exit(1); - -- if (!yes && !confirm(filename, address, size, daddress, pec)) -+ if (!yes && !confirm(filename, address, size, daddress, length, pec)) - exit(0); - - if (pec && ioctl(file, I2C_PEC, 1) < 0) { -@@ -243,6 +272,9 @@ int main(int argc, char *argv[]) - case I2C_SMBUS_WORD_DATA: - res = i2c_smbus_read_word_data(file, daddress); - break; -+ case I2C_SMBUS_I2C_BLOCK_DATA: -+ res = i2c_smbus_read_i2c_block_data(file, daddress, length, block_data); -+ break; - default: /* I2C_SMBUS_BYTE_DATA */ - res = i2c_smbus_read_byte_data(file, daddress); - } -@@ -253,7 +285,16 @@ int main(int argc, char *argv[]) - exit(2); - } - -- printf("0x%0*x\n", size == I2C_SMBUS_WORD_DATA ? 4 : 2, res); -+ if (size == I2C_SMBUS_I2C_BLOCK_DATA) { -+ int i; -+ printf("%d:", res); -+ for (i = 0; i < res; ++i) { -+ printf(" 0x%02hhx", block_data[i]); -+ } -+ printf("\n"); -+ } else { -+ printf("0x%0*x\n", size == I2C_SMBUS_WORD_DATA ? 4 : 2, res); -+ } - - exit(0); - } --- -2.11.0 - diff --git a/meta-phosphor/common/recipes-devtools/i2c-tools/i2c-tools_%.bbappend b/meta-phosphor/common/recipes-devtools/i2c-tools/i2c-tools_%.bbappend deleted file mode 100644 index 349888e8d..000000000 --- a/meta-phosphor/common/recipes-devtools/i2c-tools/i2c-tools_%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI =+ "file://0001-4-byte-read-support-466.patch \ - file://0001-i2cget-Add-support-for-i2c-block-data.patch" diff --git a/meta-phosphor/common/recipes-devtools/iotools/iotools/iotools-setup.service b/meta-phosphor/common/recipes-devtools/iotools/iotools/iotools-setup.service deleted file mode 100644 index 7cc95a0db..000000000 --- a/meta-phosphor/common/recipes-devtools/iotools/iotools/iotools-setup.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Install iotool links - -[Service] -RemainAfterExit=no -Type=oneshot -ExecStart=/usr/bin/env iotools --make-links -SystlogIdentifier=iotools - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-devtools/iotools/iotools_1.6.bb b/meta-phosphor/common/recipes-devtools/iotools/iotools_1.6.bb deleted file mode 100644 index af2cc76ac..000000000 --- a/meta-phosphor/common/recipes-devtools/iotools/iotools_1.6.bb +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION = "Command line tools for hardware device registers" -HOMEPAGE = "https://github.com/jonmayergoogle/iotools" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SRCREV = "8d928b3360246b8ead95b442ca3887ce8b8f942f" -SRC_URI = "git://git@github.com/jonmayergoogle/iotools.git;protocol=https" -PV = "v1.6+git${SRCPV}" - -inherit obmc-phosphor-systemd - -S = "${WORKDIR}/git" -FILES_${PN} = "${sbindir}" - -do_compile() { - # CC is overridden in the Makefile, so override it harder in the invocation - oe_runmake CC="${CC}" DEBUG="${DEBUG_BUILD-0}" STATIC=0 -} - -# The "install" make target runs the binary to create links for subcommands. -# The links are excessive and this doesn't work for cross compiling. -do_install() { - install -d ${D}${sbindir} - install -m 0755 iotools ${D}${sbindir} -} - -SYSTEMD_SERVICE_${PN} += "iotools-setup.service" diff --git a/meta-phosphor/common/recipes-devtools/perl/yaml-tiny_1.73.bb b/meta-phosphor/common/recipes-devtools/perl/yaml-tiny_1.73.bb deleted file mode 100644 index 46640c496..000000000 --- a/meta-phosphor/common/recipes-devtools/perl/yaml-tiny_1.73.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "YAML::Tiny Version 1.73" -PR = "r1" -LICENSE = "Artistic-1.0 | GPL-2.0" -HOMEPAGE = "https://metacpan.org/release/YAML-Tiny" - -inherit cpan -inherit allarch - -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Artistic-1.0;md5=cda03bbdc3c1951996392b872397b798 \ -file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" - -SRC_URI += "https://cpan.metacpan.org/authors/id/E/ET/ETHER/YAML-Tiny-1.73.tar.gz" - -SRC_URI[md5sum] = "d1bb2525e4ab46bfab4b22842c467529" -SRC_URI[sha256sum] = "bc315fa12e8f1e3ee5e2f430d90b708a5dc7e47c867dba8dce3a6b8fbe257744" - -S = "${WORKDIR}/YAML-Tiny-${PV}" - -BBCLASSEXTEND = "native" diff --git a/meta-phosphor/common/recipes-devtools/python/pyphosphor.bb b/meta-phosphor/common/recipes-devtools/python/pyphosphor.bb deleted file mode 100644 index ffef08c0d..000000000 --- a/meta-phosphor/common/recipes-devtools/python/pyphosphor.bb +++ /dev/null @@ -1,54 +0,0 @@ -SUMMARY = "Phosphor python library" -DESCRIPTION = "Phosphor python library." -HOMEPAGE = "http://github.com/openbmc/pyphosphor" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" - -inherit allarch -inherit setuptools -inherit python-dir - -PACKAGE_BEFORE_PN = " \ - ${PN}-ns \ - ${PN}-utils-ns \ - ${PN}-dbus-ns \ - ${PN}-wsgi-ns \ - ${PN}-wsgi-apps-ns \ - ${PN}-utils \ - ${PN}-dbus \ - " - -RDEPENDS_${PN}-utils-ns += "${PN}-ns" -RDEPENDS_${PN}-dbus-ns += "${PN}-ns" -RDEPENDS_${PN}-utils += "${PN}-utils-ns" -RDEPENDS_${PN}-wsgi-apps-ns += "${PN}-wsgi-ns" -RDEPENDS_${PN}-wsgi-ns += "${PN}-ns" -RDEPENDS_${PN}-dbus += " \ - ${PN}-dbus-ns \ - python-dbus \ - python-xml \ - python-json \ - python-pickle \ - " -RDEPENDS_${PN} += " \ - ${PN}-ns \ - ${PN}-dbus \ - python-subprocess \ - python-dbus \ - " - -FILES_${PN}-ns = "${PYTHON_SITEPACKAGES_DIR}/obmc/__init__.py*" -FILES_${PN}-utils-ns = "${PYTHON_SITEPACKAGES_DIR}/obmc/utils/__init__.py*" -FILES_${PN}-dbus-ns = "${PYTHON_SITEPACKAGES_DIR}/obmc/dbuslib/__init__.py*" -FILES_${PN}-wsgi-ns = "${PYTHON_SITEPACKAGES_DIR}/obmc/wsgi/__init__.py*" -FILES_${PN}-wsgi-apps-ns = "${PYTHON_SITEPACKAGES_DIR}/obmc/wsgi/apps/__init__.py*" - -FILES_${PN}-utils = "${PYTHON_SITEPACKAGES_DIR}/obmc/utils" -FILES_${PN}-dbus = "${PYTHON_SITEPACKAGES_DIR}/obmc/dbuslib" - -SRC_URI += "git://github.com/openbmc/pyphosphor" - -SRCREV = "f63e191ca673a0acd7ab5c45272e1acf51bf7183" - -S = "${WORKDIR}/git" diff --git a/meta-phosphor/common/recipes-devtools/python/python-bottle.inc b/meta-phosphor/common/recipes-devtools/python/python-bottle.inc deleted file mode 100644 index 159ded660..000000000 --- a/meta-phosphor/common/recipes-devtools/python/python-bottle.inc +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Fast and simple WSGI-framework for small web-applications." -DESCRIPTION = "Bottle is a fast and simple micro-framework for small web \ -applications. It offers request dispatching (Routes) with url parameter \ -support, templates, a built-in HTTP Server and adapters for many third \ -party WSGI/HTTP-server and template engines - all in a single file and \ -with no dependencies other than the Python Standard Library." -HOMEPAGE = "http://bottlepy.org/" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=94b9b2cc7e46ccea87e00af8970826b5" - -inherit allarch -inherit setuptools -inherit pypi - -RDEPENDS_${PN} += " \ - python-email \ - python-json \ - python-netserver \ - " - -PROVIDES += "${PN}-app" -PACKAGE_BEFORE_PN += "${PN}-app" - -SUMMARY_${PN}-app = "${SRCNAME} app" -RDEPENDS_${PN}-app = "${PN}" -FILES_${PN}-app = "${bindir}/bottle.py*" - -BBCLASSEXTEND = "nativesdk" diff --git a/meta-phosphor/common/recipes-devtools/python/python-bottle/LICENSE b/meta-phosphor/common/recipes-devtools/python/python-bottle/LICENSE deleted file mode 100644 index 5f3e8de3a..000000000 --- a/meta-phosphor/common/recipes-devtools/python/python-bottle/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2014, Marcel Hellkamp. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/meta-phosphor/common/recipes-devtools/python/python-bottle/json-format.patch b/meta-phosphor/common/recipes-devtools/python/python-bottle/json-format.patch deleted file mode 100644 index 9e754a996..000000000 --- a/meta-phosphor/common/recipes-devtools/python/python-bottle/json-format.patch +++ /dev/null @@ -1,31 +0,0 @@ -Index: bottle-0.12.9/bottle.py -=================================================================== ---- bottle-0.12.9.orig/bottle.py -+++ bottle-0.12.9/bottle.py -@@ -1721,8 +1721,10 @@ class JSONPlugin(object): - name = 'json' - api = 2 - -- def __init__(self, json_dumps=json_dumps): -+ def __init__(self, json_dumps=json_dumps, **kw): - self.json_dumps = json_dumps -+ self.json_kw = { x:y for x,y in kw.iteritems() \ -+ if x in ['indent','sort_keys'] } - - def apply(self, callback, route): - dumps = self.json_dumps -@@ -1735,12 +1737,12 @@ class JSONPlugin(object): - - if isinstance(rv, dict): - #Attempt to serialize, raises exception on failure -- json_response = dumps(rv) -+ json_response = dumps(rv, **self.json_kw) - #Set content type only if serialization succesful - response.content_type = 'application/json' - return json_response - elif isinstance(rv, HTTPResponse) and isinstance(rv.body, dict): -- rv.body = dumps(rv.body) -+ rv.body = dumps(rv.body, **self.json_kw) - rv.content_type = 'application/json' - return rv - diff --git a/meta-phosphor/common/recipes-devtools/python/python-bottle_0.12.13.bb b/meta-phosphor/common/recipes-devtools/python/python-bottle_0.12.13.bb deleted file mode 100644 index 08d84ff4a..000000000 --- a/meta-phosphor/common/recipes-devtools/python/python-bottle_0.12.13.bb +++ /dev/null @@ -1,10 +0,0 @@ -SRC_URI[sha256sum] = "39b751aee0b167be8dffb63ca81b735bbf1dd0905b3bc42761efedee8f123355" -SRC_URI[md5sum] = "d2fe1b48c1d49217e78bf326b1cad437" - -# There is no license on pypi. See: -# https://github.com/bottlepy/bottle/commit/55a505b3a54bb7de23e9554cb8ce7f8e160c31a0 -SRC_URI += "file://LICENSE" - -SRC_URI += "file://json-format.patch" - -require python-bottle.inc diff --git a/meta-phosphor/common/recipes-devtools/python/python-gevent-websocket_0.10.1.bb b/meta-phosphor/common/recipes-devtools/python/python-gevent-websocket_0.10.1.bb deleted file mode 100644 index 8ac2a8982..000000000 --- a/meta-phosphor/common/recipes-devtools/python/python-gevent-websocket_0.10.1.bb +++ /dev/null @@ -1,17 +0,0 @@ -HOMEPAGE = "https://bitbucket.org/noppo/gevent-websocket" -SUMMARY = "A websocket library for gevent Python networking library" -DESCRIPTION = "\ - WebSocket is a computer communications protocol, providing full-duplex \ - communication channels over a single TCP connection. gevent-websocket \ - library provides websocket support for gevent. \ - " -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=5aa2f1d4ea55d60497aa8c3debf29ab2" - -RDEPENDS_${PN} = "python-gevent" - -SRC_URI[md5sum] = "e095bf3358175489a956949c1b4de9ff" -SRC_URI[sha256sum] = "7eaef32968290c9121f7c35b973e2cc302ffb076d018c9068d2f5ca8b2d85fb0" - -inherit setuptools pypi diff --git a/meta-phosphor/common/recipes-devtools/python/python-inflection.inc b/meta-phosphor/common/recipes-devtools/python/python-inflection.inc deleted file mode 100644 index 71d218cb2..000000000 --- a/meta-phosphor/common/recipes-devtools/python/python-inflection.inc +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "A port of Ruby on Rails inflector to Python" -DESCRIPTION = "Inflection is a string transformation library. It singularizes \ -and pluralizes English words, and transforms strings from CamelCase to \ -underscored string. Inflection is a port of Ruby on Rails’ inflector to Python." -HOMEPAGE = "http://github.com/jpvanhal/inflection" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=de7833d9c2ce0052a4073928c76a13d7" - -inherit allarch -inherit setuptools -inherit pypi - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-re \ - ${PYTHON_PN}-codecs \ - " -RDEPENDS_${PN}_class-native = "" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-phosphor/common/recipes-devtools/python/python-inflection_0.3.1.bb b/meta-phosphor/common/recipes-devtools/python/python-inflection_0.3.1.bb deleted file mode 100644 index 318171c89..000000000 --- a/meta-phosphor/common/recipes-devtools/python/python-inflection_0.3.1.bb +++ /dev/null @@ -1,3 +0,0 @@ -SRC_URI[sha256sum] = "18ea7fb7a7d152853386523def08736aa8c32636b047ade55f7578c4edeb16ca" -SRC_URI[md5sum] = "7941165e9f148e0520023941c0886b40" -require python-inflection.inc diff --git a/meta-phosphor/common/recipes-devtools/python/python-mako_1.0.7.bb b/meta-phosphor/common/recipes-devtools/python/python-mako_1.0.7.bb deleted file mode 100644 index 1bc2efcc8..000000000 --- a/meta-phosphor/common/recipes-devtools/python/python-mako_1.0.7.bb +++ /dev/null @@ -1,11 +0,0 @@ -require recipes-devtools/python/python-mako.inc - -inherit setuptools - -RDEPENDS_${PN} = "python-threading \ - python-netclient \ - python-html \ -" -RDEPENDS_${PN}_class-native = "" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-phosphor/common/recipes-devtools/python/python-pygobject/obsolete_automake_macros.patch b/meta-phosphor/common/recipes-devtools/python/python-pygobject/obsolete_automake_macros.patch deleted file mode 100644 index c2591123b..000000000 --- a/meta-phosphor/common/recipes-devtools/python/python-pygobject/obsolete_automake_macros.patch +++ /dev/null @@ -1,23 +0,0 @@ -Upstream-Status: Accepted [https://bugzilla.gnome.org/show_bug.cgi?id=691101] - -Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> -diff -Nurd pygobject-2.27.91/configure.ac pygobject-2.27.91/configure.ac ---- pygobject-2.27.91/configure.ac 2011-02-23 22:14:37.000000000 +0200 -+++ pygobject-2.27.91/configure.ac 2013-01-03 05:13:44.034949954 +0200 -@@ -35,7 +35,7 @@ - AC_DEFINE(PYGOBJECT_MICRO_VERSION, pygobject_micro_version, [pygobject micro version]) - AC_SUBST(PYGOBJECT_MICRO_VERSION, pygobject_micro_version) - --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)]) - AM_INIT_AUTOMAKE(foreign) - AM_MAINTAINER_MODE -@@ -82,7 +82,6 @@ - m4_ifdef([LT_OUTPUT], [LT_OUTPUT]) - AC_ISC_POSIX - AC_PROG_CC --AM_PROG_CC_STDC - AM_PROG_CC_C_O - - # check that we have the minimum version of python necisary to build diff --git a/meta-phosphor/common/recipes-devtools/python/python-pygobject_2.28.7.bb b/meta-phosphor/common/recipes-devtools/python/python-pygobject_2.28.7.bb deleted file mode 100644 index c6fb6fe26..000000000 --- a/meta-phosphor/common/recipes-devtools/python/python-pygobject_2.28.7.bb +++ /dev/null @@ -1,53 +0,0 @@ -SUMMARY = "Python GObject bindings" -SECTION = "devel/python" -LICENSE = "LGPLv2.1" - -RECIPE_NO_UPDATE_REASON = "Newer versions of python-pygobject depend on gobject-introspection which doesn't cross-compile" - -LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" -DEPENDS = "python python-pygobject-native libffi glib-2.0" -DEPENDS_class-native = "python-native libffi-native glib-2.0-native" -RDEPENDS_class-native = "" - -MAJ_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" - -SRC_URI = "${GNOME_MIRROR}/pygobject/${MAJ_VER}/pygobject-${PV}.tar.xz \ - file://obsolete_automake_macros.patch \ -" - -# libtool-native doesn't have fixinstall.patch applied which means -# that libs get relinked at installation time. This triggers a -# relinking along the lines of: -# gcc -L/tmp/foo/media/build1/poky/build/tmp/sysroots/x86_64-linux/usr/lib -lpyglib-2.0-python -o .libs/_glib.so -# where /tmp/foo is DESTDIR and pyglib-2.0-python may be installed/reinstalled -# at the same time as the gcc command runs. -# If this happens between the handoff between gcc and ld, you can see: -# /bin/ld: cannot find -lpyglib-2.0-python -# Adding a dependency rule like install-pyglibLTLIBRARIES: install-libLTLIBRARIES -# would be ideal but automake can't cope with that without manually -# defining the whole function. Give up and disable parallel make in native builds. -PARALLEL_MAKEINST_class-native = "" - -SRC_URI[md5sum] = "ae48b60c690c4aa894e69e0c97802745" -SRC_URI[sha256sum] = "bb9d25a3442ca7511385a7c01b057492095c263784ef31231ffe589d83a96a5a" -S = "${WORKDIR}/pygobject-${PV}" - -EXTRA_OECONF += "--disable-introspection" - -inherit autotools distutils-base pkgconfig - -# necessary to let the call for python-config succeed -export BUILD_SYS -export HOST_SYS -export STAGING_INCDIR -export STAGING_LIBDIR - -PACKAGES += "${PN}-lib" - -RDEPENDS_${PN} += "python-textutils" - -FILES_${PN} = "${libdir}/python*" -FILES_${PN}-lib = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir} ${datadir}" - -BBCLASSEXTEND = "native" diff --git a/meta-phosphor/common/recipes-devtools/python/python-pyyaml_%.bbappend b/meta-phosphor/common/recipes-devtools/python/python-pyyaml_%.bbappend deleted file mode 100644 index 2a590838b..000000000 --- a/meta-phosphor/common/recipes-devtools/python/python-pyyaml_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -BBCLASSEXTEND += "nativesdk" diff --git a/meta-phosphor/common/recipes-devtools/python/python/0001-json-Use-int-long.__str__-to-convert-subclasses.patch b/meta-phosphor/common/recipes-devtools/python/python/0001-json-Use-int-long.__str__-to-convert-subclasses.patch deleted file mode 100644 index 26669d848..000000000 --- a/meta-phosphor/common/recipes-devtools/python/python/0001-json-Use-int-long.__str__-to-convert-subclasses.patch +++ /dev/null @@ -1,128 +0,0 @@ -From b002fd4b884b5f8cd3f429ea2002dd19e91d1d91 Mon Sep 17 00:00:00 2001 -From: Brad Bishop <bradleyb@fuzziesquirrel.com> -Date: Thu, 7 Jun 2018 09:18:01 -0400 -Subject: [PATCH] json: Use int/long.__str__ to convert subclasses - -Based on changes that went into 3.x: - -e0805cf10ea84b44a13ad5649267edba7cb83ee9 -a4998a70416c27730e75c0a4225ee2c3552b1618 ---- - Lib/json/encoder.py | 26 ++++++++++++++++++-------- - Modules/_json.c | 21 +++++++++++++++++---- - 2 files changed, 35 insertions(+), 12 deletions(-) - -diff --git a/Lib/json/encoder.py b/Lib/json/encoder.py -index 97ffe8e8a2..3156682fdd 100644 ---- a/Lib/json/encoder.py -+++ b/Lib/json/encoder.py -@@ -283,6 +283,8 @@ def _make_iterencode(markers, _default, _encoder, _indent, _floatstr, - long=long, - str=str, - tuple=tuple, -+ _intstr=int.__str__, -+ _longstr=long.__str__, - ): - - def _iterencode_list(lst, _current_indent_level): -@@ -317,8 +319,10 @@ def _make_iterencode(markers, _default, _encoder, _indent, _floatstr, - yield buf + 'true' - elif value is False: - yield buf + 'false' -- elif isinstance(value, (int, long)): -- yield buf + str(value) -+ elif isinstance(value, int): -+ yield buf + _intstr(value) -+ elif isinstance(value, long): -+ yield buf + _longstr(value) - elif isinstance(value, float): - yield buf + _floatstr(value) - else: -@@ -374,8 +378,10 @@ def _make_iterencode(markers, _default, _encoder, _indent, _floatstr, - key = 'false' - elif key is None: - key = 'null' -- elif isinstance(key, (int, long)): -- key = str(key) -+ elif isinstance(key, int): -+ key = _intstr(key) -+ elif isinstance(key, long): -+ key = _longstr(key) - elif _skipkeys: - continue - else: -@@ -394,8 +400,10 @@ def _make_iterencode(markers, _default, _encoder, _indent, _floatstr, - yield 'true' - elif value is False: - yield 'false' -- elif isinstance(value, (int, long)): -- yield str(value) -+ elif isinstance(value, int): -+ yield _intstr(value) -+ elif isinstance(value, long): -+ yield _longstr(value) - elif isinstance(value, float): - yield _floatstr(value) - else: -@@ -423,8 +431,10 @@ def _make_iterencode(markers, _default, _encoder, _indent, _floatstr, - yield 'true' - elif o is False: - yield 'false' -- elif isinstance(o, (int, long)): -- yield str(o) -+ elif isinstance(o, long): -+ yield _longstr(o) -+ elif isinstance(o, int): -+ yield _intstr(o) - elif isinstance(o, float): - yield _floatstr(o) - elif isinstance(o, (list, tuple)): -diff --git a/Modules/_json.c b/Modules/_json.c -index 39ec467b09..f429738145 100644 ---- a/Modules/_json.c -+++ b/Modules/_json.c -@@ -1981,12 +1981,19 @@ encoder_listencode_obj(PyEncoderObject *s, PyObject *rval, PyObject *obj, Py_ssi - return -1; - return _steal_list_append(rval, encoded); - } -- else if (PyInt_Check(obj) || PyLong_Check(obj)) { -- PyObject *encoded = PyObject_Str(obj); -+ else if (PyLong_Check(obj)) { -+ PyObject *encoded = PyLong_Type.tp_str(obj); - if (encoded == NULL) - return -1; - return _steal_list_append(rval, encoded); - } -+ else if (PyInt_Check(obj)) { -+ PyObject *encoded = PyInt_Type.tp_str(obj); -+ if (encoded == NULL) -+ return -1; -+ return _steal_list_append(rval, encoded); -+ } -+ - else if (PyFloat_Check(obj)) { - PyObject *encoded = encoder_encode_float(s, obj); - if (encoded == NULL) -@@ -2131,11 +2138,17 @@ encoder_listencode_dict(PyEncoderObject *s, PyObject *rval, PyObject *dct, Py_ss - if (kstr == NULL) - goto bail; - } -- else if (PyInt_Check(key) || PyLong_Check(key)) { -- kstr = PyObject_Str(key); -+ else if (PyLong_Check(key)) { -+ kstr = PyLong_Type.tp_str(key); - if (kstr == NULL) - goto bail; - } -+ else if (PyInt_Check(key)) { -+ kstr = PyInt_Type.tp_str(key); -+ if (kstr == NULL) -+ goto bail; -+ } -+ - else if (key == Py_True || key == Py_False || key == Py_None) { - kstr = _encoded_const(key); - if (kstr == NULL) --- -2.14.3 - diff --git a/meta-phosphor/common/recipes-devtools/python/python_2.%.bbappend b/meta-phosphor/common/recipes-devtools/python/python_2.%.bbappend deleted file mode 100644 index 6d0ff6901..000000000 --- a/meta-phosphor/common/recipes-devtools/python/python_2.%.bbappend +++ /dev/null @@ -1,14 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI += "file://0001-json-Use-int-long.__str__-to-convert-subclasses.patch" - -require wsgiref-${PYTHON_MAJMIN}-manifest.inc - -PROVIDES_prepend = "${PN}-spwd " -PACKAGES_prepend = "${PN}-spwd " - -SUMMARY_${PN}-spwd = "Shadow database support" -RDEPENDS_${PN}-spwd = "${PN}-core" -FILES_${PN}-spwd= " \ - ${libdir}/python${PYTHON_MAJMIN}/lib-dynload/spwd.so \ - ${libdir}/python${PYTHON_MAJMIN}/lib-dynload/grp.so \ - " diff --git a/meta-phosphor/common/recipes-devtools/python/wsgiref-2.7-manifest.inc b/meta-phosphor/common/recipes-devtools/python/wsgiref-2.7-manifest.inc deleted file mode 100644 index a21d05ee2..000000000 --- a/meta-phosphor/common/recipes-devtools/python/wsgiref-2.7-manifest.inc +++ /dev/null @@ -1,33 +0,0 @@ -NAME = "wsgiref" - -PROVIDES_prepend = "${PN}-${NAME} ${PN}-${NAME}-headers ${PN}-${NAME}-handlers ${PN}-${NAME}-validate ${PN}-${NAME}-simple_server ${PN}-${NAME}-util " -PACKAGES_prepend = "${PN}-${NAME} ${PN}-${NAME}-headers ${PN}-${NAME}-handlers ${PN}-${NAME}-validate ${PN}-${NAME}-simple_server ${PN}-${NAME}-util " - -package_dir = "${libdir}/python${PYTHON_MAJMIN}/${NAME}" - -SUMMARY_${PN}-${NAME}-handlers = "${NAME} handlers" -RDEPENDS_${PN}-${NAME}-handlers = "${PN}-${NAME}-util ${PN}-${NAME}-headers" -FILES_${PN}-${NAME}-handlers = "${package_dir}/handlers.py*" - -SUMMARY_${PN}-${NAME}-headers = "${NAME} headers" -RDEPENDS_${PN}-${NAME}-headers = "${PN}-${NAME}" -FILES_${PN}-${NAME}-headers = "${package_dir}/headers.py*" - -SUMMARY_${PN}-${NAME}-simple_server = "${NAME} simple server" -RDEPENDS_${PN}-${NAME}-simple_server = "${PN}-${NAME}-handlers" -FILES_${PN}-${NAME}-simple_server = "${package_dir}/simple_server.py*" - -SUMMARY_${PN}-${NAME}-util = "${NAME} util" -RDEPENDS_${PN}-${NAME}-util = "${PN}-${NAME}" -FILES_${PN}-${NAME}-util = "${package_dir}/util.py*" - -SUMMARY_${PN}-${NAME}-validate = "${NAME} validate" -RDEPENDS_${PN}-${NAME}-validate = "${PN}-${NAME}" -FILES_${PN}-${NAME}-validate = "${package_dir}/validate.py*" - -SUMMARY_${PN}-${NAME} = "WSGI (PEP 333) Reference Library" -RDEPENDS_${PN}-${NAME} = "${PN}-core" -FILES_${PN}-${NAME} = " \ - ${package_dir}/__init__.py* \ - ${package_dir}.egg-info \ - " diff --git a/meta-phosphor/common/recipes-devtools/rsync/rsync_%.bbappend b/meta-phosphor/common/recipes-devtools/rsync/rsync_%.bbappend deleted file mode 100644 index eafb15b6d..000000000 --- a/meta-phosphor/common/recipes-devtools/rsync/rsync_%.bbappend +++ /dev/null @@ -1,6 +0,0 @@ -EXTRA_OECONF_append += " --disable-largefile --disable-locale --disable-iconv \ - --without-included-popt --without-included-zlib" - -PACKAGECONFIG = "" - -DEPENDS_append = " popt zlib" diff --git a/meta-phosphor/common/recipes-extended/gpioplus/gpioplus_git.bb b/meta-phosphor/common/recipes-extended/gpioplus/gpioplus_git.bb deleted file mode 100644 index 6fbc03cfa..000000000 --- a/meta-phosphor/common/recipes-extended/gpioplus/gpioplus_git.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "C++ bindings for linux gpio APIs" -DESCRIPTION = "C++ bindings for linux gpio APIs." -HOMEPAGE = "http://github.com/openbmc/gpioplus" -PR = "r1" -PV = "0.1+git${SRCPV}" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" - -inherit autotools pkgconfig - -DEPENDS += " \ - autoconf-archive-native \ - " - -EXTRA_OECONF_append += " \ - --disable-examples \ - --disable-tests \ - " - -SRC_URI += "git://github.com/openbmc/gpioplus" -SRCREV = "68cce0fad1549f5144160182edd24bcdb83df6e0" - -S = "${WORKDIR}/git" diff --git a/meta-phosphor/common/recipes-extended/sdbusplus/sdbusplus.bb b/meta-phosphor/common/recipes-extended/sdbusplus/sdbusplus.bb deleted file mode 100644 index 8a2d5ed2c..000000000 --- a/meta-phosphor/common/recipes-extended/sdbusplus/sdbusplus.bb +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY = "C++ bindings for systemd dbus APIs" -DESCRIPTION = "C++ bindings for systemd dbus APIs." -HOMEPAGE = "http://github.com/openbmc/sdbusplus" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" - -inherit autotools pkgconfig -inherit obmc-phosphor-python-autotools - -DEPENDS += " \ - autoconf-archive-native \ - python-inflection-native \ - python-mako-native \ - python-pyyaml-native \ - " -RDEPENDS_sdbus++ += " \ - python-inflection \ - python-mako \ - python-pyyaml \ - " - -# sdbus++ has a handful of runtime dependencies on other python packages. -# Bitbake doesn't do anything with RDEPENDS in native context because -# native context doesn't have packages. -# -# While technically sdbus++ doesn't require its runtime dependencies to be -# installed to build, work around the above native context behavior -# by adding a build dependency so that clients don't have to DEPEND -# on sdbus++ runtime dependencies manually. - -DEPENDS_append_class-native = " \ - python-inflection-native \ - python-mako-native \ - python-pyyaml-native \ - " - -SRC_URI += "git://github.com/openbmc/sdbusplus" -SRCREV = "e0d6965e73f1f648ed02e483277f81a328ecb6df" - -PACKAGECONFIG ??= "libsdbusplus transaction" -PACKAGECONFIG[libsdbusplus] = "--enable-libsdbusplus,--disable-libsdbusplus,systemd,libsystemd" -PACKAGECONFIG[transaction] = "--enable-transaction,--disable-transaction" - -S = "${WORKDIR}/git" - -PROVIDES_prepend = "sdbus++ " -PACKAGE_BEFORE_PN = "sdbus++" -FILES_sdbus++_append = " ${bindir}/sdbus++" -PYTHON_AUTOTOOLS_PACKAGE = "sdbus++" - -PACKAGECONFIG_remove_class-native = "libsdbusplus" -PACKAGECONFIG_remove_class-nativesdk = "libsdbusplus" - -BBCLASSEXTEND += "native nativesdk" diff --git a/meta-phosphor/common/recipes-extended/sdeventplus/sdeventplus_git.bb b/meta-phosphor/common/recipes-extended/sdeventplus/sdeventplus_git.bb deleted file mode 100644 index ef3605141..000000000 --- a/meta-phosphor/common/recipes-extended/sdeventplus/sdeventplus_git.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "C++ bindings for systemd event APIs" -DESCRIPTION = "C++ bindings for systemd event APIs." -HOMEPAGE = "http://github.com/openbmc/sdeventplus" -PR = "r1" -PV = "0.1+git${SRCPV}" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" - -inherit autotools pkgconfig - -DEPENDS += " \ - autoconf-archive-native \ - systemd \ - " - -EXTRA_OECONF_append += " \ - --disable-examples \ - --disable-tests \ - " - -SRC_URI += "git://github.com/openbmc/sdeventplus" -SRCREV = "d38b8ffc4ee5324cf7865f31b2492a5f95e928eb" - -S = "${WORKDIR}/git" diff --git a/meta-phosphor/common/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.py b/meta-phosphor/common/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.py deleted file mode 100644 index a68f2e511..000000000 --- a/meta-phosphor/common/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.py +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env python - -# Contributors Listed Below - COPYRIGHT 2015 -# [+] International Business Machines Corp. -# -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. See the License for the specific language governing -# permissions and limitations under the License. - -import time -import sys -import dbus -import dbus.service -import dbus.mainloop.glib - -if __name__ == '__main__': - print "obmc-phosphor-chassisd starting..." - - while 1: - time.sleep(5) diff --git a/meta-phosphor/common/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.service b/meta-phosphor/common/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.service deleted file mode 100644 index e981dc06d..000000000 --- a/meta-phosphor/common/recipes-phosphor/chassis/files/obmc-phosphor-chassisd.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Phosphor Chassis Controller - -[Service] -Restart=always -ExecStart=/usr/bin/env obmc-phosphor-chassisd -SyslogIdentifier=obmc-phosphor-chassisd - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-button-power.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-button-power.bb deleted file mode 100644 index 144d4e1e7..000000000 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-button-power.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "OpenBMC org.openbmc.Button example implementation" -DESCRIPTION = "A sample implementation for a button controlling a power domain." -PR = "r1" - -inherit skeleton-gdbus -inherit obmc-phosphor-dbus-service -inherit pkgconfig - -SKELETON_DIR = "pwrbutton" - -FMT = "org.openbmc.buttons.Power@{0}.service" -DBUS_SERVICE_${PN} += "${@compose_list(d, 'FMT', 'OBMC_POWER_BUTTON_INSTANCES')}" diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-button-power/org.openbmc.buttons.Power@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-button-power/org.openbmc.buttons.Power@.service deleted file mode 100644 index 443ecbbab..000000000 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-button-power/org.openbmc.buttons.Power@.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Phosphor Power Button%i -Wants=mapper-wait@-org-openbmc-managers-System.service -After=mapper-wait@-org-openbmc-managers-System.service - -[Service] -Restart=always -ExecStart=/usr/bin/env button_power.exe -SyslogIdentifier=button_power.exe -Type=dbus -BusName={BUSNAME} - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-button-reset.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-button-reset.bb deleted file mode 100644 index 9435d3141..000000000 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-button-reset.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "OpenBMC org.openbmc.Button example implementation" -DESCRIPTION = "A sample implementation for a reset button." -PR = "r1" - -inherit skeleton-gdbus -inherit obmc-phosphor-dbus-service -inherit pkgconfig - -SKELETON_DIR = "rstbutton" - -FMT = "org.openbmc.buttons.reset@{0}.service" -DBUS_SERVICE_${PN} += "${@compose_list(d, 'FMT', 'OBMC_RESET_BUTTON_INSTANCES')}" diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-button-reset/org.openbmc.buttons.reset@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-button-reset/org.openbmc.buttons.reset@.service deleted file mode 100644 index e535e650c..000000000 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-button-reset/org.openbmc.buttons.reset@.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Phosphor Reset Button%i -Wants=mapper-wait@-org-openbmc-managers-System.service -After=mapper-wait@-org-openbmc-managers-System.service - -[Service] -Restart=always -ExecStart=/usr/bin/env button_reset.exe -SyslogIdentifier=button_reset.exe -Type=dbus -BusName={BUSNAME} - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-control-chassis.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-control-chassis.bb deleted file mode 100644 index 157d4169b..000000000 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-control-chassis.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "OpenBMC org.openbmc.control.Chassis example implementation" -DESCRIPTION = "An example implementation of the org.openbmc.control.Chassis DBUS API." -PR = "r1" - -inherit skeleton-python -inherit obmc-phosphor-dbus-service - -RDEPENDS_${PN} += "\ - python-dbus \ - python-pygobject \ - python-netclient \ - pyphosphor-dbus \ - " - -SKELETON_DIR = "pychassisctl" - -FMT = "org.openbmc.control.Chassis@{0}.service" -DBUS_SERVICE_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-control-chassis/org.openbmc.control.Chassis@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-control-chassis/org.openbmc.control.Chassis@.service deleted file mode 100644 index 76acd19a1..000000000 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-control-chassis/org.openbmc.control.Chassis@.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Phosphor Chassis%i Control - -[Service] -Restart=always -ExecStart=/usr/bin/env chassis_control.py -SyslogIdentifier=chassis_control.py -Type=dbus -BusName={BUSNAME} -Environment="PYTHONUNBUFFERED=1" -TimeoutStartSec=180s - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-host-failure-reboots.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-host-failure-reboots.bb deleted file mode 100644 index 645f40cbf..000000000 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-host-failure-reboots.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "Enables reboots on host failures" -DESCRIPTION = "Manages the settings entry that controls reboots \ -on host failures" -PR = "r1" - -inherit obmc-phosphor-systemd -inherit obmc-phosphor-license - -TMPL = "host-failure-reboots@.service" -INSTFMT = "host-failure-reboots@{0}.service" -LINK_FMT = "${TMPL}:${INSTFMT}" - -SYSTEMD_SERVICE_${PN} += "${TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'LINK_FMT', 'OBMC_HOST_INSTANCES')}" diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-host-failure-reboots/host-failure-reboots@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-host-failure-reboots/host-failure-reboots@.service deleted file mode 100644 index 88769c77a..000000000 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-host-failure-reboots/host-failure-reboots@.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Enable reboot on host failures -Wants=mapper-wait@-xyz-openbmc_project-control-host0-auto_reboot.service -After=mapper-wait@-xyz-openbmc_project-control-host0-auto_reboot.service - -[Service] -ExecStart = /bin/sh -c "busctl set-property `mapper get-service /xyz/openbmc_project/control/host0/auto_reboot` /xyz/openbmc_project/control/host0/auto_reboot xyz.openbmc_project.Control.Boot.RebootPolicy AutoReboot b true" -ExecStop = /bin/sh -c "busctl set-property `mapper get-service /xyz/openbmc_project/control/host0/auto_reboot` /xyz/openbmc_project/control/host0/auto_reboot xyz.openbmc_project.Control.Boot.RebootPolicy AutoReboot b false" -Type=oneshot -RemainAfterExit=yes - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-mgr-inventory.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-mgr-inventory.bb deleted file mode 100644 index a04aab29a..000000000 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-mgr-inventory.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "OpenBMC inventory manager" -DESCRIPTION = "OpenBMC inventory manager." -PR = "r1" - -inherit skeleton-python -inherit obmc-phosphor-dbus-service - -RRECOMMENDS_${PN} += "virtual-obmc-inventory-data" - -VIRTUAL-RUNTIME_skeleton_workbook ?= "" - -RDEPENDS_${PN} += "\ - python-argparse \ - python-dbus \ - python-json \ - python-pickle \ - python-pygobject \ - python-subprocess \ - pyphosphor-dbus \ - ${VIRTUAL-RUNTIME_skeleton_workbook} \ - " - -SKELETON_DIR = "pyinventorymgr" -SYSTEMD_SERVICE_${PN} += "obmc-sync-inventory-item@.service" diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-mgr-inventory/obmc-sync-inventory-item@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-mgr-inventory/obmc-sync-inventory-item@.service deleted file mode 100644 index 0e294a189..000000000 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-mgr-inventory/obmc-sync-inventory-item@.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Sync %I - -[Service] -Restart=no -Type=oneshot -EnvironmentFile={envfiledir}/obmc/sync_inventory_item/%I -ExecStart=/usr/bin/env sync_inventory_items.py -p ${{PROPERTY}} -s $SYNC_TYPE -SyslogIdentifier=sync_inventory_items.py - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb deleted file mode 100644 index c3a1b9dac..000000000 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb +++ /dev/null @@ -1,95 +0,0 @@ -SUMMARY = "org.openbmc.control.Power implementation for OpenPOWER" -DESCRIPTION = "A power control implementation suitable for OpenPOWER systems." -PR = "r1" - -inherit skeleton-gdbus -inherit obmc-phosphor-dbus-service -inherit pkgconfig - -DEPENDS += "phosphor-mapper systemd" - -SKELETON_DIR = "op-pwrctl" - -FMT = "org.openbmc.control.Power@{0}.service" -DBUS_SERVICE_${PN} += "${@compose_list(d, 'FMT', 'OBMC_POWER_INSTANCES')}" - -SYSTEMD_SERVICE_${PN} += " \ - op-power-start@.service \ - op-wait-power-on@.service \ - op-power-stop@.service \ - op-wait-power-off@.service \ - op-reset-chassis-running@.service \ - op-reset-chassis-on@.service \ - op-powered-off@.service \ - " - -SYSTEMD_ENVIRONMENT_FILE_${PN} += "obmc/power_control" - -START_TMPL = "op-power-start@.service" -START_TGTFMT = "obmc-chassis-poweron@{1}.target" -START_INSTFMT = "op-power-start@{0}.service" -START_FMT = "../${START_TMPL}:${START_TGTFMT}.requires/${START_INSTFMT}" - -STOP_TMPL = "op-power-stop@.service" -STOP_TGTFMT = "obmc-chassis-poweroff@{1}.target" -STOP_INSTFMT = "op-power-stop@{0}.service" -STOP_FMT = "../${STOP_TMPL}:${STOP_TGTFMT}.requires/${STOP_INSTFMT}" - -POWERED_OFF_TMPL = "op-powered-off@.service" -POWERED_OFF_INSTFMT = "op-powered-off@{0}.service" -POWERED_OFF_FMT = "../${POWERED_OFF_TMPL}:${STOP_TGTFMT}.requires/${POWERED_OFF_INSTFMT}" - -ON_TMPL = "op-wait-power-on@.service" -ON_INSTFMT = "op-wait-power-on@{0}.service" -ON_FMT = "../${ON_TMPL}:${START_TGTFMT}.requires/${ON_INSTFMT}" - -OFF_TMPL = "op-wait-power-off@.service" -OFF_INSTFMT = "op-wait-power-off@{0}.service" -OFF_FMT = "../${OFF_TMPL}:${STOP_TGTFMT}.requires/${OFF_INSTFMT}" - -RESET_TGTFMT = "obmc-chassis-powerreset@{1}.target" - -RESET_ON_TMPL = "op-reset-chassis-running@.service" -RESET_ON_INSTFMT = "op-reset-chassis-running@{0}.service" -RESET_ON_FMT = "../${RESET_ON_TMPL}:${RESET_TGTFMT}.requires/${RESET_ON_INSTFMT}" - -RESET_ON_CHASSIS_TMPL = "op-reset-chassis-on@.service" -RESET_ON_CHASSIS_INSTFMT = "op-reset-chassis-on@{0}.service" -RESET_ON_CHASSIS_FMT = "../${RESET_ON_CHASSIS_TMPL}:${RESET_TGTFMT}.requires/${RESET_ON_CHASSIS_INSTFMT}" - -# Build up requires relationship for START_TGTFMT and STOP_TGTFMT -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'START_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'STOP_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'POWERED_OFF_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'ON_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'OFF_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_ON_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_ON_CHASSIS_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" - -# Now show that the main control target requires these power targets -START_TMPL_CTRL = "obmc-chassis-poweron@.target" -START_TGTFMT_CTRL = "obmc-host-startmin@{1}.target" -START_INSTFMT_CTRL = "obmc-chassis-poweron@{0}.target" -START_FMT_CTRL = "../${START_TMPL_CTRL}:${START_TGTFMT_CTRL}.requires/${START_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'START_FMT_CTRL', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" - -# Chassis off requires host off -STOP_TMPL_CTRL = "obmc-host-stop@.target" -STOP_TGTFMT_CTRL = "obmc-chassis-poweroff@{0}.target" -STOP_INSTFMT_CTRL = "obmc-host-stop@{1}.target" -STOP_FMT_CTRL = "../${STOP_TMPL_CTRL}:${STOP_TGTFMT_CTRL}.requires/${STOP_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'STOP_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES', 'OBMC_HOST_INSTANCES')}" - -# Hard power off requires chassis off -HARD_OFF_TMPL_CTRL = "obmc-chassis-poweroff@.target" -HARD_OFF_TGTFMT_CTRL = "obmc-chassis-hard-poweroff@{0}.target" -HARD_OFF_INSTFMT_CTRL = "obmc-chassis-poweroff@{0}.target" -HARD_OFF_FMT_CTRL = "../${HARD_OFF_TMPL_CTRL}:${HARD_OFF_TGTFMT_CTRL}.requires/${HARD_OFF_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HARD_OFF_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}" - -# Force the standby target to run the chassis reset check target -RESET_TMPL_CTRL = "obmc-chassis-powerreset@.target" -SYSD_TGT = "${SYSTEMD_DEFAULT_TARGET}" -RESET_INSTFMT_CTRL = "obmc-chassis-powerreset@{0}.target" -RESET_FMT_CTRL = "../${RESET_TMPL_CTRL}:${SYSD_TGT}.wants/${RESET_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_FMT_CTRL', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/obmc/power_control b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/obmc/power_control deleted file mode 100644 index 8db889034..000000000 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/obmc/power_control +++ /dev/null @@ -1,2 +0,0 @@ -POLL_INTERVAL="3000" -PGOOD_TIMEOUT="10" diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service deleted file mode 100644 index c1de92f3b..000000000 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service +++ /dev/null @@ -1,19 +0,0 @@ -[Unit] -Description=Start Power%i -Wants=obmc-power-start@%i.target -Before=obmc-power-start@%i.target -After=obmc-power-start-pre@%i.target -After=obmc-fan-control.target -Wants=mapper-wait@-org-openbmc-control-power%i.service -After=mapper-wait@-org-openbmc-control-power%i.service -Conflicts=obmc-chassis-poweroff@%i.target -ConditionPathExists=!/run/openbmc/chassis@%i-on - -[Service] -RemainAfterExit=yes -Type=oneshot -ExecStart=/bin/sh -c "busctl call `mapper get-service /org/openbmc/control/power%i` /org/openbmc/control/power%i org.openbmc.control.Power setPowerState i 1" -SyslogIdentifier=op-power-start - -[Install] -WantedBy=obmc-host-start@%i.target diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service deleted file mode 100644 index 40dbf3637..000000000 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=Stop Power%i -Wants=obmc-power-stop@%i.target -Before=obmc-power-stop@%i.target -Wants=obmc-power-stop-pre@%i.target -After=obmc-power-stop-pre@%i.target -Wants=mapper-wait@-org-openbmc-control-power%i.service -After=mapper-wait@-org-openbmc-control-power%i.service -Conflicts=obmc-chassis-poweron@%i.target - -[Service] -RemainAfterExit=yes -ExecStart=/bin/sh -c "busctl call `mapper get-service /org/openbmc/control/power%i` /org/openbmc/control/power%i org.openbmc.control.Power setPowerState i 0" -SyslogIdentifier=op-power-stop - -[Install] -WantedBy=obmc-host-stop@%i.target diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-powered-off@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-powered-off@.service deleted file mode 100644 index b76db7bf4..000000000 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-powered-off@.service +++ /dev/null @@ -1,20 +0,0 @@ -[Unit] -Description=Power is off to chassis%i -After=op-wait-power-off@%i.service -Requires=op-wait-power-off@%i.service - -[Service] -RemainAfterExit=no -# systemd starts all wanted targets in parallel and a Conflict -# statement will resolve itself when the target starts, not when -# completes. Some services have a requirement to stop -# once power is off. The solution is to create a new target, -# obmc-chassis-powered-off@.target, that is started after it is -# verified that power has been removed from the chassis. Then -# services may conflict with this target to ensure they -# are stopped at the appropriate time. -ExecStart=/bin/systemctl start obmc-chassis-powered-off@%i.target - - -[Install] -WantedBy=obmc-chassis-poweroff@%i.target diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-on@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-on@.service deleted file mode 100644 index f2a710325..000000000 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-on@.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Start chassis%i on after BMC reset -Requires=op-reset-chassis-running@%i.service -After=op-reset-chassis-running@%i.service -After=obmc-power-reset-on@%i.target -Requires=obmc-power-reset-on@%i.target -ConditionPathExists=/run/openbmc/chassis@%i-on - -[Service] -RemainAfterExit=no -ExecStart=/bin/systemctl start obmc-chassis-poweron@%i.target - - -[Install] -WantedBy=obmc-chassis-powerreset@%i.target diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-running@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-running@.service deleted file mode 100644 index 381f89dfc..000000000 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-running@.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Check Chassis%i pgood and create a file to indicate it -Wants=mapper-wait@-org-openbmc-control-power%i.service -After=mapper-wait@-org-openbmc-control-power%i.service -Wants=obmc-power-reset-on@%i.target -Before=obmc-power-reset-on@%i.target -Conflicts=obmc-chassis-poweroff@%i.target - -[Service] -RemainAfterExit=no -Type=oneshot -ExecStart=/bin/sh -c "if [ $(busctl get-property `mapper get-service /org/openbmc/control/power%i` /org/openbmc/control/power%i org.openbmc.control.Power pgood | sed 's/i\s*[1]/on/' | grep on | wc -l) != 0 ]; then mkdir -p /run/openbmc/ && touch /run/openbmc/chassis@%i-on; fi" - -[Install] -WantedBy=obmc-chassis-powerreset@%i.target diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service deleted file mode 100644 index 11373618b..000000000 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service +++ /dev/null @@ -1,22 +0,0 @@ -[Unit] -Description=Wait for Power%i to turn off -Before=obmc-power-off@%i.target -Wants=obmc-power-stop@%i.target -Before=obmc-power-stop@%i.target -Wants=obmc-power-stop-pre@%i.target -After=obmc-power-stop-pre@%i.target -Wants=mapper-wait@-org-openbmc-control-power%i.service -After=mapper-wait@-org-openbmc-control-power%i.service -Conflicts=obmc-chassis-poweron@%i.target - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/usr/bin/env pgood_wait /org/openbmc/control/power%i off -SyslogIdentifier=pgood_wait -ExecStart=/bin/rm -f /run/openbmc/chassis@%i-on -ExecStart=/bin/rm -f /run/openbmc/host@%i-on -ExecStart=/bin/rm -f /run/openbmc/host@%i-request - -[Install] -WantedBy=obmc-host-stop@%i.target diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service deleted file mode 100644 index 1e65d0887..000000000 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service +++ /dev/null @@ -1,19 +0,0 @@ -[Unit] -Description=Wait for Power%i to turn on -Before=obmc-power-on@%i.target -Wants=obmc-power-start@%i.target -Before=obmc-power-start@%i.target -Wants=mapper-wait@-org-openbmc-control-power%i.service -After=mapper-wait@-org-openbmc-control-power%i.service -Conflicts=obmc-chassis-poweroff@%i.target -ConditionPathExists=!/run/openbmc/chassis@%i-on - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/usr/bin/env pgood_wait /org/openbmc/control/power%i on -SyslogIdentifier=pgood_wait -TimeoutSec=30 - -[Install] -WantedBy=obmc-host-start@%i.target diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/org.openbmc.control.Power@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/org.openbmc.control.Power@.service deleted file mode 100644 index 95ef0b88d..000000000 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/org.openbmc.control.Power@.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Phosphor Power%i Control -Wants=mapper-wait@-org-openbmc-managers-System.service -After=mapper-wait@-org-openbmc-managers-System.service - -[Service] -EnvironmentFile={envfiledir}/obmc/power_control -Restart=always -ExecStart=/usr/bin/env power_control.exe $POLL_INTERVAL $PGOOD_TIMEOUT -SyslogIdentifier=power_control.exe -Type=dbus -BusName={BUSNAME} - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect.bb deleted file mode 100644 index 6e0ad9719..000000000 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "OpenBMC PCIE slot detection utility" -DESCRIPTION = "OpenBMC PCIE slot detection utility." -PR = "r1" - -inherit skeleton-gdbus -inherit obmc-phosphor-systemd -inherit pkgconfig - -SKELETON_DIR = "pciedetect" - -TMPL = "pcie-slot-detect@.service" -TGTFMT = "obmc-host-startmin@{0}.target" -INSTFMT = "pcie-slot-detect@{0}.service" -FMT = "../${TMPL}:${TGTFMT}.wants/${INSTFMT}" - -SYSTEMD_SERVICE_${PN} += "pcie-slot-detect@.service" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect/pcie-slot-detect@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect/pcie-slot-detect@.service deleted file mode 100644 index 4545524d3..000000000 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-pcie-detect/pcie-slot-detect@.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=PCIE Slot Presence Detection For Chassis%i -Wants=obmc-power-on@%i.target -After=obmc-power-on@%i.target -Conflicts=obmc-host-stop@%i.target - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/usr/bin/env pcie_slot_present.exe -SyslogIdentifier=pcie_slot_present.exe - -[Install] -WantedBy=obmc-host-startmin@%i.target diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-phosphor-chassisd.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-phosphor-chassisd.bb deleted file mode 100644 index b02787e54..000000000 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-phosphor-chassisd.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "Phosphor OpenBMC Chassis Management" -DESCRIPTION = "Phosphor OpenBMC chassis management reference implementation." -PR = "r1" - -inherit obmc-phosphor-pydbus-service - -PROVIDES += "virtual/obmc-chassis-mgmt" -RPROVIDES_${PN} += "virtual-obmc-chassis-mgmt" - -S = "${WORKDIR}" -SRC_URI += "file://${PN}.py" diff --git a/meta-phosphor/common/recipes-phosphor/clear-once/clear-once.bb b/meta-phosphor/common/recipes-phosphor/clear-once/clear-once.bb deleted file mode 100644 index 79a7ecd77..000000000 --- a/meta-phosphor/common/recipes-phosphor/clear-once/clear-once.bb +++ /dev/null @@ -1,7 +0,0 @@ -SUMMARY = "Clear boot-once variables" -DESCRIPTION = "Clear u-boot variables used for one-time boot flow" - -RDEPENDS_${PN} = "${@d.getVar('PREFERRED_PROVIDER_u-boot-fw-utils', True) or 'u-boot-fw-utils'}" - -inherit obmc-phosphor-systemd -inherit obmc-phosphor-license diff --git a/meta-phosphor/common/recipes-phosphor/clear-once/clear-once/clear-once.service b/meta-phosphor/common/recipes-phosphor/clear-once/clear-once/clear-once.service deleted file mode 100644 index 132d11d69..000000000 --- a/meta-phosphor/common/recipes-phosphor/clear-once/clear-once/clear-once.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Clear one time boot overrides - -ConditionFileNotEmpty=/etc/fw_env.config -RequiresMountsFor=/run /sbin /etc - -[Service] -Type=oneshot -RemainAfterExit=yes - -# It took 7 seconds to erase and write flash, be conservative -TimeoutStartSec=60 -Restart=no - -ExecStart=/sbin/fw_setenv openbmconce -ExecStart=/sbin/fw_setenv openbmconce diff --git a/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console-ssh.socket b/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console-ssh.socket deleted file mode 100644 index 3174489ef..000000000 --- a/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console-ssh.socket +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Phosphor Host Console SSH Per-Connection socket -Wants=obmc-console@{OBMC_CONSOLE_HOST_TTY}.service - -[Socket] -ListenStream=2200 -Accept=yes - -[Install] -WantedBy=sockets.target diff --git a/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service b/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service deleted file mode 100644 index 82ffe7919..000000000 --- a/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Phosphor Host Console SSH Per-Connection -Wants=obmc-console@{OBMC_CONSOLE_HOST_TTY}.service - -[Service] -Environment="DROPBEAR_RSAKEY_DIR=/etc/dropbear" -EnvironmentFile={envfiledir}/dropbear -ExecStart=-/usr/bin/env dropbear -i -r ${{DROPBEAR_RSAKEY_DIR}}/dropbear_rsa_host_key -c "/usr/bin/env obmc-console-client" $DROPBEAR_EXTRA_ARGS -SyslogIdentifier=dropbear -ExecReload={base_bindir}/kill -HUP $MAINPID -StandardInput=socket -KillMode=process diff --git a/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console.conf deleted file mode 100644 index d42caa935..000000000 --- a/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console.conf +++ /dev/null @@ -1,2 +0,0 @@ -lpc-address = 0x3f8 -sirq = 4 diff --git a/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console@.service b/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console@.service deleted file mode 100644 index 26e452c3c..000000000 --- a/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console@.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Phosphor Console Muxer listening on device /dev/%I -BindsTo=dev-%i.device -After=dev-%i.device - -[Service] -ExecStart=/usr/bin/env obmc-console-server --config {sysconfdir}/obmc-console.conf %i -SyslogIdentifier=obmc-console-server -Restart=always - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/console/obmc-console_git.bb b/meta-phosphor/common/recipes-phosphor/console/obmc-console_git.bb deleted file mode 100644 index d4d6e616c..000000000 --- a/meta-phosphor/common/recipes-phosphor/console/obmc-console_git.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "OpenBMC console daemon" -DESCRIPTION = "Daemon to handle UART console connections" -HOMEPAGE = "http://github.com/openbmc/obmc-console" -PR = "r1" - -inherit obmc-phosphor-license -inherit obmc-phosphor-systemd -inherit autotools -inherit obmc-phosphor-discovery-service - -TARGET_CFLAGS += "-fpic -O2" - -DEPENDS += "autoconf-archive-native" - -SRC_URI += "git://github.com/openbmc/obmc-console" -SRC_URI += "file://${PN}.conf" - -SRCREV = "3c89b263484128071343bdaf0b5f3a8dace32799" -PV = "1.0+git${SRCPV}" - -REGISTERED_SERVICES_${PN} += "obmc_console:tcp:2200" -OBMC_CONSOLE_HOST_TTY ?= "ttyVUART0" -SYSTEMD_SUBSTITUTIONS += "OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh@.service" -SYSTEMD_SUBSTITUTIONS += "OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh.socket" - -SYSTEMD_SERVICE_${PN} = " \ - ${PN}@.service \ - ${PN}@${OBMC_CONSOLE_HOST_TTY}.service \ - ${PN}-ssh.socket \ - ${PN}-ssh@.service \ - " -do_install_append() { - install -m 0755 -d ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/${PN}.conf ${D}${sysconfdir}/${PN}.conf -} - -S = "${WORKDIR}/git" diff --git a/meta-phosphor/common/recipes-phosphor/datetime/phosphor-time-manager/xyz.openbmc_project.Time.Manager.service b/meta-phosphor/common/recipes-phosphor/datetime/phosphor-time-manager/xyz.openbmc_project.Time.Manager.service deleted file mode 100644 index e819e35ac..000000000 --- a/meta-phosphor/common/recipes-phosphor/datetime/phosphor-time-manager/xyz.openbmc_project.Time.Manager.service +++ /dev/null @@ -1,18 +0,0 @@ -[Unit] -Description=Phosphor Time Manager daemon -Wants=mapper-wait@-xyz-openbmc_project-time-owner.service -After=mapper-wait@-xyz-openbmc_project-time-owner.service -Wants=mapper-wait@-xyz-openbmc_project-time-sync_method.service -After=mapper-wait@-xyz-openbmc_project-time-sync_method.service -Wants=mapper-wait@-xyz-openbmc_project-state-host0.service -After=mapper-wait@-xyz-openbmc_project-state-host0.service - -[Service] -Restart=always -ExecStart=/usr/bin/env phosphor-timemanager -SyslogIdentifier=phosphor-timemanager -Type=dbus -BusName={BUSNAME} - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/datetime/phosphor-time-manager_git.bb b/meta-phosphor/common/recipes-phosphor/datetime/phosphor-time-manager_git.bb deleted file mode 100644 index 59fa7b518..000000000 --- a/meta-phosphor/common/recipes-phosphor/datetime/phosphor-time-manager_git.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "Phosphor Time Manager daemon" -DESCRIPTION = "Daemon to cater to BMC and HOST time management" -HOMEPAGE = "http://github.com/openbmc/phosphor-time-manager" -PR = "r1" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -inherit autotools pkgconfig pythonnative -inherit obmc-phosphor-dbus-service - -DEPENDS += "autoconf-archive-native" -DEPENDS += "phosphor-mapper" -DEPENDS += "systemd" -DEPENDS += "sdbusplus" -DEPENDS += "sdbusplus-native" -DEPENDS += "phosphor-logging" -DEPENDS += "phosphor-dbus-interfaces" -RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_obmc-settings-mgmt}" -RDEPENDS_${PN} += "network" -RDEPENDS_${PN} += "libmapper" -RDEPENDS_${PN} += "libsystemd" -RDEPENDS_${PN} += "sdbusplus" -RDEPENDS_${PN} += "phosphor-dbus-interfaces" - -SRC_URI += "git://github.com/openbmc/phosphor-time-manager" -SRCREV = "33752c75e8bdadf13d983e94667de72f64ba3537" -PV = "1.0+git${SRCPV}" -S = "${WORKDIR}/git" - -DBUS_SERVICE_${PN} += "xyz.openbmc_project.Time.Manager.service" diff --git a/meta-phosphor/common/recipes-phosphor/dbus/dbus-perms.bb b/meta-phosphor/common/recipes-phosphor/dbus/dbus-perms.bb deleted file mode 100644 index 8290ecce2..000000000 --- a/meta-phosphor/common/recipes-phosphor/dbus/dbus-perms.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "Phosphor OpenBMC DBUS Permissions" -DESCRIPTION = "Phosphor OpenBMC DBUS Permissions." -HOMEPAGE = "http://github.com/openbmc/" -PR = "r1" - -inherit allarch -inherit obmc-phosphor-license -inherit dbus-dir - -SRC_URI += "file://org.openbmc.conf" - -do_install_append() { - install -d ${D}${dbus_system_confdir} - install -m 0644 ${WORKDIR}/org.openbmc.conf \ - ${D}${dbus_system_confdir} -} diff --git a/meta-phosphor/common/recipes-phosphor/dbus/dbus-perms/org.openbmc.conf b/meta-phosphor/common/recipes-phosphor/dbus/dbus-perms/org.openbmc.conf deleted file mode 100644 index b51293b19..000000000 --- a/meta-phosphor/common/recipes-phosphor/dbus/dbus-perms/org.openbmc.conf +++ /dev/null @@ -1,8 +0,0 @@ -<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" - "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> -<busconfig> - <policy context="default"> - <allow own="*"/> - <allow send_destination="*"/> - </policy> -</busconfig> diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-interfaces-mapper-config-native.bb b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-interfaces-mapper-config-native.bb deleted file mode 100644 index c39e0a34f..000000000 --- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-interfaces-mapper-config-native.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY="Add /xyz/openbmc_project namespace to phosphor-mapper" -DESCRIPTION="Add the /xyz/openbmc_project path namespace and \ -xyz.openbmc_project interface prefix to the mapper \ -watch list." - -inherit phosphor-mapper -inherit native -inherit obmc-phosphor-license - -PHOSPHOR_MAPPER_NAMESPACE_append = " /xyz/openbmc_project" -PHOSPHOR_MAPPER_INTERFACE_append = " xyz.openbmc_project" diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-interfaces.bb b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-interfaces.bb deleted file mode 100644 index 790898cd1..000000000 --- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-interfaces.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "Phosphor DBus Interfaces" -DESCRIPTION = "Generated bindings, using sdbus++, for the phosphor YAML" -PR = "r1" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig -inherit obmc-phosphor-license -inherit pythonnative -inherit phosphor-dbus-yaml - -DEPENDS += "autoconf-archive-native" -DEPENDS += "sdbus++-native" - -SRC_URI += "git://github.com/openbmc/phosphor-dbus-interfaces" -SRCREV = "e0e9aed2be16f2189759c36e63dbdef8819f12c9" - -DEPENDS_remove_class-native = "sdbus++-native" -DEPENDS_remove_class-nativesdk = "sdbus++-native" - -PACKAGECONFIG ??= "libphosphor_dbus" -PACKAGECONFIG[libphosphor_dbus] = " \ - --enable-libphosphor_dbus, \ - --disable-libphosphor_dbus, \ - systemd sdbusplus, \ - libsystemd sdbusplus \ - " - -PACKAGECONFIG_remove_class-native = "libphosphor_dbus" -PACKAGECONFIG_remove_class-nativesdk = "libphosphor_dbus" - -BBCLASSEXTEND += "native nativesdk" diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native.bb b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native.bb deleted file mode 100644 index 228ae5a63..000000000 --- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Phosphor DBus Monitor Configuration" -DESCRIPTION = "Meta-recipe, pulling in native recipes that wish to add \ -configuration files to the /usr/share/phosphor-dbus-monitor filesystem." -HOMEPAGE = "http://github.com/openbmc/phosphor-dbus-monitor" -PR = "r1" - -inherit obmc-phosphor-license -inherit native -inherit phosphor-dbus-monitor - -PHOSPHOR_DBUS_MONITOR_CONFIGS ??= "" - -# To add additional config files, create a recipe in your layer, -# and add it to PHOSPHOR_DBUS_MONITOR_CONFIGS with a bbappend to this recipe. - -DEPENDS += "${PHOSPHOR_DBUS_MONITOR_CONFIGS}" - -do_install() { - mkdir -p ${D}${config_dir} -} diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor.bb b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor.bb deleted file mode 100644 index cfa684aa0..000000000 --- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor.bb +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "Phosphor DBus Monitor" -DESCRIPTION = "Phosphor DBus Monitor is a general purpose DBus application \ -that watches DBus traffic for events and takes actions based on those events." -PR = "r1" - -HOMEPAGE = "http://github.com/openbmc/phosphor-dbus-monitor" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -SRC_URI = "git://github.com/openbmc/phosphor-dbus-monitor" -SRCREV = "2ded5e1e3993913be34e8122f2b835468a2f9e91" - -inherit autotools \ - pkgconfig \ - pythonnative \ - phosphor-dbus-monitor \ - obmc-phosphor-systemd - -PACKAGE_BEFORE_PN = "phosphor-msl-verify" -SYSTEMD_PACKAGES = "${PN} phosphor-msl-verify" -SYSTEMD_SERVICE_phosphor-msl-verify = "phosphor-msl-verify.service" - -DEPENDS += " \ - ${PN}-config-native \ - phosphor-logging \ - autoconf-archive-native \ - sdbusplus-native \ - gtest \ - " -RDEPENDS_${PN} += " \ - sdbusplus \ - phosphor-dbus-interfaces \ - phosphor-logging \ - " - -RDEPENDS_phosphor-msl-verify += " \ - sdbusplus \ - phosphor-dbus-interfaces \ - phosphor-logging \ - " -FILES_phosphor-msl-verify = "${sbindir}/phosphor-msl-verify" - -S = "${WORKDIR}/git" - -EXTRA_OECONF = " \ - YAML_PATH=${STAGING_DIR_NATIVE}${config_dir} \ - " diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-dbus-monitor.service b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-dbus-monitor.service deleted file mode 100644 index 9440f0c2d..000000000 --- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-dbus-monitor.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Phosphor DBus Monitor -After=obmc-mapper.target - -[Service] -Restart=always -ExecStart=/usr/bin/env phosphor-dbus-monitor -SyslogIdentifier=phosphor-dbus-monitor - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-msl-verify.service b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-msl-verify.service deleted file mode 100644 index cbefdeab1..000000000 --- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-dbus-monitor/phosphor-msl-verify.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Phosphor MSL Verification -After=mapper-wait@-xyz-openbmc_project-inventory.service -Wants=mapper-wait@-xyz-openbmc_project-inventory.service - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/usr/bin/env phosphor-msl-verify -SyslogIdentifier=phosphor-msl-verify diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-legacy-namespace-mapper-config-native.bb b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-legacy-namespace-mapper-config-native.bb deleted file mode 100644 index 67199f9f0..000000000 --- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-legacy-namespace-mapper-config-native.bb +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY="Add /org/openbmc namespace to phosphor-mapper" -DESCRIPTION="Add the legacy /org/openbmc path namespace and \ -org.openbmc nterface prefix to the mapper watch list." - -inherit phosphor-mapper -inherit native -inherit obmc-phosphor-license - -PHOSPHOR_MAPPER_NAMESPACE_append = " /org/openbmc" -PHOSPHOR_MAPPER_INTERFACE_append = " org.openbmc" diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper-config-native.bb b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper-config-native.bb deleted file mode 100644 index 976c59b9c..000000000 --- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper-config-native.bb +++ /dev/null @@ -1,41 +0,0 @@ -SUMMARY = "Phosphor Mapper Configuration" -DESCRIPTION = "Meta-recipe, pulling in native recipes that wish to add \ -configuration files to the native /usr/share/phosphor-mapper filesystem." -HOMEPAGE = "http://github.com/openbmc/phosphor-objmgr" -PR = "r1" - -inherit obmc-phosphor-license -inherit native -inherit phosphor-mapper - -PHOSPHOR_MAPPER_CONFIGS = " \ - phosphor-dbus-interfaces-mapper-config-native \ - phosphor-legacy-namespace-mapper-config-native \ - " - -DEPENDS += "${PHOSPHOR_MAPPER_CONFIGS}" - -# To add namespaces and blacklists to the mapper configuration, -# create a native recipe in your layer, and add it to -# PHOSPHOR_MAPPER_CONFIGS with a bbappend to this recipe. -# Recipes should set one of the variables below. -# Consult phosphor-mapper.bbclass for additional information. - -# Add path namespaces to be monitored. -PHOSPHOR_MAPPER_NAMESPACE = "" - -# Add interfaces to be monitored. -PHOSPHOR_MAPPER_INTERFACE = "" - -# Blacklist paths from being monitored. -PHOSPHOR_MAPPER_NAMESPACE_BLACKLIST = "" - -# Blacklist interfaces from being monitored. -PHOSPHOR_MAPPER_INTERFACE_BLACKLIST = "" - -do_install() { - install -d ${D}/${namespace_dir} - install -d ${D}/${interface_dir} - install -d ${D}/${blacklist_dir} - install -d ${D}/${interfaceblacklist_dir} -} diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper.bb b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper.bb deleted file mode 100644 index ed7d4bb55..000000000 --- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper.bb +++ /dev/null @@ -1,96 +0,0 @@ -SUMMARY = "Phosphor DBUS Object Manager" -DESCRIPTION = "Phosphor DBUS object manager." -HOMEPAGE = "http://github.com/openbmc/phosphor-objmgr" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" - -inherit autotools pkgconfig -inherit obmc-phosphor-python-autotools -inherit obmc-phosphor-dbus-service -inherit obmc-phosphor-systemd -inherit phosphor-mapperdir - -DEPENDS += "systemd" -DEPENDS += "autoconf-archive-native" -DEPENDS += "sdbusplus" -DEPENDS += "phosphor-logging" -DEPENDS += "${PN}-config-native" - -DBUS_SERVICE_${PN} += "xyz.openbmc_project.ObjectMapper.service" -SYSTEMD_SERVICE_${PN} += " \ - mapper-wait@.service \ - mapper-subtree-remove@.service \ - " -RDEPENDS_libmapper += "libsystemd" -RDEPENDS_${PN} += " \ - python-argparse \ - python-xml \ - python-dbus \ - python-pygobject \ - pyphosphor-dbus \ - pyphosphor-utils \ - sdbusplus \ - phosphor-logging \ - " -SRC_URI += "git://github.com/openbmc/phosphor-objmgr" - -SRCREV = "d6729ea39d443bf62a27bbf64ef6bc7a123125c8" - -S = "${WORKDIR}/git" - -python populate_packages_prepend () { - mapperlibdir = d.getVar("libdir", True) - do_split_packages(d, mapperlibdir, '^lib(.*)\.so\.*', 'lib%s', 'Phosphor mapper %s library', extra_depends='', allow_links=True) -} -PACKAGES_DYNAMIC += "^libmapper.*" -FILES_${PN}_remove = "${libdir}/lib*.so.* ${libdir}/*" - -# Construct a systemd environment file with mapper commandline -# from the native sysroot /usr/share/phosphor-mapper filesystem. -python do_emit_env() { - path = d.getVar('STAGING_DIR_NATIVE', True) + \ - d.getVar('namespace_dir', True) - paths = [] - for p in os.listdir(path): - paths.append(os.sep.join(p.split('-'))) - - path = d.getVar('STAGING_DIR_NATIVE', True) + \ - d.getVar('interface_dir', True) - interfaces = [] - for i in os.listdir(path): - interfaces.append('.'.join(i.split('-'))) - - path = d.getVar('STAGING_DIR_NATIVE', True) + \ - d.getVar('blacklist_dir', True) - blacklists = [] - for b in os.listdir(path): - blacklists.append(os.sep + os.sep.join(b.split('-'))) - - path = d.getVar('STAGING_DIR_NATIVE', True) + \ - d.getVar('interfaceblacklist_dir', True) - interface_blacklists = [] - for ib in os.listdir(path): - interface_blacklists.append('.'.join(ib.split('-'))) - - path = [d.getVar('D', True) + d.getVar('envfiledir', True)] - path.append('obmc') - path.append('mapper') - parent = os.path.join(*path[:-1]) - path = os.path.join(*path) - - if not os.path.exists(parent): - os.makedirs(parent) - with open(path, 'w+') as fd: - fd.write('MAPPER_NAMESPACES="{}"'.format(' '.join(paths))) - fd.write('\n') - fd.write('MAPPER_INTERFACES="{}"'.format(' '.join(interfaces))) - fd.write('\n') - fd.write('MAPPER_BLACKLISTS="{}"'.format(' '.join(blacklists))) - fd.write('\n') - fd.write('MAPPER_INTERFACEBLACKLISTS="{}"'.format(' '.join(interface_blacklists))) - fd.write('\n') -} - -do_install[postfuncs] += "do_emit_env" -do_install[vardeps] += "PHOSPHOR_MAPPER_NAMESPACES" diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service deleted file mode 100644 index 4bd411e75..000000000 --- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service +++ /dev/null @@ -1,22 +0,0 @@ -[Unit] -Description=mapper subtree-remove %I -Wants=obmc-mapper.target -After=obmc-mapper.target - -[Service] -# We are using a Type=simple service instead of the normal Type=oneshot -# since Type=oneshot can't have Restart= lines -# https://github.com/systemd/systemd/issues/2582 -# Unfortunately Type=oneshot services halt any services which order after -# the oneshot on the completion of ExecStart= lines. For Type=simple, the -# halting is only until ExecStartPre lines have completed and ExecStart has -# begun executing. Since we want to wait for the `mapper wait` process to -# finish, it must be an ExecStartPre. All Type=simple services require an -# ExecStart so we use `true` as a placeholder to satisfy the requirement. -Type=simple -RemainAfterExit=no -Restart=on-failure -TimeoutStartSec=infinity -ExecStartPre=/usr/bin/env mapper subtree-remove %I -ExecStart=/usr/bin/env true -SyslogIdentifier=mapper diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service deleted file mode 100644 index f7744e2d8..000000000 --- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service +++ /dev/null @@ -1,22 +0,0 @@ -[Unit] -Description=Wait for %I -Wants=obmc-mapper.target -After=obmc-mapper.target - -[Service] -# We are using a Type=simple service instead of the normal Type=oneshot -# since Type=oneshot can't have Restart= lines -# https://github.com/systemd/systemd/issues/2582 -# Unfortunately Type=oneshot services halt any services which order after -# the oneshot on the completion of ExecStart= lines. For Type=simple, the -# halting is only until ExecStartPre lines have completed and ExecStart has -# begun executing. Since we want to wait for the `mapper wait` process to -# finish, it must be an ExecStartPre. All Type=simple services require an -# ExecStart so we use `true` as a placeholder to satisfy the requirement. -Type=simple -RemainAfterExit=yes -Restart=on-failure -TimeoutStartSec=infinity -ExecStartPre=/usr/bin/env mapper wait %I -ExecStart=/usr/bin/env true -SyslogIdentifier=mapper diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.conf b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.conf deleted file mode 100644 index 3d9fcc327..000000000 --- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.conf +++ /dev/null @@ -1,8 +0,0 @@ -<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" - "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> -<busconfig> - <policy user="root"> - <allow own="xyz.openbmc_project.ObjectMapper"/> - <allow send_destination="xyz.openbmc_project.ObjectMapper"/> - </policy> -</busconfig> diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service deleted file mode 100644 index aeb734da7..000000000 --- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service +++ /dev/null @@ -1,21 +0,0 @@ -[Unit] -Description=Phosphor DBus Service Discovery Manager -Before=obmc-mapper.target -After=dbus.service - -[Service] -Restart=always -Type=dbus -ExecStart=/usr/bin/env phosphor-mapper \ - --path_namespaces="${{MAPPER_NAMESPACES}}" \ - --interface_namespaces="${{MAPPER_INTERFACES}}" \ - --blacklists="${{MAPPER_BLACKLISTS}}" \ - --interface_blacklists="${{MAPPER_INTERFACEBLACKLISTS}}" -SyslogIdentifier=phosphor-mapper -BusName={BUSNAME} -TimeoutStartSec=300 -EnvironmentFile={envfiledir}/obmc/mapper -Environment="PYTHONUNBUFFERED=1" - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/devtools/obmc-pydevtools.bb b/meta-phosphor/common/recipes-phosphor/devtools/obmc-pydevtools.bb deleted file mode 100644 index b8911aa53..000000000 --- a/meta-phosphor/common/recipes-phosphor/devtools/obmc-pydevtools.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "OpenBMC python devtools" -DESCRIPTION = "Shortcut scripts for developers." -PR = "r1" - -inherit skeleton-python - -VIRTUAL-RUNTIME_skeleton_workbook ?= "" - -RDEPENDS_${PN} += "\ - python-dbus \ - python-json \ - python-xml \ - python-pygobject \ - ${VIRTUAL-RUNTIME_skeleton_workbook} \ - " - -SKELETON_DIR = "pytools" - -do_install_append() { - if [ -f ${S}/obmcutil-completion.sh ] - then - install -d ${D}${sysconfdir}/profile.d - install -m 0644 -D -t ${D}${sysconfdir}/profile.d ${S}/obmcutil-completion.sh - fi -} diff --git a/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector.bb b/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector.bb deleted file mode 100644 index b4800645b..000000000 --- a/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector.bb +++ /dev/null @@ -1,179 +0,0 @@ -SUMMARY = "Phosphor Debug Collector" -DESCRIPTION = "Phosphor Debug Collector provides mechanisms \ -to collect various log files and system parameters. \ -This will be helpful for troubleshooting the problems in OpenBMC \ -based systems." - -PR = "r1" - -DEBUG_COLLECTOR_PKGS = " \ - ${PN}-manager \ - ${PN}-monitor \ - ${PN}-dreport \ - ${PN}-scripts \ -" -PACKAGE_BEFORE_PN += "${DEBUG_COLLECTOR_PKGS}" -ALLOW_EMPTY_${PN} = "1" - -DBUS_PACKAGES = "${PN}-manager" - -SYSTEMD_PACKAGES = "${PN}-monitor" - -inherit autotools \ - pkgconfig \ - obmc-phosphor-dbus-service \ - pythonnative \ - phosphor-debug-collector - -require phosphor-debug-collector.inc - -DEPENDS += " \ - phosphor-dbus-interfaces \ - phosphor-dbus-interfaces-native \ - phosphor-logging \ - sdbusplus \ - sdbusplus-native \ - autoconf-archive-native \ -" - -RDEPENDS_${PN}-manager += " \ - sdbusplus \ - phosphor-dbus-interfaces \ - phosphor-logging \ - ${PN}-dreport \ -" -RDEPENDS_${PN}-monitor += " \ - sdbusplus \ - phosphor-dbus-interfaces \ - phosphor-logging \ -" -RDEPENDS_${PN}-dreport += " \ - systemd \ - ${VIRTUAL-RUNTIME_base-utils} \ - bash \ - xz \ -" -RDEPENDS_${PN}-scripts += " \ - bash \ -" - -MGR_SVC ?= "xyz.openbmc_project.Dump.Manager.service" - -SYSTEMD_SUBSTITUTIONS += "BMC_DUMP_PATH:${bmc_dump_path}:${MGR_SVC}" - -FILES_${PN}-manager += "${sbindir}/phosphor-dump-manager" -FILES_${PN}-monitor += "${sbindir}/phosphor-dump-monitor" -FILES_${PN}-dreport += "${bindir}/dreport" -FILES_${PN}-scripts += "${dreport_dir}" - -DBUS_SERVICE_${PN}-manager += "${MGR_SVC}" -SYSTEMD_SERVICE_${PN}-monitor += "obmc-dump-monitor.service" - -EXTRA_OECONF = "BMC_DUMP_PATH=${bmc_dump_path}" - -S = "${WORKDIR}/git" - -# Install dreport script -# From tools/dreport.d/dreport to /usr/bin/dreport -install_dreport() { - install -d ${D}${bindir} - install -m 0755 ${S}/tools/dreport.d/dreport \ - ${D}${bindir}/dreport -} - -# Install dreport sample configuration file -# From tools/dreport.d/sample.conf -# to /usr/share/dreport.d/conf.d/dreport.conf -install_dreport_conf_file() { - install -d ${D}${dreport_conf_dir} - install -m 0644 ${S}/tools/dreport.d/sample.conf \ - ${D}${dreport_conf_dir}/dreport.conf -} - -# Install dreport plugins -# From tools/dreport.d/plugins.d to /usr/share/dreport.d/plugins.d -install_dreport_plugins_scripts() { - install -d ${D}${dreport_plugin_dir} - install -m 0755 ${S}/tools/dreport.d/plugins.d/* ${D}${dreport_plugin_dir}/ -} - -# Install dreport utility functions -# From tools/dreport.d/include.d to /usr/share/dreport.d/include.d -install_dreport_include_scripts() { - install -d ${D}${dreport_include_dir} - install -m 0755 ${S}/tools/dreport.d/include.d/* \ - ${D}${dreport_include_dir}/ -} - -# Make the links for a single user plugin script -# Create user directories based on the dump type value in the config section -# Create softlinks for the base scripts in the user directories -def install_dreport_user_script(script_path, d): - import re - import configparser - - #Read the user types from the dreport.conf file - configure = configparser.ConfigParser() - conf_dir = d.getVar('D', True) + d.getVar('dreport_conf_dir', True) - confsource = os.path.join(conf_dir, "dreport.conf") - configure.read(confsource) - - config = ("config:") - section = "DumpType" - dreport_dir = d.getVar('D', True) + d.getVar('dreport_dir', True) - - script = os.path.basename(script_path) - srclink = os.path.join(d.getVar('dreport_plugin_dir', True), script) - - file = open(script_path, "r") - - for line in file: - if not config in line: - continue - revalue = re.search('[0-9]+.[0-9]+', line) - if not revalue: - bb.warn("Invalid format for config value =%s" % line) - continue - parse_value = revalue.group(0) - config_values = re.split('\W+', parse_value, 1) - if(len(config_values) != 2): - bb.warn("Invalid config value=%s" % parse_value) - break; - priority = config_values[1] - types = [int(d) for d in str(config_values[0])] - for type in types: - if not configure.has_option(section, str(type)): - bb.warn("Invalid dump type id =%s" % (str(type))) - continue - typestr = configure.get(section, str(type)) - destdir = os.path.join(dreport_dir, ("pl_" + typestr + ".d")) - if not os.path.exists(destdir): - os.makedirs(destdir) - linkname = "E" + priority + script - destlink = os.path.join(destdir, linkname) - os.symlink(srclink, destlink) - -#Make the links for all the plugins -python install_dreport_user_scripts() { - - source = d.getVar('S', True) - source_path = os.path.join(source, "tools", "dreport.d", "plugins.d") - scripts = os.listdir(source_path) - - for script in scripts: - srcname = os.path.join(source_path, script) - install_dreport_user_script(srcname, d) -} - -#Enable ubifs-workaround by DISTRO_FEATURE obmc-ubi-fs. -PACKAGECONFIG_append_df-obmc-ubi-fs = " ubifs-workaround" -PACKAGECONFIG[ubifs-workaround] = " \ - --enable-ubifs-workaround, \ - --disable-ubifs-workaround \ -" - -do_install[postfuncs] += "install_dreport" -do_install[postfuncs] += "install_dreport_conf_file" -do_install[postfuncs] += "install_dreport_plugins_scripts" -do_install[postfuncs] += "install_dreport_include_scripts" -do_install[postfuncs] += "install_dreport_user_scripts" diff --git a/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector.inc b/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector.inc deleted file mode 100644 index 7837f3e35..000000000 --- a/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector.inc +++ /dev/null @@ -1,5 +0,0 @@ -HOMEPAGE = "https://github.com/openbmc/phosphor-debug-collector" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -SRC_URI += "git://github.com/openbmc/phosphor-debug-collector" -SRCREV = "90d147a1ee5340278506bbdf94edc32bb77154f2" diff --git a/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector/obmc-dump-monitor.service b/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector/obmc-dump-monitor.service deleted file mode 100644 index 0e8ef3b5d..000000000 --- a/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector/obmc-dump-monitor.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Phosphor Dump core monitor. - -[Service] -ExecStart=/usr/bin/env phosphor-dump-monitor -SyslogIdentifier=phosphor-dump-monitor -Restart=always - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector/xyz.openbmc_project.Dump.Manager.service b/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector/xyz.openbmc_project.Dump.Manager.service deleted file mode 100644 index 131c8cdaf..000000000 --- a/meta-phosphor/common/recipes-phosphor/dump/phosphor-debug-collector/xyz.openbmc_project.Dump.Manager.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Phosphor Dump Manager - -[Service] -ExecStartPre=/bin/sh -c 'mkdir -p {BMC_DUMP_PATH}' -ExecStart=/usr/bin/env phosphor-dump-manager -SyslogIdentifier=phosphor-dump-manager -Restart=always -Type=dbus -BusName={BUSNAME} - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/fans/files/Makefile b/meta-phosphor/common/recipes-phosphor/fans/files/Makefile deleted file mode 100644 index 10e3fa2ae..000000000 --- a/meta-phosphor/common/recipes-phosphor/fans/files/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -EXE = obmc-phosphor-fand -OBJS = $(EXE).o -DEPPKGS = gio-unix-2.0 glib-2.0 -CC ?= $(CROSS_COMPILE)gcc -INCLUDES += $(shell pkg-config --cflags $(DEPPKGS)) -LIBS += $(shell pkg-config --libs $(DEPPKGS)) - -%.o : %.c - $(CC) -c $^ $(CFLAGS) $(INCLUDES) -o $@ -$(EXE): $(OBJS) - $(CC) $^ $(LDFLAGS) $(LDFLAGS) -o $@ -clean: - rm -f $(OBJS) $(EXE) *.o *.d -distclean: clean - rm -f *.c~ *.h~ *.sh~ Makefile~ config.mk~ diff --git a/meta-phosphor/common/recipes-phosphor/fans/files/obmc-phosphor-fand.c b/meta-phosphor/common/recipes-phosphor/fans/files/obmc-phosphor-fand.c deleted file mode 100644 index 558ba10bc..000000000 --- a/meta-phosphor/common/recipes-phosphor/fans/files/obmc-phosphor-fand.c +++ /dev/null @@ -1,29 +0,0 @@ -/* Contributors Listed Below - COPYRIGHT 2015 */ -/* [+] International Business Machines Corp. */ -/* */ -/* */ -/* Licensed under the Apache License, Version 2.0 (the "License"); */ -/* you may not use this file except in compliance with the License. */ -/* You may obtain a copy of the License at */ -/* */ -/* http://www.apache.org/licenses/LICENSE-2.0 */ -/* */ -/* Unless required by applicable law or agreed to in writing, software */ -/* distributed under the License is distributed on an "AS IS" BASIS, */ -/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or */ -/* implied. See the License for the specific language governing */ -/* permissions and limitations under the License. */ - -#include <stdio.h> -#include <stdlib.h> -#include <gio/gio.h> - -int main(int argc, char *argv[]) -{ - printf("obmc-phosphor-fand starting...\n"); - - while(1) - sleep(5); - - exit(EXIT_SUCCESS); -} diff --git a/meta-phosphor/common/recipes-phosphor/fans/files/obmc-phosphor-fand.service b/meta-phosphor/common/recipes-phosphor/fans/files/obmc-phosphor-fand.service deleted file mode 100644 index 958474989..000000000 --- a/meta-phosphor/common/recipes-phosphor/fans/files/obmc-phosphor-fand.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Phosphor Fan Controller - -[Service] -Restart=always -ExecStart=/usr/bin/env obmc-phosphor-fand -SyslogIdentifier=obmc-phosphor-fand - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan.bb b/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan.bb deleted file mode 100644 index 60bc87616..000000000 --- a/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "OpenBMC fan control" -DESCRIPTION = "OpenBMC fan control." -PR = "r1" - -inherit skeleton-sdbus -inherit obmc-phosphor-dbus-service -inherit pkgconfig - -RDEPENDS_${PN} += "libsystemd" -SKELETON_DIR = "fanctl" - -DBUS_SERVICE_${PN} += "org.openbmc.control.Fans.service" -SYSTEMD_SERVICE_${PN} += "obmc-max-fans.service" diff --git a/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/obmc-max-fans.service b/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/obmc-max-fans.service deleted file mode 100644 index f062fc9c8..000000000 --- a/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/obmc-max-fans.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Set Fans to Maximum -Wants=mapper-wait@-org-openbmc-control-fans.service -After=mapper-wait@-org-openbmc-control-fans.service -After=obmc-fan-control.target - -[Service] -Type=oneshot -Restart=no -ExecStart=/bin/sh -c "busctl call `mapper get-service /org/openbmc/control/fans` /org/openbmc/control/fans org.openbmc.control.Fans setMax" -SyslogIdentifier=obmc-max-fans diff --git a/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/org.openbmc.control.Fans.service b/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/org.openbmc.control.Fans.service deleted file mode 100644 index ec6391d5c..000000000 --- a/meta-phosphor/common/recipes-phosphor/fans/obmc-control-fan/org.openbmc.control.Fans.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=Phosphor Fan Control -Wants=obmc-fans-ready.target -After=obmc-fans-ready.target -Wants=obmc-fan-control.target -Before=obmc-fan-control.target - -[Service] -Restart=always -ExecStart=/usr/bin/env fan_control.exe -f 6 -SyslogIdentifier=fan_control.exe -Type=dbus -BusName={BUSNAME} -Environment="PYTHONUNBUFFERED=1" - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/fans/obmc-phosphor-fand.bb b/meta-phosphor/common/recipes-phosphor/fans/obmc-phosphor-fand.bb deleted file mode 100644 index 6faab00a2..000000000 --- a/meta-phosphor/common/recipes-phosphor/fans/obmc-phosphor-fand.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Phosphor OpenBMC Fan Management." -DESCRIPTION = "Phosphor OpenBMC fan management reference implementation." -PR = "r1" - -inherit pkgconfig -inherit obmc-phosphor-sdbus-service -inherit obmc-phosphor-c-daemon - -PROVIDES += "virtual/obmc-fan-mgmt" -RPROVIDES_${PN} += "virtual-obmc-fan-mgmt" - -S = "${WORKDIR}" -SRC_URI += "file://Makefile \ - file://obmc-phosphor-fand.c \ - " diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-events-config-native.bb b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-events-config-native.bb deleted file mode 100644 index 740b194ad..000000000 --- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-events-config-native.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Phosphor zone events definition default data" -PR = "r1" - -inherit native -inherit obmc-phosphor-license -inherit phosphor-fan - -SRC_URI += "file://events.yaml" - -S = "${WORKDIR}" - -do_install() { - DEST=${D}${control_datadir} - install -D events.yaml ${DEST}/events.yaml -} diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-events-config/events.yaml b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-events-config/events.yaml deleted file mode 100644 index b89d1dca7..000000000 --- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-events-config/events.yaml +++ /dev/null @@ -1,2 +0,0 @@ -#Default zone events definition YAML - empty. -#For format, see documentation in fan control code repository example yaml. diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-fan-config-mrw-native.bb b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-fan-config-mrw-native.bb deleted file mode 100644 index 7ae05ce80..000000000 --- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-fan-config-mrw-native.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "Generate fan control YAML from the MRW" -PR = "r1" - -inherit native -inherit obmc-phosphor-license -inherit phosphor-fan -inherit mrw-xml - -DEPENDS += " \ - mrw-native \ - mrw-perl-tools-native \ - " - -PROVIDES += "virtual/phosphor-fan-control-fan-config" - -S = "${WORKDIR}" - -do_compile() { - ${bindir}/perl-native/perl \ - ${bindir}/gen_fan_zone_yaml.pl \ - -i ${mrw_datadir}/${MRW_XML} \ - -o ${S}/fans.yaml -} - -do_install() { - DEST=${D}${control_datadir} - install -D ${S}/fans.yaml ${DEST}/fans.yaml -} diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bb b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bb deleted file mode 100644 index 76b0985ca..000000000 --- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Phosphor fan definition example data" -PR = "r1" - -inherit native -inherit obmc-phosphor-license -inherit phosphor-fan - -PROVIDES += "virtual/phosphor-fan-control-fan-config" - -SRC_URI += "file://fans.yaml" - -S = "${WORKDIR}" - -do_install() { - DEST=${D}${control_datadir} - install -D fans.yaml ${DEST}/fans.yaml -} diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-fan-config/fans.yaml b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-fan-config/fans.yaml deleted file mode 100644 index 8a6c271f2..000000000 --- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-fan-config/fans.yaml +++ /dev/null @@ -1,2 +0,0 @@ -#Default fan definition YAML - empty. -#For format, see documentation in fan control code repository example yaml. diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native.bb b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native.bb deleted file mode 100644 index 065efa539..000000000 --- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Phosphor zone conditions definition default data" -PR = "r1" - -inherit native -inherit obmc-phosphor-license -inherit phosphor-fan - -SRC_URI += "file://zone_conditions.yaml" - -S = "${WORKDIR}" - -do_install() { - DEST=${D}${control_datadir} - install -D zone_conditions.yaml ${DEST}/zone_conditions.yaml -} diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config/zone_conditions.yaml b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config/zone_conditions.yaml deleted file mode 100644 index 13406207c..000000000 --- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config/zone_conditions.yaml +++ /dev/null @@ -1,2 +0,0 @@ -#Default zone conditions definition YAML - empty. -#For format, see documentation in fan control code repository example yaml. diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-zone-config-native.bb b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-zone-config-native.bb deleted file mode 100644 index 4d8759e47..000000000 --- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-zone-config-native.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Phosphor fan zone definition default data" -PR = "r1" - -inherit native -inherit obmc-phosphor-license -inherit phosphor-fan - -SRC_URI += "file://zones.yaml" - -S = "${WORKDIR}" - -do_install() { - DEST=${D}${control_datadir} - install -D zones.yaml ${DEST}/zones.yaml -} diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-zone-config/zones.yaml b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-zone-config/zones.yaml deleted file mode 100644 index d25803ce6..000000000 --- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-control-zone-config/zones.yaml +++ /dev/null @@ -1,2 +0,0 @@ -#Default fan zone definition YAML - empty. -#For format, see documentation in fan control code repository example yaml. diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-monitor-config-native.bb b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-monitor-config-native.bb deleted file mode 100644 index 02420e43e..000000000 --- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-monitor-config-native.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Phosphor fan monitor definition default data" -PR = "r1" - -inherit native -inherit obmc-phosphor-license -inherit phosphor-fan - -SRC_URI += "file://monitor.yaml" - -S = "${WORKDIR}" - -do_install() { - DEST=${D}${monitor_datadir} - install -D monitor.yaml ${DEST}/monitor.yaml -} diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-monitor-config/monitor.yaml b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-monitor-config/monitor.yaml deleted file mode 100644 index ce60a2202..000000000 --- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-monitor-config/monitor.yaml +++ /dev/null @@ -1,2 +0,0 @@ -#Default fan monitor definition YAML - empty. -#For format, see documentation in fan monitor code repository example yaml. diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence-config-native.bb b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence-config-native.bb deleted file mode 100644 index 0eb38737c..000000000 --- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence-config-native.bb +++ /dev/null @@ -1,22 +0,0 @@ -# Provides the config file for the phosphor-fan-presence application. -# The default config file is empty. To provide a real one, -# append this recipe in a layer, add: -# FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -# and provide a config file. - -SUMMARY = "Config file for phosphor-fan-presence" -PR = "r1" - -inherit native -inherit phosphor-fan -inherit obmc-phosphor-license - -PROVIDES += "virtual/phosphor-fan-presence-config" - -SRC_URI += "file://config.yaml" - -S = "${WORKDIR}" - -do_install() { - install -D config.yaml ${D}${presence_datadir}/config.yaml -} diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence-config/config.yaml b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence-config/config.yaml deleted file mode 100644 index 15a10f409..000000000 --- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence-config/config.yaml +++ /dev/null @@ -1,3 +0,0 @@ -# This file is a stub. Consult -# https://github.com/openbmc/phosphor-fan-presence -# for file format description and examples. diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence-mrw-native.bb b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence-mrw-native.bb deleted file mode 100644 index 47dc2a4a1..000000000 --- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan-presence-mrw-native.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "Generate fan presence YAML from the MRW" -PR = "r1" - -inherit native -inherit obmc-phosphor-license -inherit phosphor-fan -inherit mrw-xml - -DEPENDS += " \ - mrw-native \ - mrw-perl-tools-native \ - " - -PROVIDES += "virtual/phosphor-fan-presence-config" - -S = "${WORKDIR}" - -do_install() { - DEST=${D}${presence_datadir} - install -d ${DEST} - - ${bindir}/perl-native/perl \ - ${bindir}/gen_presence_yaml.pl \ - -i ${mrw_datadir}/${MRW_XML} \ - -o ${DEST}/config.yaml -} diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.bb b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.bb deleted file mode 100644 index 9e4db307a..000000000 --- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.bb +++ /dev/null @@ -1,116 +0,0 @@ -SUMMARY = "Phosphor Fan" -DESCRIPTION = "Phosphor fan provides a set of fan monitoring and \ -control applications." -PR = "r1" - -require ${PN}.inc - -inherit autotools pkgconfig pythonnative -inherit obmc-phosphor-systemd -inherit phosphor-fan - -S = "${WORKDIR}/git" - -# Common build dependencies -DEPENDS += "autoconf-archive-native" -DEPENDS += "python-pyyaml-native" -DEPENDS += "python-mako-native" -DEPENDS += "sdbusplus" -DEPENDS += "sdbusplus-native" -DEPENDS += "phosphor-logging" -DEPENDS += "libevdev" - -# Package configuration -FAN_PACKAGES = " \ - ${PN}-presence-tach \ - ${PN}-control \ - ${PN}-monitor \ -" - -ALLOW_EMPTY_${PN} = "1" -PACKAGE_BEFORE_PN += "${FAN_PACKAGES}" -PACKAGECONFIG ?= "presence control monitor" -SYSTEMD_PACKAGES = "${FAN_PACKAGES}" - -# -------------------------------------- -# ${PN}-presence-tach specific configuration -PACKAGECONFIG[presence] = " \ - --enable-presence \ - PRESENCE_CONFIG=${STAGING_DIR_NATIVE}${presence_datadir}/config.yaml, \ - --disable-presence, \ - virtual/phosphor-fan-presence-config \ - , \ -" -RDEPENDS_${PN}-presence-tach += "sdbusplus" - -# Needed to install into the obmc-chassis-poweron target -TMPL_TACH = "phosphor-fan-presence-tach@.service" -INSTFMT_TACH = "phosphor-fan-presence-tach@{0}.service" -POWERON_TGT = "obmc-chassis-poweron@{0}.target" -FMT_TACH = "../${TMPL_TACH}:${POWERON_TGT}.requires/${INSTFMT_TACH}" - -FILES_${PN}-presence-tach = "${sbindir}/phosphor-fan-presence-tach" -SYSTEMD_SERVICE_${PN}-presence-tach += "${TMPL_TACH}" -SYSTEMD_LINK_${PN}-presence-tach += "${@compose_list(d, 'FMT_TACH', 'OBMC_CHASSIS_INSTANCES')}" - -# -------------------------------------- -# ${PN}-control specific configuration -PACKAGECONFIG[control] = "--enable-control \ - FAN_DEF_YAML_FILE=${STAGING_DIR_NATIVE}${control_datadir}/fans.yaml \ - FAN_ZONE_YAML_FILE=${STAGING_DIR_NATIVE}${control_datadir}/zones.yaml \ - ZONE_EVENTS_YAML_FILE=${STAGING_DIR_NATIVE}${control_datadir}/events.yaml \ - ZONE_CONDITIONS_YAML_FILE=${STAGING_DIR_NATIVE}${control_datadir}/zone_conditions.yaml \ - FAN_ZONE_OUTPUT_DIR=${S}/control, \ - --disable-control, \ - virtual/phosphor-fan-control-fan-config \ - phosphor-fan-control-zone-config-native \ - phosphor-fan-control-events-config-native \ - phosphor-fan-control-zone-conditions-config-native \ - , \ -" - -RDEPENDS_${PN}-control += "sdbusplus" - -FAN_CONTROL_TGT = "obmc-fan-control-ready@{0}.target" - -TMPL_CONTROL = "phosphor-fan-control@.service" -INSTFMT_CONTROL = "phosphor-fan-control@{0}.service" -FMT_CONTROL = "../${TMPL_CONTROL}:${FAN_CONTROL_TGT}.requires/${INSTFMT_CONTROL}" - -TMPL_CONTROL_INIT = "phosphor-fan-control-init@.service" -INSTFMT_CONTROL_INIT = "phosphor-fan-control-init@{0}.service" -FMT_CONTROL_INIT = "../${TMPL_CONTROL_INIT}:${POWERON_TGT}.wants/${INSTFMT_CONTROL_INIT}" - -FILES_${PN}-control = "${sbindir}/phosphor-fan-control" -SYSTEMD_SERVICE_${PN}-control += "${TMPL_CONTROL} ${TMPL_CONTROL_INIT}" -SYSTEMD_LINK_${PN}-control += "${@compose_list(d, 'FMT_CONTROL', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN}-control += "${@compose_list(d, 'FMT_CONTROL_INIT', 'OBMC_CHASSIS_INSTANCES')}" - -# -------------------------------------- -# ${PN}-monitor specific configuration -PACKAGECONFIG[monitor] = "--enable-monitor \ - FAN_MONITOR_YAML_FILE=${STAGING_DIR_NATIVE}${monitor_datadir}/monitor.yaml \ - FAN_MONITOR_OUTPUT_DIR=${S}/monitor, \ - --disable-monitor, \ - phosphor-fan-monitor-config-native \ - , \ -" - -RDEPENDS_${PN}-monitor += "sdbusplus" - -TMPL_MONITOR = "phosphor-fan-monitor@.service" -INSTFMT_MONITOR = "phosphor-fan-monitor@{0}.service" -FMT_MONITOR = "../${TMPL_MONITOR}:${FAN_CONTROL_TGT}.requires/${INSTFMT_MONITOR}" - -TMPL_MONITOR_INIT = "phosphor-fan-monitor-init@.service" -INSTFMT_MONITOR_INIT = "phosphor-fan-monitor-init@{0}.service" -FMT_MONITOR_INIT = "../${TMPL_MONITOR_INIT}:${POWERON_TGT}.wants/${INSTFMT_MONITOR_INIT}" - -FILES_${PN}-monitor = "${sbindir}/phosphor-fan-monitor" -SYSTEMD_SERVICE_${PN}-monitor += "${TMPL_MONITOR} ${TMPL_MONITOR_INIT}" -SYSTEMD_LINK_${PN}-monitor += "${@compose_list(d, 'FMT_MONITOR', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN}-monitor += "${@compose_list(d, 'FMT_MONITOR_INIT', 'OBMC_CHASSIS_INSTANCES')}" - -# -------------------------------------- -# phosphor-cooling-type specific configuration -PACKAGECONFIG[cooling-type] = "--enable-cooling-type,--disable-cooling-type,," diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.inc b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.inc deleted file mode 100644 index 53b80bf2f..000000000 --- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan.inc +++ /dev/null @@ -1,5 +0,0 @@ -HOMEPAGE = "https://github.com/openbmc/phosphor-fan-presence" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -SRC_URI += "git://github.com/openbmc/phosphor-fan-presence" -SRCREV = "ecd4bc7bf240b7d30ece98e74f7056b2cab1f38b" diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control-init@.service b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control-init@.service deleted file mode 100644 index 96b40f666..000000000 --- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control-init@.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Phosphor Fan Control Initialization -Wants=obmc-power-on@%i.target -After=obmc-power-on@%i.target -Conflicts=obmc-chassis-powered-off@%i.target - -[Service] -Restart=on-failure -ExecStart=/usr/bin/env phosphor-fan-control --init -SyslogIdentifier=phosphor-fan-control - -[Install] -WantedBy=obmc-chassis-poweron@%i.target diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control@.service b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control@.service deleted file mode 100644 index 8c5903e08..000000000 --- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control@.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Phosphor Fan Control Daemon -Conflicts=obmc-chassis-powered-off@%i.target - -[Service] -Restart=on-failure -ExecStart=/usr/bin/env phosphor-fan-control --control -SyslogIdentifier=phosphor-fan-control - -[Install] -RequiredBy=obmc-fan-control-ready@%i.target diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor-init@.service b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor-init@.service deleted file mode 100644 index e8a6f699a..000000000 --- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor-init@.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Phosphor Fan Monitor Initialization -Wants=obmc-power-on@%i.target -After=obmc-power-on@%i.target -Conflicts=obmc-chassis-powered-off@%i.target - -[Service] -Restart=on-failure -ExecStart=/usr/bin/env phosphor-fan-monitor --init -SyslogIdentifier=phosphor-fan-monitor - -[Install] -WantedBy=obmc-chassis-poweron@%i.target diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor@.service b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor@.service deleted file mode 100644 index ddecfba3c..000000000 --- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-monitor@.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Phosphor Fan Monitor Daemon -Conflicts=obmc-chassis-powered-off@%i.target - -[Service] -Restart=on-failure -ExecStart=/usr/bin/env phosphor-fan-monitor --monitor -SyslogIdentifier=phosphor-fan-monitor - -[Install] -RequiredBy=obmc-fan-control-ready@%i.target diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-presence-tach@.service b/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-presence-tach@.service deleted file mode 100644 index a324740c5..000000000 --- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-fan/phosphor-fan-presence-tach@.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Phosphor Fan Presence Tach Daemon -Wants=obmc-power-on@%i.target -After=obmc-power-on@%i.target -Conflicts=obmc-chassis-powered-off@%i.target - -[Service] -Restart=on-failure -ExecStart=/usr/bin/env phosphor-fan-presence-tach -SyslogIdentifier=phosphor-fan-presence-tach - -[Install] -RequiredBy=obmc-chassis-poweron@%i.target diff --git a/meta-phosphor/common/recipes-phosphor/fans/phosphor-pid-control.bb b/meta-phosphor/common/recipes-phosphor/fans/phosphor-pid-control.bb deleted file mode 100644 index 28ad04b28..000000000 --- a/meta-phosphor/common/recipes-phosphor/fans/phosphor-pid-control.bb +++ /dev/null @@ -1,52 +0,0 @@ -HOMEPAGE = "github.com/openbmc/phosphor-pid-control" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -SUMMARY = "Phosphor PID Fan Control" -DESCRIPTION = "Fan Control" -PR = "r1" - -SRC_URI = "git://github.com/openbmc/phosphor-pid-control" -SRCREV = "e2ec0f618a9b3b6809a98516abe63d5d833e7fe7" -S = "${WORKDIR}/git" - -inherit autotools pkgconfig -inherit pythonnative - -inherit phosphor-pid-control -inherit obmc-phosphor-ipmiprovider-symlink - -# Each platform will need a service file that starts -# at an appropriate time per system. For instance, if -# your system relies on passive dbus for fans or other -# sensors then it may be prudent to wait for all of them. - -DEPENDS += "autoconf-archive-native" -DEPENDS += "python-pyyaml-native" -DEPENDS += "python-mako-native" -DEPENDS += "sdbusplus" -DEPENDS += "phosphor-logging" -DEPENDS += "libevdev" -DEPENDS += "libconfig" - -# We depend on someone providing their system's configuration. -DEPENDS += "virtual/phosphor-fans-sensor-inventory" -# We depend on this to be built first so we can build our providers. -DEPENDS += "phosphor-ipmi-host" - -RDEPENDS_${PN} += "sdbusplus phosphor-dbus-interfaces" - -FILES_${PN} = "${sbindir}/swampd ${sbindir}/setsensor" - -# The following installs the OEM IPMI handler for the fan controls. -FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" -FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}" -FILES_${PN}_append = " ${libdir}/net-ipmid/lib*${SOLIBS}" -FILES_${PN}-dev_append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la" - -EXTRA_OECONF = "SENSOR_YAML_GEN=${STAGING_DIR_NATIVE}${sensor_datadir}/sensor-list.yaml \ - PID_YAML_GEN=${STAGING_DIR_NATIVE}${sensor_datadir}/pid-list.yaml \ - ZONE_YAML_GEN=${STAGING_DIR_NATIVE}${sensor_datadir}/zone-info.yaml" - -HOSTIPMI_PROVIDER_LIBRARY += "libmanualcmds.so" diff --git a/meta-phosphor/common/recipes-phosphor/flash/files/OpenBMC.priv b/meta-phosphor/common/recipes-phosphor/flash/files/OpenBMC.priv deleted file mode 100644 index 223d31809..000000000 --- a/meta-phosphor/common/recipes-phosphor/flash/files/OpenBMC.priv +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAPvSDLu6slkP1gri -PaeQXL9ysD69J/HjbBCIQ0RPfeWBb75US1tRTjPP0Ub8CtH8ExVf8iF1ulsZA78B -zIjBYZVp9pyD6LbpZ/hjV7rIH6dTNhoVpdA+F8LzmQ7cyhHG8l2JMvdunwF2uX5k -D4WDcZt/ITKZNQNavPtmIyD5HprdAgMBAAECgYEAuQkTSi5ZNpAoWz76xtGRFSwU -zUT4wQi3Mz6tDtjKTYXasiQGa0dHC1M9F8fDu6BZ9W7W4Dc9hArRcdzEighuxoI/ -nZI/0uL89iUEywnDEIHuS6D5JlZaj86/nx9YvQnO8F/seM+MX0EAWVrd5wC7aAF1 -h6Fu7ykZB4ggUjQAWwECQQD+AUiDOEO+8btLJ135dQfSGc5VFcZiequnKWVm6uXt -rX771hEYjYMjLqWGFg9G4gE3GuABM5chMINuQQUivy8tAkEA/cxfy19XkjtqcMgE -x/UDt6Nr+Ky/tk+4Y65WxPRDas0uxFOPk/vEjgVmz1k/TAy9G4giisluTvtmltr5 -DCLocQJBAJnRHx9PiD7uVhRJz6/L/iNuOzPtTsi+Loq5F83+O6T15qsM1CeBMsOw -cM5FN5UeMcwz+yjfHAsePMkcmMaU7jUCQHlg9+N8upXuIo7Dqj2zOU7nMmkgvSNE -5yuNImRZabC3ZolwaTdd7nf5r1y1Eyec5Ag5yENV6JKPe1Xkbb1XKJECQDngA0h4 -6ATvfP1Vrx4CbP11eKXbCsZ9OGPHSgyvVjn68oY5ZP3uPsIattoN7dE2BRfuJm7m -F0nIdUAhR0yTfKM= ------END PRIVATE KEY----- diff --git a/meta-phosphor/common/recipes-phosphor/flash/files/obmc-phosphor-flashd.py b/meta-phosphor/common/recipes-phosphor/flash/files/obmc-phosphor-flashd.py deleted file mode 100644 index 5e5dd8f36..000000000 --- a/meta-phosphor/common/recipes-phosphor/flash/files/obmc-phosphor-flashd.py +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env python - -# Contributors Listed Below - COPYRIGHT 2015 -# [+] International Business Machines Corp. -# -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. See the License for the specific language governing -# permissions and limitations under the License. - -import time -import sys -import dbus -import dbus.service -import dbus.mainloop.glib - -if __name__ == '__main__': - print "obmc-phosphor-flashd starting..." - - while 1: - time.sleep(5) diff --git a/meta-phosphor/common/recipes-phosphor/flash/files/obmc-phosphor-flashd.service b/meta-phosphor/common/recipes-phosphor/flash/files/obmc-phosphor-flashd.service deleted file mode 100644 index 3a7f3d53a..000000000 --- a/meta-phosphor/common/recipes-phosphor/flash/files/obmc-phosphor-flashd.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Phosphor Flash Controller - -[Service] -Restart=always -ExecStart=/usr/bin/env obmc-phosphor-flashd -SyslogIdentifier=obmc-phosphor-flashd - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios.bb b/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios.bb deleted file mode 100644 index f42bef443..000000000 --- a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "OpenBMC org.openbmc.Flash example implementation" -DESCRIPTION = "A sample implementation for the org.openbmc.Flash DBUS API. \ -org.openbmc.Flash provides APIs for functions like BIOS flash access control \ -and updating." -PR = "r1" - -inherit skeleton-gdbus -inherit obmc-phosphor-dbus-service -inherit pkgconfig - -SKELETON_DIR = "flashbios" -DBUS_SERVICE_${PN} += "org.openbmc.control.Flash.service" -SYSTEMD_SERVICE_${PN} += "obmc-flash-init.service" diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-init.service b/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-init.service deleted file mode 100644 index de196d0ea..000000000 --- a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-init.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Initialize BIOS Flash -Wants=mapper-wait@-org-openbmc-control-flash-bios.service -After=mapper-wait@-org-openbmc-control-flash-bios.service - -[Service] -Restart=no -ExecStart=/bin/sh -c "busctl call `mapper get-service /org/openbmc/control/flash/bios` /org/openbmc/control/flash/bios org.openbmc.Flash init" -SyslogIdentifier=obmc-flash-init - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/org.openbmc.control.Flash.service b/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/org.openbmc.control.Flash.service deleted file mode 100644 index 842add34d..000000000 --- a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/org.openbmc.control.Flash.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Phosphor BIOS Code Update -Wants=mapper-wait@-org-openbmc-managers-Download.service -After=mapper-wait@-org-openbmc-managers-Download.service - -[Service] -Restart=always -ExecStart=/usr/bin/env flash_bios.exe -SyslogIdentifier=flash_bios.exe -Type=dbus -BusName={BUSNAME} - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bmc.bb b/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bmc.bb deleted file mode 100644 index 5cf385513..000000000 --- a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bmc.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "OpenBMC BMC update utility" -DESCRIPTION = "OpenBMC BMC update utility." -PR = "r1" - -inherit skeleton-python -inherit obmc-phosphor-dbus-service - -RDEPENDS_${PN} += "\ - python-dbus \ - python-compression \ - python-shell \ - python-pygobject \ - python-subprocess \ - python-io \ - pyphosphor-dbus \ - " - -SKELETON_DIR = "pyflashbmc" -DBUS_SERVICE_${PN} += "org.openbmc.control.BmcFlash.service" diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bmc/org.openbmc.control.BmcFlash.service b/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bmc/org.openbmc.control.BmcFlash.service deleted file mode 100644 index bb97d8ab9..000000000 --- a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bmc/org.openbmc.control.BmcFlash.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Phosphor BMC Code Update -Wants=mapper-wait@-org-openbmc-managers-Download.service -After=mapper-wait@-org-openbmc-managers-Download.service - -[Service] -Restart=always -ExecStart=/usr/bin/env bmc_update.py -SyslogIdentifier=bmc_update.py -Environment="PYTHONUNBUFFERED=1" -Type=dbus -BusName={BUSNAME} - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-mgr-download.bb b/meta-phosphor/common/recipes-phosphor/flash/obmc-mgr-download.bb deleted file mode 100644 index a608b0ab2..000000000 --- a/meta-phosphor/common/recipes-phosphor/flash/obmc-mgr-download.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "OpenBMC org.openbmc.managers.Download example implementation" -DESCRIPTION = "An example implementation for the org.openbmc.managers.Download DBUS API." -PR = "r1" - -inherit skeleton-python -inherit obmc-phosphor-dbus-service - -RDEPENDS_${PN} += "\ - python-dbus \ - python-pygobject \ - python-subprocess \ - pyphosphor-dbus \ - " - -SKELETON_DIR = "pydownloadmgr" -DBUS_SERVICE_${PN} += "org.openbmc.managers.Download.service" diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-mgr-download/org.openbmc.managers.Download.service b/meta-phosphor/common/recipes-phosphor/flash/obmc-mgr-download/org.openbmc.managers.Download.service deleted file mode 100644 index f3ff75dfe..000000000 --- a/meta-phosphor/common/recipes-phosphor/flash/obmc-mgr-download/org.openbmc.managers.Download.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Phosphor Download Manager - -[Service] -Restart=always -ExecStart=/usr/bin/env download_manager.py -SyslogIdentifier=download_manager.py -Environment="PYTHONUNBUFFERED=1" -Type=dbus -BusName={BUSNAME} - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-op-flasher.bb b/meta-phosphor/common/recipes-phosphor/flash/obmc-op-flasher.bb deleted file mode 100644 index e70c35474..000000000 --- a/meta-phosphor/common/recipes-phosphor/flash/obmc-op-flasher.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "OpenPOWER flashing utility." -DESCRIPTION = "A BMC/BIOS flashing utility for use on OpenPOWER system." -PR = "r1" - -inherit skeleton-gdbus -inherit pkgconfig - -DEPENDS += "pflash" -RDEPENDS_${PN} += "pflash" - -SKELETON_DIR = "op-flasher" diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-phosphor-flashd.bb b/meta-phosphor/common/recipes-phosphor/flash/obmc-phosphor-flashd.bb deleted file mode 100644 index 64a47a6cd..000000000 --- a/meta-phosphor/common/recipes-phosphor/flash/obmc-phosphor-flashd.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "Phosphor OpenBMC Flash Management" -DESCRIPTION = "Phosphor OpenBMC flash management reference implementation." -PR = "r1" - -inherit obmc-phosphor-pydbus-service - -PROVIDES += "virtual/obmc-flash-mgmt" -RPROVIDES_${PN} += "virtual-obmc-flash-mgmt" - -S = "${WORKDIR}" -SRC_URI += "file://${PN}.py" diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-image-signing.bb b/meta-phosphor/common/recipes-phosphor/flash/phosphor-image-signing.bb deleted file mode 100644 index 897bfdea4..000000000 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-image-signing.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "OpenBMC image signing public key" -DESCRIPTION = "Public key information to be included in images for image verification." -PR = "r1" - -inherit allarch -inherit obmc-phosphor-license - -INSECURE_KEY = "${@'${SIGNING_KEY}' == '${STAGING_DIR_NATIVE}${datadir}/OpenBMC.priv'}" - -DEPENDS += "openssl-native" -DEPENDS += "${@oe.utils.conditional('INSECURE_KEY', 'True', 'phosphor-insecure-signing-key-native', '', d)}" - -FILES_${PN} += "${sysconfdir}/activationdata/" - -SIGNING_KEY ?= "${STAGING_DIR_NATIVE}${datadir}/OpenBMC.priv" -SIGNING_KEY_TYPE = "${@os.path.splitext(os.path.basename('${SIGNING_KEY}'))[0]}" - -do_install() { - openssl pkey -in "${SIGNING_KEY}" -pubout -out ${WORKDIR}/publickey - echo HashType=RSA-SHA256 > "${WORKDIR}/hashfunc" - - idir="${D}${sysconfdir}/activationdata/${SIGNING_KEY_TYPE}" - - install -d ${idir} - install -m 644 ${WORKDIR}/publickey ${idir} - install -m 644 ${WORKDIR}/hashfunc ${idir} -} - -SYSROOT_DIRS_append = " ${sysconfdir}" diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-insecure-signing-key-native.bb b/meta-phosphor/common/recipes-phosphor/flash/phosphor-insecure-signing-key-native.bb deleted file mode 100644 index 55ebe5779..000000000 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-insecure-signing-key-native.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Insecure private key for testing and development" -DESCRIPTION = "Do not use this key to sign images." -PR = "r1" - -inherit allarch -inherit native -inherit obmc-phosphor-license - -SRC_URI += "file://OpenBMC.priv" - -do_install() { - bbplain "Using an insecure image signing key!" - install -d ${D}${datadir} - install -m 400 ${WORKDIR}/OpenBMC.priv ${D}${datadir} -} diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-logging-error-logs-native.bbappend b/meta-phosphor/common/recipes-phosphor/flash/phosphor-logging-error-logs-native.bbappend deleted file mode 100644 index beb70b0e6..000000000 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-logging-error-logs-native.bbappend +++ /dev/null @@ -1 +0,0 @@ -DEPENDS += "phosphor-software-manager-error-native" diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager-error-native.bb b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager-error-native.bb deleted file mode 100644 index bf55058de..000000000 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager-error-native.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Copy error yaml files to known path for elog parsing" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" - -inherit native -inherit phosphor-dbus-yaml - -require phosphor-software-manager.inc - -S = "${WORKDIR}/git" - -do_install_append() { - SRC=${S}/xyz/openbmc_project/Software/ - DEST=${D}${yaml_dir}/xyz/openbmc_project/Software/ - install -d ${DEST} - install ${SRC}/*.errors.yaml ${DEST} - install ${SRC}/*.metadata.yaml ${DEST} -} diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb deleted file mode 100644 index 0b6723c89..000000000 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb +++ /dev/null @@ -1,104 +0,0 @@ -SUMMARY = "Phosphor Software Management" -DESCRIPTION = "Phosphor Software Manager provides a set of system software \ -management daemons. It is suitable for use on a wide variety of OpenBMC \ -platforms." -PR = "r1" - -require ${PN}.inc - -SOFTWARE_MGR_PACKAGES = " \ - ${PN}-version \ - ${PN}-download-mgr \ - ${PN}-updater \ - ${PN}-updater-ubi \ - ${PN}-sync \ -" -PACKAGE_BEFORE_PN += "${SOFTWARE_MGR_PACKAGES}" -ALLOW_EMPTY_${PN} = "1" - -DBUS_PACKAGES = "${SOFTWARE_MGR_PACKAGES}" - -# Set SYSTEMD_PACKAGES to empty because we do not want ${PN} and DBUS_PACKAGES -# handles the rest. -SYSTEMD_PACKAGES = "" - -PACKAGECONFIG[verify_signature] = "--enable-verify_signature,--disable-verify_signature" -PACKAGECONFIG[sync_bmc_files] = "--enable-sync_bmc_files,--disable-sync_bmc_files" -PACKAGECONFIG[ubifs_layout] = "--enable-ubifs_layout" - -inherit autotools pkgconfig -inherit obmc-phosphor-dbus-service -inherit pythonnative -inherit ${@bb.utils.contains('DISTRO_FEATURES', 'obmc-ubi-fs', 'phosphor-software-manager-ubi-fs', '', d)} - -DEPENDS += " \ - autoconf-archive-native \ - sdbusplus \ - phosphor-dbus-interfaces \ - phosphor-logging \ - sdbus++-native \ -" - -RDEPENDS_${PN}-version += " \ - phosphor-logging \ - phosphor-dbus-interfaces \ - sdbusplus \ -" -RDEPENDS_${PN}-download-mgr += " \ - phosphor-logging \ - phosphor-dbus-interfaces \ - sdbusplus \ -" -RDEPENDS_${PN}-updater += " \ - bash \ - phosphor-logging \ - phosphor-dbus-interfaces \ - sdbusplus \ - virtual-obmc-image-manager \ -" -EXTRA_OECONF += " \ - ACTIVE_BMC_MAX_ALLOWED=1 \ - MEDIA_DIR=/run/media \ -" - -RPROVIDES_${PN}-version += " \ - virtual-obmc-image-manager \ -" - -FILES_${PN}-version += "${sbindir}/phosphor-version-software-manager ${exec_prefix}/lib/tmpfiles.d/software.conf" -FILES_${PN}-download-mgr += "${sbindir}/phosphor-download-manager" -FILES_${PN}-updater += " \ - ${sbindir}/phosphor-image-updater \ - ${sbindir}/obmc-flash-bmc \ - " -FILES_${PN}-sync += " \ - ${sbindir}/phosphor-sync-software-manager \ - ${sysconfdir}/synclist \ - " -DBUS_SERVICE_${PN}-version += "xyz.openbmc_project.Software.Version.service" -DBUS_SERVICE_${PN}-download-mgr += "xyz.openbmc_project.Software.Download.service" -DBUS_SERVICE_${PN}-updater += "xyz.openbmc_project.Software.BMC.Updater.service" -DBUS_SERVICE_${PN}-sync += "xyz.openbmc_project.Software.Sync.service" - -SYSTEMD_SERVICE_${PN}-updater += " \ - obmc-flash-bmc-setenv@.service \ -" - -SRC_URI += "file://software.conf" -SRC_URI += "file://obmc-flash-bmc" - -do_install_append() { - install -d ${D}${sbindir} - install -m 0755 ${WORKDIR}/obmc-flash-bmc ${D}${sbindir}/obmc-flash-bmc - - # /tmp/images is the software image upload directory. - # It should not be deleted since it is watched by the Image Manager - # for new images. - - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true', 'false', d)}; then - install -d ${D}${exec_prefix}/lib/tmpfiles.d - install -m 644 ${WORKDIR}/software.conf ${D}${exec_prefix}/lib/tmpfiles.d/ - fi -} - -S = "${WORKDIR}/git" diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.inc b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.inc deleted file mode 100644 index 8e4a2b59a..000000000 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.inc +++ /dev/null @@ -1,5 +0,0 @@ -HOMEPAGE = "https://github.com/openbmc/phosphor-bmc-code-mgmt" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -SRC_URI += "git://github.com/openbmc/phosphor-bmc-code-mgmt" -SRCREV = "76c79df3fca0842ec9dd38f9627913cf5c64001e" diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc deleted file mode 100644 index 0b1b16ed3..000000000 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc +++ /dev/null @@ -1,516 +0,0 @@ -#!/bin/bash -set -eo pipefail - -# Get the root mtd device number (mtdX) from "/dev/ubiblockX_Y on /" -findrootmtd() { - rootmatch=" on / " - m="$(mount | grep "${rootmatch}" | grep "ubiblock")" - m="${m##*ubiblock}" - m="${m%_*}" - if [ -z "${m}" ]; then - # default to bmc mtd (0) - m=0 - fi - echo "mtd${m}" -} - -findrootubi() { - rootmatch=" on / " - m="$(mount | grep "${rootmatch}")" - m="${m##*ubiblock}" - m="${m% on*}" - echo "ubi${m}" -} - -# Get the mtd device number (mtdX) -findmtd() { - m="$(grep -xl "$1" /sys/class/mtd/*/name)" - m="${m%/name}" - m="${m##*/}" - echo "${m}" -} - -# Get the mtd device number only (return X of mtdX) -findmtdnum() { - m="$(findmtd "$1")" - m="${m##mtd}" - echo "${m}" -} - -# Get the ubi device number (ubiX_Y) -findubi() { - u="$(grep -xl "$1" /sys/class/ubi/ubi?/subsystem/ubi*/name)" - u="${u%/name}" - u="${u##*/}" - echo "${u}" -} - -# Get the ubi device number (ubiX_Y) on a specific mtd -findubi_onmtd() { - u="$(grep -xl "$1" /sys/class/ubi/ubi"$2"/subsystem/ubi"$2"*/name)" - u="${u%/name}" - u="${u##*/}" - echo "${u}" -} - -# Get all ubi device names on a specific mtd that match requested string -findubiname_onmtd() { - u="$(grep -h "$1" /sys/class/ubi/ubi"$2"/subsystem/ubi"$2"*/name)" - u="${u%/name}" - u="${u##*/}" - echo "${u}" -} - -# Get the name from the requested ubiX_Y volume -findname() { - n="$(cat /sys/class/ubi/$1/name)" - echo "${n}" -} - -# Set the u-boot envs that perform a side switch on failure to boot -set_wdt2bite() { - if ! fw_printenv wdt2bite 2>/dev/null; then - fw_setenv wdt2bite "mw.l 0x1e785024 0xa 1; mw.b 0x1e78502c 0xb3 1" - fw_setenv bootalt "run wdt2bite" - fw_setenv obmc_bootcmd "ubi part obmc-ubi; run do_rwreset; ubi read \ -\${loadaddr} \${kernelname}; bootm \${loadaddr} || run bootalt" - fi -} - -# Make space on flash before creating new volumes. This can be enhanced -# determine current flash usage. For now only keep a "keepmax" number of them -ubi_remove_volumes() -{ - rootubi="$(findrootubi)" - rootname="$(findname "${rootubi}")" - rootversion="${rootname##*-}" - rootkernel="kernel-${rootversion}" - - # Just keep max number of volumes before updating, don't delete the version - # the BMC is booted from, and when a version is identified to be deleted, - # delete both the rofs and kernel volumes for that version. - rmnames="$(findubiname_onmtd "${name%-*}-" "${ro}")" - rmnames=(${rmnames}) - ubicount="${#rmnames[@]}" - while [ ${ubicount} -ge ${keepmax} ]; do - # Loop through existing volumes and skip currently active ones - for (( index=0; index<${#rmnames[@]}; index++ )); do - rmname="${rmnames[${index}]}" - rmversion="${rmname##*-}" - [ "${rmversion}" == "${version}" ] && continue - rmubi="$(findubi_onmtd "rofs-${rmversion}" "${ro}")" - if [[ ( "${rmubi}" != "${rootubi}" ) && - ( "${rmname}" != "${rootkernel}" ) ]]; then - ubi_remove "rofs-${rmversion}" "${ro}" - ubi_remove "kernel-${rmversion}" "${ro}" - # Remove priority value - fw_setenv "${rmversion}" - break - fi - done - # Decrease count regardless to avoid an infinite loop - (( ubicount-- )) - done -} - -ubi_rw() { - rwmtd="$(findmtd "${reqmtd}")" - rw="${rwmtd#mtd}" - ubidev="/dev/ubi${rw}" - - # Update rwfs_size, check imgsize was specified, otherwise it'd clear the var - if [ ! -z "$imgsize" ]; then - rwsize="$(fw_printenv -n rwfs_size 2>/dev/null)" || true - if [[ "${imgsize}" != "${rwsize}" ]]; then - fw_setenv rwfs_size "${imgsize}" - fi - fi - - vol="$(findubi "${name}")" - if [ -z "${vol}" ]; then - ubimkvol "${ubidev}" -N "${name}" -s "${imgsize}" - fi -} - -ubi_ro() { - keepmax=2 # Default 2 volumes per mtd - romtd="$(findmtd "${reqmtd}")" - romtd2="$(findmtd "${reqmtd2}")" - - if [ ! "${romtd}" == "${romtd2}" ]; then - # Request to use alternate mtd device, choose the non-root one - keepmax=1 # 1 volume on each of the requested mtds - rootmtd="$(findrootmtd)" - if [ "${rootmtd}" == "${romtd}" ]; then - romtd="${romtd2}" - fi - fi - ro="${romtd#mtd}" - ubidev="/dev/ubi${ro}" - - ubi_remove_volumes - - if [ -z "${imgfile}" ]; then - echo "Unable to create read-only volume. Image file not specified." - return 1 - fi - - # Create a ubi volume, dynamically sized to fit BMC image if size unspecified - img="/tmp/images/${version}/${imgfile}" - imgsize="$(stat -c '%s' ${img})" - - vol="$(findubi "${name}")" - if [ ! -z "${vol}" ]; then - # Allow a duplicate kernel volume on the alt mtd - if [[ "${name}" =~ "kernel" ]]; then - vol="$(findubi_onmtd "${name}" "${ro}")" - fi - fi - if [ -z "${vol}" ]; then - ubimkvol "${ubidev}" -N "${name}" -s "${imgsize}" --type=static - vol="$(findubi "${name}")" - fi -} - -# Squashfs images need a ubi block -ubi_block() { - vol="$(findubi "${name}")" - ubidevid="${vol#ubi}" - block="/dev/ubiblock${ubidevid}" - if [ ! -e "$block" ]; then - ubiblock --create "/dev/ubi${ubidevid}" - fi -} - -ubi_updatevol() { - vol="$(findubi "${name}")" - ubidevid="${vol#ubi}" - img="/tmp/images/${version}/${imgfile}" - ubiupdatevol "/dev/ubi${ubidevid}" "${img}" -} - -ubi_remove() { - rmname="$1" - rmmtd="$2" - if [ ! -z "${rmmtd}" ]; then - vol="$(findubi_onmtd "${rmname}" "${rmmtd}")" - else - vol="$(findubi "${rmname}")" - fi - - if [ ! -z "$vol" ]; then - vol="${vol%_*}" - - if grep -q "$rmname" /proc/mounts; then - mountdir=$(grep "$rmname" /proc/mounts | cut -d " " -f 2) - umount "$mountdir" - rm -r "$mountdir" - fi - - ubirmvol "/dev/${vol}" -N "$rmname" - fi -} - -ubi_cleanup() { - # When ubi_cleanup is run, it expects one or no active version. - activeVersion=$(busctl --list --no-pager tree \ - xyz.openbmc_project.Software.BMC.Updater | \ - grep /xyz/openbmc_project/software/ | tail -c 9) - - if [[ -z "$activeVersion" ]]; then - vols=$(ubinfo -a | grep "rofs-" | cut -c 14-) - vols=(${vols}) - else - vols=$(ubinfo -a | grep "rofs-" | \ - grep -v "$activeVersion" | cut -c 14-) - vols=(${vols}) - fi - - for (( index=0; index<${#vols[@]}; index++ )); do - ubi_remove ${vols[index]} - done -} - -mount_alt_rwfs() { - altNum="$(findmtdnum "alt-bmc")" - if [ ! -z "${altNum}" ]; then - altRwfs=$(ubinfo -a -d ${altNum} | grep -w "rwfs") || true - if [ ! -z "${altRwfs}" ]; then - altVarMount="/media/alt/var" - mkdir -p "${altVarMount}" - if mount ubi"${altNum}":rwfs "${altVarMount}" -t ubifs -o defaults; then - mkdir -p "${altVarMount}"/persist/etc - fi - fi - fi -} - -remount_ubi() { - bmcmtd="$(findmtd "bmc")" - altbmcmtd="$(findmtd "alt-bmc")" - mtds="${bmcmtd: -1}","${altbmcmtd: -1}" - - IFS=',' read -r -a mtds <<< "$mtds" - mtds=($(echo "${mtds[@]}" | tr ' ' '\n' | sort -u | tr '\n' ' ')) - for mtd in ${mtds[@]}; do - # Get information on all ubi volumes - ubinfo=$(ubinfo -d ${mtd}) - presentVolumes=${ubinfo##*:} - IFS=', ' read -r -a array <<< "$presentVolumes" - for element in ${array[@]}; do - elementProperties=$(ubinfo -d $mtd -n $element) - # Get ubi volume name by getting rid of additional properties - name=${elementProperties#*Name:} - name="${name%Character*}" - name="$(echo -e "${name}" | tr -d '[:space:]')" - - if [[ ${name} == rofs-* ]]; then - mountdir="/media/${name}" - - if [ ! -d ${mountdir} ]; then - mkdir -p "${mountdir}" - # U-Boot will create the ubiblock for the running version, but not - # for the version on the other chip - if [ ! -e "/dev/ubiblock${mtd}_${element}" ]; then - ubiblock --create /dev/ubi${mtd}_${element} - fi - mount -t squashfs -o ro "/dev/ubiblock${mtd}_${element}" "${mountdir}" - fi - fi - done - done - - set_wdt2bite -} - -# Read the current env variable and set it on the alternate boot env -copy_env_var_to_alt() { - varName=$1 - value="$(fw_printenv -n "${varName}")" - fw_setenv -c /etc/alt_fw_env.config "${varName}" "${value}" -} - -# When the alternate bmc chip boots, u-boot thinks its the primary mtdX. -# Therefore need to swap the chip numbers when copying the ubiblock and root to -# alternate bmc u-boot environment. -copy_ubiblock_to_alt() { - value="$(fw_printenv -n ubiblock)" - bmcNum="$(findmtdnum "bmc")" - altNum="$(findmtdnum "alt-bmc")" - replaceAlt="${value/${altNum},/${bmcNum},}" - - if [[ "${value}" == "${replaceAlt}" ]]; then - replaceBmc="${value/${bmcNum},/${altNum},}" - value=${replaceBmc} - else - value=${replaceAlt} - fi - - fw_setenv -c /etc/alt_fw_env.config ubiblock "${value}" -} - -copy_root_to_alt() { - value="$(fw_printenv -n root)" - bmcNum="$(findmtdnum "bmc")" - altNum="$(findmtdnum "alt-bmc")" - replaceAlt="${value/${altNum}_/${bmcNum}_}" - - if [[ "${value}" == "${replaceAlt}" ]]; then - replaceBmc="${value/${bmcNum}_/${altNum}_}" - value=${replaceBmc} - else - value=${replaceAlt} - fi - - fw_setenv -c /etc/alt_fw_env.config root "${value}" -} - -ubi_setenv() { - # The U-Boot environment maintains two banks of environment variables. - # The banks need to be consistent with each other to ensure that these - # variables can reliably be read from file. In order to guarantee that the - # banks are both correct, we need to run fw_setenv twice. - variable=$1 - if [[ "$variable" == *"="* ]]; then - varName="${variable%=*}" - value="${variable##*=}" - # Write only if var is not set already to the requested value - currentValue="$(fw_printenv -n "${varName}" 2>/dev/null)" || true - if [[ "${currenValue}" != "${value}" ]]; then - fw_setenv "$varName" "$value" - fw_setenv "$varName" "$value" - fi - else - fw_setenv "$variable" - fw_setenv "$variable" - fi -} - -mtd_write() { - flashmtd="$(findmtd "${reqmtd}")" - img="/tmp/images/${version}/${imgfile}" - flashcp -v ${img} /dev/${flashmtd} -} - -backup_env_vars() { - copy_env_var_to_alt kernelname - copy_ubiblock_to_alt - copy_root_to_alt -} - -update_env_vars() { - vol="$(findubi rofs-"${version}")" - if [ -z "${vol}" ]; then - return 1 - fi - ubidevid="${vol#ubi}" - block="/dev/ubiblock${ubidevid}" - if [ ! -e "${block}" ]; then - return 1 - fi - ubi_setenv "kernelname=kernel-${version}" - ubi_setenv "ubiblock=$(echo "${ubidevid}" | sed 's/_/,/')" - ubi_setenv "root=${block}" -} - -#TODO: Replace the implementation with systemd-inhibitors lock -# once systemd/systemd#949 is resolved -rebootguardenable() { - dir="/run/systemd/system/" - file="reboot-guard.conf" - units=("reboot" "poweroff" "halt") - - for unit in "${units[@]}"; do - mkdir -p ${dir}${unit}.target.d - echo -e "[Unit]\nRefuseManualStart=yes" >> ${dir}${unit}.target.d/${file} - done -} - -#TODO: Replace the implementation with systemd-inhibitors lock -# once systemd/systemd#949 is resolved -rebootguarddisable() { - dir="/run/systemd/system/" - file="reboot-guard.conf" - units=("reboot" "poweroff" "halt") - - for unit in "${units[@]}"; do - rm -rf ${dir}${unit}.target.d/${file} - done -} - -# Create a copy in the alt mtd -create_vol_in_alt() { - alt="alt-bmc" - altmtd="$(findmtd "${alt}")" - if [ ! -z "${altmtd}" ]; then - reqmtd="${alt}" - reqmtd2="${alt}" - ubi_ro - ubi_updatevol - fi -} - -# Copy contents of one MTD device to another -mtd_copy() { - in=$1 - out=$2 - - # Must erase MTD first to prevent corruption - flash_eraseall "${out}" - dd if="${in}" of="${out}" -} - -mirroruboot() { - bmc="$(findmtd "u-boot")" - bmcdev="/dev/${bmc}" - alt="$(findmtd "alt-u-boot")" - altdev="/dev/${alt}" - - checksum_bmc="$(md5sum "${bmcdev}")" - checksum_bmc="${checksum_bmc% *}" - checksum_alt="$(md5sum "${altdev}")" - checksum_alt="${checksum_alt% *}" - - if [[ "${checksum_bmc}" != "${checksum_alt}" ]]; then - bmcenv="$(findmtd "u-boot-env")" - bmcenvdev="/dev/${bmcenv}" - altenv="$(findmtd "alt-u-boot-env")" - altenvdev="/dev/${altenv}" - - echo "Mirroring U-boot to alt chip" - mtd_copy "${bmcdev}" "${altdev}" - mtd_copy "${bmcenvdev}" "${altenvdev}" - - copy_ubiblock_to_alt - copy_root_to_alt - fi -} - -case "$1" in - mtduboot) - reqmtd="$2" - version="$3" - imgfile="image-u-boot" - mtd_write - ;; - ubirw) - reqmtd="$2" - name="$3" - imgsize="$4" - ubi_rw - ;; - ubiro) - reqmtd="$(echo "$2" | cut -d "+" -f 1)" - reqmtd2="$(echo "$2" | cut -d "+" -f 2)" - name="$3" - version="$4" - imgfile="image-rofs" - ubi_ro - ubi_updatevol - ubi_block - ;; - ubikernel) - reqmtd="$(echo "$2" | cut -d "+" -f 1)" - reqmtd2="$(echo "$2" | cut -d "+" -f 2)" - name="$3" - version="$4" - imgfile="image-kernel" - ubi_ro - ubi_updatevol - create_vol_in_alt - ;; - ubiremove) - name="$2" - ubi_remove "${name}" - ;; - ubicleanup) - ubi_cleanup - ;; - ubisetenv) - ubi_setenv "$2" - ;; - ubiremount) - remount_ubi - mount_alt_rwfs - ;; - createenvbackup) - backup_env_vars - ;; - updateubootvars) - version="$2" - update_env_vars - ;; - rebootguardenable) - rebootguardenable - ;; - rebootguarddisable) - rebootguarddisable - ;; - mirroruboot) - mirroruboot - ;; - *) - echo "Invalid argument" - exit 1 - ;; -esac diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-cleanup.service b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-cleanup.service deleted file mode 100644 index f8c9135a1..000000000 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-cleanup.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Clean up UBI volumes unattached to a BMC version after DeleteAll - -[Service] -Type=oneshot -RemainAfterExit=no -ExecStartPre=/usr/bin/env obmc-flash-bmc createenvbackup -ExecStart=/usr/bin/env obmc-flash-bmc ubicleanup -SyslogIdentifier=obmc-flash-bmc diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-mirroruboot.service b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-mirroruboot.service deleted file mode 100644 index 361dd61cd..000000000 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-mirroruboot.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Copy uboot from the currently booted bmc chip to the alternate chip - -[Service] -Type=oneshot -RemainAfterExit=no -ExecStart=/usr/bin/env obmc-flash-bmc mirroruboot -SyslogIdentifier=obmc-flash-bmc diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-setenv@.service b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-setenv@.service deleted file mode 100644 index 73b55d4f3..000000000 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-setenv@.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Set U-Boot environment variable - -[Service] -Type=oneshot -RemainAfterExit=no -ExecStart=/usr/bin/env obmc-flash-bmc ubisetenv %I -SyslogIdentifier=obmc-flash-bmc diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiremount.service b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiremount.service deleted file mode 100644 index 388bb1a0d..000000000 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiremount.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Remount the ubi volume after a reboot -Wants=xyz.openbmc_project.Software.BMC.Updater.service -Before=xyz.openbmc_project.Software.BMC.Updater.service -Wants=obmc-flash-bmc-setenv@rwreset.service -After=obmc-flash-bmc-setenv@rwreset.service - -[Service] -Type=oneshot -RemainAfterExit=no -ExecStart=/usr/bin/env obmc-flash-bmc ubiremount -SyslogIdentifier=obmc-flash-bmc - -[Install] -WantedBy=multi-user.target diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro-remove@.service b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro-remove@.service deleted file mode 100644 index 42aa026b9..000000000 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro-remove@.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Deletes read-only and kernel ubi volume %I - -[Service] -Type=oneshot -RemainAfterExit=no -ExecStart=/usr/bin/env obmc-flash-bmc ubiremove rofs-%i -ExecStart=/usr/bin/env obmc-flash-bmc ubiremove kernel-%i -SyslogIdentifier=obmc-flash-bmc diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro@.service b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro@.service deleted file mode 100644 index 5cd8565f5..000000000 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro@.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Store read-only images %I to BMC storage -OnFailure=obmc-flash-bmc-ubiro-remove@%i.service - -[Service] -Type=oneshot -RemainAfterExit=no -ExecStartPre=/usr/bin/env obmc-flash-bmc createenvbackup -ExecStart=/usr/bin/env obmc-flash-bmc ubiro {RO_MTD} rofs-%i %i -ExecStart=/usr/bin/env obmc-flash-bmc ubikernel {KERNEL_MTD} kernel-%i %i -ExecStart=/usr/bin/env obmc-flash-bmc mtduboot u-boot %i -SyslogIdentifier=obmc-flash-bmc diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw-remove.service b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw-remove.service deleted file mode 100644 index 68c4ab256..000000000 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw-remove.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Deletes BMC read-write ubi volume - -[Service] -Type=oneshot -RemainAfterExit=no -ExecStart=/usr/bin/env obmc-flash-bmc ubiremove rwfs -SyslogIdentifier=obmc-flash-bmc diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw.service b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw.service deleted file mode 100644 index 79d0ea387..000000000 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Create BMC read-write ubi volume - -[Service] -Type=oneshot -RemainAfterExit=no -ExecStart=/usr/bin/env obmc-flash-bmc ubirw {RW_MTD} rwfs {RW_SIZE} -SyslogIdentifier=obmc-flash-bmc diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-updateubootvars@.service b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-updateubootvars@.service deleted file mode 100644 index bab0b0297..000000000 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-updateubootvars@.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description= Updates the u-boot variable to point BMC version to %I - -[Service] -Type=oneshot -RemainAfterExit=no -ExecStart=/usr/bin/env obmc-flash-bmc updateubootvars %i -SyslogIdentifier=obmc-flash-bmc diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/reboot-guard-disable.service b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/reboot-guard-disable.service deleted file mode 100644 index b09df99d3..000000000 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/reboot-guard-disable.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Removes the guard that blocks BMC reboot - -[Service] -Type=oneshot -RemainAfterExit=no -ExecStart=/usr/bin/env obmc-flash-bmc rebootguarddisable -SyslogIdentifier=obmc-flash-bmc diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/reboot-guard-enable.service b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/reboot-guard-enable.service deleted file mode 100644 index 4405e3dbb..000000000 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/reboot-guard-enable.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Enable a guard that blocks BMC reboot - -[Service] -Type=oneshot -RemainAfterExit=no -ExecStart=/usr/bin/env obmc-flash-bmc rebootguardenable -SyslogIdentifier=obmc-flash-bmc diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/software.conf b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/software.conf deleted file mode 100644 index 09ecd92e4..000000000 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/software.conf +++ /dev/null @@ -1,3 +0,0 @@ -# /tmp/images is the software image upload directory -# It should not be deleted if the UBI code update is used. -x /tmp/images diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/synclist b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/synclist deleted file mode 100644 index 8213ce6a0..000000000 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/synclist +++ /dev/null @@ -1,11 +0,0 @@ -/etc/dropbear/ -/etc/group -/etc/gshadow -/etc/hostname -/etc/machine-id -/etc/passwd -/etc/shadow -/etc/ssl/ -/etc/ssl/certs/nginx/ -/etc/ssl/private/ -/etc/systemd/network/ diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/usr-local.mount b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/usr-local.mount deleted file mode 100644 index 7aa2cf656..000000000 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/usr-local.mount +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=/usr/local - -[Mount] -What=tmpfs -Where=/usr/local -Type=tmpfs diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.BMC.Updater.service b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.BMC.Updater.service deleted file mode 100644 index ef1a1c434..000000000 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.BMC.Updater.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=OpenBMC Software Update Manager -Wants=xyz.openbmc_project.Software.Version.service -Before=xyz.openbmc_project.Software.Version.service -Wants=obmc-mapper.target -After=obmc-mapper.target - -[Service] -ExecStart=/usr/bin/env phosphor-image-updater -SyslogIdentifier=phosphor-image-updater -Restart=always -Type=dbus -BusName={BUSNAME} - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Download.service b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Download.service deleted file mode 100644 index a4934f865..000000000 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Download.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Phosphor Download Manager - -[Service] -ExecStart=/usr/bin/env phosphor-download-manager -SyslogIdentifier=phosphor-download-manager -Restart=always -Type=dbus -BusName={BUSNAME} - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Sync.service b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Sync.service deleted file mode 100644 index 1ff33a2fe..000000000 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Sync.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Phosphor Sync Manager that syncs files to the alternate BMC chip - -[Service] -ExecStart=/usr/bin/env phosphor-sync-software-manager -SyslogIdentifier=phosphor-sync-software-manager -Restart=always - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Version.service b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Version.service deleted file mode 100644 index 0141245b2..000000000 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Version.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Phosphor Version Software Manager - -[Service] -ExecStartPre=/bin/sh -c 'mkdir -p /tmp/images' -ExecStart=/usr/bin/env phosphor-version-software-manager -SyslogIdentifier=phosphor-version-software-manager -Restart=always -Type=dbus -BusName={BUSNAME} - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor.bb b/meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor.bb deleted file mode 100644 index b6b92fd6c..000000000 --- a/meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor.bb +++ /dev/null @@ -1,53 +0,0 @@ -SUMMARY = "Phosphor GPIO monitor application" -DESCRIPTION = "Application to monitor gpio assertions" -HOMEPAGE = "http://github.com/openbmc/phosphor-gpio-monitor" -PR = "r1" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -inherit autotools pkgconfig -inherit obmc-phosphor-dbus-service - -GPIO_PACKAGES = " \ - ${PN}-monitor \ - ${PN}-presence \ -" - -PACKAGE_BEFORE_PN += "${GPIO_PACKAGES}" -ALLOW_EMPTY_${PN} = "1" -SYSTEMD_PACKAGES = "${GPIO_PACKAGES}" - -RPROVIDES_${PN}-monitor += "virtual/obmc-gpio-monitor" -RPROVIDES_${PN}-presence += "virtual/obmc-gpio-presence" - -PROVIDES += "virtual/obmc-gpio-monitor" -PROVIDES += "virtual/obmc-gpio-presence" - -DEPENDS += "autoconf-archive-native" -DEPENDS += "sdbusplus sdbusplus-native" -DEPENDS += "phosphor-dbus-interfaces" -DEPENDS += "libevdev" -DEPENDS += "phosphor-logging" - -RDEPENDS_${PN}-monitor += " \ - libsystemd \ - libevdev \ - phosphor-logging \ -" -RDEPENDS_${PN}-presence += " \ - libsystemd \ - libevdev \ - phosphor-logging \ - sdbusplus \ -" - -SYSTEMD_SERVICE_${PN}-monitor += "phosphor-gpio-monitor@.service" -SYSTEMD_SERVICE_${PN}-presence += "phosphor-gpio-presence@.service" - -FILES_${PN}-monitor += "${sbindir}/phosphor-gpio-monitor" -FILES_${PN}-monitor += "${sbindir}/phosphor-gpio-util" -FILES_${PN}-presence += "${sbindir}/phosphor-gpio-presence" - -SRC_URI += "git://github.com/openbmc/phosphor-gpio-monitor" -SRCREV = "96e01b7c110219bef0b0f68b6054454ae27dee95" -S = "${WORKDIR}/git" diff --git a/meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-monitor@.service b/meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-monitor@.service deleted file mode 100644 index 8d0f4cd5b..000000000 --- a/meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-monitor@.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Phosphor GPIO %I monitor - -[Service] -Restart=no -EnvironmentFile={envfiledir}/obmc/gpio/%I -ExecStart=/usr/bin/env phosphor-gpio-monitor --path=${{DEVPATH}} --key=${{KEY}} --polarity=${{POLARITY}} --target=${{TARGET}} ${{EXTRA_ARGS}} -SyslogIdentifier=phosphor-gpio-monitor diff --git a/meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-presence@.service b/meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-presence@.service deleted file mode 100644 index df758246f..000000000 --- a/meta-phosphor/common/recipes-phosphor/gpio/phosphor-gpio-monitor/phosphor-gpio-presence@.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Phosphor GPIO %I Presence -Wants=mapper-wait@-xyz-openbmc_project-inventory.service -After=mapper-wait@-xyz-openbmc_project-inventory.service -ConditionPathExists={envfiledir}/obmc/gpio/phosphor-power-supply-%i.conf - -[Service] -EnvironmentFile={envfiledir}/obmc/gpio/phosphor-power-supply-%i.conf -ExecStart=/usr/bin/env phosphor-gpio-presence --path=${{DEVPATH}} --inventory=${{INVENTORY}} --key=${{KEY}} --name=${{NAME}} --drivers=${{DRIVERS}} -SyslogIdentifier=phosphor-gpio-presence - -[Install] -RequiredBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host.bb b/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host.bb deleted file mode 100644 index 627f75956..000000000 --- a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "org.openbmc.control.Host implementation for OpenPOWER" -DESCRIPTION = "A host control implementation suitable for OpenPOWER systems." -PR = "r1" - -inherit skeleton-gdbus -inherit obmc-phosphor-dbus-service -inherit pkgconfig - -PROVIDES += "virtual/obmc-host-ctl" -RPROVIDES_${PN} += "virtual-obmc-host-ctl" - -SKELETON_DIR = "op-hostctl" - -FMT = "org.openbmc.control.Host@{0}.service" -DBUS_SERVICE_${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_SERVICE_${PN} = " \ - op-start-host@.service \ - " - -START_TMPL = "op-start-host@.service" -START_TGTFMT = "obmc-host-startmin@{1}.target" -START_INSTFMT = "op-start-host@{0}.service" -START_FMT = "../${START_TMPL}:${START_TGTFMT}.requires/${START_INSTFMT}" - -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'START_FMT', 'OBMC_HOST_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service b/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service deleted file mode 100644 index 8703a4301..000000000 --- a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/op-start-host@.service +++ /dev/null @@ -1,21 +0,0 @@ -[Unit] -Description=Start Host%i -After=obmc-host-start-pre@%i.target -Wants=obmc-host-starting@%i.target -Before=obmc-host-starting@%i.target -Before=obmc-host-started@%i.target -Wants=obmc-power-on@%i.target -After=obmc-power-on@%i.target -Wants=mapper-wait@-org-openbmc-control-host%i.service -After=mapper-wait@-org-openbmc-control-host%i.service -Conflicts=obmc-host-stop@%i.target -ConditionPathExists=!/run/openbmc/host@%i-on - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/bin/sh -c "busctl call `mapper get-service /org/openbmc/control/host%i` /org/openbmc/control/host%i org.openbmc.control.Host boot" -SyslogIdentifier=op-start-host - -[Install] -WantedBy=obmc-host-start@%i.target diff --git a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/org.openbmc.control.Host@.service b/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/org.openbmc.control.Host@.service deleted file mode 100644 index 9a64002ec..000000000 --- a/meta-phosphor/common/recipes-phosphor/host/obmc-op-control-host/org.openbmc.control.Host@.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=OpenPOWER Host%i Control -Wants=mapper-wait@-org-openbmc-managers-System.service -After=mapper-wait@-org-openbmc-managers-System.service - -[Service] -Restart=always -ExecStart=/usr/bin/env control_host.exe -SyslogIdentifier=control_host.exe -Type=dbus -BusName={BUSNAME} - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/host/phosphor-host-postd.bb b/meta-phosphor/common/recipes-phosphor/host/phosphor-host-postd.bb deleted file mode 100644 index 92ff4890e..000000000 --- a/meta-phosphor/common/recipes-phosphor/host/phosphor-host-postd.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "Phosphor OpenBMC Post Code Daemon" -DESCRIPTION = "Phosphor OpenBMC Post Code Daemon" -PR = "r1" - -inherit autotools pkgconfig -inherit obmc-phosphor-systemd - -DEPENDS += "autoconf-archive-native" -DEPENDS += "sdbusplus" -DEPENDS += "phosphor-dbus-interfaces" -DEPENDS += "systemd" - -RDEPENDS_${PN} += "sdbusplus phosphor-dbus-interfaces" - -SNOOP_DEVICE ?= "aspeed-lpc-snoop0" -POST_CODE_BYTES ?= "1" - -SERVICE_FILE = "lpcsnoop.service" -SYSTEMD_SERVICE_${PN} += "${SERVICE_FILE}" -SYSTEMD_SUBSTITUTIONS += "SNOOP_DEVICE:${SNOOP_DEVICE}:${SERVICE_FILE}" -SYSTEMD_SUBSTITUTIONS += "POST_CODE_BYTES:${POST_CODE_BYTES}:${SERVICE_FILE}" - -require ${PN}.inc - -S = "${WORKDIR}/git" - diff --git a/meta-phosphor/common/recipes-phosphor/host/phosphor-host-postd.inc b/meta-phosphor/common/recipes-phosphor/host/phosphor-host-postd.inc deleted file mode 100644 index 814895036..000000000 --- a/meta-phosphor/common/recipes-phosphor/host/phosphor-host-postd.inc +++ /dev/null @@ -1,6 +0,0 @@ -HOMEPAGE = "http://github.com/openbmc/phosphor-host-postd" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI += "git://github.com/openbmc/phosphor-host-postd" -SRCREV = "c820155fa71090122c7c0838900823570d073dfb" - diff --git a/meta-phosphor/common/recipes-phosphor/host/phosphor-host-postd/lpcsnoop.service b/meta-phosphor/common/recipes-phosphor/host/phosphor-host-postd/lpcsnoop.service deleted file mode 100644 index 117702c04..000000000 --- a/meta-phosphor/common/recipes-phosphor/host/phosphor-host-postd/lpcsnoop.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=LPC Snoop Daemon -After=systemd-modules-load.service - -[Service] -Restart=always -ExecStart={sbindir}/snoopd -d "/dev/{SNOOP_DEVICE}" -b "{POST_CODE_BYTES}" - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/images/obmc-phosphor-debug-tarball.bb b/meta-phosphor/common/recipes-phosphor/images/obmc-phosphor-debug-tarball.bb deleted file mode 100644 index e00e92843..000000000 --- a/meta-phosphor/common/recipes-phosphor/images/obmc-phosphor-debug-tarball.bb +++ /dev/null @@ -1,3 +0,0 @@ -DESCRIPTION = "Debug tools tarball for use with OpenBMC Phosphor" - -inherit obmc-phosphor-debug-tarball diff --git a/meta-phosphor/common/recipes-phosphor/images/obmc-phosphor-image.bb b/meta-phosphor/common/recipes-phosphor/images/obmc-phosphor-image.bb deleted file mode 100644 index 8e481a1bd..000000000 --- a/meta-phosphor/common/recipes-phosphor/images/obmc-phosphor-image.bb +++ /dev/null @@ -1,3 +0,0 @@ -DESCRIPTION = "Image with Phosphor, an OpenBMC framework." - -inherit obmc-phosphor-image diff --git a/meta-phosphor/common/recipes-phosphor/images/obmc-phosphor-initramfs.bb b/meta-phosphor/common/recipes-phosphor/images/obmc-phosphor-initramfs.bb deleted file mode 100644 index b68048a50..000000000 --- a/meta-phosphor/common/recipes-phosphor/images/obmc-phosphor-initramfs.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "Small image capable of booting a device. The kernel includes \ -the Minimal RAM-based Initial Root Filesystem (initramfs), which finds the \ -first 'init' program more efficiently." - -PACKAGE_INSTALL = "${VIRTUAL-RUNTIME_base-utils} udev base-passwd ${ROOTFS_BOOTSTRAP_INSTALL} obmc-phosphor-initfs" - -# Do not pollute the initrd image with rootfs features -IMAGE_FEATURES = "" - -export IMAGE_BASENAME = "obmc-phosphor-initramfs" -IMAGE_LINGUAS = "" - -LICENSE = "MIT" - -IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" -inherit core-image - -IMAGE_ROOTFS_SIZE = "8192" -IMAGE_ROOTFS_EXTRA_SPACE = "0" - -BAD_RECOMMENDATIONS += "busybox-syslog" diff --git a/meta-phosphor/common/recipes-phosphor/initrdscripts/files/obmc-init.sh b/meta-phosphor/common/recipes-phosphor/initrdscripts/files/obmc-init.sh deleted file mode 100644 index 62be89f03..000000000 --- a/meta-phosphor/common/recipes-phosphor/initrdscripts/files/obmc-init.sh +++ /dev/null @@ -1,426 +0,0 @@ -#!/bin/sh - -fslist="proc sys dev run" -rodir=run/initramfs/ro -rwdir=run/initramfs/rw -upper=$rwdir/cow -work=$rwdir/work - -cd / -mkdir -p $fslist -mount dev dev -tdevtmpfs -mount sys sys -tsysfs -mount proc proc -tproc -if ! grep run proc/mounts -then - mount tmpfs run -t tmpfs -o mode=755,nodev -fi - -mkdir -p $rodir $rwdir - -cp -rp init shutdown update whitelist bin sbin usr lib etc var run/initramfs - -# To start a interactive shell with job control at this point, run -# getty 38400 ttyS4 - -findmtd() { - m=$(grep -xl "$1" /sys/class/mtd/*/name) - m=${m%/name} - m=${m##*/} - echo $m -} - -blkid_fs_type() { - # Emulate util-linux's `blkid -s TYPE -o value $1` - # Example busybox blkid output: - # # blkid /dev/mtdblock5 - # /dev/mtdblock5: TYPE="squashfs" - # Process output to extract TYPE value "squashfs". - blkid $1 | sed -e 's/^.*TYPE="//' -e 's/".*$//' -} - -probe_fs_type() { - fst=$(blkid_fs_type $1) - echo ${fst:=jffs2} -} - -# This fw_get_env_var is a possibly broken version of fw_printenv that -# does not check the crc or flag byte. -# The u-boot environment starts with a crc32, followed by a flag byte -# when a redundannt environment is configured, followed by var=value\0 sets. -# The flag byte for nand is a 1 byte counter; for nor it is a 1 or 0 byte. - -get_fw_env_var() { - # do we have 1 or 2 copies of the environment? - # count non-blank non-comment lines - # copies=$(grep -v ^# /etc/fw_env.config | grep -c [::alnum::]) - # ... we could if we had the fw_env.config in the initramfs - copies=2 - - # * Change \n to \r and \0 to \n - # * Skip to the 5th byte to skip over crc - # * then skip to the first or 2nd byte to skip over flag if it exists - # * stop parsing at first empty line corresponding to the - # double \0 at the end of the environment. - # * print the value of the variable name passed as argument - - envdev=$(findmtd u-boot-env) - if test -n $envdev - then - cat /dev/$envdev | - tr '\n\000' '\r\n' | - tail -c +5 | tail -c +${copies-1} | - sed -ne '/^$/,$d' -e "s/^$1=//p" - fi -} - -setup_resolv() { - runresolv=/run/systemd/resolve/resolv.conf - etcresolv=/etc/resolv.conf - - if test ! -e $etcresolv -a ! -L $etcresolv - then - mkdir -p ${runresolv%/*} - ln -s $runresolv $etcresolv - fi - if test ! -f $runresolv - then - cat /proc/net/pnp > $runresolv - fi - - return 0 -} - -try_tftp() { - # split into tftp:// host:port/ path/on/remote - # then spilt off / and then :port from the end of host:port/ - # and : from the beginning of port - - rest="${1#tftp://}" - path=${rest#*/} - host=${rest%$path} - host="${host%/}" - port="${host#${host%:*}}" - host="${host%$port}" - port="${port#:}" - - setup_resolv - - if test -z "$host" -o -z "$path" - then - debug_takeover "Invalid tftp download url '$url'." - elif echo "Downloading '$url' from $host ..." && - ! tftp -g -r "$path" -l /run/image-rofs "$host" ${port+"$port"} - then - debug_takeover "Download of '$url' failed." - fi -} - -try_wget() { - setup_resolv - - echo "Downloading '$1' ..." - if ! wget -O /run/image-rofs "$1" - then - debug_takeover "Download of '$url' failed." - fi -} - -debug_takeover() { - echo "$@" - test -n "$@" && echo Enter password to try to manually fix. - cat << HERE -After fixing run exit to continue this script, or reboot -f to retry, or -touch /takeover and exit to become PID 1 allowing editing of this script. -HERE - - while ! sulogin && ! test -f /takeover - do - echo getty failed, retrying - done - - # Touch /takeover in the above getty to become pid 1 - if test -e /takeover - then - cat << HERE - -Takeover of init requested. Executing /bin/sh as PID 1. -When finished exec new init or cleanup and run reboot -f. - -Warning: No job control! Shell exit will panic the system! -HERE - export PS1=init#\ - exec /bin/sh - fi -} - -rofs=$(findmtd rofs) -rwfs=$(findmtd rwfs) - -rodev=/dev/mtdblock${rofs#mtd} -rwdev=/dev/mtdblock${rwfs#mtd} - -# Set to y for yes, anything else for no. -force_rwfst_jffs2=y -flash_images_before_init=n -consider_download_files=y -consider_download_tftp=y -consider_download_http=y -consider_download_ftp=y - -rofst=squashfs -rwfst=$(probe_fs_type $rwdev) -roopts=ro -rwopts=rw - -image=/run/initramfs/image- -trigger=${image}rwfs - -init=/sbin/init -fsckbase=/sbin/fsck. -fsck=$fsckbase$rwfst -fsckopts=-a -optfile=/run/initramfs/init-options -optbase=/run/initramfs/init-options-base -urlfile=/run/initramfs/init-download-url -update=/run/initramfs/update - -if test -e /${optfile##*/} -then - cp /${optfile##*/} $optfile -fi - -if test -e /${optbase##*/} -then - cp /${optbase##*/} $optbase -else - touch $optbase -fi - -if test ! -f $optfile -then - cat /proc/cmdline $optbase > $optfile - get_fw_env_var openbmcinit >> $optfile - get_fw_env_var openbmconce >> $optfile -fi - -echo rofs = $rofs $rofst rwfs = $rwfs $rwfst - -if grep -w debug-init-sh $optfile -then - debug_takeover "Debug initial shell requested by command line." -fi - -if test "x$consider_download_files" = xy && - grep -w openbmc-init-download-files $optfile -then - if test -f ${urlfile##*/} - then - cp ${urlfile##*/} $urlfile - fi - if test ! -f $urlfile - then - get_fw_env_var openbmcinitdownloadurl > $urlfile - fi - url="$(cat $urlfile)" - rest="${url#*://}" - proto="${url%$rest}" - - if test -z "$url" - then - echo "Download url empty. Ignoring download request." - elif test -z "$proto" - then - echo "Download failed." - elif test "$proto" = tftp:// - then - if test "x$consider_download_tftp" = xy - then - try_tftp "$url" - else - echo "Download failed." - fi - elif test "$proto" = http:// - then - if test "x$consider_download_http" = xy - then - try_wget "$url" - else - echo "Download failed." - fi - elif test "$proto" = ftp:// - then - if test "x$consider_download_ftp" = xy - then - try_wget "$url" - else - echo "Download failed." - fi - else - echo "Download failed." - fi -fi - -# If there are images in root move them to /run/initramfs/ or /run/ now. -imagebasename=${image##*/} -if test -n "${imagebasename}" && ls /${imagebasename}* > /dev/null 2>&1 -then - if test "x$flash_images_before_init" = xy - then - echo "Flash images found, will update before starting init." - mv /${imagebasename}* ${image%$imagebasename} - else - echo "Flash images found, will use but deferring flash update." - mv /${imagebasename}* /run/ - fi -fi - -if grep -w clean-rwfs-filesystem $optfile -then - echo "Cleaning of read-write overlay filesystem requested." - touch $trigger -fi - -if grep -w factory-reset $optfile -then - echo "Factory reset requested." - touch $trigger - do_save=--no-save-files -else - do_save=--save-files -fi - -if test "x$force_rwfst_jffs2" = xy -a $rwfst != jffs2 -a ! -f $trigger -then - echo "Converting read-write overlay filesystem to jffs2 forced." - touch $trigger -fi - -if ls $image* > /dev/null 2>&1 -then - if ! test -x $update - then - debug_takeover "Flash update requested but $update missing!" - elif test -f $trigger -a ! -s $trigger - then - if [ $do_save = "--save-files" ] - then - echo "Saving selected files from read-write overlay filesystem." - else - echo "No files will be selected for save." - fi - $update --no-restore-files $do_save - echo "Clearing read-write overlay filesystem." - flash_eraseall /dev/$rwfs - echo "Restoring saved files to read-write overlay filesystem." - touch $trigger - $update --no-save-files --clean-saved-files - else - $update --clean-saved-files $do_save - fi - - rwfst=$(probe_fs_type $rwdev) - fsck=$fsckbase$rwfst -fi - -if grep -w overlay-filesystem-in-ram $optfile -then - rwfst=none -fi - -copyfiles= -if grep -w copy-files-to-ram $optfile -then - rwfst=none - copyfiles=y -fi - -# It would be nice to do this after fsck but that mean rofs is mounted -# which triggers the mtd is mounted check -if test "$rwfst$copyfiles" = noney -then - touch $trigger - $update --copy-files --clean-saved-files --no-restore-files -fi - -if grep -w copy-base-filesystem-to-ram $optfile && - test ! -e /run/image-rofs && ! cp $rodev /run/image-rofs -then - # Remove any partial copy to avoid attempted usage later - if test -e /run/image-rofs - then - ls -l /run/image-rofs - rm -f /run/image-rofs - fi - debug_takeover "Copying $rodev to /run/image-rofs failed." -fi - -if test -s /run/image-rofs -then - rodev=/run/image-rofs - roopts=$roopts,loop -fi - -mount $rodev $rodir -t $rofst -o $roopts - -if test -x $rodir$fsck -then - for fs in $fslist - do - mount --bind $fs $rodir/$fs - done - chroot $rodir $fsck $fsckopts $rwdev - rc=$? - for fs in $fslist - do - umount $rodir/$fs - done - if test $rc -gt 1 - then - debug_takeover "fsck of read-write fs on $rwdev failed (rc=$rc)" - fi -elif test "$rwfst" != jffs2 -a "$rwfst" != none -then - echo "No '$fsck' in read only fs, skipping fsck." -fi - -if test "$rwfst" = none -then - echo "Running with read-write overlay in RAM for this boot." - echo "No state will be preserved unless flash update performed." -elif ! mount $rwdev $rwdir -t $rwfst -o $rwopts -then - msg="$(cat)" << HERE - -Mounting read-write $rwdev filesystem failed. Please fix and run - mount $rwdev $rwdir -t $rwfst -o $rwopts -to to continue, or do change nothing to run from RAM for this boot. -HERE - debug_takeover "$msg" -fi - -rm -rf $work -mkdir -p $upper $work - -mount -t overlay -o lowerdir=$rodir,upperdir=$upper,workdir=$work cow /root - -while ! chroot /root /bin/sh -c "test -x '$init' -a -s '$init'" -do - msg="$(cat)" << HERE - -Unable to confirm /sbin/init is an executable non-empty file -in merged file system mounted at /root. - -Change Root test failed! Invoking emergency shell. -HERE - debug_takeover "$msg" -done - -for f in $fslist -do - mount --move $f root/$f -done - -# switch_root /root $init -exec chroot /root $init - diff --git a/meta-phosphor/common/recipes-phosphor/initrdscripts/files/obmc-shutdown.sh b/meta-phosphor/common/recipes-phosphor/initrdscripts/files/obmc-shutdown.sh deleted file mode 100644 index d3c883595..000000000 --- a/meta-phosphor/common/recipes-phosphor/initrdscripts/files/obmc-shutdown.sh +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/sh - -echo shutdown: "$@" - -export PS1=shutdown-sh#\ -# exec bin/sh - -cd / -if [ ! -e /proc/mounts ] -then - mkdir -p /proc - mount proc /proc -tproc - umount_proc=1 -else - umount_proc= -fi - -# Remove an empty oldroot, that means we are not invoked from systemd-shutdown -rmdir /oldroot 2>/dev/null - -# Move /oldroot/run to /mnt in case it has the underlying rofs loop mounted. -# Ordered before /oldroot the overlay is unmounted before the loop mount -mkdir -p /mnt -mount --move /oldroot/run /mnt - -set -x -for f in $( awk '/oldroot|mnt/ { print $2 }' < /proc/mounts | sort -r ) -do - umount $f -done -set +x - -update=/run/initramfs/update -image=/run/initramfs/image- - -wdt="-t 1 -T 5" -wdrst="-T 15" - -if ls $image* > /dev/null 2>&1 -then - if test -x $update - then - if test -c /dev/watchdog - then - echo Pinging watchdog ${wdt+with args $wdt} - watchdog $wdt -F /dev/watchdog & - wd=$! - else - wd= - fi - $update --clean-saved-files - remaining=$(ls $image*) - if test -n "$remaining" - then - echo 1>&2 "Flash update failed to flash these images:" - echo 1>&2 "$remaining" - else - echo "Flash update completed." - fi - - if test -n "$wd" - then - kill -9 $wd - if test -n "$wdrst" - then - echo Resetting watchdog timeouts to $wdrst - watchdog $wdrst -F /dev/watchdog & - sleep 1 - # Kill the watchdog daemon, setting a timeout - # for the remaining shutdown work - kill -9 $! - fi - fi - else - echo 1>&2 "Flash update requested but $update program missing!" - fi -fi - -echo Remaining mounts: -cat /proc/mounts - -test "$umount_proc" && umount /proc && rmdir /proc - -# tcsattr(tty, TIOCDRAIN, mode) to drain tty messages to console -test -t 1 && stty cooked 0<&1 - -# Execute the command systemd told us to ... -if test -d /oldroot && test "$1" -then - if test "$1" = kexec - then - $1 -f -e - else - $1 -f - fi -fi - - -echo "Execute ${1-reboot} -f if all unmounted ok, or exec /init" - -export PS1=shutdown-sh#\ -exec /bin/sh diff --git a/meta-phosphor/common/recipes-phosphor/initrdscripts/files/obmc-update.sh b/meta-phosphor/common/recipes-phosphor/initrdscripts/files/obmc-update.sh deleted file mode 100755 index 278cd41d7..000000000 --- a/meta-phosphor/common/recipes-phosphor/initrdscripts/files/obmc-update.sh +++ /dev/null @@ -1,274 +0,0 @@ -#!/bin/sh - -echo update: "$@" - -echoerr() { - echo 1>&2 "ERROR: $@" -} - -cd / -if ! test -r /proc/mounts || ! test -f /proc/mounts -then - mkdir -p /proc - mount -t proc proc proc -fi -if ! test -d /sys/class -then - mkdir -p /sys - mount -t sysfs sys sys -fi -if ! test -c /dev/null -then - mkdir -p /dev - mount -t devtmpfs dev dev -fi - -# mtd number N with mtd name Name can be mounted via mtdN, or mtd:Name -# (with a mtd aware fs) or by /dev/mtdblockN (with a mtd or block fs). -mtdismounted() { - m=${1##mtd} - if grep -s "mtdblock$m " /proc/mounts || grep -s "mtd$m " /proc/mounts - then - return 0 - fi - n=$(cat /sys/class/mtd/mtd$m/name) - if test -n "$n" && grep -s "mtd:$n " /proc/mounts - then - return 0 - fi - return 1 -} - -# Detect child partitions when the whole flash is to be updated. -# Ignore mtdNro and mtdblockN names in the class subsystem directory. -childmtds() { - for m in /sys/class/mtd/$1/mtd* - do - m=${m##*/} - if test "${m%ro}" = "${m#mtdblock}" - then - echo $m - fi - done -} - -toobig() { - if test $(stat -L -c "%s" "$1") -gt $(cat /sys/class/mtd/"$2"/size) - then - return 0 - fi - return 1 -} - -findmtd() { - m=$(grep -xl "$1" /sys/class/mtd/*/name) - m=${m%/name} - m=${m##*/} - echo $m -} - -blkid_fs_type() { - # Emulate util-linux's `blkid -s TYPE -o value $1` - # Example busybox blkid output: - # # blkid /dev/mtdblock5 - # /dev/mtdblock5: TYPE="squashfs" - # Process output to extract TYPE value "squashfs". - blkid $1 | sed -e 's/^.*TYPE="//' -e 's/".*$//' -} - -probe_fs_type() { - fst=$(blkid_fs_type $1) - echo ${fst:=jffs2} -} - -rwfs=$(findmtd rwfs) - -rwdev=/dev/mtdblock${rwfs#mtd} -rwopts=rw -rorwopts=ro${rwopts#rw} - -rwdir=/run/initramfs/rw -upper=$rwdir/cow -save=/run/save/${upper##*/} - -mounted= -doflash=y -doclean= -dosave=y -dorestore=y -toram= -checksize=y -checkmount=y - -whitelist=/run/initramfs/whitelist -image=/run/initramfs/image- -imglist= - -while test "$1" != "${1#-}" -do - case "$1" in - --help) - cat <<HERE -Usage: $0 [options] -- Write images in /run/initramfs to flash (/dev/mtd*) - --help Show this message - --no-flash Don't attempt to write images to flash - --ignore-size Don't compare image size to mtd device size - --ignore-mount Don't check if destination is mounted - --save-files Copy whitelisted files to save directory in RAM - --no-save-files Don't copy whitelisted files to save directory - --copy-files Copy files from save directory to rwfs mountpoint - --restore-files Restore files from save directory to rwfs layer - --no-restore-files Don't restore saved files from ram to rwfs layer - --clean-saved-files Delete saved whitelisted files from RAM - --no-clean-saved-files Retain saved whitelisted files in RAM -HERE - - exit 0 ;; - - --no-clean-saved-files) - doclean= - shift ;; - --clean-saved-files) - doclean=y - shift ;; - --no-save-files) - dosave= - shift ;; - --save-files) - dosave=y - shift ;; - --no-restore-files) - dorestore= - shift ;; - --restore-files) - dorestore=y - shift ;; - --no-flash) - doflash= - shift ;; - --ignore-size) - checksize= - shift ;; - --ignore-mount) - checkmount= - doflash= - shift ;; - --copy-files) - toram=y - shift ;; - *) - echoerr "Unknown option $1. Try $0 --help." - exit 1 ;; - esac -done - -if test "x$dosave" = xy -then - if test ! -d $upper -a -n "$rwfs" - then - mkdir -p $rwdir - mount $rwdev $rwdir -t $(probe_fs_type $rwdev) -o $rorwopts - mounted=$rwdir - fi - - while read f - do - # Entries shall start with /, no trailing /.. or embedded /../ - if test "/${f#/}" != "$f" -o "${f%/..}" != "${f#*/../}" - then - echo 1>&2 "WARNING: Skipping bad whitelist entry $f." - continue - fi - if ! test -e "$upper/$f" - then - continue - fi - d="$save/$f" - while test "${d%/}" != "${d%/.}" - do - d="${d%/.}" - d="${d%/}" - done - mkdir -p "${d%/*}" - cp -rp "$upper/$f" "${d%/*}/" - done < $whitelist - - if test -n "$mounted" - then - umount $mounted - fi -fi - -imglist=$(echo $image*) -if test "$imglist" = "$image*" -a ! -e "$imglist" -then - # shell didn't expand the wildcard, so no files exist - echo "No images found to update." - imglist= -fi - -for f in $imglist -do - m=$(findmtd ${f#$image}) - if test -z "$m" - then - echoerr "Unable to find mtd partition for ${f##*/}." - exit 1 - fi - if test -n "$checksize" && toobig "$f" "$m" - then - echoerr "Image ${f##*/} too big for $m." - exit 1 - fi - for s in $m $(childmtds $m) - do - if test -n "$checkmount" && mtdismounted $s - then - echoerr "Device $s is mounted, ${f##*/} is busy." - exit 1 - fi - done -done - -if test -n "$doflash" -then - for f in $imglist - do - if test ! -s $f - then - echo "Skipping empty update of ${f#$image}." - rm $f - continue - fi - m=$(findmtd ${f#$image}) - echo "Updating ${f#$image}..." - flashcp -v $f /dev/$m && rm $f - done -fi - -if test -d $save -a "x$toram" = xy -then - mkdir -p $upper - cp -rp $save/. $upper/ -fi - -if test -d $save -a "x$dorestore" = xy -then - odir=$rwdir - rwdir=/run/rw - upper=$rwdir${upper#$odir} - - mkdir -p $rwdir - mount $rwdev $rwdir -t $(probe_fs_type $rwdev) -o $rwopts - mkdir -p $upper - cp -rp $save/. $upper/ - umount $rwdir - rmdir $rwdir -fi - -if test "x$doclean" = xy -then - rm -rf $save -fi - -exit diff --git a/meta-phosphor/common/recipes-phosphor/initrdscripts/files/whitelist b/meta-phosphor/common/recipes-phosphor/initrdscripts/files/whitelist deleted file mode 100644 index 20f1ec2a6..000000000 --- a/meta-phosphor/common/recipes-phosphor/initrdscripts/files/whitelist +++ /dev/null @@ -1,13 +0,0 @@ -/etc/dropbear/dropbear_rsa_host_key -/etc/group -/etc/gshadow -/etc/machine-id -/etc/passwd -/etc/resolv.conf -/etc/shadow -/etc/systemd/network -/var/cache/obmc -/var/lib/obmc -/var/lib/phosphor-inventory-manager -/var/lib/phosphor-settings-manager -/var/lib/phosphor-state-manager diff --git a/meta-phosphor/common/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bb b/meta-phosphor/common/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bb deleted file mode 100644 index ab2c38e90..000000000 --- a/meta-phosphor/common/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "Phosphor OpenBMC pre-init scripts" -DESCRIPTION = "Phosphor OpenBMC filesystem mount reference implementation." -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" - -PR = "r1" - -inherit allarch - -RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_base-utils}" - -S = "${WORKDIR}" -SRC_URI += "file://obmc-init.sh" -SRC_URI += "file://obmc-shutdown.sh" -SRC_URI += "file://obmc-update.sh" -SRC_URI += "file://whitelist" - -do_install() { - for f in init-download-url init-options - do - if test -e $f - then - install -m 0755 ${WORKDIR}/$f ${D}/$f - fi - done - install -m 0755 ${WORKDIR}/obmc-init.sh ${D}/init - install -m 0755 ${WORKDIR}/obmc-shutdown.sh ${D}/shutdown - install -m 0755 ${WORKDIR}/obmc-update.sh ${D}/update - install -m 0644 ${WORKDIR}/whitelist ${D}/whitelist - install -d ${D}/dev - mknod -m 622 ${D}/dev/console c 5 1 -} - -FILES_${PN} += " /init /shutdown /update /whitelist /dev " -FILES_${PN} += " /init-options /init-download-url " diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/bmcweb.bb b/meta-phosphor/common/recipes-phosphor/interfaces/bmcweb.bb deleted file mode 100644 index c0f53251f..000000000 --- a/meta-phosphor/common/recipes-phosphor/interfaces/bmcweb.bb +++ /dev/null @@ -1,34 +0,0 @@ -inherit obmc-phosphor-systemd -inherit useradd - -USERADD_PACKAGES = "${PN}" - -# add a user called httpd for the server to assume -USERADD_PARAM_${PN} = "-r -s /usr/sbin/nologin bmcweb" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENCE;md5=a6a4edad4aed50f39a66d098d74b265b" - -SRC_URI = "git://github.com/openbmc/bmcweb.git" - -PV = "1.0+git${SRCPV}" -SRCREV = "a38b0b206300c792979b900f506b85e535f5708a" - -S = "${WORKDIR}/git" - -DEPENDS = "openssl zlib boost libpam sdbusplus gtest nlohmann-json libtinyxml2 " - -FILES_${PN} += "${datadir}/** " - -inherit cmake - -EXTRA_OECMAKE = "-DBMCWEB_BUILD_UT=OFF -DYOCTO_DEPENDENCIES=ON" - -SYSTEMD_SERVICE_${PN} += "bmcweb.service bmcweb.socket" - -FULL_OPTIMIZATION = "-Os -pipe " - -do_install_append() { - rm -rf ${D}${includedir}/dbus - rm -rf ${D}${libdir}/cmake -} diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/bmcweb/bmcweb.service b/meta-phosphor/common/recipes-phosphor/interfaces/bmcweb/bmcweb.service deleted file mode 100644 index 86a7279a5..000000000 --- a/meta-phosphor/common/recipes-phosphor/interfaces/bmcweb/bmcweb.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Start bmcweb server - -Wants=network.target -After=network.target - -[Service] -ExecStart={bindir}/bmcweb -Type=simple -WorkingDirectory=/home/root - -[Install] -WantedBy=network.target diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/bmcweb/bmcweb.socket b/meta-phosphor/common/recipes-phosphor/interfaces/bmcweb/bmcweb.socket deleted file mode 100644 index b1db27d47..000000000 --- a/meta-phosphor/common/recipes-phosphor/interfaces/bmcweb/bmcweb.socket +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=BMC Webserver socket - -[Socket] -ListenStream=883 -ReusePort=true - -[Install] -WantedBy=sockets.target diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-gevent.bb b/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-gevent.bb deleted file mode 100644 index 015057120..000000000 --- a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-gevent.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "python-gevent startup script" -DESCRIPTION = "python-gevent startup script." -PR = "r1" - -inherit allarch -inherit setuptools -inherit obmc-phosphor-systemd - -require phosphor-rest.inc - -PROVIDES += "virtual/obmc-wsgihost" -RPROVIDES_${PN} += "virtual-obmc-wsgihost" - -RDEPENDS_${PN} += " \ - python-gevent \ - " -RRECOMMENDS_${PN} += "python-gevent-websocket" - -S = "${WORKDIR}/git/servers/gevent" - -SYSTEMD_SERVICE_${PN} += " ${PN}.service ${PN}.socket" diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-gevent/phosphor-gevent.service b/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-gevent/phosphor-gevent.service deleted file mode 100644 index 2dfc4cc10..000000000 --- a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-gevent/phosphor-gevent.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Phosphor Webserver -After=phosphor-gevent.socket -After=obmc-webserver-pre.target - -[Service] -Restart=always -ExecStart=/usr/bin/env phosphor-gevent $APPLICATION -SyslogIdentifier=phosphor-gevent -Environment="PYTHONUNBUFFERED=1" -EnvironmentFile={envfiledir}/obmc/wsgi_app diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-gevent/phosphor-gevent.socket b/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-gevent/phosphor-gevent.socket deleted file mode 100644 index 1ee86da08..000000000 --- a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-gevent/phosphor-gevent.socket +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Phosphor Webserver socket - -[Socket] -ListenStream=443 - -[Install] -WantedBy=sockets.target diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest.bb b/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest.bb deleted file mode 100644 index f18e55caa..000000000 --- a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest.bb +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "Phosphor DBUS to REST WSGI Application" -DESCRIPTION = "Phosphor DBUS to REST WSGI Application." -PR = "r1" - -inherit allarch -inherit obmc-phosphor-systemd -inherit setuptools -inherit obmc-phosphor-discovery-service - -require phosphor-rest.inc - -RRECOMMENDS_${PN} += " \ - virtual-obmc-wsgihost \ - python-gevent-websocket \ - " - -RDEPENDS_${PN} += " \ - python-xml \ - python-dbus \ - phosphor-mapper \ - python-bottle \ - python-spwd \ - pyphosphor-utils \ - pyphosphor-dbus \ - pyphosphor-wsgi-apps-ns \ - " -SRC_URI += "file://url_config.json \ - " - -FILES_${PN}_append = " ${datadir}/rest-dbus/url_config.json" - -S = "${WORKDIR}/git/module" -SYSTEMD_SERVICE_${PN} = "" -SYSTEMD_OVERRIDE_${PN} += "rest-dbus.conf:obmc-mapper.target.d/rest-dbus.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "obmc/wsgi_app" -REGISTERED_SERVICES_${PN} += "phosphor_rest:tcp:443" - -do_install_append(){ - install -d ${D}${datadir}/rest-dbus - install -m 0644 -D ${WORKDIR}/url_config.json \ - ${D}${datadir}/rest-dbus/url_config.json -} diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest.inc b/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest.inc deleted file mode 100644 index 46aeb8bb5..000000000 --- a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest.inc +++ /dev/null @@ -1,7 +0,0 @@ -HOMEPAGE = "http://github.com/openbmc/phosphor-rest-server" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" - -SRC_URI += "git://github.com/openbmc/phosphor-rest-server" -SRCREV = "6691e7ca4e2adf52bac1fc3a82ed35adfce4349c" - diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest/obmc/wsgi_app b/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest/obmc/wsgi_app deleted file mode 100644 index 7bbffe74e..000000000 --- a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest/obmc/wsgi_app +++ /dev/null @@ -1 +0,0 @@ -APPLICATION=rest_dbus diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest/rest-dbus.conf b/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest/rest-dbus.conf deleted file mode 100644 index a92f0f1ec..000000000 --- a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest/rest-dbus.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Unit] -Wants=obmc-webserver-pre.target -Before=obmc-webserver-pre.target diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest/url_config.json b/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest/url_config.json deleted file mode 100644 index d11b555b9..000000000 --- a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest/url_config.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "urls": [ - "/org/openbmc/*", - "/xyz/openbmc_project/*", - "/enumerate", - "/list", - "/login", - "/logout", - "/subscribe", - "/upload/image", - "/download/dump/*" - ] -} diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/rest-dbus.bb b/meta-phosphor/common/recipes-phosphor/interfaces/rest-dbus.bb deleted file mode 100644 index 9d4217b7a..000000000 --- a/meta-phosphor/common/recipes-phosphor/interfaces/rest-dbus.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Phosphor OpenBMC REST framework" -DESCRIPTION = "Phosphor OpenBMC REST to DBUS daemon." -HOMEPAGE = "http://github.com/openbmc/rest-dbus" -PR = "r1" - -inherit allarch -inherit obmc-phosphor-license -inherit obmc-phosphor-systemd -inherit setuptools - -RDEPENDS_${PN} += " \ - python-netserver \ - python-json \ - python-dbus \ - python-xml \ - pyphosphor-dbus \ - " - -SYSTEMD_SERVICE_${PN} += "rest-dbus.service rest-dbus.socket" - -SRC_URI += "git://github.com/openbmc/rest-dbus.git" - -SRCREV = "3084b80c489c10b03207c8fb97d4437fd760f30d" - -S = "${WORKDIR}/git" diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/rest-dbus/rest-dbus.service b/meta-phosphor/common/recipes-phosphor/interfaces/rest-dbus/rest-dbus.service deleted file mode 100644 index 9afd0c45d..000000000 --- a/meta-phosphor/common/recipes-phosphor/interfaces/rest-dbus/rest-dbus.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Phosphor DBUS Browser - -[Service] -Restart=always -ExecStart=/usr/bin/env rest-dbus -SyslogIdentifier=rest-dbus -Environment="PYTHONUNBUFFERED=1" diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/rest-dbus/rest-dbus.socket b/meta-phosphor/common/recipes-phosphor/interfaces/rest-dbus/rest-dbus.socket deleted file mode 100644 index 7ab195925..000000000 --- a/meta-phosphor/common/recipes-phosphor/interfaces/rest-dbus/rest-dbus.socket +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Phosphor DBUS Browser socket - -[Socket] -ListenStream=3000 - -[Install] -WantedBy=sockets.target diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/slpd-lite.bb b/meta-phosphor/common/recipes-phosphor/interfaces/slpd-lite.bb deleted file mode 100644 index 608796b36..000000000 --- a/meta-phosphor/common/recipes-phosphor/interfaces/slpd-lite.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Lightweight SLP Server" -DESCRIPTION = "Lightweight Unicast-only SLP Server" -HOMEPAGE = "http://github.com/openbmc/slpd-lite" -PR = "r1" - -inherit autotools pkgconfig -inherit obmc-phosphor-license -inherit obmc-phosphor-systemd - -SYSTEMD_SERVICE_${PN} += "slpd-lite.service" - -DEPENDS += "systemd" -DEPENDS += "autoconf-archive-native" - -SRC_URI += "git://github.com/openbmc/slpd-lite" - -SRCREV = "1f12e3805a69e8f7e5dada4b40e5c0860938a227" - -S = "${WORKDIR}/git" diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/slpd-lite/slpd-lite.service b/meta-phosphor/common/recipes-phosphor/interfaces/slpd-lite/slpd-lite.service deleted file mode 100644 index 5d587093f..000000000 --- a/meta-phosphor/common/recipes-phosphor/interfaces/slpd-lite/slpd-lite.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Lightweight SLP Server - -After=network.target - -[Service] -ExecStart=/usr/bin/env slpd -SyslogIdentifier=slpd -Restart=always - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/inventory/obmc-inventory.bb b/meta-phosphor/common/recipes-phosphor/inventory/obmc-inventory.bb deleted file mode 100644 index db3a5b404..000000000 --- a/meta-phosphor/common/recipes-phosphor/inventory/obmc-inventory.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Phosphor Inventory Generation" -DESCRIPTION = "Generates inventory data from the machine readable workbook" -PR = "r1" - -inherit mrw-xml - -S = "${WORKDIR}/git" - -PROVIDES += "virtual/obmc-inventory-data" -RPROVIDES_${PN} += "virtual-obmc-inventory-data" - -inherit allarch -inherit obmc-phosphor-license -inherit mrw-rev - -DEPENDS += "mrw-native mrw-api-native" - -SRC_URI += "${MRW_TOOLS_SRC_URI}" -SRCREV = "${MRW_TOOLS_SRCREV}" - -FILES_${PN} += "${datadir}/inventory" - -do_compile() { - ${STAGING_BINDIR_NATIVE}/perl-native/perl ${S}/inventory.pl \ - -x ${STAGING_DIR_NATIVE}${mrw_datadir}/${MRW_XML} -o inventory.json -} - -do_install() { - install -d ${D}${datadir}/inventory - install -m 0644 inventory.json ${D}${datadir}/inventory/inventory.json -} diff --git a/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager-assettag-native.bb b/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager-assettag-native.bb deleted file mode 100644 index fe9e6ed05..000000000 --- a/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager-assettag-native.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Recipe to create AssetTag property in inventory manager" -PR = "r1" - -inherit native -inherit obmc-phosphor-license -inherit phosphor-inventory-manager - -PROVIDES += "virtual/phosphor-inventory-manager-assettag" - -SRC_URI += "file://assettag.yaml" - -S = "${WORKDIR}" - -do_install() { - # This recipe would provide the yaml for inventory manager to - # create AssetTag property at startup - - install -d ${D}${base_datadir}/events.d/ - install assettag.yaml ${D}${base_datadir}/events.d/assettag.yaml -} diff --git a/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager-assettag/assettag.yaml b/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager-assettag/assettag.yaml deleted file mode 100644 index d3a0104b9..000000000 --- a/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager-assettag/assettag.yaml +++ /dev/null @@ -1,14 +0,0 @@ -events: - - name: Creating AssetTag at startup - description: > - Create /system at startup and populate the AssetTag property with - empty string. - type: startup - actions: - - name: createObjects - objs: - /system: - xyz.openbmc_project.Inventory.Decorator.AssetTag: - AssetTag: - value: "" - type: string diff --git a/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager-config-native.bb b/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager-config-native.bb deleted file mode 100644 index 0b1c4533d..000000000 --- a/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager-config-native.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Phosphor Inventory Manager Configuration" -DESCRIPTION = "Meta-recipe, pulling in native recipes that wish to add \ -data to the native /usr/share/phosphor-inventory-manager filesystem." -HOMEPAGE = "http://github.com/openbmc/phosphor-inventory-manager" -PR = "r1" - -inherit obmc-phosphor-license -inherit native - -PHOSPHOR_INVENTORY_MANAGER_CONFIGS += "phosphor-inventory-manager-assettag-native" - -# To add additional managed inventory items, create a recipe in your layer, -# and add it to PHOSPHOR_INVENTORY_MANAGER_CONFIGS with a bbappend to this recipe. - -DEPENDS += "${PHOSPHOR_INVENTORY_MANAGER_CONFIGS}" diff --git a/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager.bb b/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager.bb deleted file mode 100644 index 46a1d2904..000000000 --- a/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager.bb +++ /dev/null @@ -1,45 +0,0 @@ -SUMMARY = "Phosphor Inventory Manager" -DESCRIPTION = "Phosphor Inventory Manager is an inventory object \ -lifecycle management application, suitable for use on a wide variety \ -of OpenBMC platforms." -PR = "r1" - -inherit autotools \ - pkgconfig \ - pythonnative \ - phosphor-dbus-yaml \ - phosphor-inventory-manager \ - obmc-phosphor-dbus-service - -require phosphor-inventory-manager.inc - -DEPENDS += " \ - ${PN}-config-native \ - phosphor-dbus-interfaces \ - phosphor-dbus-interfaces-native \ - phosphor-logging \ - sdbusplus \ - sdbusplus-native \ - autoconf-archive-native \ - cereal \ - " -RDEPENDS_${PN} += " \ - sdbusplus \ - phosphor-dbus-interfaces \ - phosphor-logging \ - " - -OBMC_INVENTORY_PATH="${OBMC_DBUS_PATH_ROOT}/inventory" -OBMC_INVENTORY_MGR_IFACE="${OBMC_DBUS_IFACE_ROOT}.Inventory.Manager" - -DBUS_SERVICE_${PN} = "${OBMC_INVENTORY_MGR_IFACE}.service" - -S = "${WORKDIR}/git" - -EXTRA_OECONF = " \ - YAML_PATH=${STAGING_DIR_NATIVE}${base_datadir} \ - BUSNAME=${OBMC_INVENTORY_MGR_IFACE} \ - INVENTORY_ROOT=${OBMC_INVENTORY_PATH} \ - IFACE=${OBMC_INVENTORY_MGR_IFACE} \ - IFACES_PATH=${STAGING_DIR_NATIVE}${yaml_dir} \ - " diff --git a/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager.inc b/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager.inc deleted file mode 100644 index b65d56863..000000000 --- a/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager.inc +++ /dev/null @@ -1,5 +0,0 @@ -HOMEPAGE = "http://github.com/openbmc/phosphor-inventory-manager" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -SRC_URI = "git://github.com/openbmc/phosphor-inventory-manager" -SRCREV = "d6819c9fcc44b3691eeb98ef3675d553bb28eeeb" diff --git a/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager/xyz.openbmc_project.Inventory.Manager.service b/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager/xyz.openbmc_project.Inventory.Manager.service deleted file mode 100644 index c3ae5adcc..000000000 --- a/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager/xyz.openbmc_project.Inventory.Manager.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Phosphor Inventory Manager -Before=mapper-wait@-xyz-openbmc_project-inventory.service - -[Service] -Restart=always -Type=dbus -ExecStart=/usr/bin/env phosphor-inventory -SyslogIdentifier=phosphor-inventory -BusName={BUSNAME} - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-bt.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-bt.bb deleted file mode 100644 index 8138803c5..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-bt.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "Phosphor OpenBMC BT to DBUS" -DESCRIPTION = "Phosphor OpenBMC BT to DBUS." -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" - -inherit autotools pkgconfig -inherit obmc-phosphor-dbus-service - -DBUS_SERVICE_${PN} = "org.openbmc.HostIpmi.service" - -PROVIDES += "virtual/obmc-host-ipmi-hw" -RPROVIDES_${PN} += "virtual-obmc-host-ipmi-hw" -RRECOMMENDS_${PN} += "phosphor-ipmi-host" - -DEPENDS += "autoconf-archive-native" -DEPENDS += "systemd" -RDEPENDS_${PN} += "libsystemd" - -S = "${WORKDIR}/git" -SRC_URI += "git://github.com/openbmc/btbridge" -SRCREV="8fb36a936f9eb6662f0320d3c212995b8d9a7fca" - -# This is how linux-libc-headers says to include custom uapi headers -CFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include/uapi" -do_configure[depends] += "virtual/kernel:do_shared_workdir" diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-bt/org.openbmc.HostIpmi.service b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-bt/org.openbmc.HostIpmi.service deleted file mode 100644 index f5abfb5ff..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-bt/org.openbmc.HostIpmi.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Phosphor IPMI BT DBus Bridge - -[Service] -Restart=always -ExecStart=/usr/bin/env btbridged -SyslogIdentifier=btbridged -Type=dbus -BusName={BUSNAME} - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory-native.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory-native.bb deleted file mode 100644 index 33c2aba90..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory-native.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Sample channel configuration for phosphor-host-ipmid" -PR = "r1" - -inherit native -inherit phosphor-ipmi-host -inherit obmc-phosphor-license - -PROVIDES += "virtual/phosphor-ipmi-channel-config" - -SRC_URI += "file://channel.yaml" - -S = "${WORKDIR}" - -do_install() { - # This recipe is supposed to create an output yaml file with - # a sample output file. - - DEST=${D}${sensor_datadir} - install -d ${DEST} - install channel.yaml ${DEST}/channel.yaml -} diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory/channel.yaml b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory/channel.yaml deleted file mode 100644 index 819f25198..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory/channel.yaml +++ /dev/null @@ -1,6 +0,0 @@ -# Channel Number (must be unique) is the key -1: - # ifName the ethernet device name (used in the dbus path) - ifName: eth0 -2: - ifName: eth1 diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config.bb deleted file mode 100644 index 933fd3b48..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config.bb +++ /dev/null @@ -1,40 +0,0 @@ -SUMMARY = "Phosphor IPMI daemon configuration" -PR = "r1" - -inherit obmc-phosphor-license -inherit allarch - -SRC_URI = " \ - file://cipher_list.json \ - file://dcmi_cap.json \ - file://dcmi_sensors.json \ - file://dev_id.json \ - file://power_reading.json \ - " - -FILES_${PN} = " \ - ${datadir}/ipmi-providers/cipher_list.json \ - ${datadir}/ipmi-providers/dcmi_cap.json \ - ${datadir}/ipmi-providers/dcmi_sensors.json \ - ${datadir}/ipmi-providers/dev_id.json \ - ${datadir}/ipmi-providers/power_reading.json \ - " - -do_fetch[noexec] = "1" -do_patch[noexec] = "1" -do_configure[noexec] = "1" -do_compile[noexec] = "1" - -do_install() { - install -d ${D}${datadir}/ipmi-providers - install -m 0644 -D ${WORKDIR}/cipher_list.json \ - ${D}${datadir}/ipmi-providers/cipher_list.json - install -m 0644 -D ${WORKDIR}/dcmi_cap.json \ - ${D}${datadir}/ipmi-providers/dcmi_cap.json - install -m 0644 -D ${WORKDIR}/dcmi_sensors.json \ - ${D}${datadir}/ipmi-providers/dcmi_sensors.json - install -m 0644 -D ${WORKDIR}/dev_id.json \ - ${D}${datadir}/ipmi-providers/dev_id.json - install -m 0644 -D ${WORKDIR}/power_reading.json \ - ${D}${datadir}/ipmi-providers/power_reading.json -} diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config/cipher_list.json b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config/cipher_list.json deleted file mode 100644 index 767fc708c..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config/cipher_list.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "a":{ - "cipher":3, - "authentication":1, - "integrity":1, - "confidentiality":1 - }, - "b":{ - "cipher":17, - "authentication":3, - "integrity":4, - "confidentiality":1 - } -} diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_cap.json b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_cap.json deleted file mode 100644 index 2d8832081..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_cap.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "PowerManagement": 1, - "OOBSecondaryLan": 0, - "SerialTMODE": 0, - "InBandSystemInterfaceChannel": 1, - "SELAutoRollOver": 1, - "FlushEntireSELUponRollOver": 0, - "RecordLevelSELFlushUponRollOver": 0, - "NumberOfSELEntries": 200, - "TempMonitoringSamplingFreq":0, - "PowerMgmtDeviceSlaveAddress": 0, - "BMCChannelNumber": 0, - "DeviceRivision": 0, - "MandatoryPrimaryLanOOBSupport": 1, - "OptionalSecondaryLanOOBSupport": 255, - "OptionalSerialOOBMTMODECapability": 255 -} diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json deleted file mode 100644 index 502f6d162..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "inlet": [ - ], - "baseboard": [ - ], - "cpu": [ - ] -} diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json deleted file mode 100644 index 3440e0b2f..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json +++ /dev/null @@ -1,2 +0,0 @@ -{"id": 0, "revision": 0, "addn_dev_support": 0, - "manuf_id": 0, "prod_id": 0, "aux": 0} diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config/power_reading.json b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config/power_reading.json deleted file mode 100644 index f3d051f6e..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-config/power_reading.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "path": "" -} diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-hostfw-config-example-native.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-hostfw-config-example-native.bb deleted file mode 100644 index aca1d0aab..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-hostfw-config-example-native.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Sample hostfw inventory map for phosphor-ipmi-fru" -PR = "r1" - -inherit native -inherit phosphor-ipmi-fru - -require phosphor-ipmi-fru.inc - -PROVIDES += "virtual/phosphor-ipmi-fru-hostfw-config" - -S = "${WORKDIR}/git" - -do_install() { - DEST=${D}${hostfw_datadir} - install -d ${DEST} - - # TODO: copy example hostfw yaml to ${DEST}/config.yaml - # install fru-types.yaml ${DEST}/config.yaml -} diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-example-native.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-example-native.bb deleted file mode 100644 index acd98355c..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-example-native.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Sample inventory map for phosphor-ipmi-fru" -PR = "r1" - -inherit native -inherit phosphor-ipmi-fru - -require phosphor-ipmi-fru.inc - -PROVIDES += "virtual/phosphor-ipmi-fru-inventory" - -S = "${WORKDIR}/git" - -do_install() { - # TODO: install this to inventory_datadir - # after ipmi-fru-parser untangles the host - # firmware config from the machine inventory. - DEST=${D}${config_datadir} - install -d ${DEST} - install scripts/example.yaml ${DEST}/config.yaml -} diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-mrw-native.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-mrw-native.bb deleted file mode 100644 index 795c9b9c9..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-mrw-native.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Generate inventory map for phosphor-ipmi-fru from an MRW." -PR = "r1" - -inherit native -inherit phosphor-ipmi-fru -inherit mrw-xml - -require phosphor-ipmi-fru.inc - -DEPENDS += "mrw-native mrw-perl-tools-native" - -# TODO: remove this dependency after the MRW script -# has been updated to not require the hostfw metadata. -DEPENDS += "virtual/phosphor-ipmi-fru-hostfw-config" - -PROVIDES += "virtual/phosphor-ipmi-fru-inventory" - -S = "${WORKDIR}/git" -do_install() { - - DEST=${D}${config_datadir} - install -d ${DEST} - - ${bindir}/perl-native/perl \ - ${bindir}/gen_ipmi_fru.pl \ - -i ${mrw_datadir}/${MRW_XML} \ - -m ${hostfw_datadir}/config.yaml \ - -o ${DEST}/config.yaml -} diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bb deleted file mode 100644 index a44774ea1..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "To merge the Host and BMC config files generated from MRW " -DESCRIPTION = "Merge host provided FRU info config file, fru info config, \ -which is not sent by host config, and BMC accessible FRU info config \ -files generated by gen-ipmi-fru.pl into a single config file. \ -fru-gen parser parses the merged config file and generates cpp file" -PR = "r1" - -inherit native -inherit phosphor-ipmi-host -inherit obmc-phosphor-license - -DEPENDS += "virtual/phosphor-ipmi-fru-read-inventory" -DEPENDS += "virtual/phosphor-ipmi-fru-read-bmc-inventory" -DEPENDS += "virtual/phosphor-ipmi-fru-read-not-sent-by-host-inventory" -PROVIDES += "virtual/phosphor-ipmi-fru-merge-config" - -do_install_append() { - SRC=${config_datadir} - DEST=${D}${config_datadir} - install -d ${DEST} - cat ${SRC}/config.yaml ${SRC}/bmc-fru-config.yaml > ${DEST}/fru_config.yaml - cat ${SRC}/fru-config-not-sent-by-host.yaml >> ${DEST}/fru_config.yaml -} diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw-native.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw-native.bb deleted file mode 100644 index 0a1c8bd1d..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw-native.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "FRU properties config for ipmi-fru-parser" -PR = "r1" - -inherit native -inherit obmc-phosphor-license -inherit phosphor-ipmi-fru -inherit mrw-xml - -SRC_URI += "file://config.yaml" - -DEPENDS += " \ - mrw-native \ - mrw-perl-tools-native \ - " - -PROVIDES += "virtual/phosphor-ipmi-fru-properties" - -S = "${WORKDIR}" - -do_install() { - DEST=${D}${properties_datadir} - install -d ${DEST} - - ${bindir}/perl-native/perl \ - ${bindir}/gen_fru_properties.pl \ - -m ${mrw_datadir}/${MRW_XML} \ - -c config.yaml \ - -o ${DEST}/extra-properties.yaml -} diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw/config.yaml b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw/config.yaml deleted file mode 100644 index ad5561000..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw/config.yaml +++ /dev/null @@ -1,31 +0,0 @@ -PROC: - xyz.openbmc_project.Inventory.Decorator.Replaceable: - FieldReplaceable: 'false' - xyz.openbmc_project.Inventory.Decorator.Cacheable: - Cached: 'false' - xyz.openbmc_project.Inventory.Item: - Present: 'true' - -DIMM: - xyz.openbmc_project.Inventory.Decorator.Replaceable: - FieldReplaceable: 'false' - xyz.openbmc_project.Inventory.Decorator.Cacheable: - Cached: 'false' - xyz.openbmc_project.Inventory.Item: - Present: 'true' - -SYS: - xyz.openbmc_project.Inventory.Decorator.Replaceable: - FieldReplaceable: 'false' - xyz.openbmc_project.Inventory.Decorator.Cacheable: - Cached: 'false' - xyz.openbmc_project.Inventory.Item: - Present: 'true' - -NODE: - xyz.openbmc_project.Inventory.Decorator.Replaceable: - FieldReplaceable: 'false' - xyz.openbmc_project.Inventory.Decorator.Cacheable: - Cached: 'false' - xyz.openbmc_project.Inventory.Item: - Present: 'true' diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-native.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-native.bb deleted file mode 100644 index 8040f889d..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-native.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "FRU properties config for ipmi-fru-parser" -PR = "r1" - -inherit native -inherit obmc-phosphor-license -inherit phosphor-ipmi-fru - -SRC_URI += "file://extra-properties.yaml" - -PROVIDES += "virtual/phosphor-ipmi-fru-properties" - -S = "${WORKDIR}" - -do_install() { - # This recipe is supposed to create an output yaml file with - # FRU property values extracted from the MRW. This example recipe - # provides a sample output file. - - DEST=${D}${properties_datadir} - install -d ${DEST} - install extra-properties.yaml ${DEST} -} diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties/extra-properties.yaml b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties/extra-properties.yaml deleted file mode 100644 index 626ef33b8..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties/extra-properties.yaml +++ /dev/null @@ -1,11 +0,0 @@ -/system/chassis/motherboard/cpu0: - xyz.openbmc_project.Inventory.Decorator.Replaceable: - FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Decorator.Cacheable: - Cached: 'true' - -/system/chassis/motherboard/dimm0: - xyz.openbmc_project.Inventory.Decorator.Replaceable: - FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Decorator.Cacheable: - Cached: 'true' diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bb deleted file mode 100644 index 2f845d524..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "BMC accesible FRU inventory map for phosphor-ipmi-host" -PR = "r1" - -inherit native -inherit obmc-phosphor-license -inherit phosphor-ipmi-host - -SRC_URI += "file://bmc-fru-config.yaml" - -S = "${WORKDIR}" - -PROVIDES += "virtual/phosphor-ipmi-fru-read-bmc-inventory" - -do_install_append() { - DEST=${D}${config_datadir} - install -d ${DEST} - install bmc-fru-config.yaml ${DEST}/bmc-fru-config.yaml -} - diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory/bmc-fru-config.yaml b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory/bmc-fru-config.yaml deleted file mode 100644 index ac13efb44..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory/bmc-fru-config.yaml +++ /dev/null @@ -1,43 +0,0 @@ -# A YAML similar to this sample would have to be generated, for eg with MRW -# inputs and system configuration, to depict IPMI FRU information. -# -# This file maps phosphor dbus inventory properties to IPMI properties -# -# This YAML could help generate C++ code. -# Format of the YAML: -# Fruid: -# Associated Fru paths -# d-bus Interfaces -# d-bus Properties -# IPMI Fru mapping -#5: -# /system/chassis/motherboard/fan1: -# xyz.openbmc_project.Inventory.Item: -# PrettyName: -# IPMIFruProperty: Product Name -# IPMIFruSection: Product -#6: -# /system/chassis/motherboard/boxelder/bmc: -# xyz.openbmc_project.Inventory.Item: -# PrettyName: -# IPMIFruProperty: Product Name -# IPMIFruSection: Board -# xyz.openbmc_project.Inventory.Decorator.Asset: -# BuildDate: -# IPMIFruProperty: Mfg Date -# IPMIFruSection: Board -# SerialNumber: -# IPMIFruProperty: Serial Number -# IPMIFruSection: Board -# PartNumber: -# IPMIFruProperty: Part Number -# IPMIFruSection: Board -# Manufacturer: -# IPMIFruProperty: Manufacturer -# IPMIFruSection: Board -#7: -# /system/chassis/motherboard/boxelder/bmc/ethernet: -# xyz.openbmc_project.Inventory.Item: -# PrettyName: -# IPMIFruProperty: Product Name -# IPMIFruSection: Product diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-example-native.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-example-native.bb deleted file mode 100644 index 6031322f6..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-example-native.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Sample inventory map for phosphor-ipmi-host" -PR = "r1" - -inherit native -inherit phosphor-ipmi-host - -require phosphor-ipmi-host.inc - -PROVIDES += "virtual/phosphor-ipmi-fru-read-inventory" - -S = "${WORKDIR}/git" - -do_install() { - DEST=${D}${config_datadir} - install -d ${DEST} - install scripts/fru-read-example.yaml ${DEST}/config.yaml -} diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-mrw-native.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-mrw-native.bb deleted file mode 100644 index 3c5e36fce..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-mrw-native.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "Generate inventory map for phosphor-ipmi-host from a MRW." -PR = "r1" - -inherit native -inherit phosphor-ipmi-host -inherit mrw-xml - -require phosphor-ipmi-host.inc - -DEPENDS += "mrw-native mrw-perl-tools-native" - -DEPENDS += "virtual/phosphor-ipmi-fru-hostfw-config" -PROVIDES += "virtual/phosphor-ipmi-fru-read-inventory" - -S = "${WORKDIR}/git" - -do_install() { - - DEST=${D}${config_datadir} - install -d ${DEST} - - ${bindir}/perl-native/perl \ - ${bindir}/gen_ipmi_fru.pl \ - -i ${mrw_datadir}/${MRW_XML} \ - -m ${hostfw_datadir}/config.yaml \ - -o ${DEST}/config.yaml -} diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bb deleted file mode 100644 index 029e6a3b0..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "The inventory map of frus not sent by host for phosphor-ipmi-host" -PR = "r1" - -inherit native -inherit obmc-phosphor-license -inherit phosphor-ipmi-host - -SRC_URI += "file://fru-config-not-sent-by-host.yaml" - -S = "${WORKDIR}" - -PROVIDES += "virtual/phosphor-ipmi-fru-read-not-sent-by-host-inventory" - -do_install_append() { - DEST=${D}${config_datadir} - install -d ${DEST} - install fru-config-not-sent-by-host.yaml ${DEST}/fru-config-not-sent-by-host.yaml -} - diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory/fru-config-not-sent-by-host.yaml b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory/fru-config-not-sent-by-host.yaml deleted file mode 100644 index 9fa1fed43..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory/fru-config-not-sent-by-host.yaml +++ /dev/null @@ -1,21 +0,0 @@ -# A YAML similar to this sample would have to be generated, for eg with MRW -# inputs and system configuration, to depict IPMI FRU information. -# -# This file maps phosphor dbus inventory properties to IPMI properties -# -# This YAML could help generate C++ code. -# Format of the YAML: -# Fruid: -# Associated Fru paths -# d-bus Interfaces -# d-bus Properties -# IPMI Fru mapping -#20: -# /system/chassis/motherboard/gv100card0: -# entityID: 3 -# entityInstance: 1 -# interfaces: -# xyz.openbmc_project.Inventory.Item: -# PrettyName: -# IPMIFruProperty: Board Name -# IPMIFruSection: Board diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-whitelist-native.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-whitelist-native.bb deleted file mode 100644 index 30c2443c3..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-whitelist-native.bb +++ /dev/null @@ -1,6 +0,0 @@ -SUMMARY = "Whitelisted IPMI FRU Parser commands" -DESCRIPTION = "Whitelisted IPMI FRU Parser commands for OpenBMC" - -inherit obmc-phosphor-license -inherit native -inherit phosphor-ipmi-host-whitelist
\ No newline at end of file diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-whitelist/phosphor-ipmi-fru-whitelist-native.conf b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-whitelist/phosphor-ipmi-fru-whitelist-native.conf deleted file mode 100644 index 365c3d952..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru-whitelist/phosphor-ipmi-fru-whitelist-native.conf +++ /dev/null @@ -1,2 +0,0 @@ -#<NetFn>:<Command> -0x0A:0x12 //<Storage>:<Write FRU Data>
\ No newline at end of file diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru.bb deleted file mode 100644 index 251df427c..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru.bb +++ /dev/null @@ -1,50 +0,0 @@ -SUMMARY = "Phosphor IPMI Inventory Plugin" -DESCRIPTION = "A Phosphor IPMI plugin that updates inventory." -PR = "r1" - -inherit autotools pkgconfig -inherit obmc-phosphor-systemd -inherit obmc-phosphor-ipmiprovider-symlink -inherit phosphor-ipmi-fru -inherit pythonnative - -require ${PN}.inc - -DEPENDS += " \ - virtual/phosphor-ipmi-fru-hostfw-config\ - virtual/phosphor-ipmi-fru-inventory \ - virtual/phosphor-ipmi-fru-properties \ - systemd \ - sdbusplus \ - python-mako-native \ - python-pyyaml-native \ - phosphor-ipmi-host \ - phosphor-mapper \ - autoconf-archive-native \ - " - -RDEPENDS_${PN} += " \ - sdbusplus \ - " - -SYSTEMD_SERVICE_${PN} += "obmc-read-eeprom@.service" - -S = "${WORKDIR}/git" - -HOSTIPMI_PROVIDER_LIBRARY += "libstrgfnhandler.so" - -FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" -FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}" -FILES_${PN}-dev_append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la" - -# TODO: Fix the the ipmi-fru-parser code generator to handle split -# host firmware / inventory YAML and replace the OECONF below with: -# -# EXTRA_OECONF += "INVENTORY_YAML=${inventory_datadir}/config.yaml" -# EXTRA_OECONF += "HOSTFW_YAML=${hostfw_datadir}/config.yaml" -# -# For now the generator requires them to already be combined so we have: -EXTRA_OECONF = " \ - YAML_GEN=${STAGING_DIR_NATIVE}${config_datadir}/config.yaml \ - PROP_YAML=${STAGING_DIR_NATIVE}${properties_datadir}/extra-properties.yaml \ - " diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc deleted file mode 100644 index 0b348ba1a..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc +++ /dev/null @@ -1,5 +0,0 @@ -HOMEPAGE = "https://github.com/openbmc/ipmi-fru-parser" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=7702f203b58979ebbc31bfaeb44f219c" -SRC_URI += "git://github.com/openbmc/ipmi-fru-parser" -SRCREV = "c19b813e79e71a6b66887434f1dc4468df1d88bf" diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc-read-eeprom@.service b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc-read-eeprom@.service deleted file mode 100644 index 4bae65d3f..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc-read-eeprom@.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Read %I EEPROM -Wants=mapper-wait@-xyz-openbmc_project-inventory.service -After=mapper-wait@-xyz-openbmc_project-inventory.service - -[Service] -Restart=no -Type=oneshot -EnvironmentFile={envfiledir}/obmc/eeproms/%I -ExecStart=/usr/bin/env phosphor-read-eeprom --eeprom $SYSFS_PATH --fruid $FRUID -SyslogIdentifier=phosphor-read-eeprom - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host.bb deleted file mode 100644 index 7a2f7c1fd..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host.bb +++ /dev/null @@ -1,122 +0,0 @@ -SUMMARY = "Phosphor OpenBMC IPMI daemon" -DESCRIPTION = "Phosphor OpenBMC IPMI router and plugin libraries" -PR = "r1" - -RRECOMMENDS_${PN} += "packagegroup-obmc-ipmid-providers-libs" - -inherit autotools pkgconfig -inherit obmc-phosphor-ipmiprovider-symlink -inherit obmc-phosphor-license -inherit obmc-phosphor-sdbus-service -inherit obmc-phosphor-systemd -inherit phosphor-ipmi-host -inherit pythonnative - -def ipmi_whitelists(d): - whitelists = d.getVar( - 'VIRTUAL-RUNTIME_phosphor-ipmi-providers', True) or '' - whitelists = whitelists.split() - whitelists = [ '{}-whitelist-native'.format(x) for x in whitelists ] - return ' '.join(whitelists) - -DEPENDS += "autoconf-archive-native" -DEPENDS += "nlohmann-json" -DEPENDS += "obmc-targets" -DEPENDS += "${@ipmi_whitelists(d)}" -DEPENDS += "phosphor-dbus-interfaces" -DEPENDS += "phosphor-logging" -DEPENDS += "phosphor-mapper" -DEPENDS += "sdbusplus" -DEPENDS += "sdbus++-native" -DEPENDS += "virtual/phosphor-ipmi-inventory-sel" -DEPENDS += "virtual/phosphor-ipmi-fru-merge-config" -DEPENDS += "virtual/phosphor-ipmi-sensor-inventory" -DEPENDS += "virtual/phosphor-ipmi-channel-config" - -VIRTUAL-RUNTIME_ipmi-config ?= "phosphor-ipmi-config" - -RDEPENDS_${PN}-dev += "phosphor-logging" -RDEPENDS_${PN}-dev += "phosphor-mapper-dev" -RDEPENDS_${PN} += "clear-once" -RDEPENDS_${PN} += "libmapper" -RDEPENDS_${PN} += "network" -RDEPENDS_${PN} += "phosphor-dbus-interfaces" -RDEPENDS_${PN} += "phosphor-mapper" -RDEPENDS_${PN} += "phosphor-time-manager" -RDEPENDS_${PN} += "sdbusplus" -RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_ipmi-config}" -RDEPENDS_${PN} += "virtual/obmc-watchdog" - -SYSTEMD_SERVICE_${PN} += "xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service phosphor-ipmi-host.service" - -RRECOMMENDS_${PN} += "${VIRTUAL-RUNTIME_obmc-settings-mgmt}" - - -require ${PN}.inc - -# Setup IPMI Whitelist Conf files -WHITELIST_CONF = " \ - ${STAGING_DATADIR_NATIVE}/phosphor-ipmi-host/*.conf \ - ${S}/host-ipmid-whitelist.conf \ - " -EXTRA_OECONF = " \ - WHITELIST_CONF="${WHITELIST_CONF}" \ - SENSOR_YAML_GEN=${STAGING_DIR_NATIVE}${sensor_datadir}/sensor.yaml \ - INVSENSOR_YAML_GEN=${STAGING_DIR_NATIVE}${sensor_datadir}/invsensor.yaml \ - FRU_YAML_GEN=${STAGING_DIR_NATIVE}${config_datadir}/fru_config.yaml \ - CHANNEL_YAML_GEN=${STAGING_DIR_NATIVE}${sensor_datadir}/channel.yaml \ - POWER_READING_SENSOR=${datadir}/ipmi-providers/power_reading.json\ - " - -S = "${WORKDIR}/git" - -SRC_URI += "file://merge_yamls.py " - -HOSTIPMI_PROVIDER_LIBRARY += "libipmi20.so" -HOSTIPMI_PROVIDER_LIBRARY += "libsysintfcmds.so" - -NETIPMI_PROVIDER_LIBRARY += "libipmi20.so" - -FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}" -FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" -FILES_${PN}_append = " ${libdir}/net-ipmid/lib*${SOLIBS}" -FILES_${PN}-dev_append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la" - -# Soft Power Off -# install the soft power off service in the host shutdown target -SOFT_SVC = "xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service" -SOFT_TGTFMT = "obmc-host-shutdown@{0}.target" -SOFT_FMT = "../${SOFT_SVC}:${SOFT_TGTFMT}.requires/${SOFT_SVC}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'SOFT_FMT', 'OBMC_HOST_INSTANCES')}" - -#Collect all hardcoded sensor yamls from different recipes and -#merge all of them with sensor.yaml. -python do_merge_sensors () { - import subprocess - - # TODO: Perform the merge in a temporary directory? - workdir = d.getVar('WORKDIR', True) - nativedir = d.getVar('STAGING_DIR_NATIVE', True) - sensorsdir = d.getVar('sensor_datadir', True) - sensorsdir = sensorsdir[1:] - sensorsdir = os.path.join(nativedir, sensorsdir) - cmd = [] - cmd.append(os.path.join(workdir, 'merge_yamls.py')) - cmd.append(os.path.join(sensorsdir, 'sensor.yaml')) - - if os.stat(os.path.join(sensorsdir, 'sensor.yaml')).st_size == 0: - return - fetch = bb.fetch2.Fetch([], d) - override_urls = [url for url in fetch.urls if url.endswith('.hardcoded.yaml')] - for url in override_urls: - bb.debug(2, 'Overriding with source: ' + url) - local_base = os.path.basename(fetch.localpath(url)) - filename = os.path.join(workdir, local_base) - cmd.append(filename) - - # Invoke the script and don't catch any resulting exception. - subprocess.check_call(cmd) -} - -# python-pyyaml-native is installed by do_configure, so put this task after -addtask merge_sensors after do_configure before do_compile diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host.inc deleted file mode 100644 index c6247fb5c..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host.inc +++ /dev/null @@ -1,5 +0,0 @@ -HOMEPAGE = "http://github.com/openbmc/phosphor-host-ipmid" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" -SRC_URI += "git://github.com/openbmc/phosphor-host-ipmid" -SRCREV = "1e12112baf56f9a8ec6dbf7fb409c84f35fff1e8" diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py deleted file mode 100755 index 5e6c4b5e6..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py +++ /dev/null @@ -1,59 +0,0 @@ -#!/usr/bin/env python -"""Copied from phosphor-settings-manager -Loads a "target" YAML file and overwrites its values with values from -"override" YAML files. - -Override files are processed in the order given. - -Usage: - merge_settings.py <target yaml> [override yamls] -""" -import sys -import yaml -import copy - -def dict_merge(target, source): - """Deep merge for dicts. - - Works like dict.update() that recursively updates any dict values present in - both parameters. - - Args: - target (dict): Values to be overwritten by corresponding values from - `source`. - source (dict): Overriding values. Not changed by call. - - Returns: - `target` with values overwritten from those in `source` at any and all - levels of nested dicts. - """ - if not isinstance(source, dict): - return source - for k, v in source.iteritems(): - if k in target and isinstance(target[k], dict): - dict_merge(target[k], v) - else: - target[k] = copy.deepcopy(v) - return target - -if len(sys.argv) < 2: - sys.exit('Argument required: target yaml') - -if len(sys.argv) == 2: - # No overrides to handle - sys.exit(0) - -target_filename = sys.argv[1] -with open(target_filename) as target_file: - data = yaml.safe_load(target_file) - print('Loaded target YAML file ' + target_filename) - -for override_filename in sys.argv[2:]: - with open(override_filename) as override_file: - override = yaml.safe_load(override_file) - dict_merge(data, override) - print('Merged override YAML file ' + override_filename) - -with open(target_filename, 'w') as target_file: - yaml.dump(data, target_file, default_flow_style=False) - print('Wrote merged target YAML file ' + target_filename) diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service deleted file mode 100644 index 3f10e11db..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service +++ /dev/null @@ -1,21 +0,0 @@ -[Unit] -Description=Phosphor Inband IPMI -# TODO openbmc/openbmc#2059 - The wants/after below should be based on providers -Wants=mapper-wait@-xyz-openbmc_project-control-host0-boot.service -After=mapper-wait@-xyz-openbmc_project-control-host0-boot.service -Wants=mapper-wait@-xyz-openbmc_project-control-host0-boot-one_time.service -After=mapper-wait@-xyz-openbmc_project-control-host0-boot-one_time.service -Wants=mapper-wait@-xyz-openbmc_project-control-host0-power_restore_policy.service -After=mapper-wait@-xyz-openbmc_project-control-host0-power_restore_policy.service -Wants=mapper-wait@-xyz-openbmc_project-control-host0-restriction_mode.service -After=mapper-wait@-xyz-openbmc_project-control-host0-restriction_mode.service -Wants=clear-once.service -After=clear-once.service - -[Service] -Restart=always -ExecStart=/usr/bin/env ipmid -SyslogIdentifier=ipmid - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host/xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host/xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service deleted file mode 100644 index 600c86ac2..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-host/xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Soft power off of the host -Wants=mapper-wait@-org-openbmc-HostIpmi-1.service -After=mapper-wait@-org-openbmc-HostIpmi-1.service -Wants=obmc-host-stopping@0.target -Before=obmc-host-stopping@0.target -Conflicts=obmc-host-start@0.target -ConditionPathExists=!/run/openbmc/host@0-request - -[Service] -Restart=no -ExecStart=/usr/bin/env phosphor-softpoweroff -SyslogIdentifier=phosphor-softpoweroff -Type=oneshot diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-hw-example.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-hw-example.bb deleted file mode 100644 index 4639a9025..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-hw-example.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Phosphor OpenBMC host IPMI to DBUS Example" -DESCRIPTION = "Phosphor OpenBMC host IPMI to DBUS example implementation." -PR = "r1" - -RDEPENDS_${PN} += "python-subprocess python-dbus python-pygobject" -RRECOMMENDS_${PN} += "phosphor-ipmi-host" - -inherit skeleton-python - -PROVIDES += "virtual/obmc-host-ipmi-hw" -RPROVIDES_${PN} += "virtual-obmc-host-ipmi-hw" - -SKELETON_DIR = "pyipmitest" diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-mrw-native.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-mrw-native.bb deleted file mode 100644 index f04d89f7d..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-mrw-native.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Inventory to Sensor config for phosphor-host-ipmi" -PR = "r1" - -inherit native -inherit obmc-phosphor-license -inherit phosphor-ipmi-host -inherit mrw-xml - -SRC_URI += "file://config.yaml" - -DEPENDS += " \ - mrw-native \ - mrw-perl-tools-native \ - " - -PROVIDES += "virtual/phosphor-ipmi-inventory-sel" - -S = "${WORKDIR}" - -do_install() { - DEST=${D}${sensor_datadir} - install -d ${DEST} - - ${bindir}/perl-native/perl \ - ${bindir}/gen_ipmi_sel.pl \ - -i ${mrw_datadir}/${MRW_XML} \ - -m config.yaml \ - -o ${DEST}/invsensor.yaml -} diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-mrw/config.yaml b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-mrw/config.yaml deleted file mode 100644 index a6e5550d3..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-mrw/config.yaml +++ /dev/null @@ -1,24 +0,0 @@ -# Maps the Entity ID to the interested Sensor Type & Offset -0x01: - SensorType: 0x12 - Offset: 0x02 - -0x03: - SensorType: 0x07 - Offset: 0x08 - -0x07: - SensorType: 0xC7 - Offset: 0x00 - -0x20: - SensorType: 0x0C - Offset: 0x04 - -0xD0: - SensorType: 0x07 - Offset: 0x08 - -0xD8: - SensorType: 0x17 - Offset: 0x08 diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-native.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-native.bb deleted file mode 100644 index 272e53388..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-native.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Inventory to Sensor config for non-mrw machines" -PR = "r1" - -inherit native -inherit phosphor-ipmi-host -inherit obmc-phosphor-license - -PROVIDES += "virtual/phosphor-ipmi-inventory-sel" - -SRC_URI += "file://config.yaml" - -S = "${WORKDIR}" - -do_install() { - # This recipe would provide the sample inventory to sensor config - # mapping, for non-mrw machines. - - DEST=${D}${sensor_datadir} - install -d ${DEST} - install config.yaml ${DEST}/invsensor.yaml -} diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel/config.yaml b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel/config.yaml deleted file mode 100644 index c3b4ba186..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel/config.yaml +++ /dev/null @@ -1,340 +0,0 @@ -/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm0: - sensorID: 0xa6 - sensorType: 0x0C - eventReadingType: 0x6F - offset: 0x04 -/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm1: - sensorID: 0xa8 - sensorType: 0x0C - eventReadingType: 0x6F - offset: 0x04 -/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm10: - sensorID: 0xba - sensorType: 0x0C - eventReadingType: 0x6F - offset: 0x04 -/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm11: - sensorID: 0xbc - sensorType: 0x0C - eventReadingType: 0x6F - offset: 0x04 -/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm12: - sensorID: 0xbe - sensorType: 0x0C - eventReadingType: 0x6F - offset: 0x04 -/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm13: - sensorID: 0xc0 - sensorType: 0x0C - eventReadingType: 0x6F - offset: 0x04 -/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm14: - sensorID: 0xc2 - sensorType: 0x0C - eventReadingType: 0x6F - offset: 0x04 -/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm15: - sensorID: 0xc4 - sensorType: 0x0C - eventReadingType: 0x6F - offset: 0x04 -/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm2: - sensorID: 0xaa - sensorType: 0x0C - eventReadingType: 0x6F - offset: 0x04 -/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm3: - sensorID: 0xac - sensorType: 0x0C - eventReadingType: 0x6F - offset: 0x04 -/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm4: - sensorID: 0xae - sensorType: 0x0C - eventReadingType: 0x6F - offset: 0x04 -/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm5: - sensorID: 0xb0 - sensorType: 0x0C - eventReadingType: 0x6F - offset: 0x04 -/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm6: - sensorID: 0xb2 - sensorType: 0x0C - eventReadingType: 0x6F - offset: 0x04 -/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm7: - sensorID: 0xb4 - sensorType: 0x0C - eventReadingType: 0x6F - offset: 0x04 -/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm8: - sensorID: 0xb6 - sensorType: 0x0C - eventReadingType: 0x6F - offset: 0x04 -/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm9: - sensorID: 0xb8 - sensorType: 0x0C - eventReadingType: 0x6F - offset: 0x04 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0: - sensorID: 0x5a - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core0: - sensorID: 0x12 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core1: - sensorID: 0x15 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core2: - sensorID: 0x18 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core3: - sensorID: 0x1b - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core4: - sensorID: 0x1e - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core5: - sensorID: 0x21 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core6: - sensorID: 0x24 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core7: - sensorID: 0x27 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core8: - sensorID: 0x2a - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core9: - sensorID: 0x2d - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core10: - sensorID: 0x30 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core11: - sensorID: 0x33 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core12: - sensorID: 0x36 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core13: - sensorID: 0x39 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core14: - sensorID: 0x3c - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core15: - sensorID: 0x3f - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core16: - sensorID: 0x42 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core17: - sensorID: 0x45 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core18: - sensorID: 0x48 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core19: - sensorID: 0x4b - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core20: - sensorID: 0x4e - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core21: - sensorID: 0x51 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core22: - sensorID: 0x54 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0/core23: - sensorID: 0x57 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1: - sensorID: 0xa4 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core0: - sensorID: 0x5c - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core1: - sensorID: 0x5f - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core2: - sensorID: 0x62 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core3: - sensorID: 0x65 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core4: - sensorID: 0x68 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core5: - sensorID: 0x6b - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core6: - sensorID: 0x6e - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core7: - sensorID: 0x71 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core8: - sensorID: 0x74 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core9: - sensorID: 0x77 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core10: - sensorID: 0x7a - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core11: - sensorID: 0x7d - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core12: - sensorID: 0x80 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core13: - sensorID: 0x83 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core14: - sensorID: 0x86 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core15: - sensorID: 0x89 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core16: - sensorID: 0x8c - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core17: - sensorID: 0x8f - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core18: - sensorID: 0x92 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core19: - sensorID: 0x95 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core20: - sensorID: 0x98 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core21: - sensorID: 0x9b - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core22: - sensorID: 0x9e - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu1/core23: - sensorID: 0xa1 - sensorType: 0x07 - eventReadingType: 0x6F - offset: 0x08 -/xyz/openbmc_project/inventory/system/chassis/motherboard: - sensorID: 0x0c - sensorType: 0xC7 - eventReadingType: 0x03 - offset: 0x00 -/xyz/openbmc_project/inventory/system: - sensorID: 0x01 - sensorType: 0x12 - eventReadingType: 0x6F - offset: 0x02
\ No newline at end of file diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-kcs/org.openbmc.HostIpmi.service b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-kcs/org.openbmc.HostIpmi.service deleted file mode 100644 index 1f0da7533..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-kcs/org.openbmc.HostIpmi.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Phosphor IPMI KCS DBus Bridge -After=phosphor-ipmi-host.service - -[Service] -Restart=always -ExecStart={sbindir}/kcsbridged --d="/dev/{KCS_DEVICE}" -Type=dbus -BusName={BUSNAME} - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb deleted file mode 100644 index 9f25c0bf8..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "Phosphor OpenBMC KCS to DBUS" -DESCRIPTION = "Phosphor OpenBMC KCS to DBUS." -PR = "r1" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b1beb00e508e89da1ed2a541934f28c0" - -inherit autotools pkgconfig -inherit obmc-phosphor-dbus-service - -PV = "1.0+git${SRCPV}" - -KCS_DEVICE ?= "ipmi-kcs3" - -DBUS_SERVICE_${PN} = "org.openbmc.HostIpmi.service" -SYSTEMD_SUBSTITUTIONS += "KCS_DEVICE:${KCS_DEVICE}:${DBUS_SERVICE_${PN}}" - -PROVIDES += "virtual/obmc-host-ipmi-hw" -RPROVIDES_${PN} += "virtual-obmc-host-ipmi-hw" -RRECOMMENDS_${PN} += "phosphor-ipmi-host" - -DEPENDS += " \ - autoconf-archive-native \ - systemd \ - " -RDEPENDS_${PN} += "libsystemd" - -S = "${WORKDIR}/git" -SRC_URI = "git://github.com/openbmc/kcsbridge.git;protocol=https" -SRCREV = "a1c50751b57a73ee38469c03960831ace72bc860" - -# This is how linux-libc-headers says to include custom uapi headers -CFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include/uapi" -do_configure[depends] += "virtual/kernel:do_shared_workdir" diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-net.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-net.bb deleted file mode 100644 index 481e8f32f..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-net.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Phosphor Network IPMI Daemon" -DESCRIPTION = "Daemon to support IPMI protocol over network" -HOMEPAGE = "https://github.com/openbmc/phosphor-net-ipmid" -PR = "r1" - -inherit autotools pkgconfig -inherit obmc-phosphor-license -inherit obmc-phosphor-systemd - -DEPENDS += "autoconf-archive-native" -DEPENDS += "phosphor-mapper" -DEPENDS += "systemd" -DEPENDS += "phosphor-ipmi-host" -RDEPENDS_${PN} += "libmapper" -RDEPENDS_${PN} += "libsystemd" - -SRC_URI += "git://github.com/openbmc/phosphor-net-ipmid" -SRCREV = "fe5a64587256eced4736cd70f23b5be58c8933a3" - -S = "${WORKDIR}/git" - -SYSTEMD_SERVICE_${PN} = " \ - ${PN}.service \ - ${PN}.socket \ - " diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-net/phosphor-ipmi-net.service b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-net/phosphor-ipmi-net.service deleted file mode 100644 index b1f51dc65..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-net/phosphor-ipmi-net.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Network IPMI daemon -# TODO openbmc/openbmc#2059 - The wants/after below should be based on providers -Wants=mapper-wait@-xyz-openbmc_project-control-host0-boot.service -After=mapper-wait@-xyz-openbmc_project-control-host0-boot.service -Wants=mapper-wait@-xyz-openbmc_project-control-host0-boot-one_time.service -After=mapper-wait@-xyz-openbmc_project-control-host0-boot-one_time.service -Wants=mapper-wait@-xyz-openbmc_project-control-host0-power_restore_policy.service -After=mapper-wait@-xyz-openbmc_project-control-host0-power_restore_policy.service -Wants=mapper-wait@-xyz-openbmc_project-control-host0-restriction_mode.service -After=mapper-wait@-xyz-openbmc_project-control-host0-restriction_mode.service - -[Service] -ExecStart=/usr/bin/env netipmid -SyslogIdentifier=netipmid -Restart=always diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-net/phosphor-ipmi-net.socket b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-net/phosphor-ipmi-net.socket deleted file mode 100644 index 077b7804c..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-net/phosphor-ipmi-net.socket +++ /dev/null @@ -1,6 +0,0 @@ -[Socket] -ListenDatagram=623 - -[Install] -WantedBy=sockets.target - diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bb deleted file mode 100644 index 7fe9ae3da..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "OpenBMC - IPMI sensors" -PR = "r1" - -inherit native -inherit obmc-phosphor-license - -OBMC_IPMI_SENSORS_PROVIDERS = "phosphor-ipmi-sensor-inventory-mrw-config-native" - -DEPENDS_append = " ${OBMC_IPMI_SENSORS_PROVIDERS} " diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config-native.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config-native.bb deleted file mode 100644 index a33eb2b54..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config-native.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "sensor config for phosphor-host-ipmid" -PR = "r1" - -inherit native -inherit obmc-phosphor-license -inherit phosphor-ipmi-host - -SRC_URI += "file://config.yaml" - -S = "${WORKDIR}" - -do_install() { - DEST=${D}${sensor_yamldir} - install -d ${DEST} - install config.yaml ${DEST}/config.yaml -} - diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml deleted file mode 100644 index d0e4f57d5..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml +++ /dev/null @@ -1,328 +0,0 @@ -boot_count_sensor: - path: /xyz/openbmc_project/state/host0 - serviceInterface: org.freedesktop.DBus.Properties - readingType: readingAssertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameProperty - interfaces: - xyz.openbmc_project.Control.Boot.RebootAttempts: - AttemptsLeft: - Offsets: - 0xFF: - type: uint32_t - -os_boot_sensor: - path: /xyz/openbmc_project/state/host0 - serviceInterface: org.freedesktop.DBus.Properties - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameProperty - interfaces: - xyz.openbmc_project.State.OperatingSystem.Status: - OperatingSystemState: - Offsets: - 0x01: - assert: "xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.CBoot" - type: string - 0x02: - assert: "xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.PXEBoot" - type: string - 0x03: - assert: "xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.DiagBoot" - type: string - 0x04: - assert: "xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.CDROMBoot" - type: string - 0x05: - assert: "xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.ROMBoot" - type: string - 0x06: - assert: "xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.BootComplete" - type: string - -fw_boot_sensor: - path: /xyz/openbmc_project/state/host0 - serviceInterface: org.freedesktop.DBus.Properties - readingType: eventdata2 - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameProperty - interfaces: - xyz.openbmc_project.State.Boot.Progress: - BootProgress: - Offsets: - 0x00: - type: string - set: "xyz.openbmc_project.State.Boot.Progress.ProgressStages.Unspecified" - 0x01: - type: string - set: "xyz.openbmc_project.State.Boot.Progress.ProgressStages.MemoryInit" - 0x03: - type: string - set: "xyz.openbmc_project.State.Boot.Progress.ProgressStages.SecondaryProcInit" - 0x07: - type: string - set: "xyz.openbmc_project.State.Boot.Progress.ProgressStages.PCIInit" - 0x13: - type: string - set: "xyz.openbmc_project.State.Boot.Progress.ProgressStages.OSStart" - 0x14: - type: string - set: "xyz.openbmc_project.State.Boot.Progress.ProgressStages.MotherboardInit" - -dimm_func_sensor: - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 0x04: - type: "bool" - assert: false - deassert: true - Prereqs: - 0x06: - type: "bool" - assert: true - deassert: false - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x06: - type: "bool" - assert: true - deassert: false - -cpu_func_sensor: - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 0x08: - type: "bool" - assert: false - deassert: true - Prereqs: - 0x07: - type: "bool" - assert: true - deassert: false - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - type: "bool" - assert: true - deassert: false - -cpucore_func_sensor: - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 0x08: - type: "bool" - assert: false - deassert: true - Prereqs: - 0x07: - type: "bool" - assert: true - deassert: false - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - type: "bool" - assert: true - deassert: false - skipOn: "deassert" - -tpm_required_sensor: - path: /xyz/openbmc_project/control/host0/TPMEnable - serviceInterface: org.freedesktop.DBus.Properties - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameLeaf - interfaces: - xyz.openbmc_project.Control.TPM.Policy: - TPMEnable: - Offsets: - 0x00: - type: "bool" - assert: false - 0x01: - type: "bool" - assert: true - -gpu_func_sensor: - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Offsets: - 0x08: - type: "bool" - assert: false - deassert: true - Prereqs: - 0x07: - type: "bool" - assert: true - deassert: false - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - type: "bool" - assert: true - deassert: false -# Field replaceable doesn't come as a sensor data -# but we know that GPU is Field replaceable so setting -# true in both cases. - xyz.openbmc_project.Inventory.Decorator.Replaceable: - FieldReplaceable: - Offsets: - 0x07: - type: "bool" - assert: true - deassert: true - -host_auto_reboot_control_sensor: - path: /xyz/openbmc_project/control/host0/auto_reboot - serviceInterface: org.freedesktop.DBus.Properties - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameLeaf - interfaces: - xyz.openbmc_project.Control.Boot.RebootPolicy: - AutoReboot: - Offsets: - 0x00: - type: "bool" - assert: false - 0x01: - type: "bool" - assert: true - -turbo_allowed_sensor: - path: /xyz/openbmc_project/control/host0/turbo_allowed - serviceInterface: org.freedesktop.DBus.Properties - readingType: assertion - mutability: Mutability::Read - sensorNamePattern: nameLeaf - interfaces: - xyz.openbmc_project.Control.Host.TurboAllowed: - TurboAllowed: - Offsets: - 0x00: - assert: false - deassert: true - type: bool - 0x01: - assert: true - deassert: false - type: bool - -cpucore_temp_sensor: - serviceInterface: org.freedesktop.DBus.Properties - readingType: readingData - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameLeaf - multiplierM: 1 - offsetB: -127 - bExp: 0 - rExp: 0 - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC - scale: -3 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 0xFF: - type: int64_t - -dimm_temp_sensor: - serviceInterface: org.freedesktop.DBus.Properties - readingType: readingData - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameLeaf - multiplierM: 1 - offsetB: -127 - bExp: 0 - rExp: 0 - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC - scale: -3 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 0xFF: - type: int64_t - -vrm_vdd_temp_sensor: - serviceInterface: org.freedesktop.DBus.Properties - readingType: readingData - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameLeaf - multiplierM: 1 - offsetB: -127 - bExp: 0 - rExp: 0 - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC - scale: -3 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 0xFF: - type: int64_t - -gpu_temp_sensor: - serviceInterface: org.freedesktop.DBus.Properties - readingType: readingData - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameLeaf - multiplierM: 1 - offsetB: -127 - bExp: 0 - rExp: 0 - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC - scale: -3 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 0xFF: - type: int64_t - -memory_temp_sensor: - serviceInterface: org.freedesktop.DBus.Properties - readingType: readingData - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameLeaf - multiplierM: 1 - offsetB: -127 - bExp: 0 - rExp: 0 - unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC - scale: -3 - interfaces: - xyz.openbmc_project.Sensor.Value: - Value: - Offsets: - 0xFF: - type: int64_t diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-native.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-native.bb deleted file mode 100644 index e58e02a64..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-native.bb +++ /dev/null @@ -1,56 +0,0 @@ -SUMMARY = "sensor config for phosphor-host-ipmid" -PR = "r1" - -inherit native -inherit obmc-phosphor-license -inherit phosphor-ipmi-host -inherit pythonnative -inherit mrw-xml - -DEPENDS += " \ - mrw-native \ - mrw-perl-tools-native \ - phosphor-ipmi-sensor-config-native \ - phosphor-ipmi-sensor-inventory-mrw-config-native \ - python-pyyaml-native \ - " - -PROVIDES += "virtual/phosphor-ipmi-sensor-inventory" - -S = "${WORKDIR}" -SRC_URI += "file://merge_sensor_config.py" - -do_install() { - DEST=${D}${sensor_datadir} - install -d ${DEST} - - ${bindir}/perl-native/perl \ - ${bindir}/gen_ipmi_sensor.pl \ - -i ${mrw_datadir}/${MRW_XML} \ - -m ${sensor_yamldir}/config.yaml \ - -o ${DEST}/sensor.yaml -} - -python do_merge_sensor_config () { - import subprocess - - # TODO: Perform the merge in a temporary directory? - workdir = d.getVar('WORKDIR', True) - nativedir = d.getVar('STAGING_DIR_NATIVE', True) - sensoryamldir = d.getVar('sensor_yamldir', True) - cmd = [] - cmd.append(os.path.join(workdir, 'merge_sensor_config.py')) - cmd.append(os.path.join(sensoryamldir, 'config.yaml')) - - fetch = os.listdir(sensoryamldir) - override_urls = [url for url in fetch if url.endswith('-config.yaml')] - for url in override_urls: - bb.debug(2, 'Merging extra configurations: ' + url) - filename = os.path.join(sensoryamldir, url) - cmd.append(filename) - - # Invoke the script and don't catch any resulting exception. - subprocess.check_call(cmd) -} -# python-pyyaml-native is installed by do_configure, so put this task after -addtask merge_sensor_config after do_configure before do_compile diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw/merge_sensor_config.py b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw/merge_sensor_config.py deleted file mode 120000 index 6ae3bcae9..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw/merge_sensor_config.py +++ /dev/null @@ -1 +0,0 @@ -../phosphor-ipmi-host/merge_yamls.py
\ No newline at end of file diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-native.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-native.bb deleted file mode 100644 index 2464ff005..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-native.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Sensor config for phosphor-host-ipmi" -PR = "r1" - -inherit native -inherit phosphor-ipmi-host -inherit obmc-phosphor-license - -PROVIDES += "virtual/phosphor-ipmi-sensor-inventory" - -SRC_URI += "file://config.yaml" - -S = "${WORKDIR}" - -do_install() { - # This recipe is supposed to create an output yaml file with - # sensor data extracted from the mrw. - # provides a sample output file. - - DEST=${D}${sensor_datadir} - install -d ${DEST} - install config.yaml ${DEST}/sensor.yaml -} diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory/config.yaml b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory/config.yaml deleted file mode 100644 index cc463c421..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory/config.yaml +++ /dev/null @@ -1,2108 +0,0 @@ -0x03: - entityID: 0x22 - entityInstance: 1 - sensorType: 0x0F - path: /xyz/openbmc_project/state/host0 - sensorReadingType: 0x6F - serviceInterface: org.freedesktop.DBus.Properties - readingType: eventdata2 - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameProperty - interfaces: - xyz.openbmc_project.State.Boot.Progress: - BootProgress: - Offsets: - 0x13: - type: string - set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.OSStart - 0x00: - type: string - set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.Unspecified - 0x01: - type: string - set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.MemoryInit - 0x03: - type: string - set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.SecondaryProcInit - 0x07: - type: string - set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.PCIInit - 0x14: - type: string - set: xyz.openbmc_project.State.Boot.Progress.ProgressStages.MotherboardInit -0x05: - entityID: 0x23 - entityInstance: 1 - sensorType: 0x1F - path: /xyz/openbmc_project/state/host0 - sensorReadingType: 0x6F - serviceInterface: org.freedesktop.DBus.Properties - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameProperty - interfaces: - xyz.openbmc_project.State.OperatingSystem.Status: - OperatingSystemState: - Offsets: - 0x02: - assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.PXEBoot - type: string - 0x06: - assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.BootComplete - type: string - 0x04: - assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.CDROMBoot - type: string - 0x01: - assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.CBoot - type: string - 0x03: - assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.DiagBoot - type: string - 0x05: - assert: xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.ROMBoot - type: string -0x07: - entityID: 0x22 - entityInstance: 2 - sensorType: 0xC3 - path: /xyz/openbmc_project/state/host0 - sensorReadingType: 0x6F - serviceInterface: org.freedesktop.DBus.Properties - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameProperty - interfaces: - xyz.openbmc_project.Control.Boot.RebootAttempts: - AttemptsLeft: - Offsets: - 0xFF: - type: uint32_t -0x12: - entityID: 0xD0 - entityInstance: 1 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu0/core0 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x15: - entityID: 0xD0 - entityInstance: 2 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu0/core1 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x18: - entityID: 0xD0 - entityInstance: 3 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu0/core2 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x1b: - entityID: 0xD0 - entityInstance: 4 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu0/core3 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x1e: - entityID: 0xD0 - entityInstance: 5 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu0/core4 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x21: - entityID: 0xD0 - entityInstance: 6 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu0/core5 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x24: - entityID: 0xD0 - entityInstance: 7 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu0/core6 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x27: - entityID: 0xD0 - entityInstance: 8 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu0/core7 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x2a: - entityID: 0xD0 - entityInstance: 9 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu0/core8 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x2d: - entityID: 0xD0 - entityInstance: 10 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu0/core9 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x30: - entityID: 0xD0 - entityInstance: 11 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu0/core10 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x33: - entityID: 0xD0 - entityInstance: 12 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu0/core11 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x36: - entityID: 0xD0 - entityInstance: 13 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu0/core12 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x39: - entityID: 0xD0 - entityInstance: 14 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu0/core13 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x3c: - entityID: 0xD0 - entityInstance: 15 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu0/core14 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x3f: - entityID: 0xD0 - entityInstance: 16 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu0/core15 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x42: - entityID: 0xD0 - entityInstance: 17 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu0/core16 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x45: - entityID: 0xD0 - entityInstance: 18 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu0/core17 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x48: - entityID: 0xD0 - entityInstance: 19 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu0/core18 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x4b: - entityID: 0xD0 - entityInstance: 20 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu0/core19 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x4e: - entityID: 0xD0 - entityInstance: 21 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu0/core20 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x51: - entityID: 0xD0 - entityInstance: 22 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu0/core21 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x54: - entityID: 0xD0 - entityInstance: 23 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu0/core22 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x57: - entityID: 0xD0 - entityInstance: 24 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu0/core23 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x5a: - entityID: 0x03 - entityInstance: 1 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu0 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool -0x5c: - entityID: 0xD0 - entityInstance: 25 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu1/core0 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x5f: - entityID: 0xD0 - entityInstance: 26 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu1/core1 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x62: - entityID: 0xD0 - entityInstance: 27 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu1/core2 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x65: - entityID: 0xD0 - entityInstance: 28 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu1/core3 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x68: - entityID: 0xD0 - entityInstance: 29 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu1/core4 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x6b: - entityID: 0xD0 - entityInstance: 30 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu1/core5 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x6e: - entityID: 0xD0 - entityInstance: 31 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu1/core6 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x71: - entityID: 0xD0 - entityInstance: 32 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu1/core7 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x74: - entityID: 0xD0 - entityInstance: 33 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu1/core8 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x77: - entityID: 0xD0 - entityInstance: 34 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu1/core9 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x7a: - entityID: 0xD0 - entityInstance: 35 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu1/core10 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x7d: - entityID: 0xD0 - entityInstance: 36 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu1/core11 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x80: - entityID: 0xD0 - entityInstance: 37 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu1/core12 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x83: - entityID: 0xD0 - entityInstance: 38 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu1/core13 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x86: - entityID: 0xD0 - entityInstance: 39 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu1/core14 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x89: - entityID: 0xD0 - entityInstance: 40 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu1/core15 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x8c: - entityID: 0xD0 - entityInstance: 41 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu1/core16 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x8f: - entityID: 0xD0 - entityInstance: 42 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu1/core17 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x92: - entityID: 0xD0 - entityInstance: 43 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu1/core18 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x95: - entityID: 0xD0 - entityInstance: 44 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu1/core19 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x98: - entityID: 0xD0 - entityInstance: 45 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu1/core20 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x9b: - entityID: 0xD0 - entityInstance: 46 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu1/core21 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0x9e: - entityID: 0xD0 - entityInstance: 47 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu1/core22 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0xa1: - entityID: 0xD0 - entityInstance: 48 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu1/core23 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameParentLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool - skipOn: deassert -0xa4: - entityID: 0x03 - entityInstance: 2 - sensorType: 0x07 - path: /system/chassis/motherboard/cpu1 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x07: - assert: true - deassert: false - type: bool - Offsets: - 0x08: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x07: - assert: true - deassert: false - type: bool -0xa6: - entityID: 0x20 - entityInstance: 1 - sensorType: 0x0C - path: /system/chassis/motherboard/dimm0 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x06: - assert: true - deassert: false - type: bool - Offsets: - 0x04: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x06: - assert: true - deassert: false - type: bool -0xa8: - entityID: 0x20 - entityInstance: 2 - sensorType: 0x0C - path: /system/chassis/motherboard/dimm1 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x06: - assert: true - deassert: false - type: bool - Offsets: - 0x04: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x06: - assert: true - deassert: false - type: bool -0xaa: - entityID: 0x20 - entityInstance: 3 - sensorType: 0x0C - path: /system/chassis/motherboard/dimm2 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x06: - assert: true - deassert: false - type: bool - Offsets: - 0x04: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x06: - assert: true - deassert: false - type: bool -0xac: - entityID: 0x20 - entityInstance: 4 - sensorType: 0x0C - path: /system/chassis/motherboard/dimm3 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x06: - assert: true - deassert: false - type: bool - Offsets: - 0x04: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x06: - assert: true - deassert: false - type: bool -0xae: - entityID: 0x20 - entityInstance: 5 - sensorType: 0x0C - path: /system/chassis/motherboard/dimm4 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x06: - assert: true - deassert: false - type: bool - Offsets: - 0x04: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x06: - assert: true - deassert: false - type: bool -0xb0: - entityID: 0x20 - entityInstance: 6 - sensorType: 0x0C - path: /system/chassis/motherboard/dimm5 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x06: - assert: true - deassert: false - type: bool - Offsets: - 0x04: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x06: - assert: true - deassert: false - type: bool -0xb2: - entityID: 0x20 - entityInstance: 7 - sensorType: 0x0C - path: /system/chassis/motherboard/dimm6 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x06: - assert: true - deassert: false - type: bool - Offsets: - 0x04: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x06: - assert: true - deassert: false - type: bool -0xb4: - entityID: 0x20 - entityInstance: 8 - sensorType: 0x0C - path: /system/chassis/motherboard/dimm7 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x06: - assert: true - deassert: false - type: bool - Offsets: - 0x04: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x06: - assert: true - deassert: false - type: bool -0xb6: - entityID: 0x20 - entityInstance: 9 - sensorType: 0x0C - path: /system/chassis/motherboard/dimm8 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x06: - assert: true - deassert: false - type: bool - Offsets: - 0x04: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x06: - assert: true - deassert: false - type: bool -0xb8: - entityID: 0x20 - entityInstance: 10 - sensorType: 0x0C - path: /system/chassis/motherboard/dimm9 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x06: - assert: true - deassert: false - type: bool - Offsets: - 0x04: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x06: - assert: true - deassert: false - type: bool -0xba: - entityID: 0x20 - entityInstance: 11 - sensorType: 0x0C - path: /system/chassis/motherboard/dimm10 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x06: - assert: true - deassert: false - type: bool - Offsets: - 0x04: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x06: - assert: true - deassert: false - type: bool -0xbc: - entityID: 0x20 - entityInstance: 12 - sensorType: 0x0C - path: /system/chassis/motherboard/dimm11 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x06: - assert: true - deassert: false - type: bool - Offsets: - 0x04: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x06: - assert: true - deassert: false - type: bool -0xbe: - entityID: 0x20 - entityInstance: 13 - sensorType: 0x0C - path: /system/chassis/motherboard/dimm12 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x06: - assert: true - deassert: false - type: bool - Offsets: - 0x04: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x06: - assert: true - deassert: false - type: bool -0xc0: - entityID: 0x20 - entityInstance: 14 - sensorType: 0x0C - path: /system/chassis/motherboard/dimm13 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x06: - assert: true - deassert: false - type: bool - Offsets: - 0x04: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x06: - assert: true - deassert: false - type: bool -0xc2: - entityID: 0x20 - entityInstance: 15 - sensorType: 0x0C - path: /system/chassis/motherboard/dimm14 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x06: - assert: true - deassert: false - type: bool - Offsets: - 0x04: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x06: - assert: true - deassert: false - type: bool -0xc4: - entityID: 0x20 - entityInstance: 16 - sensorType: 0x0C - path: /system/chassis/motherboard/dimm15 - sensorReadingType: 0x6F - serviceInterface: xyz.openbmc_project.Inventory.Manager - readingType: assertion - mutability: Mutability::Write|Mutability::Read - sensorNamePattern: nameLeaf - interfaces: - xyz.openbmc_project.State.Decorator.OperationalStatus: - Functional: - Prereqs: - 0x06: - assert: true - deassert: false - type: bool - Offsets: - 0x04: - assert: false - deassert: true - type: bool - xyz.openbmc_project.Inventory.Item: - Present: - Offsets: - 0x06: - assert: true - deassert: false - type: bool diff --git a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-tool.bb b/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-tool.bb deleted file mode 100644 index dbc50aaba..000000000 --- a/meta-phosphor/common/recipes-phosphor/ipmi/phosphor-ipmi-tool.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "Phosphor ipmi tool for injecting ipmi commands" -DESCRIPTION = "IPMI Tool with dbus capabilities" -HOMEPAGE = "https://github.com/openbmc/ipmitool" -PR = "r1" - - -inherit obmc-phosphor-license - -DEPENDS += "systemd \ - phosphor-ipmi-host \ - " - -RDEPENDS_${PN} += "libsystemd \ - libcrypto \ - virtual-obmc-host-ipmi-hw \ - " - - -SRC_URI += "git://github.com/openbmc/ipmitool" - -SRCREV = "dfdfd89ec9b36c115a98f589880fd757a162af19" - - -S = "${WORKDIR}/git" - - -do_compile() { - ${S}/bootstrap --enable-intf-dbus - ${S}/configure --host x86_64 - make -} - -do_install() { - install -m 0755 -d ${D}${sbindir} - install -m 0755 ${S}/src/ipmitool ${D}${sbindir} -} diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-config-example-native.bb b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-config-example-native.bb deleted file mode 100644 index 4b546d05f..000000000 --- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-config-example-native.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "Phosphor LED Group Management with example data" -PR = "r1" - -inherit native -require phosphor-led-manager.inc - -PROVIDES += "virtual/phosphor-led-manager-config-native" - -S = "${WORKDIR}/git" - -# Copies example led layout yaml file -do_install() { - SRC=${S} - DEST=${D}${datadir}/phosphor-led-manager - install -D ${SRC}/led.yaml ${DEST}/led.yaml -} diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-config-mrw-native.bb b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-config-mrw-native.bb deleted file mode 100644 index 920f63745..000000000 --- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-config-mrw-native.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Phosphor LED Group Management with MRW generated data" -PR = "r1" - -inherit native -inherit obmc-phosphor-utils -inherit obmc-phosphor-license -inherit mrw-xml - -PROVIDES += "virtual/phosphor-led-manager-config-native" -DEPENDS += "mrw-native mrw-perl-tools-native" - -# Generate a YAML files based on MRW input -do_install_append() { - USE_MRW="${@df_enabled(d, 'obmc-mrw', 'yes')}" - DEST=${D}${datadir}/phosphor-led-manager - - if [ "${USE_MRW}" = "yes" ]; then - install -d ${DEST}/ - ${STAGING_BINDIR_NATIVE}/perl-native/perl \ - ${STAGING_BINDIR_NATIVE}/gen_led_groups.pl \ - -i ${mrw_datadir}/${MRW_XML} \ - -o ${DEST}/led.yaml - fi -} diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-error-native.bb b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-error-native.bb deleted file mode 100644 index c8ec04127..000000000 --- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-error-native.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Copy error yaml files to known path for elog parsing" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" - -inherit native -inherit phosphor-dbus-yaml - -require phosphor-led-manager.inc - -S = "${WORKDIR}/git" - -do_install_append() { - SRC=${S}/xyz/openbmc_project/Led/ - DEST=${D}${yaml_dir}/xyz/openbmc_project/Led/ - install -d ${DEST}/Fru - install ${SRC}/*.errors.yaml ${DEST} - install ${SRC}/*.metadata.yaml ${DEST} - install ${SRC}/Fru/*.errors.yaml ${DEST}/Fru - install ${SRC}/Fru/*.metadata.yaml ${DEST}/Fru -} diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager.bb b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager.bb deleted file mode 100644 index d501d332a..000000000 --- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager.bb +++ /dev/null @@ -1,56 +0,0 @@ -SUMMARY = "Phosphor LED Group Management Daemon" -DESCRIPTION = "Daemon to cater to triggering actions on LED groups" -PR = "r1" - -require ${PN}.inc - -inherit autotools pkgconfig pythonnative -inherit obmc-phosphor-dbus-service obmc-phosphor-systemd - -LED_MGR_PACKAGES = " \ - ${PN}-ledmanager \ - ${PN}-faultmonitor \ -" - -PACKAGE_BEFORE_PN += "${LED_MGR_PACKAGES}" -ALLOW_EMPTY_${PN} = "1" - -DBUS_PACKAGES = "${PN}-ledmanager" - -SYSTEMD_PACKAGES = "${LED_MGR_PACKAGES}" - -DEPENDS += "python-pyyaml-native" -DEPENDS += "autoconf-archive-native" -DEPENDS += "sdbusplus sdbusplus-native" -DEPENDS += "phosphor-logging" - -DEPENDS += "virtual/${PN}-config-native" -RDEPENDS_${PN}-ledmanager += "libsystemd" -RDEPENDS_${PN}-ledmanager += "phosphor-logging" - -RDEPENDS_${PN}-faultmonitor += "libsystemd" -RDEPENDS_${PN}-faultmonitor += "phosphor-logging" - -S = "${WORKDIR}/git" - -FILES_${PN}-ledmanager += "${sbindir}/phosphor-ledmanager" -FILES_${PN}-faultmonitor += "${sbindir}/phosphor-fru-fault-monitor" - -DBUS_SERVICE_${PN}-ledmanager += "xyz.openbmc_project.LED.GroupManager.service" - -SYSTEMD_SERVICE_${PN}-ledmanager += "obmc-led-group-start@.service obmc-led-group-stop@.service" -SYSTEMD_SERVICE_${PN}-faultmonitor += "obmc-fru-fault-monitor.service" - -SYSTEMD_LINK_${PN}-ledmanager += "../obmc-led-group-start@.service:${SYSTEMD_DEFAULT_TARGET}.wants/obmc-led-group-start@bmc_booted.service" - -STATES = "start stop" -TMPLFMT = "obmc-led-group-{0}@.service" -TGTFMT = "obmc-power-{0}@0.target" -INSTFMT = "obmc-led-group-{0}@power_on.service" -FMT = "../${TMPLFMT}:${TGTFMT}.wants/${INSTFMT}" -SYSTEMD_LINK_${PN}-ledmanager += "${@compose_list(d, 'FMT', 'STATES')}" - -# Install the override to set up a Conflicts relation -SYSTEMD_OVERRIDE_${PN}-ledmanager += "bmc_booted.conf:obmc-led-group-start@bmc_booted.service.d/bmc_booted.conf" - -EXTRA_OECONF = "YAML_PATH=${STAGING_DATADIR_NATIVE}/${PN}" diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager.inc b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager.inc deleted file mode 100644 index 0562742e5..000000000 --- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager.inc +++ /dev/null @@ -1,5 +0,0 @@ -HOMEPAGE = "http://github.com/openbmc/phosphor-led-manager" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -SRC_URI += "git://github.com/openbmc/phosphor-led-manager" -SRCREV = "08d613e7d549d647105bb7ff5a6d3716708d2332" diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/bmc_booted.conf b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/bmc_booted.conf deleted file mode 100644 index a300f6ace..000000000 --- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/bmc_booted.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Unit] -Wants={SYSTEMD_DEFAULT_TARGET} -After={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-fru-fault-monitor.service b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-fru-fault-monitor.service deleted file mode 100644 index 4810a7e86..000000000 --- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-fru-fault-monitor.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=FRU Fault monitor service -Wants=mapper-wait@-xyz-openbmc_project-led-groups.service -After=mapper-wait@-xyz-openbmc_project-led-groups.service - -[Service] -Restart=always -ExecStart=/usr/bin/env phosphor-fru-fault-monitor -SyslogIdentifier=phosphor-fru-fault-monitor - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-start@.service b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-start@.service deleted file mode 100644 index e0e1fc935..000000000 --- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-start@.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Assert %i LED -Wants=mapper-wait@-xyz-openbmc_project-led-groups-%i.service -After=mapper-wait@-xyz-openbmc_project-led-groups-%i.service -Conflicts=obmc-led-group-stop@%i.service - -[Service] -Type=oneshot -RemainAfterExit=yes -Restart=no -ExecStart=/bin/sh -c "busctl call `mapper get-service /xyz/openbmc_project/led/groups/%i` /xyz/openbmc_project/led/groups/%i org.freedesktop.DBus.Properties Set ssv xyz.openbmc_project.Led.Group Asserted b true" -SyslogIdentifier=obmc-led-group-start diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-stop@.service b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-stop@.service deleted file mode 100644 index 7b3966943..000000000 --- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-stop@.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Assert %i LED -Wants=mapper-wait@-xyz-openbmc_project-led-groups-%i.service -After=mapper-wait@-xyz-openbmc_project-led-groups-%i.service -Conflicts=obmc-led-group-start@%i.service - -[Service] -Type=oneshot -RemainAfterExit=yes -Restart=no -ExecStart=/bin/sh -c "busctl call `mapper get-service /xyz/openbmc_project/led/groups/%i` /xyz/openbmc_project/led/groups/%i org.freedesktop.DBus.Properties Set ssv xyz.openbmc_project.Led.Group Asserted b false" -SyslogIdentifier=obmc-led-group-stop diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/xyz.openbmc_project.LED.GroupManager.service b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/xyz.openbmc_project.LED.GroupManager.service deleted file mode 100644 index 2f9a25e91..000000000 --- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/xyz.openbmc_project.LED.GroupManager.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Phosphor LED Group Management Daemon -Before=mapper-wait@-xyz-openbmc_project-led-groups.service - -[Service] -Restart=always -ExecStart=/usr/bin/env phosphor-ledmanager -SyslogIdentifier=phosphor-ledmanager -Type=dbus -BusName={BUSNAME} - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-sysfs.bb b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-sysfs.bb deleted file mode 100644 index 76da1b56a..000000000 --- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-sysfs.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "Phosphor Physical LED Controller daemon" -DESCRIPTION = "Daemon to trigger actions on a physical LED" -HOMEPAGE = "http://github.com/openbmc/phosphor-led-sysfs" -PR = "r1" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -inherit autotools pkgconfig -inherit obmc-phosphor-dbus-service - -DEPENDS += "autoconf-archive-native" -DEPENDS += "sdbusplus" -DEPENDS += "phosphor-dbus-interfaces" -RDEPENDS_${PN} += "libsystemd" - -DBUS_SERVICE_${PN} += "xyz.openbmc_project.led.controller@.service" - -SRC_URI += "git://github.com/openbmc/phosphor-led-sysfs" -SRC_URI += "file://70-leds.rules" -SRCREV = "8609c65aaa48eeff85cd9dd375253d7755581993" -S = "${WORKDIR}/git" - -do_install_append() { - install -d ${D}/${base_libdir}/udev/rules.d/ - install ${WORKDIR}/70-leds.rules ${D}/${base_libdir}/udev/rules.d/ -} diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-sysfs/70-leds.rules b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-sysfs/70-leds.rules deleted file mode 100644 index 372d81293..000000000 --- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-sysfs/70-leds.rules +++ /dev/null @@ -1 +0,0 @@ -SUBSYSTEM=="leds", ACTION=="add", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xyz.openbmc_project.led.controller@sys-class-leds-$name" diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-sysfs/xyz.openbmc_project.led.controller@.service b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-sysfs/xyz.openbmc_project.led.controller@.service deleted file mode 100644 index c673cda66..000000000 --- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-sysfs/xyz.openbmc_project.led.controller@.service +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=Phosphor sysfs LED controller - -[Service] -Restart=always -ExecStart=/usr/bin/env phosphor-ledcontroller -p %f -SyslogIdentifier=phosphor-ledcontroller diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-logging-error-logs-native.bbappend b/meta-phosphor/common/recipes-phosphor/leds/phosphor-logging-error-logs-native.bbappend deleted file mode 100644 index 3f2c5c811..000000000 --- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-logging-error-logs-native.bbappend +++ /dev/null @@ -1 +0,0 @@ -DEPENDS += "phosphor-led-manager-error-native" diff --git a/meta-phosphor/common/recipes-phosphor/logging/ffdc.bb b/meta-phosphor/common/recipes-phosphor/logging/ffdc.bb deleted file mode 100644 index 8c832d708..000000000 --- a/meta-phosphor/common/recipes-phosphor/logging/ffdc.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "FFDC collector script" -DESCRIPTION = "Command line tool to collect and tar up debug data" -PR = "r1" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" - -RDEPENDS_${PN} += " \ - systemd \ - ${VIRTUAL-RUNTIME_base-utils} \ - " - -S = "${WORKDIR}/git" -SRC_URI += "git://github.com/openbmc/phosphor-debug-collector" - -SRCREV = "90d147a1ee5340278506bbdf94edc32bb77154f2" - -do_install() { - install -d ${D}${bindir} - install -m 0755 ffdc \ - ${D}${bindir}/ffdc -} diff --git a/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging-callouts-example-native.bb b/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging-callouts-example-native.bb deleted file mode 100644 index f76d202e1..000000000 --- a/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging-callouts-example-native.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Generated callout information for phosphor-logging" -PR = "r1" - -inherit native -inherit obmc-phosphor-license -inherit phosphor-logging - -SRC_URI += "file://callouts.yaml" - -PROVIDES += "virtual/phosphor-logging-callouts" - -S = "${WORKDIR}" - -do_install() { - DEST=${D}${callouts_datadir} - install -d ${DEST} - install callouts.yaml ${DEST} -} diff --git a/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging-callouts-example/callouts.yaml b/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging-callouts-example/callouts.yaml deleted file mode 100644 index 5b92a04c4..000000000 --- a/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging-callouts-example/callouts.yaml +++ /dev/null @@ -1 +0,0 @@ -/sys/devices/device: /system/chassis/motherboard/device diff --git a/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging-callouts-mrw-native.bb b/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging-callouts-mrw-native.bb deleted file mode 100644 index 96852d4ca..000000000 --- a/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging-callouts-mrw-native.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "Generated callout information for phosphor-logging" -PR = "r1" - -inherit native -inherit obmc-phosphor-license -inherit phosphor-logging -inherit mrw-xml - -DEPENDS += " \ - mrw-native \ - mrw-perl-tools-native \ - " - -PROVIDES += "virtual/phosphor-logging-callouts" - -S = "${WORKDIR}" - -do_install() { - DEST=${D}${callouts_datadir} - install -d ${DEST} - - ${bindir}/perl-native/perl \ - ${bindir}/gen_callouts.pl \ - -m ${mrw_datadir}/${MRW_XML} \ - -o ${DEST}/callouts.yaml -} diff --git a/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging-error-logs-native.bb b/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging-error-logs-native.bb deleted file mode 100644 index 0dfacb1b6..000000000 --- a/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging-error-logs-native.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Phosphor OpenBMC - error log meta data generation" -PR = "r1" - -inherit native -inherit obmc-phosphor-license - -#To append new recipes that copies error yaml files to the known -#location, add DEPENDS relationhip using bbappend to -#phosphor-logging-error-log-native recipe with the native -#recipe name - -#Refer to openpower-debug-collector-error-native.bb to see how -#to copy error yaml files to a known location diff --git a/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging.bb b/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging.bb deleted file mode 100644 index 9adbc4ff4..000000000 --- a/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging.bb +++ /dev/null @@ -1,97 +0,0 @@ -SUMMARY = "Phosphor OpenBMC event and error logging" -DESCRIPTION = "An error and event log daemon application, and \ - supporting tools for OpenBMC." -HOMEPAGE = "https://github.com/openbmc/phosphor-logging" -PR = "r1" - -inherit autotools pkgconfig -inherit pythonnative -inherit obmc-phosphor-license -inherit obmc-phosphor-dbus-service -inherit phosphor-logging -inherit phosphor-dbus-yaml - -DEPENDS += "autoconf-archive-native" -DEPENDS += "systemd" -DEPENDS += "python-mako-native" -DEPENDS += "python-pyyaml-native" -DEPENDS += "sdbusplus sdbusplus-native" -DEPENDS += "phosphor-dbus-interfaces phosphor-dbus-interfaces-native" -DEPENDS += "virtual/phosphor-logging-callouts" -DEPENDS += "phosphor-logging-error-logs-native" -DEPENDS += "phosphor-logging-native" -DEPENDS += "cereal" - -PACKAGE_BEFORE_PN = "${PN}-test" -FILES_${PN}-test = "${bindir}/*-test" - -PACKAGE_BEFORE_PN += "${PN}-elog" -FILES_${PN}-elog += "${elog_dir}" - -# Package configuration -LOGGING_PACKAGES = " \ - ${PN}-base \ -" - -ALLOW_EMPTY_${PN} = "1" -PACKAGE_BEFORE_PN += "${LOGGING_PACKAGES}" -SYSTEMD_PACKAGES = "${LOGGING_PACKAGES}" -DBUS_PACKAGES = "${LOGGING_PACKAGES}" - -RDEPENDS_${PN}-base += "sdbusplus phosphor-dbus-interfaces" -FILES_${PN}-base += " \ - ${sbindir}/phosphor-log-manager \ - ${libdir}/libphosphor_logging.so.* \ -" -DBUS_SERVICE_${PN}-base += "xyz.openbmc_project.Logging.service" - -SRC_URI += "git://github.com/openbmc/phosphor-logging" -SRCREV = "5ac1bde129258d906246f5d4ad78e036f03a6e80" - -S = "${WORKDIR}/git" - -# Do not DEPEND on the specified packages for native build -# as they will not be available in host machine -DEPENDS_remove_class-native = " \ - virtual/phosphor-logging-callouts \ - sdbus++ \ - systemd \ - cereal \ - " - -# Do not DEPEND on the specified packages for native SDK build -# as they will not be available in host machine -DEPENDS_remove_class-nativesdk = " \ - virtual/phosphor-logging-callouts \ - sdbus++-native \ - cereal \ - systemd \ - phosphor-dbus-interfaces \ - " - -PACKAGECONFIG ??= "metadata-processing install_scripts" - -PACKAGECONFIG[metadata-processing] = " \ - --enable-metadata-processing, \ - --disable-metadata-processing, , \ - " - -# Provide a means to enable/disable install_scripts feature -PACKAGECONFIG[install_scripts] = " \ - --enable-install_scripts, \ - --disable-install_scripts, ,\ - " - -# Enable install_scripts during native and native SDK build -PACKAGECONFIG_add_class-native = "install_scripts" -PACKAGECONFIG_add_class-nativesdk = "install_scripts" - -# Disable install_scripts during target build -PACKAGECONFIG_remove_class-target = "install_scripts" - -EXTRA_OECONF = " \ - YAML_DIR=${STAGING_DIR_NATIVE}${yaml_dir} \ - CALLOUTS_YAML=${STAGING_DIR_NATIVE}${callouts_datadir}/callouts.yaml \ - " - -BBCLASSEXTEND += "native nativesdk" diff --git a/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging/xyz.openbmc_project.Logging.service b/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging/xyz.openbmc_project.Logging.service deleted file mode 100644 index 946c3bf16..000000000 --- a/meta-phosphor/common/recipes-phosphor/logging/phosphor-logging/xyz.openbmc_project.Logging.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Phosphor Log Manager - -[Service] -ExecStart=/usr/bin/env phosphor-log-manager -SyslogIdentifier=phosphor-log-manager -Restart=always -Type=dbus -BusName={BUSNAME} - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/mboxd/files/99-aspeed-lpc-ctrl.rules b/meta-phosphor/common/recipes-phosphor/mboxd/files/99-aspeed-lpc-ctrl.rules deleted file mode 100644 index 9cf2fbad1..000000000 --- a/meta-phosphor/common/recipes-phosphor/mboxd/files/99-aspeed-lpc-ctrl.rules +++ /dev/null @@ -1 +0,0 @@ -SUBSYSTEM=="misc", KERNEL=="aspeed-lpc-ctrl", TAG+="systemd" diff --git a/meta-phosphor/common/recipes-phosphor/mboxd/files/99-aspeed-mbox.rules b/meta-phosphor/common/recipes-phosphor/mboxd/files/99-aspeed-mbox.rules deleted file mode 100644 index 12e90d86c..000000000 --- a/meta-phosphor/common/recipes-phosphor/mboxd/files/99-aspeed-mbox.rules +++ /dev/null @@ -1 +0,0 @@ -SUBSYSTEM=="misc", KERNEL=="aspeed-mbox", TAG+="systemd" diff --git a/meta-phosphor/common/recipes-phosphor/mboxd/files/aspeed-lpc-ctrl-h.patch b/meta-phosphor/common/recipes-phosphor/mboxd/files/aspeed-lpc-ctrl-h.patch deleted file mode 100644 index 122594e9f..000000000 --- a/meta-phosphor/common/recipes-phosphor/mboxd/files/aspeed-lpc-ctrl-h.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- /dev/null 2017-01-17 09:45:47.987442339 +1030 -+++ include/linux/aspeed-lpc-ctrl.h 2017-01-17 11:12:17.711635876 +1030 -@@ -0,0 +1,36 @@ -+/* -+ * Copyright 2017 IBM Corp. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version -+ * 2 of the License, or (at your option) any later version. -+ */ -+ -+#ifndef _LINUX_ASPEED_LPC_CTRL_H -+#define _LINUX_ASPEED_LPC_CTRL_H -+ -+#include <linux/ioctl.h> -+ -+/* Window types */ -+#define ASPEED_LPC_CTRL_WINDOW_FLASH 1 -+#define ASPEED_LPC_CTRL_WINDOW_MEMORY 2 -+ -+struct aspeed_lpc_ctrl_mapping { -+ __u8 window_type; -+ __u8 window_id; -+ __u16 flags; -+ __u32 addr; -+ __u32 offset; -+ __u32 size; -+}; -+ -+#define __ASPEED_LPC_CTRL_IOCTL_MAGIC 0xb2 -+ -+#define ASPEED_LPC_CTRL_IOCTL_GET_SIZE _IOWR(__ASPEED_LPC_CTRL_IOCTL_MAGIC, \ -+ 0x00, struct aspeed_lpc_ctrl_mapping) -+ -+#define ASPEED_LPC_CTRL_IOCTL_MAP _IOW(__ASPEED_LPC_CTRL_IOCTL_MAGIC, \ -+ 0x01, struct aspeed_lpc_ctrl_mapping) -+ -+#endif /* _LINUX_ASPEED_LPC_CTRL_H */ diff --git a/meta-phosphor/common/recipes-phosphor/mboxd/mboxd.bb b/meta-phosphor/common/recipes-phosphor/mboxd/mboxd.bb deleted file mode 100644 index 03428b7a8..000000000 --- a/meta-phosphor/common/recipes-phosphor/mboxd/mboxd.bb +++ /dev/null @@ -1,51 +0,0 @@ -SUMMARY = "Phosphor OpenBMC MBOX Daemon" -DESCRIPTION = "Phosphor OpenBMC MBOX Daemon" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" - -inherit autotools pkgconfig -inherit obmc-phosphor-systemd - -DEPENDS += "autoconf-archive-native" -DEPENDS += "systemd" -DEPENDS += "phosphor-logging" -RDEPENDS_${PN} += "libsystemd" - -S = "${WORKDIR}/git" - -SRC_URI += "git://github.com/openbmc/phosphor-mboxd.git" - -SRC_URI += "file://99-aspeed-mbox.rules" -SRC_URI += "file://99-aspeed-lpc-ctrl.rules" -SRC_URI += "file://aspeed-lpc-ctrl-h.patch" - -SRCREV="acdbdd141ece313f259ad6231e132f0a4bc3e062" - -PROVIDES += "mboxctl" - -MBOXD_FLASH_SIZE ??= "32M" -SYSTEMD_SUBSTITUTIONS += "FLASH_SIZE:${MBOXD_FLASH_SIZE}:${PN}.service" - -# Hacks because ${STAGING_KERNEL_DIR} points to the kernel source tree, not the -# installed, pre-processed headers. Requires the aspeed-lpc-ctrl-h patch above. -CFLAGS_append = " -I include" - -do_install_append() { - install -d ${D}/lib/udev/rules.d - install -m 0644 ${WORKDIR}/99-aspeed-mbox.rules ${D}/lib/udev/rules.d - install -m 0644 ${WORKDIR}/99-aspeed-lpc-ctrl.rules ${D}/lib/udev/rules.d -} - -TMPL = "mboxd-reload@.service" -TGTFMT = "obmc-chassis-poweron@{0}.target" -INSTFMT = "mboxd-reload@{0}.service" -FMT = "../${TMPL}:${TGTFMT}.wants/${INSTFMT}" - -SYSTEMD_SERVICE_${PN} += "mboxd.service" -SYSTEMD_SERVICE_${PN} += "mboxd-reload@.service" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" - -# Enable virtual-pnor by DISTRO_FEATURE openpower-ubi-fs. -PACKAGECONFIG_append_df-openpower-ubi-fs = "virtual-pnor" -PACKAGECONFIG[virtual-pnor] = "--enable-virtual-pnor,--disable-virtual-pnor" diff --git a/meta-phosphor/common/recipes-phosphor/mboxd/mboxd/mboxd-reload@.service b/meta-phosphor/common/recipes-phosphor/mboxd/mboxd/mboxd-reload@.service deleted file mode 100644 index be02c7a2c..000000000 --- a/meta-phosphor/common/recipes-phosphor/mboxd/mboxd/mboxd-reload@.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Reload mboxd during power on -Wants=obmc-power-start-pre@%i.target -Before=obmc-power-start-pre@%i.target -Wants=mapper-wait@-org-openbmc-mboxd.service -After=mapper-wait@-org-openbmc-mboxd.service -Conflicts=obmc-chassis-poweroff@%i.target - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/usr/bin/env mboxctl --reset -SyslogIdentifier=mboxctl - -[Install] -WantedBy=obmc-chassis-poweron@%i.target diff --git a/meta-phosphor/common/recipes-phosphor/mboxd/mboxd/mboxd.service b/meta-phosphor/common/recipes-phosphor/mboxd/mboxd/mboxd.service deleted file mode 100644 index 35081d85a..000000000 --- a/meta-phosphor/common/recipes-phosphor/mboxd/mboxd/mboxd.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Phosphor MBOX Daemon -BindsTo=dev-aspeed\x2dlpc\x2dctrl.device -After=dev-aspeed\x2dlpc\x2dctrl.device -BindsTo=dev-aspeed\x2dmbox.device -After=dev-aspeed\x2dmbox.device - - -[Service] -Restart=always -ExecStart=/usr/bin/env mboxd --flash {FLASH_SIZE} --window-size 1M -SyslogIdentifier=mboxd - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/mrw/mrw-api-native.bb b/meta-phosphor/common/recipes-phosphor/mrw/mrw-api-native.bb deleted file mode 100644 index 1930388ed..000000000 --- a/meta-phosphor/common/recipes-phosphor/mrw/mrw-api-native.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Phosphor OpenBMC machine readable workbook API modules" -DESCRIPTION = "The API for the MRW XML generated by the Serverwiz tool" -PR = "r1" - -S = "${WORKDIR}/scripts" - -inherit obmc-phosphor-license -inherit native -inherit perlnative -inherit cpan-base -inherit mrw-rev - -DEPENDS += "libxml-simple-perl-native json-perl-native" - -SRC_URI += "${MRW_API_SRC_URI}" -SRCREV = "${MRW_API_SRCREV}" - -do_install() { - install -d ${D}${PERLLIBDIRS_class-native}/perl/site_perl/${PERLVERSION}/mrw - install -m 0755 Targets.pm ${D}${PERLLIBDIRS_class-native}/perl/site_perl/${PERLVERSION}/mrw/Targets.pm -} diff --git a/meta-phosphor/common/recipes-phosphor/mrw/mrw-native.bb b/meta-phosphor/common/recipes-phosphor/mrw/mrw-native.bb deleted file mode 100644 index db9cbd902..000000000 --- a/meta-phosphor/common/recipes-phosphor/mrw/mrw-native.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Phosphor OpenBMC machine readable workbook" -DESCRIPTION = "Pulls down system specific data" -PR = "r1" - -S = "${WORKDIR}/git" - -inherit obmc-phosphor-license -inherit obmc-xmlpatch -inherit native -inherit mrw-xml - -PHOSPHOR_MRW_URI ?= "http://missing-mrw-uri" -SRC_URI += "${PHOSPHOR_MRW_URI}" -SRCREV = "${PHOSPHOR_MRW_REV}" - -do_install() { - install -d ${D}/${mrw_datadir} - install -m 0644 ${MRW_XML} ${D}/${mrw_datadir} -} - diff --git a/meta-phosphor/common/recipes-phosphor/mrw/mrw-patch-native.bb b/meta-phosphor/common/recipes-phosphor/mrw/mrw-patch-native.bb deleted file mode 100644 index acaec73aa..000000000 --- a/meta-phosphor/common/recipes-phosphor/mrw/mrw-patch-native.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Phosphor machine readable workbook patching script" -DESCRIPTION = "Retrieve the script that can patch the MRW XML" -PR = "r1" - -S = "${WORKDIR}/git" - -inherit obmc-phosphor-license -inherit native -inherit mrw-rev - -DEPENDS += "python-native python-lxml-native" - -SRC_URI += "${MRW_TOOLS_SRC_URI}" -SRCREV = "${MRW_TOOLS_SRCREV}" - -do_install() { - install -d ${D}${bindir}/obmc-mrw - install -m 0755 patchxml.py ${D}${bindir}/obmc-mrw -} diff --git a/meta-phosphor/common/recipes-phosphor/mrw/mrw-perl-tools-native.bb b/meta-phosphor/common/recipes-phosphor/mrw/mrw-perl-tools-native.bb deleted file mode 100644 index 91651227b..000000000 --- a/meta-phosphor/common/recipes-phosphor/mrw/mrw-perl-tools-native.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "OpenBMC MRW Perl Tools" -DESCRIPTION = "OpenBMC Perl tools for the machine readable workbook" -S = "${WORKDIR}/git" - -inherit obmc-phosphor-license -inherit native -inherit cpan_build -inherit mrw-rev - -DEPENDS += "libmodule-build-perl-native mrw-api-native yaml-tiny-native" - -SRC_URI += "${MRW_TOOLS_SRC_URI}" -SRCREV = "${MRW_TOOLS_SRCREV}" diff --git a/meta-phosphor/common/recipes-phosphor/network/inarp.bb b/meta-phosphor/common/recipes-phosphor/network/inarp.bb deleted file mode 100644 index 90969c248..000000000 --- a/meta-phosphor/common/recipes-phosphor/network/inarp.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Inverse ARP daemon" -DESCRIPTION = "Daemon to respond to Inverse-ARP requests" -HOMEPAGE = "http://github.com/openbmc/inarp" -PR = "r1" - -inherit autotools -inherit obmc-phosphor-license -inherit obmc-phosphor-systemd - -DEPENDS += "autoconf-archive-native" -RDEPENDS_${PN} += "network" - -SRC_URI += "git://github.com/openbmc/inarp" -SRCREV = "6e296617f041d7665b2540151646af452088482c" - -S = "${WORKDIR}/git" - -exec_prefix="/usr/local" diff --git a/meta-phosphor/common/recipes-phosphor/network/inarp/inarp.service b/meta-phosphor/common/recipes-phosphor/network/inarp/inarp.service deleted file mode 100644 index 5d26559f0..000000000 --- a/meta-phosphor/common/recipes-phosphor/network/inarp/inarp.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Phosphor Inverse ARP - -[Service] -ExecStart=/usr/bin/env inarp -SyslogIdentifier=inarp -Restart=always - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/network/network.bb b/meta-phosphor/common/recipes-phosphor/network/network.bb deleted file mode 100644 index 3170d56ee..000000000 --- a/meta-phosphor/common/recipes-phosphor/network/network.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "Network DBUS object" -DESCRIPTION = "Network DBUS object" -HOMEPAGE = "http://github.com/openbmc/phosphor-networkd" -PR = "r1" - -inherit autotools pkgconfig -inherit pythonnative -inherit obmc-phosphor-license -inherit obmc-phosphor-dbus-service -inherit phosphor-networkd-rev - -DBUS_SERVICE_${PN} += "xyz.openbmc_project.Network.service" - -DEPENDS += "systemd" -DEPENDS += "autoconf-archive-native" -DEPENDS += "sdbusplus sdbusplus-native" -DEPENDS += "phosphor-dbus-interfaces phosphor-dbus-interfaces-native" -DEPENDS += "phosphor-logging" -DEPENDS += "libnl" - -RDEPENDS_${PN} += "libsystemd" -RDEPENDS_${PN} += "sdbusplus phosphor-dbus-interfaces" -RDEPENDS_${PN} += "phosphor-logging" -RDEPENDS_${PN} += "libnl" -RDEPENDS_${PN} += "libnl-genl" - -S = "${WORKDIR}/git" diff --git a/meta-phosphor/common/recipes-phosphor/network/network/xyz.openbmc_project.Network.service b/meta-phosphor/common/recipes-phosphor/network/network/xyz.openbmc_project.Network.service deleted file mode 100644 index b9f7da728..000000000 --- a/meta-phosphor/common/recipes-phosphor/network/network/xyz.openbmc_project.Network.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Phosphor Network Manager -After=obmc-mapper.target - -[Service] -ExecStart=/usr/bin/env phosphor-network-manager -SyslogIdentifier=phosphor-network-manager -Restart=always -Type=dbus -BusName={BUSNAME} - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/network/phosphor-snmp/xyz.openbmc_project.Network.SNMP.service b/meta-phosphor/common/recipes-phosphor/network/phosphor-snmp/xyz.openbmc_project.Network.SNMP.service deleted file mode 100644 index f5a1d7274..000000000 --- a/meta-phosphor/common/recipes-phosphor/network/phosphor-snmp/xyz.openbmc_project.Network.SNMP.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Phosphor SNMP conf Manager -After=obmc-mapper.target - -[Service] -ExecStart=/usr/bin/env phosphor-network-snmpconf -SyslogIdentifier=phosphor-network-snmpconf -Restart=always -Type=dbus -BusName=xyz.openbmc_project.Network.SNMP - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/network/phosphor-snmp_git.bb b/meta-phosphor/common/recipes-phosphor/network/phosphor-snmp_git.bb deleted file mode 100644 index 7818579f0..000000000 --- a/meta-phosphor/common/recipes-phosphor/network/phosphor-snmp_git.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "SNMP Manager Configuration" -DESCRIPTION = "SNMP Manager Configuration." -HOMEPAGE = "http://github.com/openbmc/phosphor-snmp" -PR = "r1" -PV = "0.1+git${SRCPV}" - -inherit autotools pkgconfig -inherit pythonnative -inherit obmc-phosphor-dbus-service - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -SRC_URI += "git://github.com/openbmc/phosphor-snmp" -SRCREV = "f4ecf883389f5d9d7ebf635d62b20b91ef72e048" - -DBUS_SERVICE_${PN} += "xyz.openbmc_project.Network.SNMP.service" - -DEPENDS += "systemd" -DEPENDS += "autoconf-archive-native" -DEPENDS += "sdbusplus sdbusplus-native" -DEPENDS += "phosphor-dbus-interfaces phosphor-dbus-interfaces-native" -DEPENDS += "phosphor-logging" -DEPENDS += "net-snmp" - -RDEPENDS_${PN} += "libsystemd" -RDEPENDS_${PN} += "sdbusplus phosphor-dbus-interfaces" -RDEPENDS_${PN} += "phosphor-logging" -RDEPENDS_${PN} += "net-snmp-libs" - -S = "${WORKDIR}/git" diff --git a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb deleted file mode 100644 index 5c184babf..000000000 --- a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb +++ /dev/null @@ -1,133 +0,0 @@ -SUMMARY = "OpenBMC - Applications" -PR = "r1" - -inherit packagegroup -inherit obmc-phosphor-license - -PROVIDES = "${PACKAGES}" -PACKAGES = " \ - ${PN}-bmc-state-mgmt \ - ${PN}-chassis-state-mgmt \ - ${PN}-extras \ - ${PN}-extrasdev \ - ${PN}-extrasdevtools \ - ${PN}-fan-control \ - ${PN}-host-state-mgmt \ - ${PN}-inventory \ - ${PN}-leds \ - ${PN}-logging \ - ${PN}-sensors \ - ${PN}-software \ - ${PN}-host-check-mgmt \ - ${PN}-debug-collector \ - ${PN}-settings \ - ${PN}-network \ - ${PN}-user-mgmt \ - " - -SUMMARY_${PN}-bmc-state-mgmt = "BMC state management" -RDEPENDS_${PN}-bmc-state-mgmt = " \ - ${VIRTUAL-RUNTIME_obmc-bmc-state-manager} \ - " - -SUMMARY_${PN}-chassis-state-mgmt = "Chassis state management" -RDEPENDS_${PN}-chassis-state-mgmt = " \ - ${VIRTUAL-RUNTIME_obmc-chassis-state-manager} \ - " - -SUMMARY_${PN}-extras = "Extra features" -RDEPENDS_${PN}-extras = " \ - phosphor-rest \ - phosphor-dbus-monitor \ - phosphor-systemd-policy \ - " - -SUMMARY_${PN}-extrasdev = "Development features" -RDEPENDS_${PN}-extrasdev = " \ - rest-dbus \ - " - -SUMMARY_${PN}-extrasdevtools = "Development tools" -RDEPENDS_${PN}-extrasdevtools = " \ - " - -# Use the fan control package group for applications -# implementing fan control or system fan policy only. -# Applications that create inventory or sensors should -# be added those respective package groups instead. -SUMMARY_${PN}-fan-control = "Fan control" -RDEPENDS_${PN}-fan-control = " \ - ${VIRTUAL-RUNTIME_obmc-fan-control} \ - phosphor-fan-monitor \ - " - -SUMMARY_${PN}-host-state-mgmt = "Host state management" -RDEPENDS_${PN}-host-state-mgmt = " \ - ${VIRTUAL-RUNTIME_obmc-host-state-manager} \ - ${VIRTUAL-RUNTIME_obmc-discover-system-state} \ - " - -SUMMARY_${PN}-inventory = "Inventory applications" -RDEPENDS_${PN}-inventory = " \ - ${VIRTUAL-RUNTIME_obmc-inventory-manager} \ - ${VIRTUAL-RUNTIME_obmc-fan-presence} \ - " - -SUMMARY_${PN}-leds = "LED applications" -RDEPENDS_${PN}-leds = " \ - ${VIRTUAL-RUNTIME_obmc-leds-manager} \ - ${VIRTUAL-RUNTIME_obmc-leds-sysfs} \ - ${VIRTUAL-RUNTIME_obmc-led-monitor} \ - " - -SUMMARY_${PN}-logging = "Logging applications" -RDEPENDS_${PN}-logging = " \ - phosphor-logging \ - " - -SUMMARY_${PN}-sensors = "Sensor applications" -RDEPENDS_${PN}-sensors = " \ - ${VIRTUAL-RUNTIME_obmc-sensors-hwmon} \ - " - -# These packages are not required with UBI enabled -${PN}-software-extras = " \ - obmc-flash-bmc \ - obmc-mgr-download \ - " - -${PN}-software-extras_df-obmc-ubi-fs = " \ - phosphor-image-signing \ - phosphor-software-manager-updater-ubi \ - " - -SUMMARY_${PN}-software = "Software applications" -RDEPENDS_${PN}-software = " \ - ${VIRTUAL-RUNTIME_obmc-bmc-download-mgr} \ - ${VIRTUAL-RUNTIME_obmc-bmc-updater} \ - ${VIRTUAL-RUNTIME_obmc-bmc-version} \ - ${${PN}-software-extras} \ - " - -SUMMARY_${PN}-debug-collector = "BMC debug collector" -RDEPENDS_${PN}-debug-collector = " \ - ${VIRTUAL-RUNTIME_obmc-dump-manager} \ - ${VIRTUAL-RUNTIME_obmc-dump-monitor} \ - phosphor-debug-collector-dreport \ - phosphor-debug-collector-scripts \ - " - -SUMMARY_${PN}-settings = "Settings applications" -RDEPENDS_${PN}-settings = " \ - ${VIRTUAL-RUNTIME_obmc-settings-mgmt} \ - " - -SUMMARY_${PN}-network = "BMC Network Manager" -RDEPENDS_${PN}-network = " \ - ${VIRTUAL-RUNTIME_obmc-network-manager} \ - " - -SUMMARY_${PN}-user-mgmt = "User management applications" -RDEPENDS_${PN}-user-mgmt = " \ - ${VIRTUAL-RUNTIME_obmc-user-mgmt} \ - " diff --git a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bb b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bb deleted file mode 100644 index cbe7e7fb9..000000000 --- a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "OpenBMC - IPMI providers" -PR = "r1" - -inherit packagegroup -inherit obmc-phosphor-license - -PROVIDES = "${PACKAGES}" -PACKAGES = "${PN}-libs" - -SUMMARY_${PN}-libs = "Extra providers for ipmid." -RDEPENDS_${PN}-libs = "${VIRTUAL-RUNTIME_phosphor-ipmi-providers}" diff --git a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bb b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bb deleted file mode 100644 index 1a6d4b787..000000000 --- a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Phosphor OpenBMC - Debug Tools" -PR = "r1" - -inherit packagegroup -inherit obmc-phosphor-license - -RDEPENDS_${PN} = " \ - strace \ - ldd \ - ethtool \ - net-tools \ - phosphor-logging-test \ - lmsensors-sensors \ - tcpdump \ - " diff --git a/meta-phosphor/common/recipes-phosphor/preinit-mounts/preinit-mounts.bb b/meta-phosphor/common/recipes-phosphor/preinit-mounts/preinit-mounts.bb deleted file mode 100644 index 30e0f3613..000000000 --- a/meta-phosphor/common/recipes-phosphor/preinit-mounts/preinit-mounts.bb +++ /dev/null @@ -1,22 +0,0 @@ -inherit obmc-phosphor-license -inherit allarch -inherit update-alternatives - -RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_base-utils}" - -SRC_URI += "file://init" - -FILES_${PN} += "${base_sbindir}/init" - -do_install() { - install -d ${D}/${base_sbindir} - install -m 0755 ${WORKDIR}/init ${D}/${base_sbindir}/preinit-mounts -} - -ALTERNATIVE_${PN} = "init" -ALTERNATIVE_TARGET[init] = "${base_sbindir}/preinit-mounts" -ALTERNATIVE_LINK_NAME[init] = "${base_sbindir}/init" - -# Use a number higher than the systemd init alternative so that -# ours is enabled instead. -ALTERNATIVE_PRIORITY[init] ?= "400" diff --git a/meta-phosphor/common/recipes-phosphor/preinit-mounts/preinit-mounts/init b/meta-phosphor/common/recipes-phosphor/preinit-mounts/preinit-mounts/init deleted file mode 100644 index 91f8038f9..000000000 --- a/meta-phosphor/common/recipes-phosphor/preinit-mounts/preinit-mounts/init +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -if ! mount ubi0:rwfs /var -t ubifs -o defaults; then - if ! mount ubi0:rwfs /var -t ubifs -o defaults,ro; then - mount tmpfs /var -t tmpfs -o defaults - fi -fi - -mkdir -p /var/persist/etc /var/persist/etc-work /var/persist/home/root - -rm -rf /var/persist/etc-work/* -# rm -rf specifically skips . and .. directories; pipe all output to null to avoid the error message -rm -rf /var/persist/etc-work/.* > /dev/null 2>&1 - -if ! mount overlay /etc -t overlay -o defaults,lowerdir=/etc,upperdir=/var/persist/etc,workdir=/var/persist/etc-work; then - mount overlay /etc -t overlay -o defaults,lowerdir=/etc:/var/persist/etc -fi - -exec /lib/systemd/systemd diff --git a/meta-phosphor/common/recipes-phosphor/sensors/obmc-mgr-sensor.bb b/meta-phosphor/common/recipes-phosphor/sensors/obmc-mgr-sensor.bb deleted file mode 100644 index 5eacac067..000000000 --- a/meta-phosphor/common/recipes-phosphor/sensors/obmc-mgr-sensor.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "OpenBMC sensor manager" -DESCRIPTION = "OpenBMC sensor manager." -PR = "r1" - -inherit skeleton-python -inherit obmc-phosphor-dbus-service - -VIRTUAL-RUNTIME_skeleton_workbook ?= "" - -RDEPENDS_${PN} += "\ - python-dbus \ - python-json \ - python-pygobject\ - pyphosphor \ - pyphosphor-dbus \ - ${VIRTUAL-RUNTIME_skeleton_workbook} \ - " - -SKELETON_DIR = "pysensormgr" -DBUS_SERVICE_${PN} += "org.openbmc.Sensors.service" diff --git a/meta-phosphor/common/recipes-phosphor/sensors/obmc-mgr-sensor/org.openbmc.Sensors.service b/meta-phosphor/common/recipes-phosphor/sensors/obmc-mgr-sensor/org.openbmc.Sensors.service deleted file mode 100644 index a4cb16439..000000000 --- a/meta-phosphor/common/recipes-phosphor/sensors/obmc-mgr-sensor/org.openbmc.Sensors.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Phosphor Sensor Manager -Wants=mapper-wait@-xyz-openbmc_project-control-power_supply_redundancy.service -After=mapper-wait@-xyz-openbmc_project-control-power_supply_redundancy.service - -[Service] -Restart=always -ExecStart=/usr/bin/env sensor_manager2.py -SyslogIdentifier=sensor_manager2.py -Type=dbus -BusName={BUSNAME} -Environment="PYTHONUNBUFFERED=1" - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon-config-mrw.bb b/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon-config-mrw.bb deleted file mode 100644 index c6d0cba73..000000000 --- a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon-config-mrw.bb +++ /dev/null @@ -1,53 +0,0 @@ -SUMMARY = "Phosphor hwmon configuration generator" -DESCRIPTION = "Generate phosphor-hwmon configuration from an MRW." -PR = "r1" - -inherit obmc-phosphor-license -inherit allarch -inherit mrw-xml - -DEPENDS += "mrw-perl-tools-native mrw-native" - -do_compile_append() { - ${STAGING_BINDIR_NATIVE}/perl-native/perl \ - ${STAGING_BINDIR_NATIVE}/hwmon.pl \ - -x ${mrw_datadir}/${MRW_XML} \ - -d ${WORKDIR}/mrw-config-files -} - -def find_conf_files(dir): - from fnmatch import fnmatch - myfiles = [] - - #These conf files generated by hwmon.pl are in - #subdirectories which we need to preserve the path to. - for root, dirs, files in os.walk(dir): - for name in files: - if fnmatch(name, "*.conf"): - myfiles.append(os.path.join(root, name)) - - return myfiles - -python install_conf_files() { - from shutil import copy - - conf_file_dir = os.path.join( - d.getVar("WORKDIR", True), - 'mrw-config-files') - files = find_conf_files(conf_file_dir) - - install_dir = os.path.join(d.getVar("D", True), - "etc", "default", "obmc", "hwmon") - - dir_len = len(conf_file_dir) - - for f in files: - dest = os.path.join(install_dir, f[dir_len + 1:]) - parent = os.path.dirname(dest) - if not os.path.exists(parent): - os.makedirs(parent) - - copy(f, dest) -} - -do_install[postfuncs] += "install_conf_files" diff --git a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon.bb b/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon.bb deleted file mode 100644 index fe051b57a..000000000 --- a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon.bb +++ /dev/null @@ -1,53 +0,0 @@ -SUMMARY = "OpenBMC hwmon poller" -DESCRIPTION = "OpenBMC hwmon poller." -PR = "r1" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" - -inherit autotools pkgconfig obmc-phosphor-systemd - -PACKAGE_BEFORE_PN = "max31785-msl" -SYSTEMD_PACKAGES = "${PN} max31785-msl" - -SYSTEMD_SERVICE_${PN} = "xyz.openbmc_project.Hwmon@.service" -SYSTEMD_SERVICE_max31785-msl = "phosphor-max31785-msl@.service" - -DEPENDS += "autoconf-archive-native" -DEPENDS += " \ - sdbusplus \ - phosphor-dbus-interfaces \ - phosphor-logging \ - " - - -RDEPENDS_${PN} += "\ - sdbusplus \ - phosphor-dbus-interfaces \ - phosphor-logging \ - bash \ - " - -RRECOMMENDS_${PN} += "${VIRTUAL-RUNTIME_phosphor-hwmon-config}" - -FILES_max31785-msl = "${bindir}/max31785-msl" -RDEPENDS_max31785-msl = "${VIRTUAL-RUNTIME_base-utils} i2c-tools" - -SRC_URI += "git://github.com/openbmc/phosphor-hwmon" -SRC_URI += "file://70-hwmon.rules" -SRC_URI += "file://70-iio.rules" -SRC_URI += "file://start_hwmon.sh" - -SRCREV = "c9c818ed854f23a87dd77c2209b6a27805825adb" - -S = "${WORKDIR}/git" - -do_install_append() { - - install -d ${D}/${base_libdir}/udev/rules.d/ - install ${WORKDIR}/70-hwmon.rules ${D}/${base_libdir}/udev/rules.d/ - install ${WORKDIR}/70-iio.rules ${D}/${base_libdir}/udev/rules.d/ - - install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/start_hwmon.sh ${D}${bindir} -} diff --git a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/70-hwmon.rules b/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/70-hwmon.rules deleted file mode 100644 index 503b2d002..000000000 --- a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/70-hwmon.rules +++ /dev/null @@ -1,2 +0,0 @@ -SUBSYSTEM=="hwmon", ACTION=="add", RUN="/usr/bin/start_hwmon.sh start %p %E{OF_FULLNAME}" -SUBSYSTEM=="hwmon", ACTION=="remove", RUN="/usr/bin/start_hwmon.sh stop %p %E{OF_FULLNAME}" diff --git a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/70-iio.rules b/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/70-iio.rules deleted file mode 100644 index 45fb4b0fb..000000000 --- a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/70-iio.rules +++ /dev/null @@ -1,2 +0,0 @@ -SUBSYSTEM=="iio", ACTION=="add", RUN="/usr/bin/start_hwmon.sh start %p %E{OF_FULLNAME}" -SUBSYSTEM=="iio", ACTION=="remove", RUN="/usr/bin/start_hwmon.sh stop %p %E{OF_FULLNAME}" diff --git a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/phosphor-max31785-msl@.service b/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/phosphor-max31785-msl@.service deleted file mode 100644 index d9de6c081..000000000 --- a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/phosphor-max31785-msl@.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Phosphor MAX31785 MSL -ConditionFileNotEmpty={envfiledir}/obmc/hwmon-max31785/%I.conf -Wants=mapper-wait@-xyz-openbmc_project-inventory.service -After=mapper-wait@-xyz-openbmc_project-inventory.service - -[Service] -Type=oneshot -ExecStart=/usr/bin/env max31785-msl -p "${{PATHS}}" -b ${{BUS}} -r ${{REVISION}} -EnvironmentFile={envfiledir}/obmc/hwmon-max31785/%I.conf -SyslogIdentifier=max31785-msl diff --git a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/start_hwmon.sh b/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/start_hwmon.sh deleted file mode 100755 index cde0f96ca..000000000 --- a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/start_hwmon.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -action=$1 -devpath=$2 -of_fullname=$3 - -#Use of_fullname if it's there, otherwise use devpath. - -path=$of_fullname -if [ -z "$path" ] -then - path=$devpath - - if [[ "$path" =~ (.*)/hwmon/hwmon[0-9]+$ ]]; - then - path=${BASH_REMATCH[1]} - fi -fi - -path="${path//:/--}" - -systemctl $action 'xyz.openbmc_project.Hwmon@'$path'.service' diff --git a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service b/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service deleted file mode 100644 index 9d3e2635e..000000000 --- a/meta-phosphor/common/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Phosphor Hwmon Poller -ConditionFileNotEmpty=/etc/default/obmc/hwmon/%I.conf -After=xyz.openbmc_project.ObjectMapper.service - -[Service] -Restart=on-failure -ExecStart=/usr/bin/env phosphor-hwmon-readd -o %f -SyslogIdentifier=phosphor-hwmon-readd -EnvironmentFile=/etc/default/obmc/hwmon/%I.conf diff --git a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-defaults-native.bb b/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-defaults-native.bb deleted file mode 100644 index 37b8d4ef6..000000000 --- a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-defaults-native.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Default settings" -PR = "r1" - -inherit native -inherit obmc-phosphor-license -inherit phosphor-settings-manager - -SRC_URI += "file://defaults.yaml" - -PROVIDES += "virtual/phosphor-settings-defaults" - -S = "${WORKDIR}" - -do_install() { - DEST=${D}${settings_datadir} - install -d ${DEST} - install defaults.yaml ${DEST} -} diff --git a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-defaults/defaults.yaml b/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-defaults/defaults.yaml deleted file mode 100644 index de00b8e68..000000000 --- a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-defaults/defaults.yaml +++ /dev/null @@ -1,117 +0,0 @@ -/xyz/openbmc_project/control/minimum_ship_level_required: - - Interface: xyz.openbmc_project.Control.MinimumShipLevel - Properties: - MinimumShipLevelRequired: - Default: 'true' - -/xyz/openbmc_project/control/host0/auto_reboot: - - Interface: xyz.openbmc_project.Control.Boot.RebootPolicy - Properties: - AutoReboot: - Default: 'true' - -/xyz/openbmc_project/control/host0/boot: - - Interface: xyz.openbmc_project.Control.Boot.Source - Properties: - BootSource: - Default: Source::Sources::Default - - Interface: xyz.openbmc_project.Control.Boot.Mode - Properties: - BootMode: - Default: Mode::Modes::Regular - -/xyz/openbmc_project/control/host0/boot/one_time: - - Interface: xyz.openbmc_project.Control.Boot.Source - Properties: - BootSource: - Default: Source::Sources::Default - - Interface: xyz.openbmc_project.Control.Boot.Mode - Properties: - BootMode: - Default: Mode::Modes::Regular - - Interface: xyz.openbmc_project.Object.Enable - Properties: - Enabled: - Default: 'true' - -/xyz/openbmc_project/control/host0/power_cap: - - Interface: xyz.openbmc_project.Control.Power.Cap - Properties: - PowerCap: - Default: 0 - Validation: - Type: "range" - Validator: "0..1000" - Unit: "Watts" - PowerCapEnable: - Default: 'false' - -/xyz/openbmc_project/control/host0/power_restore_policy: - - Interface: xyz.openbmc_project.Control.Power.RestorePolicy - Properties: - PowerRestorePolicy: - Default: RestorePolicy::Policy::AlwaysOff - -/xyz/openbmc_project/time/owner: - - Interface: xyz.openbmc_project.Time.Owner - Properties: - TimeOwner: - Default: Owner::Owners::BMC - -/xyz/openbmc_project/time/sync_method: - - Interface: xyz.openbmc_project.Time.Synchronization - Properties: - TimeSyncMethod: - Default: Synchronization::Method::NTP - -/xyz/openbmc_project/network/host0/intf: - - Interface: xyz.openbmc_project.Network.MACAddress - Properties: - MACAddress: - Default: '"00:00:00:00:00:00"' - Validation: - Type: "regex" - Validator: '^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$' - -#needs to implement address validation TODO openbmc/issues/2046 -/xyz/openbmc_project/network/host0/intf/addr: - - Interface: xyz.openbmc_project.Network.IP - Properties: - Address: - Default: '"0.0.0.0"' - PrefixLength: - Default: 0 - Validation: - Type: "range" - Validator: 0..128 - Unit: "bits" - Origin: - Default: IP::AddressOrigin::Static - Gateway: - Default: '"0.0.0.0"' - Type: - Default: IP::Protocol::IPv4 - -/xyz/openbmc_project/control/host0/restriction_mode: - - Interface: xyz.openbmc_project.Control.Security.RestrictionMode - Properties: - RestrictionMode: - Default: RestrictionMode::Modes::None - -/xyz/openbmc_project/control/host0/TPMEnable: - - Interface: xyz.openbmc_project.Control.TPM.Policy - Properties: - TPMEnable: - Default: 'false' - -/xyz/openbmc_project/control/power_supply_redundancy: - - Interface: xyz.openbmc_project.Control.PowerSupplyRedundancy - Properties: - PowerSupplyRedundancyEnabled: - Default: 'true' - -/xyz/openbmc_project/control/host0/turbo_allowed: - - Interface: xyz.openbmc_project.Control.Host.TurboAllowed - Properties: - TurboAllowed: - Default: 'true' diff --git a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager.bb b/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager.bb deleted file mode 100644 index a63a1f24a..000000000 --- a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager.bb +++ /dev/null @@ -1,67 +0,0 @@ -SUMMARY = "Phosphor Settings Manager" -DESCRIPTION = "Phosphor Settings Manager is an application that creates \ -d-bus objects to represent various user settings." -PR = "r1" - -inherit autotools -inherit obmc-phosphor-dbus-service -inherit pythonnative -inherit phosphor-settings-manager - -require phosphor-settings-manager.inc - -DBUS_SERVICE_${PN} = "xyz.openbmc_project.Settings.service" - -DEPENDS += "python-pyyaml-native" -DEPENDS += "python-mako-native" -DEPENDS += "autoconf-archive-native" -DEPENDS += "virtual/phosphor-settings-defaults" -DEPENDS += "${@df_enabled(d, 'obmc-mrw', 'phosphor-settings-read-settings-mrw-native')}" -DEPENDS += "sdbusplus sdbusplus-native" -DEPENDS += "phosphor-dbus-interfaces phosphor-dbus-interfaces-native" -DEPENDS += "phosphor-logging" -DEPENDS += "cereal" - -RDEPENDS_${PN} += "sdbusplus phosphor-dbus-interfaces" - -S = "${WORKDIR}/git" -SRC_URI += "file://merge_settings.py" - -EXTRA_OECONF = " \ - SETTINGS_YAML=${STAGING_DIR_NATIVE}${settings_datadir}/defaults.yaml \ - " - -# Collect files in SRC_URI that end in ".override.yml" and call a script that -# writes their contents over that of settings.yaml, which is then updated to -# the merged data values. -# This doesn't correctly handle globs in ".override.yml" entries in SRC_URI. -python do_merge_settings () { - import subprocess - - # TODO: Perform the merge in a temporary directory? - workdir = d.getVar('WORKDIR', True) - nativedir = d.getVar('STAGING_DIR_NATIVE', True) - settingsdir = d.getVar('settings_datadir', True) - settingsdir = settingsdir[1:] - settingsdir = os.path.join(nativedir, settingsdir) - cmd = [] - cmd.append(os.path.join(workdir, 'merge_settings.py')) - cmd.append(os.path.join(settingsdir, 'defaults.yaml')) - # Used for any settings from the MRW - use_mrw = df_enabled(d, 'obmc-mrw', 'true') - if (use_mrw == 'true'): - cmd.append(os.path.join(settingsdir, 'mrw-settings.override.yaml')) - - fetch = bb.fetch2.Fetch([], d) - override_urls = [url for url in fetch.urls if url.endswith('.override.yml')] - for url in override_urls: - bb.debug(2, 'Overriding with source: ' + url) - local_base = os.path.basename(fetch.localpath(url)) - filename = os.path.join(workdir, local_base) - cmd.append(filename) - - # Invoke the script and don't catch any resulting exception. - subprocess.check_call(cmd) -} -# python-pyyaml-native is installed by do_configure, so put this task after -addtask merge_settings after do_configure before do_compile diff --git a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager.inc b/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager.inc deleted file mode 100644 index b6c6b0b8a..000000000 --- a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager.inc +++ /dev/null @@ -1,5 +0,0 @@ -HOMEPAGE = "http://github.com/openbmc/phosphor-settingsd" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" -SRC_URI += "git://github.com/openbmc/phosphor-settingsd" -SRCREV = "58d2efeef84aa2812dfc249d7005c765c4b2091a" diff --git a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager/merge_settings.py b/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager/merge_settings.py deleted file mode 100755 index 01f5e3552..000000000 --- a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager/merge_settings.py +++ /dev/null @@ -1,58 +0,0 @@ -#!/usr/bin/env python -"""Loads a "target" YAML file and overwrites its values with values from -"override" YAML files. - -Override files are processed in the order given. - -Usage: - merge_settings.py <target yaml> [override yamls] -""" -import sys -import yaml -import copy - -def dict_merge(target, source): - """Deep merge for dicts. - - Works like dict.update() that recursively updates any dict values present in - both parameters. - - Args: - target (dict): Values to be overwritten by corresponding values from - `source`. - source (dict): Overriding values. Not changed by call. - - Returns: - `target` with values overwritten from those in `source` at any and all - levels of nested dicts. - """ - if not isinstance(source, dict): - return source - for k, v in source.iteritems(): - if k in target and isinstance(target[k], dict): - dict_merge(target[k], v) - else: - target[k] = copy.deepcopy(v) - return target - -if len(sys.argv) < 2: - sys.exit('Argument required: target yaml') - -if len(sys.argv) == 2: - # No overrides to handle - sys.exit() - -target_filename = sys.argv[1] -with open(target_filename) as target_file: - data = yaml.safe_load(target_file) - print('Loaded target YAML file ' + target_filename) - -for override_filename in sys.argv[2:]: - with open(override_filename) as override_file: - override = yaml.safe_load(override_file) - dict_merge(data, override) - print('Merged override YAML file ' + override_filename) - -with open(target_filename, 'w') as target_file: - yaml.dump(data, target_file) - print('Wrote merged target YAML file ' + target_filename) diff --git a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager/xyz.openbmc_project.Settings.service b/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager/xyz.openbmc_project.Settings.service deleted file mode 100644 index 50e21665c..000000000 --- a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager/xyz.openbmc_project.Settings.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Phosphor Settings Daemon - -[Service] -ExecStart=/usr/bin/env phosphor-settings-manager -SyslogIdentifier=phosphor-settings-manager -Restart=always -Type=dbus -BusName={BUSNAME} - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bb b/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bb deleted file mode 100644 index d5ec1bc53..000000000 --- a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bb +++ /dev/null @@ -1,37 +0,0 @@ -# Generates MRW settings override yaml for phosphor-settings-manager -# The default YAML file, mrw-override-settings.yaml, is empty, therefore no -# settings will be overwritten. To override, modify mrw-override-settings.yaml. - -SUMMARY = "Generates MRW settings override YAML for phosphor-settings-manager." -PR = "r1" - -inherit native -inherit phosphor-settings-manager -inherit mrw-xml - -inherit obmc-phosphor-license - -DEPENDS += "mrw-native mrw-perl-tools-native" - -SRC_URI += "file://mrw-override-settings.yaml" - -S = "${WORKDIR}" - -MRW_EXPRESSION_VARS ?= "" - -do_install() { - DEST=${D}${config_datadir} - install -D mrw-override-settings.yaml ${DEST}/mrw-override-settings.yaml - - SETTINGS=${D}${settings_datadir} - install -d ${SETTINGS} - - # gen_settings.pl replaces any MRW variables with their value - ${bindir}/perl-native/perl \ - ${bindir}/gen_settings.pl \ - -i ${mrw_datadir}/${MRW_XML} \ - -s ${DEST}/mrw-override-settings.yaml \ - -o ${SETTINGS}/mrw-settings.override.yaml \ - ${MRW_EXPRESSION_VARS} \ - -f -} diff --git a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-read-settings-mrw/mrw-override-settings.yaml b/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-read-settings-mrw/mrw-override-settings.yaml deleted file mode 100644 index c0fbedecc..000000000 --- a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-read-settings-mrw/mrw-override-settings.yaml +++ /dev/null @@ -1,3 +0,0 @@ -# Default MRW settings override definition YAML - empty. -# Any MRW variables, marked by MRW_<MRW variable name>, are replaced with their -# MRW value. diff --git a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings/merge_settings.py b/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings/merge_settings.py deleted file mode 120000 index f1395f001..000000000 --- a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings/merge_settings.py +++ /dev/null @@ -1 +0,0 @@ -../phosphor-settings-manager/merge_settings.py
\ No newline at end of file diff --git a/meta-phosphor/common/recipes-phosphor/skeleton/obmc-libobmc-intf.bb b/meta-phosphor/common/recipes-phosphor/skeleton/obmc-libobmc-intf.bb deleted file mode 100644 index b02b83234..000000000 --- a/meta-phosphor/common/recipes-phosphor/skeleton/obmc-libobmc-intf.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "OpenBMC gdbus library" -DESCRIPTION = "libopenbmc_intf provides a set of gpio access \ -methods and the GDBUS skeleton code for the org.openbmc DBUS API." -PR = "r1" - -inherit skeleton -inherit pkgconfig - -DEPENDS += "glib-2.0" -DEPENDS += "cjson" - -SKELETON_DIR = "libopenbmc_intf" - -SRC_URI += "file://gpio_defs.json" - -do_install() { - oe_runmake install DESTDIR=${D} - - install -d ${D}${sysconfdir}/default/obmc/gpio/ - install -m 0644 ${WORKDIR}/gpio_defs.json ${D}/${sysconfdir}/default/obmc/gpio/ -} diff --git a/meta-phosphor/common/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json b/meta-phosphor/common/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json deleted file mode 100644 index 6e4ef9ff9..000000000 --- a/meta-phosphor/common/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "_comments": "This file should be overridden with one from the machine layer." -} diff --git a/meta-phosphor/common/recipes-phosphor/state/files/obmc/phosphor-reboot-host/reboot.conf b/meta-phosphor/common/recipes-phosphor/state/files/obmc/phosphor-reboot-host/reboot.conf deleted file mode 100644 index 2e3ca1a5b..000000000 --- a/meta-phosphor/common/recipes-phosphor/state/files/obmc/phosphor-reboot-host/reboot.conf +++ /dev/null @@ -1 +0,0 @@ -REBOOT_DELAY=5 diff --git a/meta-phosphor/common/recipes-phosphor/state/files/phosphor-discover-system-state@.service b/meta-phosphor/common/recipes-phosphor/state/files/phosphor-discover-system-state@.service deleted file mode 100644 index f39803899..000000000 --- a/meta-phosphor/common/recipes-phosphor/state/files/phosphor-discover-system-state@.service +++ /dev/null @@ -1,19 +0,0 @@ -[Unit] -Description=Reboot If Enabled -Wants=mapper-wait@-xyz-openbmc_project-control-host0-power_restore_policy.service -After=mapper-wait@-xyz-openbmc_project-control-host0-power_restore_policy.service -Wants=mapper-wait@-xyz-openbmc_project-state-host%i.service -After=mapper-wait@-xyz-openbmc_project-state-host%i.service -Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service -After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service -After=op-reset-chassis-on@%i.service -ConditionPathExists=!/run/openbmc/chassis@%i-on - -[Service] -Restart=no -Type=oneshot -ExecStart=/usr/bin/env phosphor-discover-system-state --host %i -SyslogIdentifier=phosphor-discover-system-state - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reboot-host@.service b/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reboot-host@.service deleted file mode 100644 index 27479f2de..000000000 --- a/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reboot-host@.service +++ /dev/null @@ -1,18 +0,0 @@ -[Unit] -Description=Reboot host%i -Wants=obmc-host-stop@%i.target -After=obmc-host-stop@%i.target - -[Service] -#ExecStart={base_bindir}/systemctl start obmc-host-start@%i.target -# This service is starting another target that conflicts with the -# target this service is running in. OpenBMC needs a refactor of -# how it does its host reset path. Until then, this short term -# solution does the job. -# Since this is a part of the reboot target, call the startmin -# target which does the minimum required to start the host. -ExecStart=/bin/sh -c "sleep ${{REBOOT_DELAY}} && systemctl start obmc-host-startmin@%i.target" -EnvironmentFile={envfiledir}/obmc/phosphor-reboot-host/reboot.conf - -[Install] -WantedBy=obmc-host-reboot@%i.target diff --git a/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reset-host-check@.service b/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reset-host-check@.service deleted file mode 100644 index 6062320b2..000000000 --- a/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reset-host-check@.service +++ /dev/null @@ -1,19 +0,0 @@ -[Unit] -Description=Check Host%i status on BMC reset -Wants=mapper-wait@-xyz-openbmc_project-control-host%i.service -After=mapper-wait@-xyz-openbmc_project-control-host%i.service -Wants=obmc-host-reset-running@%i.target -Before=obmc-host-reset-running@%i.target -Wants=op-reset-chassis-on@%i.service -After=op-reset-chassis-on@%i.service -Conflicts=obmc-host-stop@%i.target -ConditionPathExists=/run/openbmc/chassis@%i-on - -[Service] -RemainAfterExit=yes -Type=oneshot -ExecStart=/usr/bin/env phosphor-host-check -SyslogIdentifier=phosphor-host-check - -[Install] -WantedBy=obmc-host-reset@%i.target diff --git a/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reset-host-reboot-attempts@.service b/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reset-host-reboot-attempts@.service deleted file mode 100644 index 35de4304b..000000000 --- a/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reset-host-reboot-attempts@.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Reset host reboot counter -Wants=mapper-wait@-xyz-openbmc_project-state-host%i.service -After=mapper-wait@-xyz-openbmc_project-state-host%i.service -ConditionPathExists=!/run/openbmc/host@%i-on - -[Service] -Restart=no -Type=oneshot -ExecStart=/bin/sh -c "busctl set-property `mapper get-service /xyz/openbmc_project/state/host%i` /xyz/openbmc_project/state/host%i xyz.openbmc_project.Control.Boot.RebootAttempts AttemptsLeft u 3" - -[Install] -WantedBy=obmc-host-start@%i.target diff --git a/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reset-host-running@.service b/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reset-host-running@.service deleted file mode 100644 index a49bbdd16..000000000 --- a/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reset-host-running@.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Start host%i running after BMC reset -After=obmc-host-reset-running@%i.target -Requires=obmc-host-reset-running@%i.target -ConditionPathExists=/run/openbmc/host@%i-on - -[Service] -RemainAfterExit=no -ExecStart=/bin/systemctl start obmc-host-start@%i.target - - -[Install] -WantedBy=obmc-host-reset@%i.target diff --git a/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reset-sensor-states@.service b/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reset-sensor-states@.service deleted file mode 100644 index 689372f4a..000000000 --- a/meta-phosphor/common/recipes-phosphor/state/files/phosphor-reset-sensor-states@.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Reset host sensors -After=phosphor-reset-host-check@%i.service -Wants=mapper-wait@-xyz-openbmc_project-state-host%i.service -After=mapper-wait@-xyz-openbmc_project-state-host%i.service -ConditionPathExists=!/run/openbmc/host@%i-on - -[Service] -Restart=no -Type=oneshot -ExecStart=/bin/sh -c "busctl set-property `mapper get-service /xyz/openbmc_project/state/host0` /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Boot.Progress BootProgress s xyz.openbmc_project.State.Boot.Progress.ProgressStages.Unspecified" -ExecStart=/bin/sh -c "busctl set-property `mapper get-service /xyz/openbmc_project/state/host0` /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.OperatingSystem.Status OperatingSystemState s xyz.openbmc_project.State.OperatingSystem.Status.OSStatus.Inactive" - -[Install] -WantedBy=obmc-host-reset@%i.target diff --git a/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service b/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service deleted file mode 100644 index 057af648d..000000000 --- a/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Phosphor BMC State Manager -Before=mapper-wait@-xyz-openbmc_project-state-bmc.service -Wants=obmc-mapper.target -After=obmc-mapper.target - - -[Service] -ExecStart=/usr/bin/env phosphor-bmc-state-manager -SyslogIdentifier=phosphor-bmc-state-manager -Restart=always -Type=dbus -BusName={BUSNAME} - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Chassis.service b/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Chassis.service deleted file mode 100644 index 259dd16af..000000000 --- a/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Chassis.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Phosphor Chassis State Manager -Before=mapper-wait@-xyz-openbmc_project-state-chassis.service -Wants=obmc-mapper.target -After=obmc-mapper.target -After=org.openbmc.control.Power@0.service - -[Service] -ExecStart=/usr/bin/env phosphor-chassis-state-manager -SyslogIdentifier=phosphor-chassis-state-manager -Restart=always -Type=dbus -BusName={BUSNAME} - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service b/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service deleted file mode 100644 index 26f523eaa..000000000 --- a/meta-phosphor/common/recipes-phosphor/state/files/xyz.openbmc_project.State.Host.service +++ /dev/null @@ -1,18 +0,0 @@ -[Unit] -Description=Phosphor Host State Manager -Wants=mapper-wait@-xyz-openbmc_project-control-host0-auto_reboot.service -After=mapper-wait@-xyz-openbmc_project-control-host0-auto_reboot.service -Before=mapper-wait@-xyz-openbmc_project-state-host.service -After=phosphor-reset-host-running@0.service -Wants=obmc-mapper.target -After=obmc-mapper.target - -[Service] -ExecStart=/usr/bin/env phosphor-host-state-manager -SyslogIdentifier=phosphor-host-state-manager -Restart=always -Type=dbus -BusName={BUSNAME} - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/state/phosphor-state-manager.bb b/meta-phosphor/common/recipes-phosphor/state/phosphor-state-manager.bb deleted file mode 100644 index 4acaa5688..000000000 --- a/meta-phosphor/common/recipes-phosphor/state/phosphor-state-manager.bb +++ /dev/null @@ -1,141 +0,0 @@ -SUMMARY = "Phosphor State Management" -DESCRIPTION = "Phosphor State Manager provides a set of system state \ -management daemons. It is suitable for use on a wide variety of OpenBMC \ -platforms." -HOMEPAGE = "https://github.com/openbmc/phosphor-state-manager" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" - -STATE_MGR_PACKAGES = " \ - ${PN}-host \ - ${PN}-chassis \ - ${PN}-bmc \ - ${PN}-discover \ - ${PN}-host-check \ - ${PN}-reset-sensor-states \ -" -PACKAGE_BEFORE_PN += "${STATE_MGR_PACKAGES}" -ALLOW_EMPTY_${PN} = "1" - -DBUS_PACKAGES = "${STATE_MGR_PACKAGES}" - -SYSTEMD_PACKAGES = "${PN}-discover \ - ${PN}-reset-sensor-states \ -" - -# The host-check function will check if the host is running -# after a BMC reset. -# The reset-sensor-states function will reset the host -# sensors on a BMC reset or system power loss. -# Neither is required for host state function but are -# recommended to deal properly with these reset scenarios. -RRECOMMENDS_${PN}-host = "${PN}-host-check ${PN}-reset-sensor-states" - -inherit autotools pkgconfig -inherit obmc-phosphor-dbus-service - -DEPENDS += "autoconf-archive-native" -DEPENDS += "sdbusplus" -DEPENDS += "phosphor-logging" -DEPENDS += "phosphor-dbus-interfaces" -DEPENDS += "cereal" -RDEPENDS_${PN} += "sdbusplus" - -RDEPENDS_${PN}-host += "libsystemd phosphor-dbus-interfaces" -RDEPENDS_${PN}-chassis += "libsystemd phosphor-dbus-interfaces" -RDEPENDS_${PN}-bmc += "libsystemd phosphor-dbus-interfaces" -RDEPENDS_${PN}-discover += "libsystemd phosphor-dbus-interfaces" -RDEPENDS_${PN}-host-check += "libsystemd phosphor-dbus-interfaces" -RDEPENDS_${PN}-reset-sensor-states += "libsystemd phosphor-dbus-interfaces" - -FILES_${PN}-host = "${sbindir}/phosphor-host-state-manager" -DBUS_SERVICE_${PN}-host += "xyz.openbmc_project.State.Host.service" -DBUS_SERVICE_${PN}-host += "phosphor-reboot-host@.service" -SYSTEMD_ENVIRONMENT_FILE_${PN}-host += "obmc/phosphor-reboot-host/reboot.conf" -SYSTEMD_SERVICE_${PN}-host += "phosphor-reset-host-reboot-attempts@.service" - -FILES_${PN}-chassis = "${sbindir}/phosphor-chassis-state-manager" -DBUS_SERVICE_${PN}-chassis += "xyz.openbmc_project.State.Chassis.service" - -FILES_${PN}-bmc = "${sbindir}/phosphor-bmc-state-manager" -DBUS_SERVICE_${PN}-bmc += "xyz.openbmc_project.State.BMC.service" - -FILES_${PN}-discover = "${sbindir}/phosphor-discover-system-state" -SYSTEMD_SERVICE_${PN}-discover += "phosphor-discover-system-state@.service" - -FILES_${PN}-host-check = "${sbindir}/phosphor-host-check" -SYSTEMD_SERVICE_${PN}-host-check += "phosphor-reset-host-check@.service" -SYSTEMD_SERVICE_${PN}-host-check += "phosphor-reset-host-running@.service" - -SYSTEMD_SERVICE_${PN}-reset-sensor-states += "phosphor-reset-sensor-states@.service" - -RESET_CHECK_TMPL = "phosphor-reset-host-check@.service" -RESET_CHECK_TGTFMT = "obmc-host-reset@{1}.target" -RESET_CHECK_INSTFMT = "phosphor-reset-host-check@{0}.service" -RESET_CHECK_FMT = "../${RESET_CHECK_TMPL}:${RESET_CHECK_TGTFMT}.requires/${RESET_CHECK_INSTFMT}" - -SENSOR_RESET_TMPL = "phosphor-reset-sensor-states@.service" -SENSOR_RESET_TGTFMT = "obmc-host-reset@{1}.target" -SENSOR_RESET_INSTFMT = "phosphor-reset-sensor-states@{0}.service" -SENSOR_RESET_FMT = "../${SENSOR_RESET_TMPL}:${SENSOR_RESET_TGTFMT}.requires/${SENSOR_RESET_INSTFMT}" - -RESET_RUNNING_TMPL = "phosphor-reset-host-running@.service" -RESET_RUNNING_TGTFMT = "obmc-host-reset@{1}.target" -RESET_RUNNING_INSTFMT = "phosphor-reset-host-running@{0}.service" -RESET_RUNNING_FMT = "../${RESET_RUNNING_TMPL}:${RESET_RUNNING_TGTFMT}.requires/${RESET_RUNNING_INSTFMT}" - -SYSTEMD_LINK_${PN}-host-check += "${@compose_list_zip(d, 'RESET_CHECK_FMT', 'OBMC_HOST_INSTANCES', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_LINK_${PN}-host-check += "${@compose_list_zip(d, 'RESET_RUNNING_FMT', 'OBMC_HOST_INSTANCES', 'OBMC_HOST_INSTANCES')}" - -SYSTEMD_LINK_${PN}-reset-sensor-states += "${@compose_list_zip(d, 'SENSOR_RESET_FMT', 'OBMC_HOST_INSTANCES', 'OBMC_HOST_INSTANCES')}" - -# Force the standby target to run the host reset check target -RESET_TMPL_CTRL = "obmc-host-reset@.target" -SYSD_TGT = "${SYSTEMD_DEFAULT_TARGET}" -RESET_INSTFMT_CTRL = "obmc-host-reset@{0}.target" -RESET_FMT_CTRL = "../${RESET_TMPL_CTRL}:${SYSD_TGT}.wants/${RESET_INSTFMT_CTRL}" -SYSTEMD_LINK_${PN}-host-check += "${@compose_list_zip(d, 'RESET_FMT_CTRL', 'OBMC_HOST_INSTANCES')}" - -TMPL = "phosphor-discover-system-state@.service" -INSTFMT = "phosphor-discover-system-state@{0}.service" -FMT = "../${TMPL}:${SYSTEMD_DEFAULT_TARGET}.wants/${INSTFMT}" -SYSTEMD_LINK_${PN}-discover += "${@compose_list(d, 'FMT', 'OBMC_HOST_INSTANCES')}" - -# Force the shutdown target to run the chassis-poweroff target -CHASSIS_STOP_TMPL = "obmc-chassis-poweroff@.target" -HOST_STOP_TGTFMT = "obmc-host-shutdown@{1}.target" -CHASSIS_STOP_INSTFMT = "obmc-chassis-poweroff@{0}.target" -HOST_STOP_FMT = "../${CHASSIS_STOP_TMPL}:${HOST_STOP_TGTFMT}.requires/${CHASSIS_STOP_INSTFMT}" -SYSTEMD_LINK_${PN}-host += "${@compose_list_zip(d, 'HOST_STOP_FMT', 'OBMC_CHASSIS_INSTANCES', 'OBMC_HOST_INSTANCES')}" - -# Force the host reboot target to run the shutdown target -HOST_SHUTDOWN_TMPL = "obmc-host-shutdown@.target" -HOST_REBOOT_TGTFMT = "obmc-host-reboot@{0}.target" -HOST_SHUTDOWN_INSTFMT = "obmc-host-shutdown@{0}.target" -HOST_REBOOT_FMT = "../${HOST_SHUTDOWN_TMPL}:${HOST_REBOOT_TGTFMT}.requires/${HOST_SHUTDOWN_INSTFMT}" -SYSTEMD_LINK_${PN}-host += "${@compose_list_zip(d, 'HOST_REBOOT_FMT', 'OBMC_HOST_INSTANCES')}" - -# And also force the reboot target to call the host startmin service -HOST_REBOOT_SVC = "phosphor-reboot-host@.service" -HOST_REBOOT_SVC_INST = "phosphor-reboot-host@{0}.service" -HOST_REBOOT_SVC_FMT = "../${HOST_REBOOT_SVC}:${HOST_REBOOT_TGTFMT}.requires/${HOST_REBOOT_SVC_INST}" -SYSTEMD_LINK_${PN}-host += "${@compose_list_zip(d, 'HOST_REBOOT_SVC_FMT', 'OBMC_HOST_INSTANCES', 'OBMC_HOST_INSTANCES')}" - -# Force the host-start target to call the host-startmin target -HOST_STARTMIN_TMPL = "obmc-host-startmin@.target" -HOST_START_TGTFMT = "obmc-host-start@{0}.target" -HOST_STARTMIN_INSTFMT = "obmc-host-startmin@{0}.target" -HOST_START_FMT = "../${HOST_STARTMIN_TMPL}:${HOST_START_TGTFMT}.requires/${HOST_STARTMIN_INSTFMT}" -SYSTEMD_LINK_${PN}-host += "${@compose_list_zip(d, 'HOST_START_FMT', 'OBMC_HOST_INSTANCES')}" - -# Force the host-start target to call the reboot count reset service -HOST_RST_RBT_ATTEMPTS_SVC = "phosphor-reset-host-reboot-attempts@.service" -HOST_RST_RBT_ATTEMPTS_SVC_INST = "phosphor-reset-host-reboot-attempts@{0}.service" -HOST_RST_RBT_ATTEMPTS_SVC_FMT = "../${HOST_RST_RBT_ATTEMPTS_SVC}:${HOST_START_TGTFMT}.requires/${HOST_RST_RBT_ATTEMPTS_SVC_INST}" -SYSTEMD_LINK_${PN}-host += "${@compose_list_zip(d, 'HOST_RST_RBT_ATTEMPTS_SVC_FMT', 'OBMC_HOST_INSTANCES', 'OBMC_HOST_INSTANCES')}" - -SRC_URI += "git://github.com/openbmc/phosphor-state-manager" -SRCREV = "a965cf06a6bb6b130a2e4f1202978aac9124be68" - -S = "${WORKDIR}/git" diff --git a/meta-phosphor/common/recipes-phosphor/system/files/obmc-phosphor-sysd.py b/meta-phosphor/common/recipes-phosphor/system/files/obmc-phosphor-sysd.py deleted file mode 100644 index c8080ac2c..000000000 --- a/meta-phosphor/common/recipes-phosphor/system/files/obmc-phosphor-sysd.py +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env python - -# Contributors Listed Below - COPYRIGHT 2015 -# [+] International Business Machines Corp. -# -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. See the License for the specific language governing -# permissions and limitations under the License. - -import time -import sys -import dbus -import dbus.service -import dbus.mainloop.glib - -if __name__ == '__main__': - print "obmc-phosphor-watchdogd starting..." - - while 1: - time.sleep(5) diff --git a/meta-phosphor/common/recipes-phosphor/system/files/obmc-phosphor-sysd.service b/meta-phosphor/common/recipes-phosphor/system/files/obmc-phosphor-sysd.service deleted file mode 100644 index d4dacf546..000000000 --- a/meta-phosphor/common/recipes-phosphor/system/files/obmc-phosphor-sysd.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Phosphor System Manager - -[Service] -Restart=always -ExecStart=/usr/bin/env obmc-phosphor-sysd -SyslogIdentifier=obmc-phosphor-sysd - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/system/obmc-control-bmc.bb b/meta-phosphor/common/recipes-phosphor/system/obmc-control-bmc.bb deleted file mode 100644 index eb5b4a810..000000000 --- a/meta-phosphor/common/recipes-phosphor/system/obmc-control-bmc.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "OpenBMC org.openbmc.control.Bmc example implementation" -DESCRIPTION = "A sample implementation for the org.openbmc.control.Bmc DBUS API. \ -org.openbmc.control.Bmc provides APIs for functions like resetting the BMC." -PR = "r1" - -inherit skeleton-gdbus -inherit obmc-phosphor-dbus-service -inherit pkgconfig - -SKELETON_DIR = "bmcctl" - -FMT = "org.openbmc.control.Bmc@{0}.service" -DBUS_SERVICE_${PN} += "${@compose_list(d, 'FMT', 'OBMC_BMC_INSTANCES')}" diff --git a/meta-phosphor/common/recipes-phosphor/system/obmc-control-bmc/org.openbmc.control.Bmc@.service b/meta-phosphor/common/recipes-phosphor/system/obmc-control-bmc/org.openbmc.control.Bmc@.service deleted file mode 100644 index 9685efecd..000000000 --- a/meta-phosphor/common/recipes-phosphor/system/obmc-control-bmc/org.openbmc.control.Bmc@.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Phosphor BMC%i Control - -[Service] -Restart=always -ExecStart=/usr/bin/env control_bmc.exe -SyslogIdentifier=control_bmc.exe -Type=dbus -BusName={BUSNAME} - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-system.bb b/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-system.bb deleted file mode 100644 index 0df36f9c1..000000000 --- a/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-system.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "OpenBMC system manager" -DESCRIPTION = "OpenBMC system manager." -PR = "r1" - -inherit skeleton-python -inherit obmc-phosphor-dbus-service - -VIRTUAL-RUNTIME_skeleton_workbook ?= "" - -RDEPENDS_${PN} += "\ - python-dbus \ - python-json \ - python-subprocess \ - python-pygobject \ - pyphosphor \ - pyphosphor-dbus \ - ${VIRTUAL-RUNTIME_skeleton_workbook} \ - " - -SKELETON_DIR = "pysystemmgr" - -DBUS_SERVICE_${PN} += "org.openbmc.managers.System.service" diff --git a/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-system/org.openbmc.managers.System.service b/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-system/org.openbmc.managers.System.service deleted file mode 100644 index 9d1761fd8..000000000 --- a/meta-phosphor/common/recipes-phosphor/system/obmc-mgr-system/org.openbmc.managers.System.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Phosphor System Manager -Wants=obmc-mapper.target -After=obmc-mapper.target - -[Service] -Restart=always -ExecStart=/usr/bin/env system_manager.py -SyslogIdentifier=system_manager.py -Type=dbus -BusName={BUSNAME} -Environment="PYTHONUNBUFFERED=1" -TimeoutStartSec=180s - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/system/obmc-phosphor-sysd.bb b/meta-phosphor/common/recipes-phosphor/system/obmc-phosphor-sysd.bb deleted file mode 100644 index 7a21c2fe6..000000000 --- a/meta-phosphor/common/recipes-phosphor/system/obmc-phosphor-sysd.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "Phosphor OpenBMC System Management" -DESCRIPTION = "Phosphor OpenBMC system management reference implementation." -PR = "r1" - -inherit obmc-phosphor-pydbus-service - -PROVIDES += "virtual/obmc-system-mgmt" -RPROVIDES_${PN} += "virtual-obmc-system-mgmt" - -S = "${WORKDIR}" -SRC_URI += "file://${PN}.py" diff --git a/meta-phosphor/common/recipes-phosphor/systemd-policy/phosphor-systemd-policy.bb b/meta-phosphor/common/recipes-phosphor/systemd-policy/phosphor-systemd-policy.bb deleted file mode 100644 index ce58a532a..000000000 --- a/meta-phosphor/common/recipes-phosphor/systemd-policy/phosphor-systemd-policy.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Phosphor systemd configuration overrides" -DESCRIPTION = "Overrides for systemd and its applications" -PR = "r1" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" - -DEPENDS += "systemd" - -SRC_URI = "file://service-restart-policy.conf" -SRC_URI += "file://disable-duplicate-kernel-msg.conf" - -FILES_${PN} += "${systemd_unitdir}/system.conf.d/service-restart-policy.conf" -FILES_${PN} += "${systemd_unitdir}/journald.conf.d/disable-duplicate-kernel-msg.conf" - - -do_install() { - install -m 644 -D ${WORKDIR}/service-restart-policy.conf ${D}${systemd_unitdir}/system.conf.d/service-restart-policy.conf - install -m 644 -D ${WORKDIR}/disable-duplicate-kernel-msg.conf ${D}${systemd_unitdir}/journald.conf.d/disable-duplicate-kernel-msg.conf -} diff --git a/meta-phosphor/common/recipes-phosphor/systemd-policy/phosphor-systemd-policy/disable-duplicate-kernel-msg.conf b/meta-phosphor/common/recipes-phosphor/systemd-policy/phosphor-systemd-policy/disable-duplicate-kernel-msg.conf deleted file mode 100644 index beb2f445f..000000000 --- a/meta-phosphor/common/recipes-phosphor/systemd-policy/phosphor-systemd-policy/disable-duplicate-kernel-msg.conf +++ /dev/null @@ -1,13 +0,0 @@ -# This file overrides some defaults for systemd -# -# OpenBMC uses busybox which uses klogd which causes duplicate -# kernel messages to show up in the journal due to syslog. -# This override prevents journald from reading from kmsg so -# only one instance of the kernel messages will show up in -# journald instead of the two of each currently put in the -# journal -# -# See systemd-system.conf(5) for details on the conf files - -[Journal] -ReadKMsg=no diff --git a/meta-phosphor/common/recipes-phosphor/systemd-policy/phosphor-systemd-policy/service-restart-policy.conf b/meta-phosphor/common/recipes-phosphor/systemd-policy/phosphor-systemd-policy/service-restart-policy.conf deleted file mode 100644 index 54516c2d4..000000000 --- a/meta-phosphor/common/recipes-phosphor/systemd-policy/phosphor-systemd-policy/service-restart-policy.conf +++ /dev/null @@ -1,31 +0,0 @@ -# This file overrides some defaults for systemd -# -# - Change the RestartSec from 100ms to 1s. -# When a service hits a failure, our new debug collection service kicks -# in. When a core file is involved, it's been found that generating 5 core -# files within ~500ms puts a huge strain on the BMC. Also, if the bmc is -# going to get a fix on a restart of a service, the more time the better -# (think retries on device driver scenarios). -# -# - Change the StartLimitBurst to 2 -# Five just seems excessive for our services in openbmc. In all fail -# scenarios seen so far (other then with phosphor-hwmon), either -# restarting once does the job or restarting all 5 times does not help -# and we just end up hitting the 5 limit anyway. -# -# - Change the StartLimitIntervalSec to 30s -# The BMC CPU performance is already challenged. When a service is -# failing and a core dump is being generated and collected into a dump, -# it's even more challenged. Recent failures have shown situations where -# the service does not fail again until 15-20 seconds after the initial -# failure which means the default of 10s for this results in the service -# being restarted indefinitely. Change this to 30s to only allow a service -# to be restarted StartLimitBurst times within a 30s interval before -# being put in a permanent fail state. -# -# See systemd-system.conf(5) for details on the conf files - -[Manager] -DefaultRestartSec=1s -DefaultStartLimitBurst=2 -DefaultStartLimitIntervalSec=30s diff --git a/meta-phosphor/common/recipes-phosphor/users/phosphor-user-manager.bb b/meta-phosphor/common/recipes-phosphor/users/phosphor-user-manager.bb deleted file mode 100644 index 2c05c9ba7..000000000 --- a/meta-phosphor/common/recipes-phosphor/users/phosphor-user-manager.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Phosphor User Manager Daemon" -DESCRIPTION = "Daemon that does user management" -HOMEPAGE = "http://github.com/openbmc/phosphor-user-manager" -PR = "r1" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -inherit autotools pkgconfig -inherit obmc-phosphor-dbus-service - -DEPENDS += "autoconf-archive-native" -DEPENDS += "sdbusplus" -DEPENDS += "phosphor-logging" -DEPENDS += "phosphor-dbus-interfaces" -DEPENDS += "boost" -RDEPENDS_${PN} += "libsystemd" -RDEPENDS_${PN} += "phosphor-logging" - -inherit useradd - -USERADD_PACKAGES = "${PN}" -# add groups needed for privilege maintenance -GROUPADD_PARAM_${PN} = "priv-admin; priv-operator; priv-user; priv-callback " - -DBUS_SERVICE_${PN} += "xyz.openbmc_project.User.Manager.service" - -SRC_URI += "git://github.com/openbmc/phosphor-user-manager" -SRCREV = "10eb23f8d64d197dade920178b193c1979235156" -S = "${WORKDIR}/git" diff --git a/meta-phosphor/common/recipes-phosphor/users/phosphor-user-manager/xyz.openbmc_project.User.Manager.service b/meta-phosphor/common/recipes-phosphor/users/phosphor-user-manager/xyz.openbmc_project.User.Manager.service deleted file mode 100644 index f8926e77c..000000000 --- a/meta-phosphor/common/recipes-phosphor/users/phosphor-user-manager/xyz.openbmc_project.User.Manager.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Phosphor User Manager - -[Service] -ExecStart=/usr/bin/env phosphor-user-manager -SyslogIdentifier=phosphor-user-manager -Restart=always -Type=dbus -BusName={BUSNAME} - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/common/recipes-phosphor/video/fbterm/fb.modes b/meta-phosphor/common/recipes-phosphor/video/fbterm/fb.modes deleted file mode 100644 index dfc51fe97..000000000 --- a/meta-phosphor/common/recipes-phosphor/video/fbterm/fb.modes +++ /dev/null @@ -1,7 +0,0 @@ -mode "800x600-60" - # D: 40.00 MHz, H: 37.879 kHz, V: 60.32 Hz - geometry 800 600 800 600 32 - timings 0 88 40 23 1 128 4 - hsync high - vsync high -endmode diff --git a/meta-phosphor/common/recipes-phosphor/video/fbterm/fbterm b/meta-phosphor/common/recipes-phosphor/video/fbterm/fbterm deleted file mode 100644 index 0cf29d433..000000000 --- a/meta-phosphor/common/recipes-phosphor/video/fbterm/fbterm +++ /dev/null @@ -1 +0,0 @@ -FB_MODE=800x600-60 diff --git a/meta-phosphor/common/recipes-phosphor/video/fbterm/fbterm.service b/meta-phosphor/common/recipes-phosphor/video/fbterm/fbterm.service deleted file mode 100644 index 2b18c91ef..000000000 --- a/meta-phosphor/common/recipes-phosphor/video/fbterm/fbterm.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=UART renderer -Requires=obmc-console@ttyVUART0.service - -[Service] -EnvironmentFile={envfiledir}/fbterm -ExecStartPre=/usr/sbin/fbset $FB_MODE -ExecStart=/usr/bin/fbterm --write-only obmc-console-client diff --git a/meta-phosphor/common/recipes-phosphor/video/fbterm_git.bb b/meta-phosphor/common/recipes-phosphor/video/fbterm_git.bb deleted file mode 100644 index 0c171dd3a..000000000 --- a/meta-phosphor/common/recipes-phosphor/video/fbterm_git.bb +++ /dev/null @@ -1,29 +0,0 @@ -HOMEPAGE = "https://github.com/jk-ozlabs/fbterm" -LICENSE = "GPLv2+" - -SRC_URI += "git://github.com/jk-ozlabs/fbterm.git;nobranch=1" -SRC_URI += "file://fb.modes" -PR = "r1" - -LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=d8e20eece214df8ef953ed5857862150" - -DEPENDS += "freetype" -DEPENDS += "fontconfig" - -inherit autotools -inherit pkgconfig -inherit obmc-phosphor-systemd - -SRCREV = "c15430560aeb82a27358cc320af4a29e1296e6c1" -PV = "1.7+git${SRCPV}" - -S = "${WORKDIR}/git" - -do_install() { - oe_runmake 'DESTDIR=${D}' install-exec - install -d ${D}${sysconfdir}/ - install -m 0644 ${WORKDIR}/fb.modes ${D}${sysconfdir}/ -} - -SYSTEMD_SERVICE_${PN} += "fbterm.service" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "fbterm" diff --git a/meta-phosphor/common/recipes-phosphor/video/liberation-fonts_2.00.1.bbappend b/meta-phosphor/common/recipes-phosphor/video/liberation-fonts_2.00.1.bbappend deleted file mode 100644 index 5283a7841..000000000 --- a/meta-phosphor/common/recipes-phosphor/video/liberation-fonts_2.00.1.bbappend +++ /dev/null @@ -1,9 +0,0 @@ - -do_install () { - install -d ${D}${datadir}/fonts/ttf/ - for i in LiberationMono-Regular.ttf; do - install -m 0644 $i ${D}${prefix}/share/fonts/ttf/${i} - done - install -d ${D}${sysconfdir}/fonts/conf.d/ - install -m 0644 ${WORKDIR}/30-liberation-aliases.conf ${D}${sysconfdir}/fonts/conf.d/ -} diff --git a/meta-phosphor/common/recipes-phosphor/video/uart-render-controller/uart-render-controller.service b/meta-phosphor/common/recipes-phosphor/video/uart-render-controller/uart-render-controller.service deleted file mode 100644 index 3fd688f31..000000000 --- a/meta-phosphor/common/recipes-phosphor/video/uart-render-controller/uart-render-controller.service +++ /dev/null @@ -1,14 +0,0 @@ - -[Unit] -Description=UART render controller -Requires=xyz.openbmc_project.State.Host.service -After=xyz.openbmc_project.State.Host.service - -[Service] -ExecStart=/usr/sbin/obmc-uart-render-controller \ - /sys/devices/platform/ahb/ahb:apb/1e6e2000.syscon/1e6e2000.syscon:scratch/vga0 \ - /sys/devices/platform/ahb/ahb:apb/1e6e2000.syscon/1e6e2000.syscon:scratch/dac_mux \ - fbterm.service - -[Install] -WantedBy=obmc-standby.target diff --git a/meta-phosphor/common/recipes-phosphor/video/uart-render-controller_git.bb b/meta-phosphor/common/recipes-phosphor/video/uart-render-controller_git.bb deleted file mode 100644 index c8780a4e7..000000000 --- a/meta-phosphor/common/recipes-phosphor/video/uart-render-controller_git.bb +++ /dev/null @@ -1,30 +0,0 @@ -HOMEPAGE = "https://github.com/jk-ozlabs/uart-render-controller" -LICENSE = "GPLv2+" - -SRC_URI += "git://github.com/jk-ozlabs/uart-render-controller;branch=master" -SRC_URI += "file://uart-render-controller.service" - -PR = "r1" - -LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" - -inherit autotools -inherit pkgconfig -inherit systemd - -DEPENDS += "autoconf-archive-native" -DEPENDS += "systemd" -RDEPENDS_${PN} += "libsystemd" -RDEPENDS_${PN} += "fbterm" - -SRCREV = "14decab20f621c050760e5f3310f5a960cf21211" -PV = "0.1+git${SRCPV}" - -S = "${WORKDIR}/git" - -SYSTEMD_SERVICE_${PN} += "uart-render-controller.service" - -do_install_append() { - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/uart-render-controller.service ${D}${systemd_system_unitdir}/ -} diff --git a/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog.bb b/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog.bb deleted file mode 100644 index fe9436522..000000000 --- a/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog.bb +++ /dev/null @@ -1,50 +0,0 @@ -SUMMARY = "Phosphor Watchdog application" -DESCRIPTION = "Application that implements software watchdog" -HOMEPAGE = "http://github.com/openbmc/phosphor-watchdog" -PR = "r1" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -inherit autotools pkgconfig -inherit obmc-phosphor-dbus-service - -RPROVIDES_${PN} += "virtual/obmc-watchdog" -PROVIDES += "virtual/obmc-watchdog" - -DEPENDS += "autoconf-archive-native" -DEPENDS += "sdbusplus sdbusplus-native" -DEPENDS += "phosphor-dbus-interfaces" -DEPENDS += "phosphor-logging" -RDEPENDS_${PN} += "libsystemd" -RDEPENDS_${PN} += "phosphor-logging" - -SRC_URI += "git://github.com/openbmc/phosphor-watchdog" -SRCREV = "d5353086a46402c95d6079c033e9d2f3555c6b5f" -S = "${WORKDIR}/git" - -# Copies config file having arguments for host watchdog -SYSTEMD_ENVIRONMENT_FILE_${PN} +="obmc/watchdog/poweron" - -# Install the override to set up a Conflicts relation -SYSTEMD_OVERRIDE_${PN} += "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" - -# For now, watching PowerOn is the only usecase -OBMC_HOST_WATCHDOG_INSTANCES = "poweron" - -# This is really a DBUS service but the service name is -# an argument, so making it this way. -WATCHDOG_TMPL = "phosphor-watchdog@.service" -ENABLE_WATCHDOG_TMPL = "obmc-enable-host-watchdog@.service" -SYSTEMD_SERVICE_${PN} += "${WATCHDOG_TMPL}" - -# To Enable Host Watchdog early during poweron -SYSTEMD_SERVICE_${PN} += "${ENABLE_WATCHDOG_TMPL}" - -WATCHDOG_TGTFMT = "phosphor-watchdog@{0}.service" -ENABLE_WATCHDOG_TGTFMT = "obmc-enable-host-watchdog@{0}.service" - -WATCHDOG_FMT = "../${WATCHDOG_TMPL}:obmc-host-startmin@{1}.target.wants/${WATCHDOG_TGTFMT}" -ENABLE_WATCHDOG_FMT = "../${ENABLE_WATCHDOG_TMPL}:obmc-host-startmin@{0}.target.wants/${ENABLE_WATCHDOG_TGTFMT}" - -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'WATCHDOG_FMT', 'OBMC_HOST_WATCHDOG_INSTANCES', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'ENABLE_WATCHDOG_FMT', 'OBMC_HOST_INSTANCES')}" diff --git a/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/obmc-enable-host-watchdog@.service b/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/obmc-enable-host-watchdog@.service deleted file mode 100644 index 0cf5e7cd3..000000000 --- a/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/obmc-enable-host-watchdog@.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Start Watchdog%i -Wants=obmc-host-started@%i.target -After=obmc-host-started@%i.target -Wants=mapper-wait@-xyz-openbmc_project-watchdog-host%i.service -After=mapper-wait@-xyz-openbmc_project-watchdog-host%i.service -Conflicts=obmc-host-stop@%i.target -ConditionPathExists=!/run/openbmc/host@%i-on - -[Service] -Type=oneshot -ExecStart=/bin/sh -c "busctl call `mapper get-service /xyz/openbmc_project/watchdog/host%i` /xyz/openbmc_project/watchdog/host%i org.freedesktop.DBus.Properties Set ssv xyz.openbmc_project.State.Watchdog Enabled b true" -RemainAfterExit=yes -SyslogIdentifier=obmc-enable-host-watchdog diff --git a/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/poweron b/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/poweron deleted file mode 100644 index 591d6dcd7..000000000 --- a/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/poweron +++ /dev/null @@ -1,3 +0,0 @@ -DEVPATH=/xyz/openbmc_project/watchdog/host0 -SERVICE=xyz.openbmc_project.Watchdog -TARGET=obmc-host-timeout@0.target diff --git a/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service b/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service deleted file mode 100644 index 52c129025..000000000 --- a/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Phosphor %I watchdog - -[Service] -Restart=no -EnvironmentFile={envfiledir}/obmc/watchdog/%I -ExecStart=/usr/bin/env phosphor-watchdog --continue --service=${{SERVICE}} --path=${{DEVPATH}} --target=${{TARGET}} -SyslogIdentifier=phosphor-watchdog diff --git a/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/poweron.conf b/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/poweron.conf deleted file mode 100644 index b25324982..000000000 --- a/meta-phosphor/common/recipes-phosphor/watchdog/phosphor-watchdog/poweron.conf +++ /dev/null @@ -1,4 +0,0 @@ -[Unit] -Conflicts=obmc-host-stop@0.target -Conflicts=obmc-chassis-poweroff@0.target -Conflicts=obmc-host-quiesce@0.target diff --git a/meta-phosphor/common/recipes-phosphor/webui/phosphor-webui.bb b/meta-phosphor/common/recipes-phosphor/webui/phosphor-webui.bb deleted file mode 100644 index 5ec201f63..000000000 --- a/meta-phosphor/common/recipes-phosphor/webui/phosphor-webui.bb +++ /dev/null @@ -1,45 +0,0 @@ -# This recipe requires online access to build, as it uses NPM for dependency -# management and resolution. - -LICENSE = "Apache-2.0" -SRC_URI = "git://github.com/openbmc/phosphor-webui.git" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -SRCREV = "e364faa0314c8c98a31260bf69df78a104b106a1" -S = "${WORKDIR}/git" - -DEPENDS_prepend = "nodejs-native " - -# allarch is required because the files this recipe produces (html and -# javascript) are valid for any target, regardless of architecture. The allarch -# class removes your compiler definitions, as it assumes that anything that -# requires a compiler is platform specific. Unfortunately, one of the build -# tools uses libsass for compiling the css templates, and it needs a compiler to -# build the library that it then uses to compress the scss into normal css. -# Enabling allarch, then re-adding the compiler flags was the best of the bad -# options - -inherit allarch - -export CXX = "${BUILD_CXX}" -export CC = "${BUILD_CC}" -export CFLAGS = "${BUILD_CFLAGS}" -export CPPFLAGS = "${BUILD_CPPFLAGS}" -export CXXFLAGS = "${BUILD_CXXFLAGS}" - -FILES_${PN} += "${datadir}/www/*" - -do_compile () { - cd ${S} - rm -rf node_modules - npm --loglevel info --proxy=${HTTP_PROXY} --https-proxy=${HTTPS_PROXY} install - npm run-script build -} - -do_install () { - # create directory structure - install -d ${D}${datadir}/www - cp -r ${S}/dist/** ${D}${datadir}/www - find ${D}${datadir}/www -type f -exec chmod a=r,u+w '{}' + - find ${D}${datadir}/www -type d -exec chmod a=rx,u+w '{}' + -} - diff --git a/meta-phosphor/common/recipes-support/cjson/cjson_git.bb b/meta-phosphor/common/recipes-support/cjson/cjson_git.bb deleted file mode 100644 index 096e3c988..000000000 --- a/meta-phosphor/common/recipes-support/cjson/cjson_git.bb +++ /dev/null @@ -1,15 +0,0 @@ -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=218947f77e8cb8e2fa02918dc41c50d0" - -SRC_URI = "git://github.com/DaveGamble/cJSON.git" - -PV = "1.7.6+git${SRCPV}" -SRCREV = "cbc05de76fbd4dfff17b5626d5cfe9ec922b1f4a" - -S = "${WORKDIR}/git" - -inherit cmake - -FILES_${PN}-dev += "${libdir}/cmake/cJSON/*" - -EXTRA_OECMAKE = "-DENABLE_CUSTOM_COMPILER_FLAGS=OFF -DENABLE_TARGET_EXPORT=OFF" diff --git a/meta-phosphor/common/recipes-support/libgpg-error/libgpg-error/0001-syscfg-Add-ppc64le-cross-build-support.patch b/meta-phosphor/common/recipes-support/libgpg-error/libgpg-error/0001-syscfg-Add-ppc64le-cross-build-support.patch deleted file mode 100644 index e171b3191..000000000 --- a/meta-phosphor/common/recipes-support/libgpg-error/libgpg-error/0001-syscfg-Add-ppc64le-cross-build-support.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 7f8ca0ae0b89f4f4442bf4f7f05677f255121dd6 Mon Sep 17 00:00:00 2001 -From: Brad Bishop <bradleyb@fuzziesquirrel.com> -Date: Wed, 14 Mar 2018 16:03:38 -0400 -Subject: [PATCH] syscfg: Add ppc64le cross build support. - -* src/syscfg/lock-obj-pub.ppc64le-unknown-linux-gnu.h: New. -* src/Makefile.am (lock_obj_pub): Add. --- - -Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com> ---- - src/Makefile.am | 1 + - .../lock-obj-pub.ppc64le-unknown-linux-gnu.h | 25 ++++++++++++++++++++++ - 2 files changed, 26 insertions(+) - create mode 100644 src/syscfg/lock-obj-pub.ppc64le-unknown-linux-gnu.h - -diff --git a/src/Makefile.am b/src/Makefile.am -index 268c2ab..e3ed6c1 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -64,6 +64,7 @@ lock_obj_pub = \ - syscfg/lock-obj-pub.powerpc-unknown-linux-gnu.h \ - syscfg/lock-obj-pub.powerpc64-unknown-linux-gnu.h \ - syscfg/lock-obj-pub.powerpc64le-unknown-linux-gnu.h \ -+ syscfg/lock-obj-pub.ppc64le-unknown-linux-gnu.h \ - syscfg/lock-obj-pub.powerpc-unknown-linux-gnuspe.h \ - syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h \ - syscfg/lock-obj-pub.s390x-ibm-linux-gnu.h \ -diff --git a/src/syscfg/lock-obj-pub.ppc64le-unknown-linux-gnu.h b/src/syscfg/lock-obj-pub.ppc64le-unknown-linux-gnu.h -new file mode 100644 -index 0000000..b9407d4 ---- /dev/null -+++ b/src/syscfg/lock-obj-pub.ppc64le-unknown-linux-gnu.h -@@ -0,0 +1,25 @@ -+## lock-obj-pub.ppc64le-unknown-linux-gnu.h -+## File created by gen-posix-lock-obj - DO NOT EDIT -+## To be included by mkheader into gpg-error.h -+ -+typedef struct -+{ -+ long _vers; -+ union { -+ volatile char _priv[40]; -+ long _x_align; -+ long *_xp_align; -+ } u; -+} gpgrt_lock_t; -+ -+#define GPGRT_LOCK_INITIALIZER {1,{{0,0,0,0,0,0,0,0, \ -+ 0,0,0,0,0,0,0,0, \ -+ 0,0,0,0,0,0,0,0, \ -+ 0,0,0,0,0,0,0,0, \ -+ 0,0,0,0,0,0,0,0}}} -+## -+## Local Variables: -+## mode: c -+## buffer-read-only: t -+## End: -+## --- -2.5.0 - diff --git a/meta-phosphor/common/recipes-support/libgpg-error/libgpg-error_%.bbappend b/meta-phosphor/common/recipes-support/libgpg-error/libgpg-error_%.bbappend deleted file mode 100644 index 16137de0c..000000000 --- a/meta-phosphor/common/recipes-support/libgpg-error/libgpg-error_%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://0001-syscfg-Add-ppc64le-cross-build-support.patch" diff --git a/meta-phosphor/common/recipes-support/lm_sensors/lmsensors-config_1.0.bbappend b/meta-phosphor/common/recipes-support/lm_sensors/lmsensors-config_1.0.bbappend deleted file mode 100644 index 83c9ea145..000000000 --- a/meta-phosphor/common/recipes-support/lm_sensors/lmsensors-config_1.0.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -# Prevent lmsensors from pulling in lighttpd as lighttpd -# uses md4 and we disable openssl md4 support. - -RRECOMMENDS_${PN}-cgi_remove = "lighttpd lighttpd-module-cgi" diff --git a/meta-phosphor/common/recipes-support/nlohmann-json/nlohmann-json_git.bb b/meta-phosphor/common/recipes-support/nlohmann-json/nlohmann-json_git.bb deleted file mode 100644 index bbb63a1bf..000000000 --- a/meta-phosphor/common/recipes-support/nlohmann-json/nlohmann-json_git.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "JSON for modern C++" -HOMEPAGE = "https://nlohmann.github.io/json/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=9a8ae1c2d606c432a2aa2e2de15be22a" - -SRC_URI = "git://github.com/nlohmann/json.git" - -ALLOW_EMPTY_${PN} = "1" - -PV = "3.1.2+git${SRCPV}" - -SRCREV = "183390c10b8ba4aa33934ae593f82f352befefc8" - -S = "${WORKDIR}/git" -do_install_append(){ - install -d ${D}${includedir}/nlohmann - install -m 644 ${S}/single_include/nlohmann/json.hpp ${D}${includedir}/nlohmann/json.hpp -} diff --git a/meta-phosphor/common/recipes-support/rng-tools/rng-tools/rngd.service b/meta-phosphor/common/recipes-support/rng-tools/rng-tools/rngd.service deleted file mode 100644 index 7b0e9a71f..000000000 --- a/meta-phosphor/common/recipes-support/rng-tools/rng-tools/rngd.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Hardware RNG Entropy Gatherer Daemon - -[Service] -ExecStart=@SBINDIR@/rngd -f - -[Install] -WantedBy=multi-user.target diff --git a/meta-phosphor/common/recipes-support/rng-tools/rng-tools_%.bbappend b/meta-phosphor/common/recipes-support/rng-tools/rng-tools_%.bbappend deleted file mode 100644 index cda8e0b51..000000000 --- a/meta-phosphor/common/recipes-support/rng-tools/rng-tools_%.bbappend +++ /dev/null @@ -1,17 +0,0 @@ - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://rngd.service" - -inherit systemd - -SYSTEMD_SERVICE_${PN} = "rngd.service" - -do_install_append() { - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${systemd_unitdir}/system - install -m 644 ${WORKDIR}/rngd.service ${D}${systemd_unitdir}/system - sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/rngd.service - fi -} - diff --git a/meta-phosphor/common/recipes-support/serialization/cereal_1.2.2.bb b/meta-phosphor/common/recipes-support/serialization/cereal_1.2.2.bb deleted file mode 100644 index 50c85787c..000000000 --- a/meta-phosphor/common/recipes-support/serialization/cereal_1.2.2.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Cereal - A C++11 library for serialization" -DESCRIPTION = "Cereal is a header-only C++11 serialization library." -HOMEPAGE = "https://github.com/USCiLab/cereal" -PR = "r1" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e612690af2f575dfd02e2e91443cea23" - -SRC_URI += "git://github.com/USCiLab/cereal" -SRCREV = "51cbda5f30e56c801c07fe3d3aba5d7fb9e6cca4" -PV = "1.2.2+git${SRCPV}" - -S = "${WORKDIR}/git" - -ALLOW_EMPTY_${PN} = "1" - -do_install () { - install -d ${D}${includedir}/cereal - cp -r ${S}/include/cereal/* ${D}${includedir}/cereal/ -} diff --git a/meta-phosphor/common/recipes-textproc/json-perl/json-perl_2.97001.bb b/meta-phosphor/common/recipes-textproc/json-perl/json-perl_2.97001.bb deleted file mode 100644 index 9196e8e57..000000000 --- a/meta-phosphor/common/recipes-textproc/json-perl/json-perl_2.97001.bb +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION = "This module is a thin wrapper for JSON::XS-compatible modules with a few \ -additional features. All the backend modules convert a Perl data structure \ -to a JSON text as of RFC4627 (which we know is obsolete but we still stick \ -to; see below for an option to support part of RFC7159) and vice versa. \ -This module uses JSON::XS by default, and when JSON::XS is not available, \ -this module falls back on JSON::PP, which is in the Perl core since 5.14. \ -If JSON::PP is not available either, this module then falls back on \ -JSON::backportPP (which is actually JSON::PP in a different .pm file) \ -bundled in the same distribution as this module. You can also explicitly \ -specify to use Cpanel::JSON::XS, a fork of JSON::XS by Reini Urban." - -SECTION = "libs" -LICENSE = "Artisticv1 | GPLv1+" -PR = "r0" - -MAINTAINER= "Poky <poky@yoctoproject.org>" -HOMEPAGE= "https://metacpan.org/release/JSON" - -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Artistic-1.0;md5=cda03bbdc3c1951996392b872397b798 \ -file://${COMMON_LICENSE_DIR}/GPL-1.0;md5=e9e36a9de734199567a4d769498f743d" - -SRC_URI = "https://cpan.metacpan.org/authors/id/I/IS/ISHIGAKI/JSON-2.97001.tar.gz" - -SRC_URI[md5sum] = "693d6ff167496362f8ec6c3c5b8ba5ee" -SRC_URI[sha256sum] = "e277d9385633574923f48c297e1b8acad3170c69fa590e31fa466040fc6f8f5a" - -S = "${WORKDIR}/JSON-${PV}" - -inherit cpan allarch - -BBCLASSEXTEND = "native" diff --git a/meta-phosphor/common/recipes.txt b/meta-phosphor/common/recipes.txt deleted file mode 100644 index ccd19b2f7..000000000 --- a/meta-phosphor/common/recipes.txt +++ /dev/null @@ -1,7 +0,0 @@ -recipes-connectivity - Libraries and applications related to communication with other devices -recipes-core - What's needed to build a basic working Linux image including commonly used dependencies -recipes-devtools - Tools primarily used by the build system (but can also be used on targets) -recipes-extended - Applications which whilst not essential add features compared to the alternatives in - core. May be needed for full tool functionality or LSB compliance. -recipes-kernel - The kernel and generic applications/libraries with strong kernel dependencies -recipes-phosphor - Phosphor OpenBMC applications and configuration |
