diff options
| author | Ed Tanous <edtanous@google.com> | 2022-09-19 19:13:20 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2022-09-20 17:02:39 +0300 |
| commit | 9936f86df6fc55be042cec5eb15f6e19a9e7c890 (patch) | |
| tree | 251861f6bba6451ddfe328558097f6abf438d8d6 /meta-phosphor | |
| parent | bb8f0657781d78264d08d324853f94bd1abc8efa (diff) | |
| download | openbmc-9936f86df6fc55be042cec5eb15f6e19a9e7c890.tar.xz | |
Run oe-stylize on our files
In all of our recipes, we should be following yoctos lead on formatting,
order, and other things, for consistency in our meta layers.
This commit runs oe-stylize.py on all of our files. The types of
changes being made can be seen in the commit, but amount to:
1. Setting an explicit key ordering
2. Sectioning the files appropriately
3. Applying rules checking to our files
At some point in the near future, we would turn this on as part of
repotest, but some minor changes need to be upstreamed to meta-oe (WIP)
to make that happen.
Looking for input on whether this is something we'd like to do, and
whether the diffs below look reasonable to folks.
Signed-off-by: Ed Tanous <edtanous@google.com>
Change-Id: I489dd21d38a9fe4f3ece89cc7a5e1d0463224abf
Diffstat (limited to 'meta-phosphor')
173 files changed, 1643 insertions, 2017 deletions
diff --git a/meta-phosphor/dynamic-layers/aspeed-layer/recipes-connectivity/jsnbd/jsnbd_git.bbappend b/meta-phosphor/dynamic-layers/aspeed-layer/recipes-connectivity/jsnbd/jsnbd_git.bbappend index 1061a9271f..92a7948912 100644 --- a/meta-phosphor/dynamic-layers/aspeed-layer/recipes-connectivity/jsnbd/jsnbd_git.bbappend +++ b/meta-phosphor/dynamic-layers/aspeed-layer/recipes-connectivity/jsnbd/jsnbd_git.bbappend @@ -1,9 +1,10 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -FILES:${PN} += "${sysconfdir}/nbd-proxy/state" SRC_URI += "file://state_hook" do_install:append() { install -d ${D}${sysconfdir}/nbd-proxy/ install -m 0755 ${WORKDIR}/state_hook ${D}${sysconfdir}/nbd-proxy/state } + +FILES:${PN} += "${sysconfdir}/nbd-proxy/state" diff --git a/meta-phosphor/dynamic-layers/nuvoton-layer/recipes-connectivity/jsnbd/jsnbd_git.bbappend b/meta-phosphor/dynamic-layers/nuvoton-layer/recipes-connectivity/jsnbd/jsnbd_git.bbappend index 1061a9271f..92a7948912 100644 --- a/meta-phosphor/dynamic-layers/nuvoton-layer/recipes-connectivity/jsnbd/jsnbd_git.bbappend +++ b/meta-phosphor/dynamic-layers/nuvoton-layer/recipes-connectivity/jsnbd/jsnbd_git.bbappend @@ -1,9 +1,10 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -FILES:${PN} += "${sysconfdir}/nbd-proxy/state" SRC_URI += "file://state_hook" do_install:append() { install -d ${D}${sysconfdir}/nbd-proxy/ install -m 0755 ${WORKDIR}/state_hook ${D}${sysconfdir}/nbd-proxy/state } + +FILES:${PN} += "${sysconfdir}/nbd-proxy/state" diff --git a/meta-phosphor/dynamic-layers/nuvoton-layer/recipes-kernel/linux/linux-nuvoton_%.bbappend b/meta-phosphor/dynamic-layers/nuvoton-layer/recipes-kernel/linux/linux-nuvoton_%.bbappend index 848627ac75..fd90bddb0b 100644 --- a/meta-phosphor/dynamic-layers/nuvoton-layer/recipes-kernel/linux/linux-nuvoton_%.bbappend +++ b/meta-phosphor/dynamic-layers/nuvoton-layer/recipes-kernel/linux/linux-nuvoton_%.bbappend @@ -2,4 +2,4 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" # OpenBMC loads in kernel features via other mechanisms so this check # in the kernel-yocto.bbclass is not required -KERNEL_DANGLING_FEATURES_WARN_ONLY="1" +KERNEL_DANGLING_FEATURES_WARN_ONLY = "1" diff --git a/meta-phosphor/recipes-connectivity/avahi/avahi_%.bbappend b/meta-phosphor/recipes-connectivity/avahi/avahi_%.bbappend index 18cb48e306..5986ac0811 100644 --- a/meta-phosphor/recipes-connectivity/avahi/avahi_%.bbappend +++ b/meta-phosphor/recipes-connectivity/avahi/avahi_%.bbappend @@ -2,10 +2,9 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/avahi-daemon:" SRC_URI += "file://avahi-daemon-override.conf" -FILES:avahi-daemon:append = " ${systemd_system_unitdir}/avahi-daemon.service.d/avahi-daemon-override.conf" - do_install:append() { - install -m 644 -D ${WORKDIR}/avahi-daemon-override.conf \ ${D}${systemd_system_unitdir}/avahi-daemon.service.d/avahi-daemon-override.conf } + +FILES:avahi-daemon:append = " ${systemd_system_unitdir}/avahi-daemon.service.d/avahi-daemon-override.conf" diff --git a/meta-phosphor/recipes-connectivity/jsnbd/jsnbd_git.bb b/meta-phosphor/recipes-connectivity/jsnbd/jsnbd_git.bb index 75a1efecfb..4b6cd331d4 100644 --- a/meta-phosphor/recipes-connectivity/jsnbd/jsnbd_git.bb +++ b/meta-phosphor/recipes-connectivity/jsnbd/jsnbd_git.bb @@ -1,25 +1,24 @@ SUMMARY = "Network Block Device Proxy" HOMEPAGE = "https://github.com/openbmc/jsnbd" -PR = "r1" -PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENCE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -inherit autotools pkgconfig - DEPENDS += "json-c" DEPENDS += "udev" +SRCREV = "3ebe3dadd3f550d20080c8bb14dee113e322eb61" +PV = "1.0+git${SRCPV}" +PR = "r1" -RDEPENDS:${PN} += "nbd-client" +SRC_URI = "git://github.com/openbmc/jsnbd;branch=master;protocol=https" S = "${WORKDIR}/git" -SRC_URI = "git://github.com/openbmc/jsnbd;branch=master;protocol=https" -SRCREV = "3ebe3dadd3f550d20080c8bb14dee113e322eb61" - -NBD_PROXY_CONFIG_JSON ??= "${S}/config.sample.json" +inherit autotools pkgconfig do_install:append() { install -d ${D}${sysconfdir}/nbd-proxy/ install -m 0644 ${NBD_PROXY_CONFIG_JSON} ${D}${sysconfdir}/nbd-proxy/config.json } + +RDEPENDS:${PN} += "nbd-client" + +NBD_PROXY_CONFIG_JSON ??= "${S}/config.sample.json" diff --git a/meta-phosphor/recipes-connectivity/openssl/openssl_%.bbappend b/meta-phosphor/recipes-connectivity/openssl/openssl_%.bbappend index 0581dcd638..23b95a1248 100644 --- a/meta-phosphor/recipes-connectivity/openssl/openssl_%.bbappend +++ b/meta-phosphor/recipes-connectivity/openssl/openssl_%.bbappend @@ -1,9 +1,7 @@ # General config settings. EXTRA_OECONF:append:class-target = " shared no-hw no-err no-psk no-srp " - # Disable SSL (keep TLS only). EXTRA_OECONF:append:class-target = " no-ssl2 no-ssl3 " - # Disable various algorithms. EXTRA_OECONF:append:class-target = " \ no-rmd160 \ @@ -21,4 +19,5 @@ do_configure:append() { # We don't want to depend on perl in our image RDEPENDS:${PN}-bin:remove = "perl" + FILES:${PN}-misc:append = " ${bindir}/c_rehash" diff --git a/meta-phosphor/recipes-core/base-files/base-files_%.bbappend b/meta-phosphor/recipes-core/base-files/base-files_%.bbappend index 3eef9d8b5f..8ea8c16968 100644 --- a/meta-phosphor/recipes-core/base-files/base-files_%.bbappend +++ b/meta-phosphor/recipes-core/base-files/base-files_%.bbappend @@ -1,10 +1,7 @@ FILESEXTRAPATHS:prepend:df-obmc-ubi-fs := "${THISDIR}/${PN}/df-ubi:" FILESEXTRAPATHS:prepend:df-phosphor-mmc := "${THISDIR}/${PN}/df-mmc:" - FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -RDEPENDS:${PN}:append:df-obmc-ubi-fs = " preinit-mounts" - SRC_URI += " \ file://50-rp_filter.conf \ " @@ -12,9 +9,9 @@ SRC_URI += " \ do_install:append() { sed -i 's/\(\(passwd\|group\):\s*\).*/\1files systemd/' \ "${D}${sysconfdir}/nsswitch.conf" - install -d ${D}/srv - install -d ${D}/${libdir}/sysctl.d install -D -m 644 ${WORKDIR}/50-rp_filter.conf ${D}/${libdir}/sysctl.d/50-rp_filter.conf } + +RDEPENDS:${PN}:append:df-obmc-ubi-fs = " preinit-mounts" diff --git a/meta-phosphor/recipes-core/busybox/busybox_%.bbappend b/meta-phosphor/recipes-core/busybox/busybox_%.bbappend index f8800b45a3..ee8b6223aa 100644 --- a/meta-phosphor/recipes-core/busybox/busybox_%.bbappend +++ b/meta-phosphor/recipes-core/busybox/busybox_%.bbappend @@ -1,4 +1,5 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + SRC_URI += " \ file://busybox.cfg \ file://flash.cfg \ diff --git a/meta-phosphor/recipes-core/dropbear/dropbear_%.bbappend b/meta-phosphor/recipes-core/dropbear/dropbear_%.bbappend index 5113c66bba..a3cbd1b69d 100644 --- a/meta-phosphor/recipes-core/dropbear/dropbear_%.bbappend +++ b/meta-phosphor/recipes-core/dropbear/dropbear_%.bbappend @@ -2,6 +2,7 @@ # 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://localoptions.h \ file://dropbear.default \ diff --git a/meta-phosphor/recipes-core/os-release/os-release.bbappend b/meta-phosphor/recipes-core/os-release/os-release.bbappend index 50c3787e4a..e587825723 100644 --- a/meta-phosphor/recipes-core/os-release/os-release.bbappend +++ b/meta-phosphor/recipes-core/os-release/os-release.bbappend @@ -6,7 +6,6 @@ # what that means! OS_RELEASE_ROOTPATH ?= "${COREBASE}" - def run_git(d, cmd): try: oeroot = d.getVar('OS_RELEASE_ROOTPATH', True) @@ -16,7 +15,6 @@ def run_git(d, cmd): except Exception as e: bb.warn("Unexpected exception from 'git' call: %s" % e) pass - # DISTRO_VERSION can be overridden by a bbappend or config, so it must be a # weak override. But, when a variable is weakly overridden the definition # and not the contents are used in the task-hash (for sstate reuse). We need @@ -26,15 +24,10 @@ def run_git(d, cmd): PHOSPHOR_OS_RELEASE_DISTRO_VERSION := "${@run_git(d, 'describe --dirty')}" DISTRO_VERSION ??= "${PHOSPHOR_OS_RELEASE_DISTRO_VERSION}" EXTENDED_VERSION ??= "${PHOSPHOR_OS_RELEASE_DISTRO_VERSION}" - VERSION = "${@'-'.join(d.getVar('VERSION_ID').split('-')[0:2])}" - OPENBMC_TARGET_MACHINE = "${MACHINE}" - OS_RELEASE_FIELDS:append = " BUILD_ID OPENBMC_TARGET_MACHINE EXTENDED_VERSION" - # 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/recipes-core/systemd/obmc-targets.bb b/meta-phosphor/recipes-core/systemd/obmc-targets.bb index 10631126ed..d1725995ec 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets.bb +++ b/meta-phosphor/recipes-core/systemd/obmc-targets.bb @@ -1,11 +1,9 @@ SUMMARY = "Phosphor Systemd targets" DESCRIPTION = "Provides well known Systemd synchronization points for OpenBMC." HOMEPAGE = "http://github.com/openbmc" -PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit allarch obmc-phosphor-systemd +PR = "r1" SRC_URI += "\ file://obmc-mapper.target \ @@ -14,3 +12,5 @@ SRC_URI += "\ SYSTEMD_SERVICE:${PN} += " \ obmc-mapper.target \ " + +inherit allarch obmc-phosphor-systemd diff --git a/meta-phosphor/recipes-core/systemd/phosphor-systemd-policy.bb b/meta-phosphor/recipes-core/systemd/phosphor-systemd-policy.bb index ea9beabd5d..d19815c2fd 100644 --- a/meta-phosphor/recipes-core/systemd/phosphor-systemd-policy.bb +++ b/meta-phosphor/recipes-core/systemd/phosphor-systemd-policy.bb @@ -1,20 +1,17 @@ SUMMARY = "Phosphor systemd configuration overrides" DESCRIPTION = "Overrides for systemd and its applications" -PR = "r1" - LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - DEPENDS += "systemd" +PR = "r1" SRC_URI += "file://service-restart-policy.conf" SRC_URI += "file://journald-maxlevel-policy.conf" -FILES:${PN} += "${systemd_unitdir}/system.conf.d/service-restart-policy.conf" -FILES:${PN} += "${systemd_unitdir}/journald.conf.d/journald-maxlevel-policy.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}/journald-maxlevel-policy.conf ${D}${systemd_unitdir}/journald.conf.d/journald-maxlevel-policy.conf } + +FILES:${PN} += "${systemd_unitdir}/system.conf.d/service-restart-policy.conf" +FILES:${PN} += "${systemd_unitdir}/journald.conf.d/journald-maxlevel-policy.conf" diff --git a/meta-phosphor/recipes-core/systemd/systemd_%.bbappend b/meta-phosphor/recipes-core/systemd/systemd_%.bbappend index fb73ca15a7..beffdb97d0 100644 --- a/meta-phosphor/recipes-core/systemd/systemd_%.bbappend +++ b/meta-phosphor/recipes-core/systemd/systemd_%.bbappend @@ -1,8 +1,4 @@ -FILES:${PN}-catalog-extralocales = "\ - ${exec_prefix}/lib/systemd/catalog/*.*.catalog \ -" - -PACKAGES =+ "${PN}-catalog-extralocales" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" PACKAGECONFIG = "\ coredump \ hostnamed \ @@ -20,14 +16,20 @@ PACKAGECONFIG = "\ zstd \ " -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "file://0001-sd-bus-Don-t-automatically-add-ObjectManager.patch" EXTRA_OEMESON:append = " -Ddns-servers=''" -ALTERNATIVE:${PN} += "init" -ALTERNATIVE_TARGET[init] = "${rootlibexecdir}/systemd/systemd" +PACKAGES =+ "${PN}-catalog-extralocales" + +RRECOMMENDS:${PN}:append:openbmc-phosphor = " phosphor-systemd-policy" + +FILES:${PN}-catalog-extralocales = "\ + ${exec_prefix}/lib/systemd/catalog/*.*.catalog \ +" + ALTERNATIVE_LINK_NAME[init] = "${base_sbindir}/init" ALTERNATIVE_PRIORITY[init] ?= "300" -RRECOMMENDS:${PN}:append:openbmc-phosphor = " phosphor-systemd-policy" +ALTERNATIVE:${PN} += "init" +ALTERNATIVE_TARGET[init] = "${rootlibexecdir}/systemd/systemd" diff --git a/meta-phosphor/recipes-devtools/i2c-tools/i2c-tools_%.bbappend b/meta-phosphor/recipes-devtools/i2c-tools/i2c-tools_%.bbappend index fefe06252d..be6409f527 100644 --- a/meta-phosphor/recipes-devtools/i2c-tools/i2c-tools_%.bbappend +++ b/meta-phosphor/recipes-devtools/i2c-tools/i2c-tools_%.bbappend @@ -1,2 +1,3 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + SRC_URI =+ "file://0001-4-byte-read-support-466.patch" diff --git a/meta-phosphor/recipes-devtools/iotools/iotools_1.6.bb b/meta-phosphor/recipes-devtools/iotools/iotools_1.6.bb index 54303fa0bd..c0c76ce1bd 100644 --- a/meta-phosphor/recipes-devtools/iotools/iotools_1.6.bb +++ b/meta-phosphor/recipes-devtools/iotools/iotools_1.6.bb @@ -3,19 +3,19 @@ HOMEPAGE = "https://github.com/jonmayergoogle/iotools" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" SRCREV = "8d928b3360246b8ead95b442ca3887ce8b8f942f" -SRC_URI = "git://git@github.com/jonmayergoogle/iotools.git;protocol=https;branch=master" PV = "v1.6+git${SRCPV}" -inherit obmc-phosphor-systemd +SRC_URI = "git://git@github.com/jonmayergoogle/iotools.git;protocol=https;branch=master" S = "${WORKDIR}/git" -FILES:${PN} = "${sbindir}" +SYSTEMD_SERVICE:${PN} += "iotools-setup.service" + +inherit obmc-phosphor-systemd 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() { @@ -23,4 +23,4 @@ do_install() { install -m 0755 iotools ${D}${sbindir} } -SYSTEMD_SERVICE:${PN} += "iotools-setup.service" +FILES:${PN} = "${sbindir}" diff --git a/meta-phosphor/recipes-devtools/perl/yaml-tiny_1.73.bb b/meta-phosphor/recipes-devtools/perl/yaml-tiny_1.73.bb index 845242b4f6..a8a15c6597 100644 --- a/meta-phosphor/recipes-devtools/perl/yaml-tiny_1.73.bb +++ b/meta-phosphor/recipes-devtools/perl/yaml-tiny_1.73.bb @@ -1,20 +1,17 @@ SUMMARY = "YAML::Tiny Version 1.73" -PR = "r1" -LICENSE = "Artistic-1.0 | GPL-1.0+" HOMEPAGE = "https://metacpan.org/release/YAML-Tiny" - -inherit cpan -inherit allarch - +LICENSE = "Artistic-1.0 | GPL-1.0+" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Artistic-1.0;md5=cda03bbdc3c1951996392b872397b798 \ file://${COMMON_LICENSE_DIR}/GPL-1.0-or-later;md5=30c0b8a5048cc2f4be5ff15ef0d8cf61" - +PR = "r1" 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}" +inherit cpan +inherit allarch + BBCLASSEXTEND = "native" diff --git a/meta-phosphor/recipes-devtools/python/pyphosphor_git.bb b/meta-phosphor/recipes-devtools/python/pyphosphor_git.bb index c2cfdb4cb9..039c718de2 100644 --- a/meta-phosphor/recipes-devtools/python/pyphosphor_git.bb +++ b/meta-phosphor/recipes-devtools/python/pyphosphor_git.bb @@ -1,25 +1,20 @@ SUMMARY = "Phosphor python library" DESCRIPTION = "Phosphor python library." HOMEPAGE = "http://github.com/openbmc/pyphosphor" -PR = "r1" -PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" +SRCREV = "cb240aa1ed95799d2ea8bde951c6ed443839a7e0" +PV = "1.0+git${SRCPV}" +PR = "r1" + +SRC_URI += "git://github.com/openbmc/pyphosphor;branch=master;protocol=https" + +S = "${WORKDIR}/git" inherit allarch inherit setuptools3 inherit python3-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" @@ -44,12 +39,15 @@ 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;branch=master;protocol=https" - -SRCREV = "cb240aa1ed95799d2ea8bde951c6ed443839a7e0" - -S = "${WORKDIR}/git" +PACKAGE_BEFORE_PN = " \ + ${PN}-ns \ + ${PN}-utils-ns \ + ${PN}-dbus-ns \ + ${PN}-wsgi-ns \ + ${PN}-wsgi-apps-ns \ + ${PN}-utils \ + ${PN}-dbus \ + " diff --git a/meta-phosphor/recipes-devtools/python/python3_%.bbappend b/meta-phosphor/recipes-devtools/python/python3_%.bbappend index a2dafcf6c3..c3de5a05f2 100644 --- a/meta-phosphor/recipes-devtools/python/python3_%.bbappend +++ b/meta-phosphor/recipes-devtools/python/python3_%.bbappend @@ -1,9 +1,5 @@ inherit update-alternatives -ALTERNATIVE:${PN}-core += "python" -ALTERNATIVE_LINK_NAME[python] = "${bindir}/python" -ALTERNATIVE_TARGET[python] = "${bindir}/python3" - # python3 takes up a lot of space that most embedded systems # do not have, so remove some un-needed files from the rootfs do_install:append:class-target() { @@ -11,3 +7,8 @@ do_install:append:class-target() { # a large, compressed version of pip. Remove it to free up the space. rm -rf ${D}${libdir}/python${PYTHON_MAJMIN}/ensurepip } + +ALTERNATIVE_LINK_NAME[python] = "${bindir}/python" + +ALTERNATIVE:${PN}-core += "python" +ALTERNATIVE_TARGET[python] = "${bindir}/python3" diff --git a/meta-phosphor/recipes-devtools/rsync/rsync_%.bbappend b/meta-phosphor/recipes-devtools/rsync/rsync_%.bbappend index 8502a0af13..6a235b6068 100644 --- a/meta-phosphor/recipes-devtools/rsync/rsync_%.bbappend +++ b/meta-phosphor/recipes-devtools/rsync/rsync_%.bbappend @@ -1,8 +1,7 @@ +DEPENDS:append:class-target = " popt zlib" +PACKAGECONFIG = "" + EXTRA_OECONF:append:class-target = " \ --disable-locale --disable-iconv \ --without-included-popt --without-included-zlib \ " - -PACKAGECONFIG = "" - -DEPENDS:append:class-target = " popt zlib" diff --git a/meta-phosphor/recipes-extended/gpioplus/gpioplus_git.bb b/meta-phosphor/recipes-extended/gpioplus/gpioplus_git.bb index e611b46099..c0137e3163 100644 --- a/meta-phosphor/recipes-extended/gpioplus/gpioplus_git.bb +++ b/meta-phosphor/recipes-extended/gpioplus/gpioplus_git.bb @@ -1,10 +1,15 @@ 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" +SRCREV = "8944f2e24ad8152793af010906faf06607f0e04b" +PV = "0.1+git${SRCPV}" +PR = "r1" + +SRC_URI += "git://github.com/openbmc/gpioplus;branch=master;protocol=https" + +S = "${WORKDIR}/git" inherit meson pkgconfig @@ -12,8 +17,3 @@ EXTRA_OEMESON = " \ -Dexamples=false \ -Dtests=disabled \ " - -SRC_URI += "git://github.com/openbmc/gpioplus;branch=master;protocol=https" -SRCREV = "8944f2e24ad8152793af010906faf06607f0e04b" - -S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-extended/libbej/libbej_git.bb b/meta-phosphor/recipes-extended/libbej/libbej_git.bb index 858534999e..842dd92bdd 100644 --- a/meta-phosphor/recipes-extended/libbej/libbej_git.bb +++ b/meta-phosphor/recipes-extended/libbej/libbej_git.bb @@ -1,17 +1,17 @@ SUMMARY = "Binary Encoded JSON library" DESCRIPTION = "Used to decode Redfish Device Enablement (RDE) BEJ" -PR = "r1" -PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" +SRCREV = "cc4098e1508eede5887724fc68119a5e12fc3f96" +PV = "0.1+git${SRCPV}" +PR = "r1" + +SRC_URI += "git://github.com/openbmc/libbej;branch=main;protocol=https" + +S = "${WORKDIR}/git" inherit meson pkgconfig EXTRA_OEMESON = " \ -Dtests=disabled \ " - -SRC_URI += "git://github.com/openbmc/libbej;branch=main;protocol=https" -SRCREV = "cc4098e1508eede5887724fc68119a5e12fc3f96" - -S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-extended/pam/libpam_%.bbappend b/meta-phosphor/recipes-extended/pam/libpam_%.bbappend index 682f132b53..658dc0beec 100644 --- a/meta-phosphor/recipes-extended/pam/libpam_%.bbappend +++ b/meta-phosphor/recipes-extended/pam/libpam_%.bbappend @@ -6,13 +6,6 @@ SRC_URI += " file://pam.d/common-password \ file://pam.d/common-session \ " -RDEPENDS:${PN}-runtime += "${MLPREFIX}pam-plugin-cracklib-${libpam_suffix} \ - ${MLPREFIX}pam-plugin-tally2-${libpam_suffix} \ - ${MLPREFIX}pam-plugin-pwhistory-${libpam_suffix} \ - ${MLPREFIX}pam-plugin-succeed-if-${libpam_suffix} \ - ${MLPREFIX}pam-plugin-localuser-${libpam_suffix} \ - " - do_install:append() { # The libpam recipe will always add a pam_systemd.so line to # common-session if systemd is enabled; however systemd only @@ -20,3 +13,10 @@ do_install:append() { # that package. So, remove the pam_systemd.so line here. sed -i '/pam_systemd.so/d' ${D}${sysconfdir}/pam.d/common-session } + +RDEPENDS:${PN}-runtime += "${MLPREFIX}pam-plugin-cracklib-${libpam_suffix} \ + ${MLPREFIX}pam-plugin-tally2-${libpam_suffix} \ + ${MLPREFIX}pam-plugin-pwhistory-${libpam_suffix} \ + ${MLPREFIX}pam-plugin-succeed-if-${libpam_suffix} \ + ${MLPREFIX}pam-plugin-localuser-${libpam_suffix} \ + " diff --git a/meta-phosphor/recipes-extended/pam/pam-ipmi_git.bb b/meta-phosphor/recipes-extended/pam/pam-ipmi_git.bb index ee362a6f75..3044f6b4d9 100644 --- a/meta-phosphor/recipes-extended/pam/pam-ipmi_git.bb +++ b/meta-phosphor/recipes-extended/pam/pam-ipmi_git.bb @@ -1,21 +1,20 @@ SUMMARY = "PAM modules for IPMI support" DESCRIPTION = "PAM modules managing password for IPMI" HOMEPAGE = "http://github.com/openbmc/pam-ipmi" -PR = "r1" -PV = "1.0+git${SRCPV}" - LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" +DEPENDS += "autoconf-archive-native" +DEPENDS += "openssl libpam" +SRCREV = "c971bebca35d9f697a7a9e3efae3c66867e5b68d" +PV = "1.0+git${SRCPV}" +PR = "r1" SRC_URI += "git://github.com/openbmc/pam-ipmi;branch=master;protocol=https" -SRCREV = "c971bebca35d9f697a7a9e3efae3c66867e5b68d" + S = "${WORKDIR}/git" inherit autotools pkgconfig -DEPENDS += "autoconf-archive-native" -DEPENDS += "openssl libpam" - FILES:${PN} += " \ ${base_libdir}/security/ \ ${sysconfdir}/key_file \ diff --git a/meta-phosphor/recipes-extended/rsyslog/rsyslog_%.bbappend b/meta-phosphor/recipes-extended/rsyslog/rsyslog_%.bbappend index f04f63dd25..c87b51a81e 100644 --- a/meta-phosphor/recipes-extended/rsyslog/rsyslog_%.bbappend +++ b/meta-phosphor/recipes-extended/rsyslog/rsyslog_%.bbappend @@ -1,15 +1,14 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" +PACKAGECONFIG ??= " \ + rsyslogd rsyslogrt inet regexp uuid \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ +" SRC_URI += " \ file://rsyslog.conf \ file://server.conf \ " -PACKAGECONFIG ??= " \ - rsyslogd rsyslogrt inet regexp uuid \ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ -" - do_install:append(){ install -m 0644 -D ${WORKDIR}/server.conf \ ${D}${sysconfdir}/rsyslog.d/server.conf diff --git a/meta-phosphor/recipes-extended/sdbusplus/python3-sdbus++_git.bb b/meta-phosphor/recipes-extended/sdbusplus/python3-sdbus++_git.bb index d0443d1ce6..f682b62c95 100644 --- a/meta-phosphor/recipes-extended/sdbusplus/python3-sdbus++_git.bb +++ b/meta-phosphor/recipes-extended/sdbusplus/python3-sdbus++_git.bb @@ -1,12 +1,5 @@ SUMMARY = "sdbus++ dbus API / binding generator" DESCRIPTION = "Generates bindings against sdbusplus for dbus APIs" - -PYPI_PACKAGE = "sdbusplus" -PV = "1.0" -inherit setuptools3 - -include sdbusplus-rev.inc - ## The sdbusplus repository has an Apache LICENSE file, which we would ## normally check here, but the python setup script is in a subdirectory ## which requires us to set ${S} below. When we change ${S} from the root @@ -14,14 +7,18 @@ include sdbusplus-rev.inc ## to the common Apache license file in poky's meta instead. LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -S="${WORKDIR}/git/tools" - DEPENDS += " \ ${PYTHON_PN}-inflection-native \ ${PYTHON_PN}-mako-native \ ${PYTHON_PN}-pyyaml-native \ " +PV = "1.0" + +PYPI_PACKAGE = "sdbusplus" + +S = "${WORKDIR}/git/tools" + +inherit setuptools3 RDEPENDS:${PN} += " \ ${PYTHON_PN}-inflection \ @@ -29,4 +26,6 @@ RDEPENDS:${PN} += " \ ${PYTHON_PN}-pyyaml \ " +include sdbusplus-rev.inc + BBCLASSEXTEND += "native nativesdk" diff --git a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb index 454ca60974..28b76d0e20 100644 --- a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb +++ b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb @@ -1,15 +1,7 @@ SUMMARY = "C++ bindings for systemd dbus APIs" DESCRIPTION = "C++ bindings for systemd dbus APIs." - -inherit pkgconfig meson -inherit python3native -include sdbusplus-rev.inc - LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" - -S = "${WORKDIR}/git" - DEPENDS += " \ ${PYTHON_PN}-inflection-native \ ${PYTHON_PN}-mako-native \ @@ -18,7 +10,14 @@ DEPENDS += " \ systemd \ " +S = "${WORKDIR}/git" + +inherit pkgconfig meson +inherit python3native + EXTRA_OEMESON:append = " \ -Dtests=disabled \ -Dexamples=disabled \ " + +include sdbusplus-rev.inc diff --git a/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb b/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb index 3b9d266607..72f78020b4 100644 --- a/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb +++ b/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb @@ -1,25 +1,24 @@ 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 meson pkgconfig - DEPENDS += " \ function2 \ stdplus \ systemd \ " +SRCREV = "13afebfaa6a2bbb0bc03f4382eb6ba1c50fa6d4d" +PV = "0.1+git${SRCPV}" +PR = "r1" + +SRC_URI += "git://github.com/openbmc/sdeventplus;branch=master;protocol=https" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig EXTRA_OEMESON = " \ -Dexamples=false \ -Dtests=disabled \ " - -SRC_URI += "git://github.com/openbmc/sdeventplus;branch=master;protocol=https" -SRCREV = "13afebfaa6a2bbb0bc03f4382eb6ba1c50fa6d4d" - -S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb b/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb index 8308dc1d27..2714e36648 100644 --- a/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb +++ b/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb @@ -1,22 +1,21 @@ SUMMARY = "Common C++ functions" DESCRIPTION = "Common C++ functions." HOMEPAGE = "http://github.com/openbmc/stdplus" -PR = "r1" -PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -inherit meson pkgconfig - DEPENDS += " \ fmt \ liburing \ " +SRCREV = "aa4fcfc208c45511aa9788a08c969425e440fda0" +PV = "0.1+git${SRCPV}" +PR = "r1" -PACKAGES =+ "libstdplus libstdplus-dl libstdplus-io_uring" -FILES:libstdplus = "${libdir}/libstdplus.so.*" -FILES:libstdplus-dl = "${libdir}/libstdplus-dl.so.*" -FILES:libstdplus-io_uring = "${libdir}/libstdplus-io_uring.so.*" +SRC_URI += "git://github.com/openbmc/stdplus;branch=master;protocol=https" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig EXTRA_OEMESON = " \ -Dexamples=false \ @@ -24,7 +23,8 @@ EXTRA_OEMESON = " \ -Dgtest=disabled \ " -SRC_URI += "git://github.com/openbmc/stdplus;branch=master;protocol=https" -SRCREV = "aa4fcfc208c45511aa9788a08c969425e440fda0" +PACKAGES =+ "libstdplus libstdplus-dl libstdplus-io_uring" -S = "${WORKDIR}/git" +FILES:libstdplus = "${libdir}/libstdplus.so.*" +FILES:libstdplus-dl = "${libdir}/libstdplus-dl.so.*" +FILES:libstdplus-io_uring = "${libdir}/libstdplus-io_uring.so.*" diff --git a/meta-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb b/meta-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb index a6c87b2169..2355dde266 100644 --- a/meta-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb +++ b/meta-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb @@ -2,16 +2,13 @@ SUMMARY = "OpenBMC VNC server and ipKVM daemon" DESCRIPTION = "obmc-ikvm is a vncserver for JPEG-serving V4L2 devices to allow ipKVM" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=75859989545e37968a99b631ef42722e" - DEPENDS = " libvncserver systemd sdbusplus phosphor-logging phosphor-dbus-interfaces" - -SRC_URI = "git://github.com/openbmc/obmc-ikvm;branch=master;protocol=https" SRCREV = "f79f6f540b846e7e25627265f5bbffef13034873" - PV = "1.0+git${SRCPV}" -SYSTEMD_SERVICE:${PN} += "start-ipkvm.service" +SRC_URI = "git://github.com/openbmc/obmc-ikvm;branch=master;protocol=https" +SYSTEMD_SERVICE:${PN} += "start-ipkvm.service" S = "${WORKDIR}/git" inherit pkgconfig meson systemd diff --git a/meta-phosphor/recipes-graphics/ttf-fonts/liberation-fonts_%.bbappend b/meta-phosphor/recipes-graphics/ttf-fonts/liberation-fonts_%.bbappend index 5283a7841f..4403c67dec 100644 --- a/meta-phosphor/recipes-graphics/ttf-fonts/liberation-fonts_%.bbappend +++ b/meta-phosphor/recipes-graphics/ttf-fonts/liberation-fonts_%.bbappend @@ -1,9 +1,8 @@ - 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/ + 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/recipes-phosphor/bios/biosconfig-manager_git.bb b/meta-phosphor/recipes-phosphor/bios/biosconfig-manager_git.bb index af8c6091cd..683e7e3f20 100644 --- a/meta-phosphor/recipes-phosphor/bios/biosconfig-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/bios/biosconfig-manager_git.bb @@ -1,26 +1,11 @@ -HOMEPAGE = "https://github.com/openbmc/bios-settings-mgr" - SUMMARY = "Remote BIOS Configuration via BMC" - DESCRIPTION = "Provides ability for the user to view and modify the BIOS setup \ configuration parameters remotely via BMC at any Host state. \ Modifications to the parameters take place upon the next system \ reboot or immediate based on the host firmware." - -PR = "r1" -PV = "1.0+git${SRCPV}" +HOMEPAGE = "https://github.com/openbmc/bios-settings-mgr" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=bcd9ada3a943f58551867d72893cc9ab" - -SRC_URI = "git://github.com/openbmc/bios-settings-mgr;branch=master;protocol=https" -SRCREV = "36cd3238d75c5f3479a944a2f1a9a3abc316120a" - -inherit meson pkgconfig systemd - -S = "${WORKDIR}/git" -SYSTEMD_SERVICE:${PN} = "xyz.openbmc_project.biosconfig_manager.service \ - xyz.openbmc_project.biosconfig_password.service" - DEPENDS = " boost \ openssl \ phosphor-dbus-interfaces \ @@ -28,4 +13,14 @@ DEPENDS = " boost \ sdbusplus \ systemd \ nlohmann-json " +SRCREV = "36cd3238d75c5f3479a944a2f1a9a3abc316120a" +PV = "1.0+git${SRCPV}" +PR = "r1" +SRC_URI = "git://github.com/openbmc/bios-settings-mgr;branch=master;protocol=https" + +S = "${WORKDIR}/git" +SYSTEMD_SERVICE:${PN} = "xyz.openbmc_project.biosconfig_manager.service \ + xyz.openbmc_project.biosconfig_password.service" + +inherit meson pkgconfig systemd diff --git a/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb b/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb index d27f9d9861..4d237332eb 100644 --- a/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb @@ -1,18 +1,8 @@ SUMMARY = "Phosphor Certificate Manager" DESCRIPTION = "Manages client and server certificates" HOMEPAGE = "https://github.com/openbmc/phosphor-certificate-manager" - -PR = "r1" -PV = "0.1+git${SRCPV}" - LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -SRC_URI = "git://github.com/openbmc/phosphor-certificate-manager;branch=master;protocol=https" -SRCREV = "b3dbfb37a6624153d5c27d87fc07d95e36bef352" - -inherit meson pkgconfig systemd - DEPENDS = " \ cli11 \ openssl \ @@ -21,18 +11,18 @@ DEPENDS = " \ sdbusplus \ sdeventplus \ " - -S = "${WORKDIR}/git" - -EXTRA_OEMESON += "-Dtests=disabled" - -SYSTEMD_SERVICE:${PN} = "phosphor-certificate-manager@.service" - +SRCREV = "b3dbfb37a6624153d5c27d87fc07d95e36bef352" PACKAGECONFIG ??= "bmcweb-cert nslcd-authority-cert" PACKAGECONFIG[ibm-hypervisor-cert] = "-Dca-cert-extension=enabled,-Dca-cert-extension=disabled" PACKAGECONFIG[bmcweb-cert] = "-Dconfig-bmcweb=enabled,-Dconfig-bmcweb=disabled" PACKAGECONFIG[nslcd-authority-cert] = "-Dconfig-nslcd=enabled,-Dconfig-nslcd=disabled" +PV = "0.1+git${SRCPV}" +PR = "r1" + +SRC_URI = "git://github.com/openbmc/phosphor-certificate-manager;branch=master;protocol=https" +S = "${WORKDIR}/git" +SYSTEMD_SERVICE:${PN} = "phosphor-certificate-manager@.service" SYSTEMD_SERVICE:${PN} = " \ phosphor-certificate-manager@.service \ ${@bb.utils.contains('PACKAGECONFIG', 'ibm-hypervisor-cert', 'bmc-vmi-ca-manager.service', '', d)} \ @@ -40,4 +30,8 @@ SYSTEMD_SERVICE:${PN} = " \ ${@bb.utils.contains('PACKAGECONFIG', 'bmcweb', 'phosphor-certificate-manager@bmcweb.service', '', d)} \ " +inherit meson pkgconfig systemd + +EXTRA_OEMESON += "-Dtests=disabled" + FILES:${PN}:append = " ${systemd_system_unitdir}/* ${datadir}/dbus-1" diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-control-chassis_git.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-control-chassis_git.bb index 3c62552c64..1f98bc0548 100644 --- a/meta-phosphor/recipes-phosphor/chassis/obmc-control-chassis_git.bb +++ b/meta-phosphor/recipes-phosphor/chassis/obmc-control-chassis_git.bb @@ -1,7 +1,9 @@ SUMMARY = "OpenBMC org.openbmc.control.Chassis example implementation" DESCRIPTION = "An example implementation of the org.openbmc.control.Chassis DBUS API." -PR = "r1" PV = "1.0+git${SRCPV}" +PR = "r1" + +SKELETON_DIR = "pychassisctl" inherit skeleton-python inherit obmc-phosphor-dbus-service @@ -13,7 +15,5 @@ RDEPENDS:${PN} += "\ 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/recipes-phosphor/chassis/obmc-host-failure-reboots.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-host-failure-reboots.bb index b21440d89b..42e6b25a62 100644 --- a/meta-phosphor/recipes-phosphor/chassis/obmc-host-failure-reboots.bb +++ b/meta-phosphor/recipes-phosphor/chassis/obmc-host-failure-reboots.bb @@ -1,15 +1,15 @@ SUMMARY = "Enables reboots on host failures" DESCRIPTION = "Manages the settings entry that controls reboots \ on host failures" -PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" +PR = "r1" + +SYSTEMD_SERVICE:${PN} += "${TMPL}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'LINK_FMT', 'OBMC_HOST_INSTANCES')}" inherit obmc-phosphor-systemd 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/recipes-phosphor/chassis/obmc-phosphor-buttons_git.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-buttons_git.bb index 651d51b7cb..4fcac31a46 100644 --- a/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-buttons_git.bb +++ b/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-buttons_git.bb @@ -1,35 +1,34 @@ SUMMARY = "OpenBMC Buttons" DESCRIPTION = "OpenBMC All buttons" -PR = "r1" -PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -S = "${WORKDIR}/git" -SRC_URI += "git://github.com/openbmc/phosphor-buttons.git;branch=master;protocol=https" +DEPENDS += " \ + systemd \ + sdbusplus \ + phosphor-dbus-interfaces \ + phosphor-logging \ + " SRCREV = "a6d4e65d5c4c78f86d690fff31b79db9fa8c3b4c" - -inherit meson pkgconfig systemd - -BUTTON_PACKAGES="${PN}-signals ${PN}-handler" - -ALLOW_EMPTY:${PN} = "1" -PACKAGE_BEFORE_PN += "${BUTTON_PACKAGES}" PACKAGECONFIG ??= "signals handler" -SYSTEMD_PACKAGES = "${BUTTON_PACKAGES}" - PACKAGECONFIG[signals] = ",,gpioplus nlohmann-json," PACKAGECONFIG[handler] = ",,,phosphor-state-manager-chassis phosphor-state-manager-host" +PV = "1.0+git${SRCPV}" +PR = "r1" -FILES:${PN}-signals = "${bindir}/buttons" +SRC_URI += "git://github.com/openbmc/phosphor-buttons.git;branch=master;protocol=https" + +S = "${WORKDIR}/git" +SYSTEMD_PACKAGES = "${BUTTON_PACKAGES}" SYSTEMD_SERVICE:${PN}-signals = "xyz.openbmc_project.Chassis.Buttons.service" +SYSTEMD_SERVICE:${PN}-handler = "phosphor-button-handler.service" + +inherit meson pkgconfig systemd +FILES:${PN}-signals = "${bindir}/buttons" FILES:${PN}-handler = "${bindir}/button-handler" -SYSTEMD_SERVICE:${PN}-handler = "phosphor-button-handler.service" -DEPENDS += " \ - systemd \ - sdbusplus \ - phosphor-dbus-interfaces \ - phosphor-logging \ - " +ALLOW_EMPTY:${PN} = "1" + +BUTTON_PACKAGES = "${PN}-signals ${PN}-handler" + +PACKAGE_BEFORE_PN += "${BUTTON_PACKAGES}" diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-power_git.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-power_git.bb index bc42b9495b..b35c387fe5 100644 --- a/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-power_git.bb +++ b/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-power_git.bb @@ -1,17 +1,16 @@ SUMMARY = "Chassis Power Control" HOMEPAGE = "https://github.com/openbmc/phosphor-power-control" -PR = "r1" -PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -inherit meson pkgconfig - DEPENDS += "phosphor-logging" DEPENDS += "nlohmann-json" DEPENDS += "gpioplus" +SRCREV = "09fdcb592a9320b9363fb1c7fec872a69ac95189" +PV = "1.0+git${SRCPV}" +PR = "r1" + +SRC_URI = "git://github.com/openbmc/phosphor-power-control;branch=master;protocol=https" S = "${WORKDIR}/git" -SRC_URI = "git://github.com/openbmc/phosphor-power-control;branch=master;protocol=https" -SRCREV = "09fdcb592a9320b9363fb1c7fec872a69ac95189" +inherit meson pkgconfig diff --git a/meta-phosphor/recipes-phosphor/clear-once/clear-once.bb b/meta-phosphor/recipes-phosphor/clear-once/clear-once.bb index acd0dbb157..8886bea143 100644 --- a/meta-phosphor/recipes-phosphor/clear-once/clear-once.bb +++ b/meta-phosphor/recipes-phosphor/clear-once/clear-once.bb @@ -1,9 +1,8 @@ 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'}" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit obmc-phosphor-systemd -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" +RDEPENDS:${PN} = "${@d.getVar('PREFERRED_PROVIDER_u-boot-fw-utils', True) or 'u-boot-fw-utils'}" diff --git a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb index eebffdd3e3..63e3f04307 100644 --- a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb @@ -1,16 +1,8 @@ SUMMARY = "Entity Manager" DESCRIPTION = "Entity Manager provides d-bus configuration data \ and configures system sensors" - -SRC_URI = "git://github.com/openbmc/entity-manager.git;branch=master;protocol=https \ - file://blocklist.json \ - " -SRCREV = "53f84ca26e949115d805d4f2834347df3238145e" -PV = "0.1+git${SRCPV}" - LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENCE;md5=a6a4edad4aed50f39a66d098d74b265b" - DEPENDS = "boost \ dbus \ nlohmann-json \ @@ -18,21 +10,28 @@ DEPENDS = "boost \ valijson \ ${PYTHON_PN}-jsonschema-native \ " +SRCREV = "53f84ca26e949115d805d4f2834347df3238145e" +PACKAGECONFIG ??= "ipmi-fru" +PACKAGECONFIG[ipmi-fru] = "-Dfru-device=true, -Dfru-device=false, i2c-tools," +PV = "0.1+git${SRCPV}" + +SRC_URI = "git://github.com/openbmc/entity-manager.git;branch=master;protocol=https \ + file://blocklist.json \ + " S = "${WORKDIR}/git" +SYSTEMD_PACKAGES = "${PN} ${EXTRA_ENTITY_MANAGER_PACKAGES}" +SYSTEMD_SERVICE:${PN} = "xyz.openbmc_project.EntityManager.service" +SYSTEMD_SERVICE:fru-device = "xyz.openbmc_project.FruDevice.service" +SYSTEMD_AUTO_ENABLE:fru-device_ibm-power-cpu = "disable" + inherit pkgconfig meson systemd python3native EXTRA_OEMESON = "-Dtests=disabled" - -PACKAGECONFIG ??= "ipmi-fru" -PACKAGECONFIG[ipmi-fru] = "-Dfru-device=true, -Dfru-device=false, i2c-tools," - EXTRA_ENTITY_MANAGER_PACKAGES = " \ ${@bb.utils.contains('PACKAGECONFIG', 'ipmi-fru', 'fru-device', '', d)} \ " -PACKAGE_BEFORE_PN = "${EXTRA_ENTITY_MANAGER_PACKAGES}" - do_install:append() { install -D ${WORKDIR}/blocklist.json ${D}${datadir}/${BPN}/blacklist.json } @@ -42,7 +41,4 @@ FILES:${PN} += " \ " FILES:fru-device = "${bindir}/fru-device ${datadir}/${BPN}/blacklist.json" -SYSTEMD_PACKAGES = "${PN} ${EXTRA_ENTITY_MANAGER_PACKAGES}" -SYSTEMD_SERVICE:${PN} = "xyz.openbmc_project.EntityManager.service" -SYSTEMD_SERVICE:fru-device = "xyz.openbmc_project.FruDevice.service" -SYSTEMD_AUTO_ENABLE:fru-device_ibm-power-cpu = "disable" +PACKAGE_BEFORE_PN = "${EXTRA_ENTITY_MANAGER_PACKAGES}" diff --git a/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb b/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb index 64bcafc4e2..de64d52212 100644 --- a/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb +++ b/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb @@ -1,59 +1,41 @@ SUMMARY = "OpenBMC console daemon" DESCRIPTION = "Daemon to handle UART console connections" HOMEPAGE = "http://github.com/openbmc/obmc-console" -PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" - -inherit autotools pkgconfig -inherit obmc-phosphor-discovery-service -inherit systemd - -S = "${WORKDIR}/git" - -TARGET_CFLAGS += "-fpic -O2" - +DEPENDS += "autoconf-archive-native \ + systemd \ + " +SRCREV = "bbc95526c6b612ec42f45e3d554d01324477c4e7" PACKAGECONFIG ??= "udev ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[udev] = "--with-udevdir=`pkg-config --variable=udevdir udev`,\ --without-udevdir,udev" PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}, \ --without-systemdsystemunitdir" - -DEPENDS += "autoconf-archive-native \ - systemd \ - " +PV = "1.0+git${SRCPV}" +PR = "r1" SRC_URI += "git://github.com/openbmc/obmc-console;branch=master;protocol=https" SRC_URI += "file://${BPN}.conf" -SRCREV = "bbc95526c6b612ec42f45e3d554d01324477c4e7" -PV = "1.0+git${SRCPV}" - -REGISTERED_SERVICES:${PN} += "obmc_console:tcp:2200:" - +S = "${WORKDIR}/git" SYSTEMD_SERVICE:${PN} += "obmc-console-ssh@.service \ obmc-console-ssh.socket \ obmc-console@.service \ " -FILES:${PN} += "${systemd_system_unitdir}/obmc-console-ssh@.service.d/use-socket.conf" - -OBMC_CONSOLE_HOST_TTY ?= "ttyVUART0" - -# Support multiple TTY ports using space separated list. -# Ex. OBMC_CONSOLE_TTYS = "ttyS1 ttyS2" -OBMC_CONSOLE_TTYS ?= "${OBMC_CONSOLE_HOST_TTY}" +inherit autotools pkgconfig +inherit obmc-phosphor-discovery-service +inherit systemd do_install:append() { # Install the server configuration install -m 0755 -d ${D}${sysconfdir}/${BPN} - # If the OBMC_CONSOLE_TTYS variable is used without the default OBMC_CONSOLE_HOST_TTY # the port specific config file should be provided. If it is just OBMC_CONSOLE_HOST_TTY, # use the old style which supports both port specific or obmc-console.conf method. if [ "${OBMC_CONSOLE_TTYS}" != "${OBMC_CONSOLE_HOST_TTY}" ]; then rm -f ${D}${sysconfdir}/${BPN}/server.ttyVUART0.conf - for CONSOLE in ${OBMC_CONSOLE_TTYS} do if test -f "${WORKDIR}/server.${CONSOLE}.conf" ; then @@ -85,5 +67,14 @@ do_install:append() { sed -ri '/^socket-id =/d' ${D}${sysconfdir}/${BPN}/server.${OBMC_CONSOLE_TTYS}.conf fi fi - } + +FILES:${PN} += "${systemd_system_unitdir}/obmc-console-ssh@.service.d/use-socket.conf" + +TARGET_CFLAGS += "-fpic -O2" + +REGISTERED_SERVICES:${PN} += "obmc_console:tcp:2200:" +OBMC_CONSOLE_HOST_TTY ?= "ttyVUART0" +# Support multiple TTY ports using space separated list. +# Ex. OBMC_CONSOLE_TTYS = "ttyS1 ttyS2" +OBMC_CONSOLE_TTYS ?= "${OBMC_CONSOLE_HOST_TTY}" diff --git a/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb b/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb index 6761c7ba35..ce66037577 100644 --- a/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb @@ -1,13 +1,8 @@ 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 meson pkgconfig python3native -inherit obmc-phosphor-dbus-service - DEPENDS += "autoconf-archive-native" DEPENDS += "phosphor-mapper" DEPENDS += "systemd" @@ -15,13 +10,19 @@ DEPENDS += "sdbusplus" DEPENDS += "${PYTHON_PN}-sdbus++-native" DEPENDS += "phosphor-logging" DEPENDS += "phosphor-dbus-interfaces" -RDEPENDS:${PN} += "phosphor-settings-manager" -RDEPENDS:${PN} += "phosphor-network" -RDEPENDS:${PN} += "phosphor-mapper" - -SRC_URI += "git://github.com/openbmc/phosphor-time-manager;branch=master;protocol=https" SRCREV = "dc746c0b3bf8e635bcc45fb870e7c27013e122b6" PV = "1.0+git${SRCPV}" +PR = "r1" + +SRC_URI += "git://github.com/openbmc/phosphor-time-manager;branch=master;protocol=https" + S = "${WORKDIR}/git" +inherit meson pkgconfig python3native +inherit obmc-phosphor-dbus-service + +RDEPENDS:${PN} += "phosphor-settings-manager" +RDEPENDS:${PN} += "phosphor-network" +RDEPENDS:${PN} += "phosphor-mapper" + DBUS_SERVICE:${PN} += "xyz.openbmc_project.Time.Manager.service" diff --git a/meta-phosphor/recipes-phosphor/dbus/dbus-perms.bb b/meta-phosphor/recipes-phosphor/dbus/dbus-perms.bb index 9097222f02..025da15df7 100644 --- a/meta-phosphor/recipes-phosphor/dbus/dbus-perms.bb +++ b/meta-phosphor/recipes-phosphor/dbus/dbus-perms.bb @@ -1,19 +1,19 @@ SUMMARY = "Phosphor OpenBMC DBUS Permissions" DESCRIPTION = "Phosphor OpenBMC DBUS Permissions." HOMEPAGE = "http://github.com/openbmc/" -PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit allarch -inherit dbus-dir +PR = "r1" SRC_URI += "file://org.openbmc.conf" -FILES:${PN}:append = " ${dbus_system_confdir}" +inherit allarch +inherit dbus-dir do_install:append() { install -d ${D}${dbus_system_confdir} install -m 0644 ${WORKDIR}/org.openbmc.conf \ ${D}${dbus_system_confdir} } + +FILES:${PN}:append = " ${dbus_system_confdir}" diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces-mapper-config-native.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces-mapper-config-native.bb index dda33fa997..22e2ee3f91 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces-mapper-config-native.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces-mapper-config-native.bb @@ -1,8 +1,7 @@ -SUMMARY="Add xyz.openbmc_project namespace to phosphor-mapper" -DESCRIPTION="Add the xyz.openbmc_project service namespace and \ +SUMMARY = "Add xyz.openbmc_project namespace to phosphor-mapper" +DESCRIPTION = "Add the xyz.openbmc_project service namespace and \ xyz.openbmc_project interface prefix to the mapper \ watch list." - LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb index 095aa24618..bcac236f86 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb @@ -1,24 +1,28 @@ SUMMARY = "Phosphor DBus Interfaces" DESCRIPTION = "Generated bindings, using sdbus++, for the phosphor YAML" -PR = "r1" -PV = "1.0+git${SRCPV}" -S = "${WORKDIR}/git" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" - -inherit pkgconfig meson -inherit obmc-phosphor-utils -inherit phosphor-dbus-yaml -inherit python3native - DEPENDS += " \ ${PYTHON_PN}-sdbus++-native \ sdbusplus \ systemd \ " +SRCREV = "a1a46a94405db4fc29d9ad695dee44e2214e4262" +PV = "1.0+git${SRCPV}" +PR = "r1" SRC_URI = "git://github.com/openbmc/phosphor-dbus-interfaces;branch=master;protocol=https" -SRCREV = "a1a46a94405db4fc29d9ad695dee44e2214e4262" + +S = "${WORKDIR}/git" + +inherit pkgconfig meson +inherit obmc-phosphor-utils +inherit phosphor-dbus-yaml +inherit python3native + +# Markdown files are installed into /usr/share/phosphor-dbus-interfaces so +# add them to the 'doc' subpackage. +FILES:${PN}-doc += "${datadir}/${BPN}" # Process OBMC_ORG_YAML_SUBDIRS to create Meson config options. # ex. xyz/openbmc_project -> -Ddata_xyz_openbmc_project=true @@ -29,14 +33,9 @@ def pdi_meson_config(d): ]) pdi_meson_config[vardeps] = "OBMC_ORG_YAML_SUBDIRS" EXTRA_OEMESON += "${@pdi_meson_config(d)}" - # Remove all schemas by default regardless of the meson_options.txt config do_write_config:append() { for intf in $(grep "^option('data_" ${S}/meson_options.txt | sed "s,^.*\(data_[^']*\).*$,\1,"); do sed -i "/^\[built-in options\]\$/a$intf = false" ${WORKDIR}/meson.cross done } - -# Markdown files are installed into /usr/share/phosphor-dbus-interfaces so -# add them to the 'doc' subpackage. -FILES:${PN}-doc += "${datadir}/${BPN}" diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bb index dddf9c04c2..093457e34f 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bb @@ -1,22 +1,20 @@ +# 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. SUMMARY = "Phosphor DBus Monitor Configuration" DESCRIPTION = "Meta-recipe, pulling in non-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" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" +DEPENDS += "${PHOSPHOR_DBUS_MONITOR_CONFIGS}" +PR = "r1" 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} } FILES:${PN} += "${config_dir}" + +PHOSPHOR_DBUS_MONITOR_CONFIGS ??= "" diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb index 2ca40fe5f0..e9fcf6c0c7 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb @@ -1,24 +1,9 @@ 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" -PV = "1.0+git${SRCPV}" 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;branch=master;protocol=https" -SRCREV = "04267b4ff02aeb9a7cc15676c38fd760575c53bd" - -inherit meson \ - pkgconfig \ - python3native \ - 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 \ phosphor-logging \ @@ -31,11 +16,26 @@ DEPENDS += " \ ${PYTHON_PN}-setuptools-native \ ${PYTHON_PN}-mako-native \ " +SRCREV = "04267b4ff02aeb9a7cc15676c38fd760575c53bd" +PV = "1.0+git${SRCPV}" +PR = "r1" -FILES:phosphor-msl-verify = "${bindir}/phosphor-msl-verify" +SRC_URI = "git://github.com/openbmc/phosphor-dbus-monitor;branch=master;protocol=https" +SYSTEMD_PACKAGES = "${PN} phosphor-msl-verify" +SYSTEMD_SERVICE:phosphor-msl-verify = "phosphor-msl-verify.service" S = "${WORKDIR}/git" +inherit meson \ + pkgconfig \ + python3native \ + phosphor-dbus-monitor \ + obmc-phosphor-systemd + EXTRA_OEMESON = " \ -DYAML_PATH=${STAGING_DIR_HOST}${config_dir} \ " + +FILES:phosphor-msl-verify = "${bindir}/phosphor-msl-verify" + +PACKAGE_BEFORE_PN = "phosphor-msl-verify" diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-legacy-namespace-mapper-config-native.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-legacy-namespace-mapper-config-native.bb index 2682ba37c2..c74144b48c 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-legacy-namespace-mapper-config-native.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-legacy-namespace-mapper-config-native.bb @@ -1,7 +1,6 @@ -SUMMARY="Add org.openbmc namespace to phosphor-mapper" -DESCRIPTION="Add the legacy org.openbmc service namespace and \ +SUMMARY = "Add org.openbmc namespace to phosphor-mapper" +DESCRIPTION = "Add the legacy org.openbmc service namespace and \ org.openbmc interface prefix to the mapper watch list." - LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper-config-native.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper-config-native.bb index ca88023d9b..1ee9b86254 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper-config-native.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper-config-native.bb @@ -1,38 +1,33 @@ +# 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. 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" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" +DEPENDS += "${PHOSPHOR_MAPPER_CONFIGS}" +PR = "r1" inherit phosphor-mapper inherit native +do_install() { + install -d ${D}/${namespace_dir} + install -d ${D}/${interface_dir} + install -d ${D}/${serviceblacklist_dir} +} + 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 services to be monitored. PHOSPHOR_MAPPER_SERVICE = "" - # Add interfaces to be monitored. PHOSPHOR_MAPPER_INTERFACE = "" - # Blacklist services from being monitored. PHOSPHOR_MAPPER_SERVICE_BLACKLIST = "" - -do_install() { - install -d ${D}/${namespace_dir} - install -d ${D}/${interface_dir} - install -d ${D}/${serviceblacklist_dir} -} diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb index 4d49516a99..6925d71c1b 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb @@ -1,43 +1,43 @@ SUMMARY = "Phosphor DBUS Object Manager" DESCRIPTION = "Phosphor DBUS object manager." HOMEPAGE = "http://github.com/openbmc/phosphor-objmgr" -PR = "r1" -PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" - -inherit meson pkgconfig -inherit obmc-phosphor-dbus-service -inherit obmc-phosphor-systemd -inherit phosphor-mapperdir - DEPENDS += "systemd" DEPENDS += "boost" DEPENDS += "libtinyxml2" DEPENDS += "sdbusplus" DEPENDS += "phosphor-logging" DEPENDS += "${PN}-config-native" +SRCREV = "1e94e60b4fb6f6e1ebe42eeeeaf52a070ae11c30" +PV = "1.0+git${SRCPV}" +PR = "r1" + +SRC_URI += "git://github.com/openbmc/phosphor-objmgr;branch=master;protocol=https" -DBUS_SERVICE:${PN} += "xyz.openbmc_project.ObjectMapper.service" SYSTEMD_SERVICE:${PN} += " \ mapper-wait@.service \ mapper-subtree-remove@.service \ " -SRC_URI += "git://github.com/openbmc/phosphor-objmgr;branch=master;protocol=https" - -SRCREV = "1e94e60b4fb6f6e1ebe42eeeeaf52a070ae11c30" - S = "${WORKDIR}/git" +inherit meson pkgconfig +inherit obmc-phosphor-dbus-service +inherit obmc-phosphor-systemd +inherit phosphor-mapperdir + EXTRA_OEMESON += "-Dtests=disabled" +do_install[postfuncs] += "do_emit_env" + +PACKAGES_DYNAMIC += "^libmapper.*" + +FILES:${PN}:remove = "${libdir}/lib*.so.* ${libdir}/*" + 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() { @@ -46,25 +46,21 @@ python do_emit_env() { services = [] for s in os.listdir(path): services.append('.'.join(s.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('serviceblacklist_dir', True) service_blacklists = [] for x in os.listdir(path): service_blacklists.append('.'.join(x.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: @@ -76,4 +72,4 @@ python do_emit_env() { fd.write('\n') } -do_install[postfuncs] += "do_emit_env" +DBUS_SERVICE:${PN} += "xyz.openbmc_project.ObjectMapper.service" diff --git a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb index c57e90f527..d618e14bac 100644 --- a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb +++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb @@ -3,30 +3,6 @@ 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" -PV = "1.0+git${SRCPV}" - -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 pkgconfig meson \ - obmc-phosphor-dbus-service \ - python3native \ - phosphor-debug-collector - -require phosphor-debug-collector.inc - DEPENDS += " \ phosphor-dbus-interfaces \ phosphor-logging \ @@ -40,6 +16,48 @@ DEPENDS += " \ ${PYTHON_PN}-mako-native \ fmt \ " +PACKAGECONFIG ??= "${@bb.utils.contains_any('DISTRO_FEATURES', \ + 'obmc-ubi-fs phosphor-mmc', '', 'jffs-workaround', d)}" +PACKAGECONFIG[jffs-workaround] = "-Djffs-workaround=enabled, \ + -Djffs-workaround=disabled" +PACKAGECONFIG[host-dump-transport-pldm] = " \ + -Dhost-transport=pldm,, \ + pldm \ + " +PACKAGECONFIG[openpower-dumps-extension] = " \ + -Dopenpower-dumps-extension=enabled, \ + -Dopenpower-dumps-extension=disabled \ +" +PV = "1.0+git${SRCPV}" +PR = "r1" + +SRC_URI += "file://coretemp.conf" + +SYSTEMD_PACKAGES = "${PN}-monitor" +SYSTEMD_SUBSTITUTIONS += "BMC_DUMP_PATH:${bmc_dump_path}:${MGR_SVC}" +SYSTEMD_SERVICE:${PN}-monitor += "obmc-dump-monitor.service" +SYSTEMD_SERVICE:${PN}-monitor += "ramoops-monitor.service" +S = "${WORKDIR}/git" + +inherit pkgconfig meson \ + obmc-phosphor-dbus-service \ + python3native \ + phosphor-debug-collector + +EXTRA_OEMESON = " \ + -DBMC_DUMP_PATH=${bmc_dump_path} \ + -DERROR_MAP_YAML=${STAGING_DIR_NATIVE}/${datadir}/dump/errors_watch.yaml \ + " + +do_install:append() { + install -d ${D}${exec_prefix}/lib/tmpfiles.d + install -m 644 ${WORKDIR}/coretemp.conf ${D}${exec_prefix}/lib/tmpfiles.d/ +} +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" RDEPENDS:${PN}-manager += " \ ${PN}-dreport \ @@ -54,11 +72,7 @@ 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 += " \ +FILES:${PN}-manager += " \ ${bindir}/phosphor-dump-manager \ ${bindir}/phosphor-offload-handler \ ${exec_prefix}/lib/tmpfiles.d/coretemp.conf \ @@ -69,23 +83,20 @@ FILES:${PN}-monitor += "${bindir}/phosphor-ramoops-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" -SYSTEMD_SERVICE:${PN}-monitor += "ramoops-monitor.service" - -EXTRA_OEMESON = " \ - -DBMC_DUMP_PATH=${bmc_dump_path} \ - -DERROR_MAP_YAML=${STAGING_DIR_NATIVE}/${datadir}/dump/errors_watch.yaml \ - " - -S = "${WORKDIR}/git" -SRC_URI += "file://coretemp.conf" +require phosphor-debug-collector.inc -do_install:append() { - install -d ${D}${exec_prefix}/lib/tmpfiles.d - install -m 644 ${WORKDIR}/coretemp.conf ${D}${exec_prefix}/lib/tmpfiles.d/ -} +ALLOW_EMPTY:${PN} = "1" +DEBUG_COLLECTOR_PKGS = " \ + ${PN}-manager \ + ${PN}-monitor \ + ${PN}-dreport \ + ${PN}-scripts \ +" +PACKAGE_BEFORE_PN += "${DEBUG_COLLECTOR_PKGS}" +DBUS_PACKAGES = "${PN}-manager" +MGR_SVC ?= "xyz.openbmc_project.Dump.Manager.service" +DBUS_SERVICE:${PN}-manager += "${MGR_SVC}" # Install dreport script # From tools/dreport.d/dreport to /usr/bin/dreport install_dreport() { @@ -93,7 +104,6 @@ install_dreport() { 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 @@ -102,14 +112,12 @@ install_dreport_conf_file() { 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() { @@ -117,29 +125,23 @@ install_dreport_include_scripts() { 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 @@ -166,36 +168,12 @@ def install_dreport_user_script(script_path, d): destlink = os.path.join(destdir, linkname) os.symlink(srclink, destlink) file.close() - #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) } - -PACKAGECONFIG ??= "${@bb.utils.contains_any('DISTRO_FEATURES', \ - 'obmc-ubi-fs phosphor-mmc', '', 'jffs-workaround', d)}" -PACKAGECONFIG[jffs-workaround] = "-Djffs-workaround=enabled, \ - -Djffs-workaround=disabled" - -PACKAGECONFIG[host-dump-transport-pldm] = " \ - -Dhost-transport=pldm,, \ - pldm \ - " - -PACKAGECONFIG[openpower-dumps-extension] = " \ - -Dopenpower-dumps-extension=enabled, \ - -Dopenpower-dumps-extension=disabled \ -" - -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/recipes-phosphor/dump/phosphor-debug-errors-native.bb b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-errors-native.bb index ea24203631..9ff5ab6b25 100644 --- a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-errors-native.bb +++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-errors-native.bb @@ -1,19 +1,17 @@ SUMMARY = "Debug collector error watch config file" -PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit native +PROVIDES += "virtual/phosphor-debug-errors" +PR = "r1" SRC_URI += "file://errors_watch.yaml" -PROVIDES += "virtual/phosphor-debug-errors" - S = "${WORKDIR}" +inherit native + do_install:append() { DEST=${D}${datadir}/dump install -d ${DEST} install errors_watch.yaml ${DEST}/ } - diff --git a/meta-phosphor/recipes-phosphor/ecc/phosphor-ecc_git.bb b/meta-phosphor/recipes-phosphor/ecc/phosphor-ecc_git.bb index 90919a9310..74d9263834 100644 --- a/meta-phosphor/recipes-phosphor/ecc/phosphor-ecc_git.bb +++ b/meta-phosphor/recipes-phosphor/ecc/phosphor-ecc_git.bb @@ -2,21 +2,19 @@ SUMMARY = "Phosphor BMC Memory ECC Logging" DESCRIPTION = "Daemon to monitor and report the BMC memory ECC" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -PR = "r1" - -inherit meson pkgconfig -inherit systemd - DEPENDS += "sdbusplus" DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "sdeventplus" DEPENDS += "phosphor-logging" - -RDEPENDS:${PN} += "phosphor-sel-logger" +SRCREV = "c33f294ecc59cd31698ada37827bb5c9f00adc8b" +PR = "r1" SRC_URI = "git://github.com/openbmc/phosphor-ecc.git;branch=master;protocol=https" -SRCREV = "c33f294ecc59cd31698ada37827bb5c9f00adc8b" S = "${WORKDIR}/git" - SYSTEMD_SERVICE:${PN} = " ${PN}.service" + +inherit meson pkgconfig +inherit systemd + +RDEPENDS:${PN} += "phosphor-sel-logger" diff --git a/meta-phosphor/recipes-phosphor/fans/obmc-control-fan_git.bb b/meta-phosphor/recipes-phosphor/fans/obmc-control-fan_git.bb index a138f7a378..7689fa60c9 100644 --- a/meta-phosphor/recipes-phosphor/fans/obmc-control-fan_git.bb +++ b/meta-phosphor/recipes-phosphor/fans/obmc-control-fan_git.bb @@ -1,15 +1,14 @@ SUMMARY = "OpenBMC fan control" DESCRIPTION = "OpenBMC fan control." -PR = "r1" +DEPENDS = "systemd" PV = "1.0+git${SRCPV}" +PR = "r1" + +SKELETON_DIR = "fanctl" +SYSTEMD_SERVICE:${PN} += "obmc-max-fans.service" inherit skeleton-sdbus inherit obmc-phosphor-dbus-service inherit pkgconfig -DEPENDS = "systemd" - -SKELETON_DIR = "fanctl" - DBUS_SERVICE:${PN} += "org.openbmc.control.Fans.service" -SYSTEMD_SERVICE:${PN} += "obmc-max-fans.service" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-events-config.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-events-config.bb index 7d9fbde757..cda3f5dbbc 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-events-config.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-events-config.bb @@ -1,14 +1,14 @@ SUMMARY = "Phosphor zone events definition default data" -PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" +PR = "r1" -inherit allarch -inherit phosphor-fan +SRC_URI = "file://events.yaml" S = "${WORKDIR}" -SRC_URI = "file://events.yaml" +inherit allarch +inherit phosphor-fan do_install() { install -D events.yaml ${D}${control_datadir}/events.yaml diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-fan-config-mrw.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-fan-config-mrw.bb index 428c21245b..0f8f643bcc 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-fan-config-mrw.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-fan-config-mrw.bb @@ -1,22 +1,21 @@ SUMMARY = "Generate fan control YAML from the MRW" -PR = "r1" LICENSE = "Apache-2.0" +DEPENDS = "mrw-native mrw-perl-tools-native" +PROVIDES += "virtual/phosphor-fan-control-fan-config" +PR = "r1" + +S = "${WORKDIR}" inherit allarch inherit phosphor-fan inherit mrw-xml -S = "${WORKDIR}" -DEPENDS = "mrw-native mrw-perl-tools-native" -PROVIDES += "virtual/phosphor-fan-control-fan-config" - do_compile() { ${bindir}/perl-native/perl \ ${bindir}/gen_fan_zone_yaml.pl \ -i ${STAGING_DIR_NATIVE}${mrw_datadir}/${MRW_XML} \ -o fans.yaml } - do_install() { install -D fans.yaml ${D}${control_datadir}/fans.yaml } diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-fan-config.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-fan-config.bb index 54e6045bfb..b6bf189d8f 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-fan-config.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-fan-config.bb @@ -1,15 +1,15 @@ SUMMARY = "Phosphor fan definition example data" -PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" +PROVIDES += "virtual/phosphor-fan-control-fan-config" +PR = "r1" -inherit allarch -inherit phosphor-fan +SRC_URI = "file://fans.yaml" S = "${WORKDIR}" -PROVIDES += "virtual/phosphor-fan-control-fan-config" -SRC_URI = "file://fans.yaml" +inherit allarch +inherit phosphor-fan do_install() { install -D fans.yaml ${D}${control_datadir}/fans.yaml diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config.bb index 8d040e1cc9..f924ffa1bc 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config.bb @@ -1,14 +1,14 @@ SUMMARY = "Phosphor zone conditions definition default data" -PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" +PR = "r1" -inherit allarch -inherit phosphor-fan +SRC_URI = "file://zone_conditions.yaml" S = "${WORKDIR}" -SRC_URI = "file://zone_conditions.yaml" +inherit allarch +inherit phosphor-fan do_install() { install -D zone_conditions.yaml ${D}${control_datadir}/zone_conditions.yaml diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-zone-config.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-zone-config.bb index e2136f70ea..ee1056a491 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-zone-config.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-control-zone-config.bb @@ -1,14 +1,14 @@ SUMMARY = "Phosphor fan zone definition default data" -PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" +PR = "r1" -inherit allarch -inherit phosphor-fan +SRC_URI = "file://zones.yaml" S = "${WORKDIR}" -SRC_URI = "file://zones.yaml" +inherit allarch +inherit phosphor-fan do_install() { install -D zones.yaml ${D}${control_datadir}/zones.yaml diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-monitor-config.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-monitor-config.bb index d49bda495f..61764d5544 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-monitor-config.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-monitor-config.bb @@ -1,14 +1,14 @@ SUMMARY = "Phosphor fan monitor definition default data" -PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" +PR = "r1" -inherit allarch -inherit phosphor-fan +SRC_URI = "file://monitor.yaml" S = "${WORKDIR}" -SRC_URI = "file://monitor.yaml" +inherit allarch +inherit phosphor-fan do_install() { DEST=${D}${monitor_datadir} diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-presence-config.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-presence-config.bb index d2df636d45..d1deb86a33 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-presence-config.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-presence-config.bb @@ -3,19 +3,18 @@ # append this recipe in a layer, add: # FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" # and provide a config file. - SUMMARY = "Config file for phosphor-fan-presence" -PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" +PROVIDES += "virtual/phosphor-fan-presence-config" +PR = "r1" -inherit allarch -inherit phosphor-fan +SRC_URI = "file://config.yaml" S = "${WORKDIR}" -PROVIDES += "virtual/phosphor-fan-presence-config" -SRC_URI = "file://config.yaml" +inherit allarch +inherit phosphor-fan do_install() { install -D config.yaml ${D}${presence_datadir}/config.yaml diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-presence-mrw.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-presence-mrw.bb index aa0e80798b..84e4bf1a9b 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan-presence-mrw.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan-presence-mrw.bb @@ -1,24 +1,22 @@ SUMMARY = "Generate fan presence YAML from the MRW" -PR = "r1" LICENSE = "Apache-2.0" - -inherit allarch -inherit phosphor-fan -inherit mrw-xml - DEPENDS = "mrw-native mrw-perl-tools-native" PROVIDES += "virtual/phosphor-fan-presence-config" - -FILES:${PN} += "${presence_datadir}/config.yaml" +PR = "r1" S = "${WORKDIR}" +inherit allarch +inherit phosphor-fan +inherit mrw-xml + do_install() { DEST=${D}${presence_datadir} install -d ${DEST} - ${bindir}/perl-native/perl \ ${bindir}/gen_presence_yaml.pl \ -i ${STAGING_DIR_NATIVE}${mrw_datadir}/${MRW_XML} \ -o ${DEST}/config.yaml } + +FILES:${PN} += "${presence_datadir}/config.yaml" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb index da2d6954f6..a8eecf8e6a 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb @@ -1,16 +1,6 @@ SUMMARY = "Phosphor Fan" DESCRIPTION = "Phosphor fan provides a set of fan monitoring and \ control applications." -PR = "r1" -PV = "1.0+git${SRCPV}" - -require ${BPN}.inc -inherit meson pkgconfig python3native -inherit obmc-phosphor-systemd -inherit phosphor-fan - -S = "${WORKDIR}/git" - # Common build dependencies DEPENDS += "${PYTHON_PN}-pyyaml-native" DEPENDS += "${PYTHON_PN}-mako-native" @@ -22,26 +12,9 @@ DEPENDS += "phosphor-logging" DEPENDS += "libevdev" DEPENDS += "nlohmann-json" DEPENDS += "cli11" - -# Package configuration -FAN_PACKAGES = " \ - ${PN}-presence-tach \ - ${PN}-control \ - ${PN}-monitor \ - ${PN}-sensor-monitor \ -" - -ALLOW_EMPTY:${PN} = "1" -PACKAGE_BEFORE_PN += "${FAN_PACKAGES}" PACKAGECONFIG ?= "presence control monitor sensor-monitor" -SYSTEMD_PACKAGES = "${FAN_PACKAGES}" -EXTRA_OEMESON:append = " -Dtests=disabled" -PKG_DEFAULT_MACHINE ??= "${MACHINE}" -PACKAGE_ARCH = "${MACHINE_ARCH}" - # The control, monitor, and presence apps can either be JSON or YAML driven. PACKAGECONFIG[json] = "-Djson-config=enabled, -Djson-config=disabled" - # -------------------------------------- # ${PN}-presence-tach specific configuration PACKAGECONFIG[presence] = "-Dpresence-service=enabled \ @@ -51,26 +24,6 @@ PACKAGECONFIG[presence] = "-Dpresence-service=enabled \ virtual/phosphor-fan-presence-config \ , \ " - -MULTI_USR_TGT = "multi-user.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}.wants/${INSTFMT_TACH}" -FMT_TACH_MUSR = "../${TMPL_TACH}:${MULTI_USR_TGT}.wants/${INSTFMT_TACH}" - -FILES:${PN}-presence-tach = "${bindir}/phosphor-fan-presence-tach" -SYSTEMD_SERVICE:${PN}-presence-tach += "${TMPL_TACH}" -SYSTEMD_LINK:${PN}-presence-tach += "${@compose_list(d, 'FMT_TACH', 'OBMC_CHASSIS_INSTANCES')}" - -# JSON mode also gets linked into multi-user -SYSTEMD_LINK:${PN}-presence-tach += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ - compose_list(d, 'FMT_TACH_MUSR', 'OBMC_CHASSIS_INSTANCES'), '', d)}" - -# Package the JSON config files installed from the repo -FILES:${PN}-presence-tach += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ - '${datadir}/phosphor-fan-presence/presence/*', '', d)}" - # -------------------------------------- # ${PN}-control specific configuration PACKAGECONFIG[control] = "-Dcontrol-service=enabled \ @@ -86,24 +39,33 @@ PACKAGECONFIG[control] = "-Dcontrol-service=enabled \ phosphor-fan-control-zone-conditions-config \ , \ " +# -------------------------------------- +# ${PN}-monitor specific configuration +PACKAGECONFIG[monitor] = "-Dmonitor-service=enabled \ + -Dmachine-name=${PKG_DEFAULT_MACHINE} \ + -Dfan-monitor-yaml-file=${STAGING_DIR_HOST}${monitor_datadir}/monitor.yaml, \ + -Dmonitor-service=disabled, \ + phosphor-fan-monitor-config \ + , \ +" +# -------------------------------------- +# phosphor-cooling-type specific configuration +PACKAGECONFIG[cooling-type] = "-Dcooling-type-service=enabled,-Dcooling-type-service=disabled,," +# -------------------------------------- +# ${PN}-sensor-monitor specific configuration +PACKAGECONFIG[sensor-monitor] = "-Dsensor-monitor-service=enabled,-Dsensor-monitor-service=disabled" +PV = "1.0+git${SRCPV}" +PR = "r1" -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}" -FMT_CONTROL_MUSR = "../${TMPL_CONTROL}:${MULTI_USR_TGT}.wants/${INSTFMT_CONTROL}" -FMT_CONTROL_PWRON = "../${TMPL_CONTROL}:${POWERON_TGT}.wants/${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 = "${bindir}/phosphor-fan-control" -FILES:${PN}-control += "${bindir}/fanctl" +S = "${WORKDIR}/git" +SYSTEMD_PACKAGES = "${FAN_PACKAGES}" +SYSTEMD_SERVICE:${PN}-presence-tach += "${TMPL_TACH}" +SYSTEMD_LINK:${PN}-presence-tach += "${@compose_list(d, 'FMT_TACH', 'OBMC_CHASSIS_INSTANCES')}" +# JSON mode also gets linked into multi-user +SYSTEMD_LINK:${PN}-presence-tach += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ + compose_list(d, 'FMT_TACH_MUSR', 'OBMC_CHASSIS_INSTANCES'), '', d)}" SYSTEMD_SERVICE:${PN}-control += "${TMPL_CONTROL}" SYSTEMD_SERVICE:${PN}-control += "${@bb.utils.contains('PACKAGECONFIG', 'json', '', '${TMPL_CONTROL_INIT}', d)}" - # JSON: Linked to multi-user and poweron # YAML: Linked to fans-ready and fan control-init poweron SYSTEMD_LINK:${PN}-control += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ @@ -112,57 +74,76 @@ SYSTEMD_LINK:${PN}-control += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ SYSTEMD_LINK:${PN}-control += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ compose_list(d, 'FMT_CONTROL_PWRON', 'OBMC_CHASSIS_INSTANCES'), \ compose_list(d, 'FMT_CONTROL_INIT', 'OBMC_CHASSIS_INSTANCES'), d)}" - -# Package the JSON config files installed from the repo -FILES:${PN}-control += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ - '${datadir}/phosphor-fan-presence/control/*', '', d)}" - -# -------------------------------------- -# ${PN}-monitor specific configuration -PACKAGECONFIG[monitor] = "-Dmonitor-service=enabled \ - -Dmachine-name=${PKG_DEFAULT_MACHINE} \ - -Dfan-monitor-yaml-file=${STAGING_DIR_HOST}${monitor_datadir}/monitor.yaml, \ - -Dmonitor-service=disabled, \ - phosphor-fan-monitor-config \ - , \ -" - -TMPL_MONITOR = "phosphor-fan-monitor@.service" -INSTFMT_MONITOR = "phosphor-fan-monitor@{0}.service" -FMT_MONITOR_FANSREADY = "../${TMPL_MONITOR}:${FAN_CONTROL_TGT}.requires/${INSTFMT_MONITOR}" -FMT_MONITOR_PWRON = "../${TMPL_MONITOR}:${POWERON_TGT}.wants/${INSTFMT_MONITOR}" -FMT_MONITOR_MUSR = "../${TMPL_MONITOR}:${MULTI_USR_TGT}.wants/${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 = "${bindir}/phosphor-fan-monitor" SYSTEMD_SERVICE:${PN}-monitor += "${TMPL_MONITOR}" SYSTEMD_SERVICE:${PN}-monitor += "${@bb.utils.contains('PACKAGECONFIG', 'json', '', '${TMPL_MONITOR_INIT}', d)}" - # JSON: power on and multi-user links. YAML: fans-ready and fan monitor init links SYSTEMD_LINK:${PN}-monitor += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ compose_list(d, 'FMT_MONITOR_PWRON', 'OBMC_CHASSIS_INSTANCES'), \ compose_list(d, 'FMT_MONITOR_FANSREADY', 'OBMC_CHASSIS_INSTANCES'), d)}" - SYSTEMD_LINK:${PN}-monitor += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ compose_list(d, 'FMT_MONITOR_MUSR', 'OBMC_CHASSIS_INSTANCES'), \ compose_list(d, 'FMT_MONITOR_INIT', 'OBMC_CHASSIS_INSTANCES'), d)}" +SYSTEMD_SERVICE:sensor-monitor += "sensor-monitor.service" +SYSTEMD_LINK:sensor-monitor += "../sensor-monitor.service:${MULTI_USR_TGT}.wants/sensor-monitor.service" + +inherit meson pkgconfig python3native +inherit obmc-phosphor-systemd +inherit phosphor-fan +EXTRA_OEMESON:append = " -Dtests=disabled" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +FILES:${PN}-presence-tach = "${bindir}/phosphor-fan-presence-tach" +# Package the JSON config files installed from the repo +FILES:${PN}-presence-tach += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ + '${datadir}/phosphor-fan-presence/presence/*', '', d)}" +FILES:${PN}-control = "${bindir}/phosphor-fan-control" +FILES:${PN}-control += "${bindir}/fanctl" +# Package the JSON config files installed from the repo +FILES:${PN}-control += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ + '${datadir}/phosphor-fan-presence/control/*', '', d)}" +FILES:${PN}-monitor = "${bindir}/phosphor-fan-monitor" # Package the JSON config files installed from the repo FILES:${PN}-monitor += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ '${datadir}/phosphor-fan-presence/monitor/*', '', d)}" +FILES:sensor-monitor += " ${bindir}/sensor-monitor" -# -------------------------------------- -# phosphor-cooling-type specific configuration -PACKAGECONFIG[cooling-type] = "-Dcooling-type-service=enabled,-Dcooling-type-service=disabled,," -# -------------------------------------- -# ${PN}-sensor-monitor specific configuration -PACKAGECONFIG[sensor-monitor] = "-Dsensor-monitor-service=enabled,-Dsensor-monitor-service=disabled" +require ${BPN}.inc -FAN_PACKAGES:append = "${@bb.utils.contains('PACKAGECONFIG', 'sensor-monitor', ' sensor-monitor', '', d)}" +ALLOW_EMPTY:${PN} = "1" -FILES:sensor-monitor += " ${bindir}/sensor-monitor" -SYSTEMD_SERVICE:sensor-monitor += "sensor-monitor.service" -SYSTEMD_LINK:sensor-monitor += "../sensor-monitor.service:${MULTI_USR_TGT}.wants/sensor-monitor.service" +PKG_DEFAULT_MACHINE ??= "${MACHINE}" + +# Package configuration +FAN_PACKAGES = " \ + ${PN}-presence-tach \ + ${PN}-control \ + ${PN}-monitor \ + ${PN}-sensor-monitor \ +" +PACKAGE_BEFORE_PN += "${FAN_PACKAGES}" +MULTI_USR_TGT = "multi-user.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}.wants/${INSTFMT_TACH}" +FMT_TACH_MUSR = "../${TMPL_TACH}:${MULTI_USR_TGT}.wants/${INSTFMT_TACH}" +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}" +FMT_CONTROL_MUSR = "../${TMPL_CONTROL}:${MULTI_USR_TGT}.wants/${INSTFMT_CONTROL}" +FMT_CONTROL_PWRON = "../${TMPL_CONTROL}:${POWERON_TGT}.wants/${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}" +TMPL_MONITOR = "phosphor-fan-monitor@.service" +INSTFMT_MONITOR = "phosphor-fan-monitor@{0}.service" +FMT_MONITOR_FANSREADY = "../${TMPL_MONITOR}:${FAN_CONTROL_TGT}.requires/${INSTFMT_MONITOR}" +FMT_MONITOR_PWRON = "../${TMPL_MONITOR}:${POWERON_TGT}.wants/${INSTFMT_MONITOR}" +FMT_MONITOR_MUSR = "../${TMPL_MONITOR}:${MULTI_USR_TGT}.wants/${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}" +FAN_PACKAGES:append = "${@bb.utils.contains('PACKAGECONFIG', 'sensor-monitor', ' sensor-monitor', '', d)}" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb index b521d3209c..10fb5d8d87 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb @@ -1,25 +1,12 @@ +# 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. SUMMARY = "Phosphor PID Fan Control" DESCRIPTION = "Fan Control" HOMEPAGE = "github.com/openbmc/phosphor-pid-control" -PR = "r1" -PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -inherit autotools pkgconfig - -inherit obmc-phosphor-ipmiprovider-symlink -inherit systemd - -S = "${WORKDIR}/git" -SRC_URI = "git://github.com/openbmc/phosphor-pid-control;branch=master;protocol=https" -SRCREV = "bcdeb83ca05ed0fa352290ec8f78bb28a2d1d2fb" - -# 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 += "sdbusplus" DEPENDS += "phosphor-dbus-interfaces" @@ -28,21 +15,29 @@ DEPENDS += "libevdev" DEPENDS += "nlohmann-json" DEPENDS += "cli11" DEPENDS += "boost" - # We depend on this to be built first so we can build our providers. DEPENDS += "phosphor-ipmi-host" +SRCREV = "bcdeb83ca05ed0fa352290ec8f78bb28a2d1d2fb" +PV = "0.1+git${SRCPV}" +PR = "r1" +SRC_URI = "git://github.com/openbmc/phosphor-pid-control;branch=master;protocol=https" + +S = "${WORKDIR}/git" SERVICE_FILE = "phosphor-pid-control.service" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE:${PN} = "${SERVICE_FILE}" +inherit autotools pkgconfig +inherit obmc-phosphor-ipmiprovider-symlink +inherit systemd + EXTRA_OECONF = " \ SYSTEMD_TARGET="multi-user.target" \ --disable-tests \ " FILES:${PN} = "${bindir}/swampd ${bindir}/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}" @@ -50,8 +45,7 @@ FILES:${PN}:append = " ${libdir}/net-ipmid/lib*${SOLIBS}" FILES:${PN}-dev:append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la" HOSTIPMI_PROVIDER_LIBRARY += "libmanualcmds.so" - -config_datadir="${datadir}/swampd/" +config_datadir = "${datadir}/swampd/" # config_path is the location swampd expects to find a json configuration. # the file is expected to be named config.json -config_path="${config_datadir}config.json" +config_path = "${config_datadir}config.json" diff --git a/meta-phosphor/recipes-phosphor/flash/noverify-bmc-update.bb b/meta-phosphor/recipes-phosphor/flash/noverify-bmc-update.bb index 4fa3ff73f8..3d7c94e78f 100644 --- a/meta-phosphor/recipes-phosphor/flash/noverify-bmc-update.bb +++ b/meta-phosphor/recipes-phosphor/flash/noverify-bmc-update.bb @@ -2,21 +2,21 @@ DESCRIPTION = "phosphor-ipmi-flash config to update without verifying the image" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -inherit systemd - SRC_URI += "file://noverify-bmc-update.service" SRC_URI += "file://noverify-bmc-verify.service" SRC_URI += "file://config-bmc.json" SYSTEMD_SERVICE:${PN} += "noverify-bmc-update.service" SYSTEMD_SERVICE:${PN} += "noverify-bmc-verify.service" -FILES:${PN} += "${datadir}/phosphor-ipmi-flash/config-bmc.json" + +inherit systemd do_install() { install -d ${D}${datadir}/phosphor-ipmi-flash install -m 0644 ${WORKDIR}/config-bmc.json ${D}${datadir}/phosphor-ipmi-flash - install -d ${D}${systemd_system_unitdir} install -m 0644 ${WORKDIR}/noverify-bmc-update.service ${D}${systemd_system_unitdir} install -m 0644 ${WORKDIR}/noverify-bmc-verify.service ${D}${systemd_system_unitdir} } + +FILES:${PN} += "${datadir}/phosphor-ipmi-flash/config-bmc.json" diff --git a/meta-phosphor/recipes-phosphor/flash/obmc-flash-bios_git.bb b/meta-phosphor/recipes-phosphor/flash/obmc-flash-bios_git.bb index d5e24a3d01..9dd30e3a32 100644 --- a/meta-phosphor/recipes-phosphor/flash/obmc-flash-bios_git.bb +++ b/meta-phosphor/recipes-phosphor/flash/obmc-flash-bios_git.bb @@ -2,13 +2,14 @@ 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" PV = "1.0+git${SRCPV}" +PR = "r1" + +SKELETON_DIR = "flashbios" +SYSTEMD_SERVICE:${PN} += "obmc-flash-init.service" 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/recipes-phosphor/flash/obmc-flash-bmc_git.bb b/meta-phosphor/recipes-phosphor/flash/obmc-flash-bmc_git.bb index cd2b555816..0c4053c26a 100644 --- a/meta-phosphor/recipes-phosphor/flash/obmc-flash-bmc_git.bb +++ b/meta-phosphor/recipes-phosphor/flash/obmc-flash-bmc_git.bb @@ -1,7 +1,9 @@ SUMMARY = "OpenBMC BMC update utility" DESCRIPTION = "OpenBMC BMC update utility." -PR = "r1" PV = "1.0+git${SRCPV}" +PR = "r1" + +SKELETON_DIR = "pyflashbmc" inherit skeleton-python inherit obmc-phosphor-dbus-service @@ -16,5 +18,4 @@ RDEPENDS:${PN} += "\ pyphosphor-dbus \ " -SKELETON_DIR = "pyflashbmc" DBUS_SERVICE:${PN} += "org.openbmc.control.BmcFlash.service" diff --git a/meta-phosphor/recipes-phosphor/flash/obmc-mgr-download_git.bb b/meta-phosphor/recipes-phosphor/flash/obmc-mgr-download_git.bb index a6cd660587..7ba18e4ad7 100644 --- a/meta-phosphor/recipes-phosphor/flash/obmc-mgr-download_git.bb +++ b/meta-phosphor/recipes-phosphor/flash/obmc-mgr-download_git.bb @@ -1,7 +1,9 @@ SUMMARY = "OpenBMC org.openbmc.managers.Download example implementation" DESCRIPTION = "An example implementation for the org.openbmc.managers.Download DBUS API." -PR = "r1" PV = "1.0+git${SRCPV}" +PR = "r1" + +SKELETON_DIR = "pydownloadmgr" inherit skeleton-python inherit obmc-phosphor-dbus-service @@ -13,5 +15,4 @@ RDEPENDS:${PN} += "\ pyphosphor-dbus \ " -SKELETON_DIR = "pydownloadmgr" DBUS_SERVICE:${PN} += "org.openbmc.managers.Download.service" diff --git a/meta-phosphor/recipes-phosphor/flash/obmc-op-flasher_git.bb b/meta-phosphor/recipes-phosphor/flash/obmc-op-flasher_git.bb index 8c5d263a64..4818c20ed0 100644 --- a/meta-phosphor/recipes-phosphor/flash/obmc-op-flasher_git.bb +++ b/meta-phosphor/recipes-phosphor/flash/obmc-op-flasher_git.bb @@ -1,12 +1,12 @@ SUMMARY = "OpenPOWER flashing utility." DESCRIPTION = "A BMC/BIOS flashing utility for use on OpenPOWER system." -PR = "r1" +DEPENDS += "pflash" PV = "1.0+git${SRCPV}" +PR = "r1" + +SKELETON_DIR = "op-flasher" inherit skeleton-gdbus inherit pkgconfig -DEPENDS += "pflash" RDEPENDS:${PN} += "pflash" - -SKELETON_DIR = "op-flasher" diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-hostfw-image.bb b/meta-phosphor/recipes-phosphor/flash/phosphor-hostfw-image.bb index a9123b1b4a..31a06284e2 100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-hostfw-image.bb +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-hostfw-image.bb @@ -1,31 +1,28 @@ SUMMARY = "Provides a host firmware image" DESCRIPTION = "Use a bbappend to add the image files" +LICENSE = "${HOSTFW_LICENSE}" +LIC_FILES_CHKSUM = "${HOSTFW_LIC_FILES_CHKSUM}" PR = "r1" inherit allarch inherit deploy -HOSTFW_LICENSE ?= "Apache-2.0" -HOSTFW_LIC_FILES_CHKSUM ?= "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -LICENSE = "${HOSTFW_LICENSE}" -LIC_FILES_CHKSUM = "${HOSTFW_LIC_FILES_CHKSUM}" - do_compile() { # The image directory can be used as the source to create a filesystem to # add to the BMC image. install -d ${B}/image - # Install an image-hostfw file in the update directory to be included in # the code update tarball. install -d ${B}/update } +addtask deploy before do_build after do_compile + +HOSTFW_LICENSE ?= "Apache-2.0" +HOSTFW_LIC_FILES_CHKSUM ?= "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" do_deploy() { install -d ${DEPLOYDIR}/hostfw/image install -d ${DEPLOYDIR}/hostfw/update cp -R --no-dereference --preserve=mode,links ${B}/image/ ${DEPLOYDIR}/hostfw/ cp -R --no-dereference --preserve=mode,links ${B}/update/ ${DEPLOYDIR}/hostfw/ } - -addtask deploy before do_build after do_compile diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-image-signing.bb b/meta-phosphor/recipes-phosphor/flash/phosphor-image-signing.bb index d10eceffa0..cfacfbe65e 100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-image-signing.bb +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-image-signing.bb @@ -1,30 +1,26 @@ SUMMARY = "OpenBMC image signing public key" DESCRIPTION = "Public key information to be included in images for image verification." -PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit allarch - -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/" +PR = "r1" SIGNING_KEY ?= "${STAGING_DIR_NATIVE}${datadir}/OpenBMC.priv" SIGNING_KEY_TYPE = "${@os.path.splitext(os.path.basename('${SIGNING_KEY}'))[0]}" +SYSROOT_DIRS:append = " ${sysconfdir}" -do_install() { - openssl pkey -in "${SIGNING_KEY}" -pubout -out ${WORKDIR}/publickey - echo HashType=RSA-SHA256 > "${WORKDIR}/hashfunc" - - idir="${D}${sysconfdir}/activationdata/${SIGNING_KEY_TYPE}" +inherit allarch - install -d ${idir} - install -m 644 ${WORKDIR}/publickey ${idir} - install -m 644 ${WORKDIR}/hashfunc ${idir} +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}" +FILES:${PN} += "${sysconfdir}/activationdata/" + +INSECURE_KEY = "${@'${SIGNING_KEY}' == '${STAGING_DIR_NATIVE}${datadir}/OpenBMC.priv'}" diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-insecure-signing-key-native.bb b/meta-phosphor/recipes-phosphor/flash/phosphor-insecure-signing-key-native.bb index d16cea3135..16f62e3fd0 100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-insecure-signing-key-native.bb +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-insecure-signing-key-native.bb @@ -1,16 +1,16 @@ SUMMARY = "Insecure private key for testing and development" DESCRIPTION = "Do not use this key to sign images." -PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" +PR = "r1" + +SRC_URI += "file://OpenBMC.priv" inherit allarch inherit native -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} + bbplain "Using an insecure image signing key!" + install -d ${D}${datadir} + install -m 400 ${WORKDIR}/OpenBMC.priv ${D}${datadir} } diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager-error-native_git.bb b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager-error-native_git.bb index ffc343b931..54abc12e73 100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager-error-native_git.bb +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager-error-native_git.bb @@ -1,16 +1,14 @@ SUMMARY = "Copy error yaml files to known path for elog parsing" -PR = "r1" -PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" +PV = "1.0+git${SRCPV}" +PR = "r1" + +S = "${WORKDIR}/git" inherit phosphor-dbus-yaml inherit native -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/ @@ -18,3 +16,5 @@ do_install:append() { install ${SRC}/*.errors.yaml ${DEST} install ${SRC}/*.metadata.yaml ${DEST} } + +require phosphor-software-manager.inc diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager-yaml-provider_git.bb b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager-yaml-provider_git.bb index 84450eb611..438487a545 100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager-yaml-provider_git.bb +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager-yaml-provider_git.bb @@ -1,10 +1,11 @@ SUMMARY = "phosphor-software-manager: install phosphor-logging yaml" -PR = "r1" -PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" +PV = "1.0+git${SRCPV}" +PR = "r1" + +S = "${WORKDIR}/git" inherit phosphor-logging-yaml-provider -require phosphor-software-manager.inc -S = "${WORKDIR}/git" +require phosphor-software-manager.inc diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb index 9c71ad3528..0b020503e2 100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb @@ -2,10 +2,25 @@ 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" +DEPENDS += " \ + openssl \ + phosphor-dbus-interfaces \ + phosphor-logging \ + ${PYTHON_PN}-sdbus++-native \ + sdbusplus \ +" +PACKAGECONFIG[verify_signature] = " \ + -Dverify-full-signature=enabled, \ + -Dverify-full-signature=disabled" +PACKAGECONFIG[sync_bmc_files] = "-Dsync-bmc-files=enabled, -Dsync-bmc-files=disabled" +PACKAGECONFIG[usb_code_update] = "-Dusb-code-update=enabled, -Dusb-code-update=disabled, cli11" +PACKAGECONFIG[side_switch_on_boot] = "-Dside-switch-on-boot=enabled, -Dside-switch-on-boot=disabled, cli11" +PACKAGECONFIG[ubifs_layout] = "-Dbmc-layout=ubi" +PACKAGECONFIG[mmc_layout] = "-Dbmc-layout=mmc" +PACKAGECONFIG[flash_bios] = "-Dhost-bios-upgrade=enabled, -Dhost-bios-upgrade=disabled" +PACKAGECONFIG[static-dual-image] = "-Dbmc-static-dual-image=enabled, -Dbmc-static-dual-image=disabled" PV = "1.0+git${SRCPV}" - -require ${BPN}.inc +PR = "r1" SOFTWARE_MGR_PACKAGES = " \ ${PN}-version \ @@ -17,25 +32,23 @@ SOFTWARE_MGR_PACKAGES = " \ ${PN}-usb \ ${PN}-side-switch \ " -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] = " \ - -Dverify-full-signature=enabled, \ - -Dverify-full-signature=disabled" -PACKAGECONFIG[sync_bmc_files] = "-Dsync-bmc-files=enabled, -Dsync-bmc-files=disabled" -PACKAGECONFIG[usb_code_update] = "-Dusb-code-update=enabled, -Dusb-code-update=disabled, cli11" -PACKAGECONFIG[side_switch_on_boot] = "-Dside-switch-on-boot=enabled, -Dside-switch-on-boot=disabled, cli11" -PACKAGECONFIG[ubifs_layout] = "-Dbmc-layout=ubi" -PACKAGECONFIG[mmc_layout] = "-Dbmc-layout=mmc" -PACKAGECONFIG[flash_bios] = "-Dhost-bios-upgrade=enabled, -Dhost-bios-upgrade=disabled" -PACKAGECONFIG[static-dual-image] = "-Dbmc-static-dual-image=enabled, -Dbmc-static-dual-image=disabled" +SYSTEMD_SERVICE:${PN}-updater += " \ + force-reboot.service \ + obmc-flash-bmc-setenv@.service \ + reboot-guard-disable.service \ + reboot-guard-enable.service \ + usr-local.mount \ +" +SYSTEMD_SERVICE:${PN}-updater += "${@bb.utils.contains('PACKAGECONFIG', 'flash_bios', 'obmc-flash-host-bios@.service', '', d)}" +SYSTEMD_SERVICE:${PN}-usb += "${@bb.utils.contains('PACKAGECONFIG', 'usb_code_update', 'usb-code-update@.service', '', d)}" +SYSTEMD_SERVICE:${PN}-side-switch += "${@bb.utils.contains('PACKAGECONFIG', 'side_switch_on_boot', 'phosphor-bmc-side-switch.service', '', d)}" +SYSTEMD_SERVICE:${PN}-updater += "${@bb.utils.contains('PACKAGECONFIG', 'static-dual-image', 'obmc-flash-bmc-alt@.service', '', d)}" +SYSTEMD_SERVICE:${PN}-updater += "${@bb.utils.contains('PACKAGECONFIG', 'static-dual-image', 'obmc-flash-bmc-static-mount-alt.service', '', d)}" +SYSTEMD_SERVICE:${PN}-updater += "${@bb.utils.contains('PACKAGECONFIG', 'static-dual-image', 'obmc-flash-bmc-prepare-for-sync.service', '', d)}" +S = "${WORKDIR}/git" inherit meson pkgconfig inherit obmc-phosphor-dbus-service @@ -43,17 +56,14 @@ inherit python3native inherit ${@bb.utils.contains('DISTRO_FEATURES', 'obmc-ubi-fs', 'phosphor-software-manager-ubi-fs', '', d)} inherit ${@bb.utils.contains('DISTRO_FEATURES', 'phosphor-mmc', 'phosphor-software-manager-mmc', '', d)} -DEPENDS += " \ - openssl \ - phosphor-dbus-interfaces \ - phosphor-logging \ - ${PYTHON_PN}-sdbus++-native \ - sdbusplus \ -" +EXTRA_OEMESON:append = " -Dtests=disabled" + +do_install:append() { + install -d ${D}/usr/local +} # The repo installs several scripts that depends on bash RDEPENDS:${PN} += " bash" - RDEPENDS:${PN}-updater += " \ bash \ virtual-obmc-image-manager \ @@ -82,30 +92,14 @@ FILES:${PN}-usb += "\ FILES:${PN}-side-switch += "\ ${bindir}/phosphor-bmc-side-switch \ " + +require ${BPN}.inc + +ALLOW_EMPTY:${PN} = "1" + +PACKAGE_BEFORE_PN += "${SOFTWARE_MGR_PACKAGES}" +DBUS_PACKAGES = "${SOFTWARE_MGR_PACKAGES}" 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 += " \ - force-reboot.service \ - obmc-flash-bmc-setenv@.service \ - reboot-guard-disable.service \ - reboot-guard-enable.service \ - usr-local.mount \ -" - -SYSTEMD_SERVICE:${PN}-updater += "${@bb.utils.contains('PACKAGECONFIG', 'flash_bios', 'obmc-flash-host-bios@.service', '', d)}" -SYSTEMD_SERVICE:${PN}-usb += "${@bb.utils.contains('PACKAGECONFIG', 'usb_code_update', 'usb-code-update@.service', '', d)}" -SYSTEMD_SERVICE:${PN}-side-switch += "${@bb.utils.contains('PACKAGECONFIG', 'side_switch_on_boot', 'phosphor-bmc-side-switch.service', '', d)}" -SYSTEMD_SERVICE:${PN}-updater += "${@bb.utils.contains('PACKAGECONFIG', 'static-dual-image', 'obmc-flash-bmc-alt@.service', '', d)}" -SYSTEMD_SERVICE:${PN}-updater += "${@bb.utils.contains('PACKAGECONFIG', 'static-dual-image', 'obmc-flash-bmc-static-mount-alt.service', '', d)}" -SYSTEMD_SERVICE:${PN}-updater += "${@bb.utils.contains('PACKAGECONFIG', 'static-dual-image', 'obmc-flash-bmc-prepare-for-sync.service', '', d)}" - -S = "${WORKDIR}/git" - -EXTRA_OEMESON:append = " -Dtests=disabled" - -do_install:append() { - install -d ${D}/usr/local -} diff --git a/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb index 6ea8c4072d..4692bd1e2e 100644 --- a/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb +++ b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb @@ -1,28 +1,8 @@ SUMMARY = "Phosphor GPIO monitor application" DESCRIPTION = "Application to monitor gpio assertions" HOMEPAGE = "http://github.com/openbmc/phosphor-gpio-monitor" -PR = "r1" -PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -inherit meson 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 += "sdbusplus" DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "libevdev" @@ -32,10 +12,27 @@ DEPENDS += "boost" DEPENDS += "libgpiod" DEPENDS += "cli11" DEPENDS += "nlohmann-json" +PROVIDES += "virtual/obmc-gpio-monitor" +PROVIDES += "virtual/obmc-gpio-presence" +SRCREV = "629f3e3cd414294ee73bb3946e336f485fe8b504" +PV = "1.0+git${SRCPV}" +PR = "r1" + +SRC_URI += "git://github.com/openbmc/phosphor-gpio-monitor;branch=master;protocol=https" +SYSTEMD_PACKAGES = "${GPIO_PACKAGES}" SYSTEMD_SERVICE:${PN}-monitor += "phosphor-multi-gpio-monitor.service" SYSTEMD_SERVICE:${PN}-monitor += "phosphor-gpio-monitor@.service" SYSTEMD_SERVICE:${PN}-presence += "phosphor-gpio-presence@.service" +S = "${WORKDIR}/git" + +inherit meson pkgconfig +inherit obmc-phosphor-dbus-service + +EXTRA_OEMESON:append = " -Dtests=disabled" + +RPROVIDES:${PN}-monitor += "virtual/obmc-gpio-monitor" +RPROVIDES:${PN}-presence += "virtual/obmc-gpio-presence" FILES:${PN}-monitor += "${bindir}/phosphor-gpio-monitor" FILES:${PN}-monitor += "${bindir}/phosphor-multi-gpio-monitor" @@ -43,8 +40,10 @@ FILES:${PN}-monitor += "${bindir}/phosphor-gpio-util" FILES:${PN}-monitor += "${nonarch_base_libdir}/udev/rules.d/99-gpio-keys.rules" FILES:${PN}-presence += "${bindir}/phosphor-gpio-presence" -SRC_URI += "git://github.com/openbmc/phosphor-gpio-monitor;branch=master;protocol=https" -SRCREV = "629f3e3cd414294ee73bb3946e336f485fe8b504" -S = "${WORKDIR}/git" +ALLOW_EMPTY:${PN} = "1" -EXTRA_OEMESON:append = " -Dtests=disabled" +GPIO_PACKAGES = " \ + ${PN}-monitor \ + ${PN}-presence \ +" +PACKAGE_BEFORE_PN += "${GPIO_PACKAGES}" diff --git a/meta-phosphor/recipes-phosphor/health/phosphor-health-monitor_git.bb b/meta-phosphor/recipes-phosphor/health/phosphor-health-monitor_git.bb index e1c464b08d..4c70253f54 100644 --- a/meta-phosphor/recipes-phosphor/health/phosphor-health-monitor_git.bb +++ b/meta-phosphor/recipes-phosphor/health/phosphor-health-monitor_git.bb @@ -1,21 +1,20 @@ SUMMARY = "BMC Health Monitoring" DESCRIPTION = "Daemon to collect and monitor bmc health statistics" HOMEPAGE = "https://github.com/openbmc/phosphor-health-monitor" -PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=9e69ba356fa59848ffd865152a3ccc13" - -inherit meson pkgconfig -inherit systemd - DEPENDS += "sdbusplus" DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "sdeventplus" DEPENDS += "phosphor-logging" DEPENDS += "nlohmann-json" +SRCREV = "b7d7bd5a384ea501766b15e4613eb9b14fe71e7f" +PR = "r1" SRC_URI = "git://github.com/openbmc/phosphor-health-monitor.git;protocol=https;branch=master" -SRCREV = "b7d7bd5a384ea501766b15e4613eb9b14fe71e7f" -S = "${WORKDIR}/git" +S = "${WORKDIR}/git" SYSTEMD_SERVICE:${PN} = "phosphor-health-monitor.service" + +inherit meson pkgconfig +inherit systemd diff --git a/meta-phosphor/recipes-phosphor/host/obmc-op-control-host_git.bb b/meta-phosphor/recipes-phosphor/host/obmc-op-control-host_git.bb index ffe2f366ea..6cc31b4641 100644 --- a/meta-phosphor/recipes-phosphor/host/obmc-op-control-host_git.bb +++ b/meta-phosphor/recipes-phosphor/host/obmc-op-control-host_git.bb @@ -1,26 +1,24 @@ SUMMARY = "org.openbmc.control.Host implementation for OpenPOWER" DESCRIPTION = "A host control implementation suitable for OpenPOWER systems." -PR = "r1" -PV = "1.0+git${SRCPV}" - -inherit skeleton-gdbus -inherit obmc-phosphor-dbus-service -inherit pkgconfig - PROVIDES += "virtual/obmc-host-ctl" -RPROVIDES:${PN} += "virtual-obmc-host-ctl" +PV = "1.0+git${SRCPV}" +PR = "r1" 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')}" + +inherit skeleton-gdbus +inherit obmc-phosphor-dbus-service +inherit pkgconfig + +RPROVIDES:${PN} += "virtual-obmc-host-ctl" + +FMT = "org.openbmc.control.Host@{0}.service" +DBUS_SERVICE:${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_INSTANCES')}" diff --git a/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb b/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb index 4afbc14a4f..05ded76597 100644 --- a/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb +++ b/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb @@ -1,35 +1,35 @@ SUMMARY = "Phosphor OpenBMC Post Code Daemon" DESCRIPTION = "Phosphor OpenBMC Post Code Daemon" HOMEPAGE = "http://github.com/openbmc/phosphor-host-postd" -PR = "r1" -PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -inherit meson -inherit pkgconfig -inherit systemd - -PACKAGECONFIG ?= "" -PACKAGECONFIG[7seg] = "-D7seg=enabled,-D7seg=disabled,,udev" - DEPENDS += "sdbusplus" DEPENDS += "sdeventplus" DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "systemd" DEPENDS += "libgpiod" +SRCREV = "aee6540154f2ac8ea510efacd2785868c1898a7d" +PACKAGECONFIG ?= "" +PACKAGECONFIG[7seg] = "-D7seg=enabled,-D7seg=disabled,,udev" +PV = "0.1+git${SRCPV}" +PR = "r1" -S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-host-postd;branch=master;protocol=https" -SRCREV = "aee6540154f2ac8ea510efacd2785868c1898a7d" +S = "${WORKDIR}/git" SNOOP_DEVICE ?= "aspeed-lpc-snoop0" -POST_CODE_BYTES ?= "1" -7SEG_GPIO ?= "0" - SERVICE_FILE = "lpcsnoop.service" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE:${PN} += "${SERVICE_FILE}" +SERVICE_FILE_7SEG = " \ + postcode-7seg@.service \ + postcode-7seg@${POSTCODE_SEVENSEG_DEVICE}.service \ +" +SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', '7seg', '${SERVICE_FILE_7SEG}', '', d)}" + +inherit meson +inherit pkgconfig +inherit systemd EXTRA_OEMESON:append = " \ -Dsnoop-device=${SNOOP_DEVICE} \ @@ -37,9 +37,6 @@ EXTRA_OEMESON:append = " \ -Dtests=disabled \ " +POST_CODE_BYTES ?= "1" +7SEG_GPIO ?= "0" POSTCODE_SEVENSEG_DEVICE ?= "seven_seg_disp_val" -SERVICE_FILE_7SEG = " \ - postcode-7seg@.service \ - postcode-7seg@${POSTCODE_SEVENSEG_DEVICE}.service \ -" -SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', '7seg', '${SERVICE_FILE_7SEG}', '', d)}" diff --git a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image-base.bb b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image-base.bb index 38b1c2d426..1073951cee 100644 --- a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image-base.bb +++ b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image-base.bb @@ -1,6 +1,4 @@ DESCRIPTION = "A basic OpenBMC image with no features enabled." - -IMAGE_LINGUAS = "" LICENSE = "Apache-2.0" inherit obmc-phosphor-image @@ -8,3 +6,5 @@ inherit obmc-phosphor-image # The /etc/version file is misleading and not useful. Remove it. # Users should instead rely on /etc/os-release. ROOTFS_POSTPROCESS_COMMAND += "remove_etc_version ; " + +IMAGE_LINGUAS = "" diff --git a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb index f276e64399..0806ada231 100644 --- a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb +++ b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb @@ -1,9 +1,15 @@ DESCRIPTION = "Image with Phosphor, a software stack for hardware management \ in devices with baseboard management controllers. The image supports the \ full OpenBMC feature set for devices of all types." +LICENSE = "Apache-2.0" -IMAGE_LINGUAS = "" +inherit obmc-phosphor-image +# The /etc/version file is misleading and not useful. Remove it. +# Users should instead rely on /etc/os-release. +ROOTFS_POSTPROCESS_COMMAND += "remove_etc_version ; " + +IMAGE_LINGUAS = "" IMAGE_FEATURES += " \ obmc-bmc-state-mgmt \ obmc-bmcweb \ @@ -39,15 +45,6 @@ IMAGE_FEATURES += " \ obmc-settings-mgmt \ obmc-telemetry \ " - -LICENSE = "Apache-2.0" - -inherit obmc-phosphor-image - -# The /etc/version file is misleading and not useful. Remove it. -# Users should instead rely on /etc/os-release. -ROOTFS_POSTPROCESS_COMMAND += "remove_etc_version ; " - # The shadow recipe provides the binaries(like useradd, usermod) needed by the # phosphor-user-manager. ROOTFS_RO_UNNEEDED:remove = "shadow" diff --git a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-initramfs.bb b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-initramfs.bb index 9df4432fe5..9b2e41690a 100644 --- a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-initramfs.bb +++ b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-initramfs.bb @@ -1,30 +1,26 @@ 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." +LICENSE = "MIT" +# Needed for the set_user_group functions to succeed +DEPENDS += "shadow-native" -# Init scripts -INIT_PACKAGE = "obmc-phosphor-initfs" -INIT_PACKAGE:df-phosphor-mmc = "phosphor-mmc-init" +inherit core-image + +export IMAGE_BASENAME = "obmc-phosphor-initramfs" + +BAD_RECOMMENDATIONS += "busybox-syslog" PACKAGE_INSTALL = "${VIRTUAL-RUNTIME_base-utils} base-passwd ${ROOTFS_BOOTSTRAP_INSTALL} ${INIT_PACKAGE}" +PACKAGE_INSTALL:remove = "shadow" +# Init scripts +INIT_PACKAGE = "obmc-phosphor-initfs" +INIT_PACKAGE:df-phosphor-mmc = "phosphor-mmc-init" # Do not pollute the initrd image with rootfs features IMAGE_FEATURES = "read-only-rootfs" - -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" - -# Needed for the set_user_group functions to succeed -DEPENDS += "shadow-native" - -PACKAGE_INSTALL:remove = "shadow" PACKAGE_EXCLUDE = "shadow" -BAD_RECOMMENDATIONS += "busybox-syslog" diff --git a/meta-phosphor/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bb b/meta-phosphor/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bb index f816706af9..66d002042c 100644 --- a/meta-phosphor/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bb +++ b/meta-phosphor/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bb @@ -2,27 +2,25 @@ SUMMARY = "Phosphor OpenBMC pre-init scripts" DESCRIPTION = "Phosphor OpenBMC filesystem mount reference implementation." LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - 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" +S = "${WORKDIR}" + +inherit allarch + 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 + 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 @@ -31,5 +29,7 @@ do_install() { mknod -m 622 ${D}/dev/console c 5 1 } +RDEPENDS:${PN} += "${VIRTUAL-RUNTIME_base-utils}" + FILES:${PN} += " /init /shutdown /update /whitelist /dev " FILES:${PN} += " /init-options /init-download-url " diff --git a/meta-phosphor/recipes-phosphor/initrdscripts/phosphor-mmc-init.bb b/meta-phosphor/recipes-phosphor/initrdscripts/phosphor-mmc-init.bb index 96c27da12b..c4d5bc8420 100644 --- a/meta-phosphor/recipes-phosphor/initrdscripts/phosphor-mmc-init.bb +++ b/meta-phosphor/recipes-phosphor/initrdscripts/phosphor-mmc-init.bb @@ -2,11 +2,20 @@ SUMMARY = "Phosphor OpenBMC pre-init scripts for mmc" DESCRIPTION = "Phosphor OpenBMC filesystem mount implementation for mmc." LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - PR = "r1" +SRC_URI += "file://mmc-init.sh" + +S = "${WORKDIR}" + inherit allarch +do_install() { + install -m 0755 ${WORKDIR}/mmc-init.sh ${D}/init + install -d ${D}/dev + mknod -m 622 ${D}/dev/console c 5 1 +} + RDEPENDS:${PN} += " \ ${@d.getVar('PREFERRED_PROVIDER_u-boot-fw-utils', True) or 'u-boot-fw-utils'} \ ${VIRTUAL-RUNTIME_base-utils} \ @@ -18,13 +27,4 @@ RDEPENDS:${PN} += " \ udev \ " -S = "${WORKDIR}" -SRC_URI += "file://mmc-init.sh" - -do_install() { - install -m 0755 ${WORKDIR}/mmc-init.sh ${D}/init - install -d ${D}/dev - mknod -m 622 ${D}/dev/console c 5 1 -} - FILES:${PN} += " /init /dev " diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index b3ba0a1e00..da9d94541e 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -1,28 +1,5 @@ -inherit systemd -inherit useradd - -USERADD_PACKAGES = "${PN}" - -# add a user called httpd for the server to assume -USERADD_PARAM:${PN} = "-r -s /sbin/nologin bmcweb" -GROUPADD_PARAM:${PN} = "web; redfish" - LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=175792518e4ac015ab6696d16c4f607e" - -SRC_URI = "git://github.com/openbmc/bmcweb.git;branch=master;protocol=https;nobranch=1" - -PV = "1.0+git${SRCPV}" -SRCREV = "894744945e8f40a93fbcd6c100c92e0cf5b0ef67" - -S = "${WORKDIR}/git" - -inherit pkgconfig meson ptest - -SRC_URI += " \ - file://run-ptest \ -" - DEPENDS = " \ openssl \ zlib \ @@ -36,19 +13,20 @@ DEPENDS = " \ ${@bb.utils.contains('PTEST_ENABLED', '1', 'gtest', '', d)} \ ${@bb.utils.contains('PTEST_ENABLED', '1', 'gmock', '', d)} \ " +SRCREV = "894744945e8f40a93fbcd6c100c92e0cf5b0ef67" +PV = "1.0+git${SRCPV}" -RDEPENDS:${PN} += " \ - jsnbd \ - phosphor-mapper \ +SRC_URI = "git://github.com/openbmc/bmcweb.git;branch=master;protocol=https;nobranch=1" +SRC_URI += " \ + file://run-ptest \ " -do_install_ptest() { - install -d ${D}${PTEST_PATH}/test - cp -rf ${B}/*_test ${D}${PTEST_PATH}/test/ -} - -FILES:${PN} += "${datadir}/** " +S = "${WORKDIR}/git" +SYSTEMD_SERVICE:${PN} += "bmcweb.service bmcweb.socket" +inherit systemd +inherit useradd +inherit pkgconfig meson ptest EXTRA_OEMESON = " \ --buildtype=minsize \ @@ -56,6 +34,21 @@ EXTRA_OEMESON = " \ -Dyocto-deps=enabled \ " -SYSTEMD_SERVICE:${PN} += "bmcweb.service bmcweb.socket" +do_install_ptest() { + install -d ${D}${PTEST_PATH}/test + cp -rf ${B}/*_test ${D}${PTEST_PATH}/test/ +} + +RDEPENDS:${PN} += " \ + jsnbd \ + phosphor-mapper \ +" +FILES:${PN} += "${datadir}/** " + +USERADD_PACKAGES = "${PN}" +# add a user called httpd for the server to assume +USERADD_PARAM:${PN} = "-r -s /sbin/nologin bmcweb" + +GROUPADD_PARAM:${PN} = "web; redfish" FULL_OPTIMIZATION = "-Os " diff --git a/meta-phosphor/recipes-phosphor/interfaces/rest-dbus_git.bb b/meta-phosphor/recipes-phosphor/interfaces/rest-dbus_git.bb index 27d873381a..c20621ec21 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/rest-dbus_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/rest-dbus_git.bb @@ -1,10 +1,16 @@ SUMMARY = "Phosphor OpenBMC REST framework" DESCRIPTION = "Phosphor OpenBMC REST to DBUS daemon." HOMEPAGE = "http://github.com/openbmc/rest-dbus" -PR = "r1" -PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" +SRCREV = "99d57f2698568be1bf989057f678ff5c053e7957" +PV = "1.0+git${SRCPV}" +PR = "r1" + +SRC_URI += "git://github.com/openbmc/rest-dbus.git;branch=master;protocol=https" + +SYSTEMD_SERVICE:${PN} += "rest-dbus.service rest-dbus.socket" +S = "${WORKDIR}/git" inherit allarch inherit obmc-phosphor-systemd @@ -17,11 +23,3 @@ RDEPENDS:${PN} += " \ python-xml \ pyphosphor-dbus \ " - -SYSTEMD_SERVICE:${PN} += "rest-dbus.service rest-dbus.socket" - -SRC_URI += "git://github.com/openbmc/rest-dbus.git;branch=master;protocol=https" - -SRCREV = "99d57f2698568be1bf989057f678ff5c053e7957" - -S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/interfaces/slpd-lite_git.bb b/meta-phosphor/recipes-phosphor/interfaces/slpd-lite_git.bb index 7f77689d65..2233b0c6f0 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/slpd-lite_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/slpd-lite_git.bb @@ -1,21 +1,18 @@ SUMMARY = "Lightweight SLP Server" DESCRIPTION = "Lightweight Unicast-only SLP Server" HOMEPAGE = "http://github.com/openbmc/slpd-lite" -PR = "r1" -PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" - -inherit autotools pkgconfig -inherit obmc-phosphor-systemd - -SYSTEMD_SERVICE:${PN} += "slpd-lite.service" - DEPENDS += "systemd" DEPENDS += "autoconf-archive-native" +SRCREV = "ef078cd0d560b8c49061f0b855f0cb4450e69b3a" +PV = "1.0+git${SRCPV}" +PR = "r1" SRC_URI += "git://github.com/openbmc/slpd-lite;branch=master;protocol=https" -SRCREV = "ef078cd0d560b8c49061f0b855f0cb4450e69b3a" - +SYSTEMD_SERVICE:${PN} += "slpd-lite.service" S = "${WORKDIR}/git" + +inherit autotools pkgconfig +inherit obmc-phosphor-systemd diff --git a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager-assettag.bb b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager-assettag.bb index 317269f829..44971f358e 100644 --- a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager-assettag.bb +++ b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager-assettag.bb @@ -1,15 +1,15 @@ SUMMARY = "Recipe to create AssetTag property in inventory manager" -PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" +PROVIDES += "virtual/phosphor-inventory-manager-assettag" +PR = "r1" -inherit allarch -inherit phosphor-inventory-manager +SRC_URI = "file://assettag.yaml" -PROVIDES += "virtual/phosphor-inventory-manager-assettag" S = "${WORKDIR}" -SRC_URI = "file://assettag.yaml" +inherit allarch +inherit phosphor-inventory-manager do_install() { install -D assettag.yaml ${D}${base_datadir}/events.d/assettag.yaml diff --git a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager_git.bb b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager_git.bb index ee839cc231..5a192a3053 100644 --- a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager_git.bb @@ -2,18 +2,6 @@ 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" -PV = "1.0+git${SRCPV}" - -inherit meson \ - pkgconfig \ - python3native \ - phosphor-dbus-yaml \ - phosphor-inventory-manager \ - obmc-phosphor-dbus-service - -require phosphor-inventory-manager.inc - DEPENDS += " \ phosphor-inventory-manager-assettag \ phosphor-dbus-interfaces \ @@ -26,19 +14,28 @@ DEPENDS += " \ ${PYTHON_PN}-mako-native \ nlohmann-json \ " - -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" +PACKAGECONFIG ??= "" +PACKAGECONFIG[associations] = "-Dassociations=enabled, -Dassociations=disabled" +PV = "1.0+git${SRCPV}" +PR = "r1" S = "${WORKDIR}/git" +inherit meson \ + pkgconfig \ + python3native \ + phosphor-dbus-yaml \ + phosphor-inventory-manager \ + obmc-phosphor-dbus-service + EXTRA_OEMESON = " \ -Dtests=disabled \ -DYAML_PATH=${STAGING_DIR_HOST}${base_datadir} \ -DIFACES_PATH=${STAGING_DIR_TARGET}${yaml_dir} \ " -PACKAGECONFIG ??= "" -PACKAGECONFIG[associations] = "-Dassociations=enabled, -Dassociations=disabled" +require phosphor-inventory-manager.inc + +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" diff --git a/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb b/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb index 968c9662f6..29d5b4b137 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb @@ -1,16 +1,16 @@ -HOMEPAGE = "http://github.com/openbmc/ipmi-blob-tool" SUMMARY = "Library and Host-side tool for talking to OpenBMC IPMI BLOB handlers." DESCRIPTION = "This package provides a library for the BMC and host for core blob mechanics and host-side binaries for talking to OpenBMC IPMI BLOB handlers." -PR = "r1" -PV = "0.1+git${SRCPV}" +HOMEPAGE = "http://github.com/openbmc/ipmi-blob-tool" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" +SRCREV = "ee975086169fce82413c27fefb871b779ea6b657" +PV = "0.1+git${SRCPV}" +PR = "r1" -inherit meson pkgconfig - -EXTRA_OEMESON = "-Dtests=disabled" +SRC_URI = "git://github.com/openbmc/ipmi-blob-tool;branch=master;protocol=https" S = "${WORKDIR}/git" -SRC_URI = "git://github.com/openbmc/ipmi-blob-tool;branch=master;protocol=https" -SRCREV = "ee975086169fce82413c27fefb871b779ea6b657" +inherit meson pkgconfig + +EXTRA_OEMESON = "-Dtests=disabled" diff --git a/meta-phosphor/recipes-phosphor/ipmi/ipmitool_%.bbappend b/meta-phosphor/recipes-phosphor/ipmi/ipmitool_%.bbappend index 7ede354123..f7b0a47be1 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/ipmitool_%.bbappend +++ b/meta-phosphor/recipes-phosphor/ipmi/ipmitool_%.bbappend @@ -1,10 +1,10 @@ +LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=9aa91e13d644326bf281924212862184" FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" - DEPENDS += "systemd" - -SRC_URI = "git://github.com/ipmitool/ipmitool.git;protocol=https;branch=master" SRCREV = "c3939dac2c060651361fc71516806f9ab8c38901" +PV = "1.8.18+git${SRCPV}" +SRC_URI = "git://github.com/ipmitool/ipmitool.git;protocol=https;branch=master" # TODO: when a new company joins the OpenBMC project by signing # a CLA, if they have an enterprise number on file with the # IANA, the versioned file, $PWD/ipmitool/enterprise-numbers @@ -18,8 +18,10 @@ SRC_URI += " \ file://enterprise-numbers \ " -# make sure that the enterprise-numbers file gets installed in the root FS -FILES:${PN} += "/usr/share/misc/enterprise-numbers" +S = "${WORKDIR}/git" + +EXTRA_OECONF:append = " --disable-ipmishell --enable-intf-dbus DEFAULT_INTF=dbus " + do_compile:prepend() { # copy the SRC_URI version of enterprise-numbers # to the build dir to prevent a fetch @@ -27,9 +29,5 @@ do_compile:prepend() { cp "${WORKDIR}/enterprise-numbers" "${WORKDIR}/build/enterprise-numbers" } -S = "${WORKDIR}/git" -LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=9aa91e13d644326bf281924212862184" - -EXTRA_OECONF:append = " --disable-ipmishell --enable-intf-dbus DEFAULT_INTF=dbus " - -PV = "1.8.18+git${SRCPV}" +# make sure that the enterprise-numbers file gets installed in the root FS +FILES:${PN} += "/usr/share/misc/enterprise-numbers" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_git.bb index a4a456a351..01b1794b58 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_git.bb @@ -1,30 +1,28 @@ -HOMEPAGE = "http://github.com/openbmc/phosphor-ipmi-blobs-binarystore" SUMMARY = "BMC Generic Binary Blob Store via OEM IPMI Blob Transport" DESCRIPTION = "This package provides a read/write/serialize abstraction for storing binary data through IPMI blobs" -PR = "r1" -PV = "1.0+git${SRCPV}" +HOMEPAGE = "http://github.com/openbmc/phosphor-ipmi-blobs-binarystore" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -inherit meson pkgconfig - DEPENDS += "autoconf-archive-native" DEPENDS += "phosphor-ipmi-blobs" DEPENDS += "phosphor-logging" DEPENDS += "protobuf-native" DEPENDS += "protobuf" - +SRCREV = "62872f5cb38e755a5325a7f4875a053bd357ef1a" PACKAGECONFIG ??= "" PACKAGECONFIG[blobtool] = "-Dblobtool=enabled,-Dblobtool=disabled" +PV = "1.0+git${SRCPV}" +PR = "r1" -S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-blobs-binarystore;branch=master;protocol=https" -SRCREV = "62872f5cb38e755a5325a7f4875a053bd357ef1a" -FILES:${PN}:append = " ${libdir}/ipmid-providers" -FILES:${PN}:append = " ${libdir}/blob-ipmid" +S = "${WORKDIR}/git" -BLOBIPMI_PROVIDER_LIBRARY += "libbinarystore.so" +inherit meson pkgconfig EXTRA_OEMESON:append = " -Dtests=disabled" +FILES:${PN}:append = " ${libdir}/ipmid-providers" +FILES:${PN}:append = " ${libdir}/blob-ipmid" + +BLOBIPMI_PROVIDER_LIBRARY += "libbinarystore.so" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb index 9e938ecee5..fea06cfd7a 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb @@ -1,26 +1,26 @@ -HOMEPAGE = "http://github.com/openbmc/phosphor-ipmi-blobs" SUMMARY = "Phosphor OEM IPMI BLOBS Protocol Implementation" DESCRIPTION = "This package handles a series of OEM IPMI commands that implement the BLOB protocol for sending and receiving data over IPMI." -PR = "r1" -PV = "0.1+git${SRCPV}" +HOMEPAGE = "http://github.com/openbmc/phosphor-ipmi-blobs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -inherit meson pkgconfig - DEPENDS += " \ ipmi-blob-tool \ phosphor-ipmi-host \ phosphor-logging \ " +SRCREV = "83f9992cc60dedb6a2a964a733fd35c89c8a0cfa" +PV = "0.1+git${SRCPV}" +PR = "r1" -S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-blobs;branch=master;protocol=https" -SRCREV = "83f9992cc60dedb6a2a964a733fd35c89c8a0cfa" -FILES:${PN} += "${libdir}/ipmid-providers" +S = "${WORKDIR}/git" + +inherit meson pkgconfig EXTRA_OEMESON:append = " \ -Dtests=disabled \ -Dexamples=false \ " + +FILES:${PN} += "${libdir}/ipmid-providers" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb index 8d62b596c2..9f69a59562 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb @@ -1,22 +1,23 @@ SUMMARY = "Phosphor OpenBMC BT to DBUS" DESCRIPTION = "Phosphor OpenBMC BT to DBUS." -PR = "r1" -PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" +DEPENDS += "autoconf-archive-native" +DEPENDS += "systemd" +PROVIDES += "virtual/obmc-host-ipmi-hw" +SRCREV = "a6ec899618a28a30f7907a6cc90fe027047297d1" +PV = "1.0+git${SRCPV}" +PR = "r1" + +SRC_URI += "git://github.com/openbmc/btbridge;branch=master;protocol=https" + +S = "${WORKDIR}/git" 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" +RPROVIDES:${PN} += "virtual-obmc-host-ipmi-hw" -S = "${WORKDIR}/git" -SRC_URI += "git://github.com/openbmc/btbridge;branch=master;protocol=https" -SRCREV="a6ec899618a28a30f7907a6cc90fe027047297d1" +DBUS_SERVICE:${PN} = "org.openbmc.HostIpmi.service" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config.bb index 24c4941dc6..303a0ef07c 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config.bb @@ -1,9 +1,7 @@ SUMMARY = "Phosphor IPMI daemon configuration" -PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit allarch +PR = "r1" SRC_URI = " \ file://cipher_list.json \ @@ -17,23 +15,12 @@ SRC_URI = " \ file://cs_privilege_levels.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 \ - ${datadir}/ipmi-providers/channel_access.json \ - ${datadir}/ipmi-providers/channel_config.json \ - ${datadir}/ipmi-providers/entity-map.json \ - ${datadir}/ipmi-providers/cs_privilege_levels.json \ - " +inherit allarch 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 \ @@ -55,3 +42,15 @@ do_install() { install -m 0644 -D ${WORKDIR}/cs_privilege_levels.json \ ${D}${datadir}/ipmi-providers/cs_privilege_levels.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 \ + ${datadir}/ipmi-providers/channel_access.json \ + ${datadir}/ipmi-providers/channel_config.json \ + ${datadir}/ipmi-providers/entity-map.json \ + ${datadir}/ipmi-providers/cs_privilege_levels.json \ + " diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb index 99a80bc41c..ee26c0498f 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb @@ -1,20 +1,22 @@ SUMMARY = "Phosphor OEM IPMI Ethernet Stats Implementation" DESCRIPTION = "This package handles receiving OEM IPMI commands to provide ethernet device statistics." HOMEPAGE = "http://github.com/openbmc/phosphor-ipmi-ethstats" -PR = "r1" -PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -inherit autotools pkgconfig -inherit obmc-phosphor-ipmiprovider-symlink - DEPENDS += "autoconf-archive-native" DEPENDS += "phosphor-ipmi-host" +SRCREV = "c8894c55f5d58862f266aebedc43e2652f529a41" +PV = "0.1+git${SRCPV}" +PR = "r1" -S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-ethstats;branch=master;protocol=https" -SRCREV = "c8894c55f5d58862f266aebedc43e2652f529a41" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig +inherit obmc-phosphor-ipmiprovider-symlink + +EXTRA_OECONF += "--disable-tests" FILES:${PN}:append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" FILES:${PN}:append = " ${libdir}/host-ipmid/lib*${SOLIBS}" @@ -22,5 +24,3 @@ FILES:${PN}:append = " ${libdir}/net-ipmid/lib*${SOLIBS}" FILES:${PN}-dev:append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la" HOSTIPMI_PROVIDER_LIBRARY += "libethstatscmd.so" - -EXTRA_OECONF += "--disable-tests" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb index 8973eb2773..e88c8cf0e0 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb @@ -1,13 +1,8 @@ -HOMEPAGE = "http://github.com/openbmc/phosphor-ipmi-flash" SUMMARY = "Phosphor OEM IPMI In-band Firmware Update over BLOB" DESCRIPTION = "This package handles a series of OEM IPMI commands that implement the firmware update handler over the BLOB protocol." -PR = "r1" -PV = "1.0+git${SRCPV}" +HOMEPAGE = "http://github.com/openbmc/phosphor-ipmi-flash" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -inherit meson pkgconfig systemd - DEPENDS += " \ phosphor-ipmi-blobs \ phosphor-logging \ @@ -16,7 +11,7 @@ DEPENDS += " \ ipmi-blob-tool \ function2 \ " - +SRCREV = "a4216a593f339dd4ce96bc7ad316b1100b6ab7a2" PACKAGECONFIG ?= "cleanup-delete" PACKAGECONFIG[cleanup-delete] = "-Dcleanup-delete=enabled,-Dcleanup-delete=disabled" # If using static-layout, reboot-update is a good option to handle updating. @@ -24,12 +19,10 @@ PACKAGECONFIG[cleanup-delete] = "-Dcleanup-delete=enabled,-Dcleanup-delete=disab # Note that both reboot-update and update-status cannot be enabled at the same time. PACKAGECONFIG[reboot-update] = "-Dreboot-update=true,-Dreboot-update=false" PACKAGECONFIG[update-status] = "-Dupdate-status=true,-Dupdate-status=false" - # Default options for supporting various flash types: PACKAGECONFIG[static-bmc] = "-Dupdate-type=static-layout,-Dupdate-type=none" PACKAGECONFIG[ubitar-bmc] = "-Dupdate-type=tarball-ubi,-Dupdate-type=none" PACKAGECONFIG[host-bios] = "-Dhost-bios=true,-Dhost-bios=false" - # Hardware options to enable transmitting the data from the host. # Only one type of p2a or lpc can be enabled. PACKAGECONFIG[aspeed-p2a] = "-Dp2a-type=aspeed-p2a,,,,,aspeed-lpc nuvoton-lpc nuvoton-p2a-vga nuvoton-p2a-mbox" @@ -38,32 +31,26 @@ PACKAGECONFIG[nuvoton-lpc] = "-Dlpc-type=nuvoton-lpc,,,,,aspeed-p2a aspeed-lpc n PACKAGECONFIG[nuvoton-p2a-vga] = "-Dp2a-type=nuvoton-p2a-vga,,,,,aspeed-p2a aspeed-lpc nuvoton-lpc nuvoton-p2a-mbox" PACKAGECONFIG[nuvoton-p2a-mbox] = "-Dp2a-type=nuvoton-p2a-mbox,,,,,aspeed-p2a aspeed-lpc nuvoton-lpc nuvoton-p2a-vga" PACKAGECONFIG[net-bridge] = "-Dnet-bridge=true,-Dnet-bridge=false" +PV = "1.0+git${SRCPV}" +PR = "r1" -EXTRA_OEMESON = "-Dtests=disabled -Dhost-tool=disabled" - -# Set this variable in your recipe to set it instead of using MAPPED_ADDRESS directly. -IPMI_FLASH_BMC_ADDRESS ?= "0" -EXTRA_OEMESON:append = " -Dmapped-address=${IPMI_FLASH_BMC_ADDRESS}" - -S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-flash;branch=master;protocol=https" -SRCREV = "a4216a593f339dd4ce96bc7ad316b1100b6ab7a2" +S = "${WORKDIR}/git" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE:${PN} += " \ phosphor-ipmi-flash-bmc-prepare.target \ phosphor-ipmi-flash-bmc-verify.target \ phosphor-ipmi-flash-bmc-update.target \ " +SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'host-bios', '${HOST_BIOS_TARGETS}', '', d)}" -# If they enabled host-bios, add those three extra targets. -HOST_BIOS_TARGETS = " \ - phosphor-ipmi-flash-bios-prepare.target \ - phosphor-ipmi-flash-bios-verify.target \ - phosphor-ipmi-flash-bios-update.target \ -" +inherit meson pkgconfig systemd -SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'host-bios', '${HOST_BIOS_TARGETS}', '', d)}" +EXTRA_OEMESON = "-Dtests=disabled -Dhost-tool=disabled" +EXTRA_OEMESON:append = " -Dmapped-address=${IPMI_FLASH_BMC_ADDRESS}" + +do_configure[depends] += "virtual/kernel:do_shared_workdir" FILES:${PN}:append = " ${libdir}/ipmid-providers" FILES:${PN}:append = " ${libdir}/blob-ipmid" @@ -74,4 +61,11 @@ BLOBIPMI_PROVIDER_LIBRARY += "libversionblob.so" BLOBIPMI_PROVIDER_LIBRARY += "liblogblob.so" BLOBIPMI_PROVIDER_LIBRARY += "${@bb.utils.contains('PACKAGECONFIG', 'cleanup-delete', 'libfirmwarecleanupblob.so', '', d)}" -do_configure[depends] += "virtual/kernel:do_shared_workdir" +# Set this variable in your recipe to set it instead of using MAPPED_ADDRESS directly. +IPMI_FLASH_BMC_ADDRESS ?= "0" +# If they enabled host-bios, add those three extra targets. +HOST_BIOS_TARGETS = " \ + phosphor-ipmi-flash-bios-prepare.target \ + phosphor-ipmi-flash-bios-verify.target \ + phosphor-ipmi-flash-bios-update.target \ +" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-hostfw-config-example-native_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-hostfw-config-example-native_git.bb index afa5435789..70d3f02312 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-hostfw-config-example-native_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-hostfw-config-example-native_git.bb @@ -1,20 +1,18 @@ SUMMARY = "Sample hostfw inventory map for phosphor-ipmi-fru" -PR = "r1" +PROVIDES += "virtual/phosphor-ipmi-fru-hostfw-config" PV = "1.0+git${SRCPV}" +PR = "r1" + +S = "${WORKDIR}/git" inherit phosphor-ipmi-fru inherit native -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 } + +require phosphor-ipmi-fru.inc diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-example-native_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-example-native_git.bb index 08425c13a6..0fe5ca7afd 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-example-native_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-example-native_git.bb @@ -1,16 +1,13 @@ SUMMARY = "Sample inventory map for phosphor-ipmi-fru" -PR = "r1" +PROVIDES += "virtual/phosphor-ipmi-fru-inventory" PV = "1.0+git${SRCPV}" +PR = "r1" + +S = "${WORKDIR}/git" inherit phosphor-ipmi-fru inherit native -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 @@ -19,3 +16,5 @@ do_install() { install -d ${DEST} install scripts/example.yaml ${DEST}/config.yaml } + +require phosphor-ipmi-fru.inc diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-mrw-native_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-mrw-native_git.bb index 64bcbe3dd9..e4e169407d 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-mrw-native_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-inventory-mrw-native_git.bb @@ -1,30 +1,26 @@ SUMMARY = "Generate inventory map for phosphor-ipmi-fru from an MRW." -PR = "r1" -PV = "1.0+git${SRCPV}" - -inherit phosphor-ipmi-fru -inherit mrw-xml -inherit native - -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" +PV = "1.0+git${SRCPV}" +PR = "r1" S = "${WORKDIR}/git" -do_install() { +inherit phosphor-ipmi-fru +inherit mrw-xml +inherit native + +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 } + +require phosphor-ipmi-fru.inc diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bb index b89311501d..5a91a728fa 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bb @@ -3,17 +3,16 @@ 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" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit phosphor-ipmi-host -inherit native - 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" +PR = "r1" + +inherit phosphor-ipmi-host +inherit native do_install:append() { SRC=${config_datadir} diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw-native.bb index 8de3384ab5..182c206105 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw-native.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-mrw-native.bb @@ -1,27 +1,24 @@ SUMMARY = "FRU properties config for ipmi-fru-parser" -PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit phosphor-ipmi-fru -inherit mrw-xml -inherit native - -SRC_URI += "file://config.yaml" - DEPENDS += " \ mrw-native \ mrw-perl-tools-native \ " - PROVIDES += "virtual/phosphor-ipmi-fru-properties" +PR = "r1" + +SRC_URI += "file://config.yaml" S = "${WORKDIR}" +inherit phosphor-ipmi-fru +inherit mrw-xml +inherit native + do_install() { DEST=${D}${properties_datadir} install -d ${DEST} - ${bindir}/perl-native/perl \ ${bindir}/gen_fru_properties.pl \ -m ${mrw_datadir}/${MRW_XML} \ diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-native.bb index 2caf218cb9..60beb99db8 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-native.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-native.bb @@ -1,22 +1,20 @@ SUMMARY = "FRU properties config for ipmi-fru-parser" -PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit phosphor-ipmi-fru -inherit native +PROVIDES += "virtual/phosphor-ipmi-fru-properties" +PR = "r1" SRC_URI += "file://extra-properties.yaml" -PROVIDES += "virtual/phosphor-ipmi-fru-properties" - S = "${WORKDIR}" +inherit phosphor-ipmi-fru +inherit native + 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/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bb index bb1addd087..c0bfa9fc1d 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bb @@ -1,20 +1,18 @@ SUMMARY = "BMC accesible FRU inventory map for phosphor-ipmi-host" -PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit phosphor-ipmi-host -inherit native +PROVIDES += "virtual/phosphor-ipmi-fru-read-bmc-inventory" +PR = "r1" SRC_URI += "file://bmc-fru-config.yaml" S = "${WORKDIR}" -PROVIDES += "virtual/phosphor-ipmi-fru-read-bmc-inventory" +inherit phosphor-ipmi-host +inherit native 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/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-example-native_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-example-native_git.bb index e205200052..0b6253aff8 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-example-native_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-example-native_git.bb @@ -1,18 +1,17 @@ SUMMARY = "Sample inventory map for phosphor-ipmi-host" -PR = "r1" +PROVIDES += "virtual/phosphor-ipmi-fru-read-inventory" PV = "1.0+git${SRCPV}" +PR = "r1" + +S = "${WORKDIR}/git" inherit phosphor-ipmi-host inherit native -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 } + +require phosphor-ipmi-host.inc diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-mrw-native_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-mrw-native_git.bb index 7a143a4171..a18a7a713a 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-mrw-native_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-inventory-mrw-native_git.bb @@ -1,28 +1,24 @@ SUMMARY = "Generate inventory map for phosphor-ipmi-host from a MRW." -PR = "r1" -PV = "1.0+git${SRCPV}" - -inherit phosphor-ipmi-host -inherit mrw-xml -inherit native - -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" +PV = "1.0+git${SRCPV}" +PR = "r1" S = "${WORKDIR}/git" -do_install() { +inherit phosphor-ipmi-host +inherit mrw-xml +inherit native +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 } + +require phosphor-ipmi-host.inc diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bb index e87b8dfd0a..124aac3cff 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bb @@ -1,20 +1,18 @@ SUMMARY = "The inventory map of frus not sent by host for phosphor-ipmi-host" -PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit phosphor-ipmi-host -inherit native +PROVIDES += "virtual/phosphor-ipmi-fru-read-not-sent-by-host-inventory" +PR = "r1" SRC_URI += "file://fru-config-not-sent-by-host.yaml" S = "${WORKDIR}" -PROVIDES += "virtual/phosphor-ipmi-fru-read-not-sent-by-host-inventory" +inherit phosphor-ipmi-host +inherit native 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/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb index c91fb7bd82..7ac14d0df1 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb @@ -1,16 +1,5 @@ SUMMARY = "Phosphor IPMI Inventory Plugin" DESCRIPTION = "A Phosphor IPMI plugin that updates inventory." -PR = "r1" -PV = "1.0+git${SRCPV}" - -inherit autotools pkgconfig -inherit obmc-phosphor-systemd -inherit obmc-phosphor-ipmiprovider-symlink -inherit phosphor-ipmi-fru -inherit python3native - -require ${BPN}.inc - DEPENDS += " \ virtual/phosphor-ipmi-fru-inventory \ virtual/phosphor-ipmi-fru-properties \ @@ -24,21 +13,19 @@ DEPENDS += " \ phosphor-logging \ cli11 \ " - -RDEPENDS:${PN} += "bash" +PV = "1.0+git${SRCPV}" +PR = "r1" SRC_URI += "file://of-name-to-eeprom.sh" SYSTEMD_SERVICE:${PN} += "obmc-read-eeprom@.service" - S = "${WORKDIR}/git" -HOSTIPMI_PROVIDER_LIBRARY += "libstrgfnhandler.so" - -FILES:${PN} += "${bindir}/of-name-to-eeprom.sh" -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" +inherit autotools pkgconfig +inherit obmc-phosphor-systemd +inherit obmc-phosphor-ipmiprovider-symlink +inherit phosphor-ipmi-fru +inherit python3native EXTRA_OECONF = " \ YAML_GEN=${STAGING_DIR_NATIVE}${config_datadir}/config.yaml \ @@ -49,3 +36,14 @@ do_install:append() { install -d ${D}${bindir} install -m 0755 ${WORKDIR}/of-name-to-eeprom.sh ${D}${bindir} } + +RDEPENDS:${PN} += "bash" + +FILES:${PN} += "${bindir}/of-name-to-eeprom.sh" +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" + +require ${BPN}.inc + +HOSTIPMI_PROVIDER_LIBRARY += "libstrgfnhandler.so" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-mrw-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-mrw-native.bb index 8199cbf341..70b60f1f9a 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-mrw-native.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-mrw-native.bb @@ -1,27 +1,24 @@ SUMMARY = "Inventory to Sensor config for phosphor-host-ipmi" -PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit phosphor-ipmi-host -inherit mrw-xml -inherit native - -SRC_URI += "file://config.yaml" - DEPENDS += " \ mrw-native \ mrw-perl-tools-native \ " - PROVIDES += "virtual/phosphor-ipmi-inventory-sel" +PR = "r1" + +SRC_URI += "file://config.yaml" S = "${WORKDIR}" +inherit phosphor-ipmi-host +inherit mrw-xml +inherit native + do_install() { DEST=${D}${sensor_datadir} install -d ${DEST} - ${bindir}/perl-native/perl \ ${bindir}/gen_ipmi_sel.pl \ -i ${mrw_datadir}/${MRW_XML} \ diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-native.bb index 4deaf0de17..08ae17d7e2 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-native.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-inventory-sel-native.bb @@ -1,21 +1,19 @@ SUMMARY = "Inventory to Sensor config for non-mrw machines" -PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit phosphor-ipmi-host -inherit native - PROVIDES += "virtual/phosphor-ipmi-inventory-sel" +PR = "r1" SRC_URI += "file://config.yaml" S = "${WORKDIR}" +inherit phosphor-ipmi-host +inherit native + 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/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb index bd4d013e8b..16315e676e 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb @@ -1,22 +1,21 @@ SUMMARY = "IPMB bridge" DESCRIPTION = "The IPMB bridge implements a Dbus compliant interface for \ implementing IPMB interfaces" - -SRC_URI = "git://github.com/openbmc/ipmbbridge.git;branch=master;protocol=https" -SRCREV = "8978a5a81cddfa86423cd2a0c2a8154858df0151" -PV = "0.1+git${SRCPV}" - LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" - -SYSTEMD_SERVICE:${PN} = "ipmb.service" - DEPENDS = "sdbusplus \ phosphor-logging \ i2c-tools \ boost \ nlohmann-json" +SRCREV = "8978a5a81cddfa86423cd2a0c2a8154858df0151" +PV = "0.1+git${SRCPV}" + +SRC_URI = "git://github.com/openbmc/ipmbbridge.git;branch=master;protocol=https" +SYSTEMD_SERVICE:${PN} = "ipmb.service" S = "${WORKDIR}/git" -inherit cmake pkgconfig systemd + +inherit cmake pkgconfig systemd + FILES:${PN} += "/usr/share/ipmbbridge/ipmb-channels.json" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb index 5aba357915..291cc8a61d 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb @@ -1,24 +1,7 @@ SUMMARY = "Phosphor OpenBMC KCS to DBUS" DESCRIPTION = "Phosphor OpenBMC KCS to DBUS." -PR = "r1" - LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=b1beb00e508e89da1ed2a541934f28c0" - -inherit meson pkgconfig -inherit systemd - -PV = "1.0+git${SRCPV}" - -KCS_DEVICE ?= "ipmi-kcs3" - -SYSTEMD_SERVICE:${PN} = "${PN}@${KCS_DEVICE}.service" -FILES:${PN} += "${systemd_system_unitdir}/${PN}@.service" - -PROVIDES += "virtual/obmc-host-ipmi-hw" -RPROVIDES:${PN} += "virtual-obmc-host-ipmi-hw" -RRECOMMENDS:${PN} += "phosphor-ipmi-host" - DEPENDS += " \ fmt \ sdbusplus \ @@ -26,7 +9,23 @@ DEPENDS += " \ stdplus \ systemd \ " +PROVIDES += "virtual/obmc-host-ipmi-hw" +SRCREV = "bc7bf463229b69bb2346cc66f1e4b9f65f5374bd" +PV = "1.0+git${SRCPV}" +PR = "r1" -S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/kcsbridge.git;branch=master;protocol=https" -SRCREV = "bc7bf463229b69bb2346cc66f1e4b9f65f5374bd" + +SYSTEMD_SERVICE:${PN} = "${PN}@${KCS_DEVICE}.service" +S = "${WORKDIR}/git" + +inherit meson pkgconfig +inherit systemd + +RRECOMMENDS:${PN} += "phosphor-ipmi-host" + +RPROVIDES:${PN} += "virtual-obmc-host-ipmi-hw" + +FILES:${PN} += "${systemd_system_unitdir}/${PN}@.service" + +KCS_DEVICE ?= "ipmi-kcs3" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb index b23efbea80..2a63b8737e 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb @@ -1,30 +1,45 @@ +# To add another RMCPP interface, add similar lines to the +# following lines in a bbappend: +# +# ALT_RMCPP_IFACE = "eth1" +# SYSTEMD_SERVICE:${PN} += " \ +# ${PN}@${ALT_RMCPP_IFACE}.service \ +# ${PN}@${ALT_RMCPP_IFACE}.socket \ +# " +# Also, be sure to enable a corresponding entry in the channel +# config file with the same 'name' as the interfaces above +# Override the default phosphor-ipmi-config.bb with a bbappend SUMMARY = "Phosphor Network IPMI Daemon" DESCRIPTION = "Daemon to support IPMI protocol over network" HOMEPAGE = "https://github.com/openbmc/phosphor-net-ipmid" -PR = "r1" -PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" - -inherit meson pkgconfig -inherit systemd - DEPENDS += "cli11" DEPENDS += "phosphor-mapper" DEPENDS += "systemd" DEPENDS += "phosphor-ipmi-host" - -RRECOMMENDS:${PN} = "pam-ipmi" +SRCREV = "67aaec2e06ff9c2bfd5900b9f07834fca9d009f2" +PV = "1.0+git${SRCPV}" +PR = "r1" SRC_URI += "git://github.com/openbmc/phosphor-net-ipmid;branch=master;protocol=https" -SRCREV = "67aaec2e06ff9c2bfd5900b9f07834fca9d009f2" S = "${WORKDIR}/git" +# install parameterized service and socket files +SYSTEMD_SERVICE:${PN} = " \ + ${PN}@${RMCPP_IFACE}.service \ + ${PN}@${RMCPP_IFACE}.socket \ + " + +inherit meson pkgconfig +inherit systemd EXTRA_OEMESON = " \ -Dtests=disabled \ " +RRECOMMENDS:${PN} = "pam-ipmi" + FILES:${PN} += " \ ${systemd_system_unitdir}/${PN}@.service \ ${systemd_system_unitdir}/${PN}@.socket \ @@ -33,23 +48,3 @@ FILES:${PN} += " \ # If RMCPP_IFACE is not set by bbappend, set it to default DEFAULT_RMCPP_IFACE = "eth0" RMCPP_IFACE ?= "${DEFAULT_RMCPP_IFACE}" - -# install parameterized service and socket files -SYSTEMD_SERVICE:${PN} = " \ - ${PN}@${RMCPP_IFACE}.service \ - ${PN}@${RMCPP_IFACE}.socket \ - " - -# To add another RMCPP interface, add similar lines to the -# following lines in a bbappend: -# -# ALT_RMCPP_IFACE = "eth1" -# SYSTEMD_SERVICE:${PN} += " \ -# ${PN}@${ALT_RMCPP_IFACE}.service \ -# ${PN}@${ALT_RMCPP_IFACE}.socket \ -# " - -# Also, be sure to enable a corresponding entry in the channel -# config file with the same 'name' as the interfaces above -# Override the default phosphor-ipmi-config.bb with a bbappend - diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bb index 19c03fb794..3909a2f904 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bb @@ -1,10 +1,9 @@ SUMMARY = "OpenBMC - IPMI sensors" -PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" +DEPENDS:append = " ${OBMC_IPMI_SENSORS_PROVIDERS} " +PR = "r1" inherit native OBMC_IPMI_SENSORS_PROVIDERS = "phosphor-ipmi-sensor-inventory-mrw-config-native" - -DEPENDS:append = " ${OBMC_IPMI_SENSORS_PROVIDERS} " diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config-native.bb index 45604ced4f..a762a52c2a 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config-native.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config-native.bb @@ -1,18 +1,17 @@ SUMMARY = "sensor config for phosphor-host-ipmid" -PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit phosphor-ipmi-host -inherit native +PR = "r1" SRC_URI += "file://config.yaml" S = "${WORKDIR}" +inherit phosphor-ipmi-host +inherit native + do_install() { DEST=${D}${sensor_yamldir} install -d ${DEST} install config.yaml ${DEST}/config.yaml } - diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-native.bb index 923227971d..c83760c9b3 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-native.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-native.bb @@ -1,22 +1,20 @@ SUMMARY = "Sensor config for phosphor-host-ipmi" -PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit phosphor-ipmi-host -inherit native - PROVIDES += "virtual/phosphor-ipmi-sensor-inventory" +PR = "r1" SRC_URI += "file://config.yaml" S = "${WORKDIR}" +inherit phosphor-ipmi-host +inherit native + 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/recipes-phosphor/ipmi/phosphor-ipmi-ssif_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif_git.bb index 7dd27f7526..46a753c6b8 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif_git.bb @@ -1,25 +1,24 @@ SUMMARY = "Phosphor OpenBMC SSIF to DBUS" DESCRIPTION = "Phosphor OpenBMC SSIF to DBUS." -PR = "r1" -PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit meson pkgconfig -inherit systemd - -SYSTEMD_SERVICE:${PN} = "ssifbridge.service" - -PROVIDES += "virtual/obmc-host-ipmi-hw" -RPROVIDES:${PN} += "virtual-obmc-host-ipmi-hw" -RRECOMMENDS:${PN} += "phosphor-ipmi-host" - DEPENDS += "systemd" DEPENDS += "phosphor-logging" DEPENDS += "sdbusplus" DEPENDS += "cli11" +PROVIDES += "virtual/obmc-host-ipmi-hw" +SRCREV = "88cdf7d12a0e4a8377e5ec664bd60a456cbbb5f3" +PV = "1.0+git${SRCPV}" +PR = "r1" -S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/ssifbridge.git;protocol=https;branch=master" -SRCREV= "88cdf7d12a0e4a8377e5ec664bd60a456cbbb5f3" +SYSTEMD_SERVICE:${PN} = "ssifbridge.service" +S = "${WORKDIR}/git" + +inherit meson pkgconfig +inherit systemd + +RRECOMMENDS:${PN} += "phosphor-ipmi-host" + +RPROVIDES:${PN} += "virtual-obmc-host-ipmi-hw" diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-config-example-native_git.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-config-example-native_git.bb index 343a6e089b..4f85763b8a 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-config-example-native_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-config-example-native_git.bb @@ -1,17 +1,17 @@ SUMMARY = "Phosphor LED Group Management with example data" -PR = "r1" -PV = "1.0+git${SRCPV}" - -inherit native -require phosphor-led-manager.inc - PROVIDES += "virtual/phosphor-led-manager-config-native" +PV = "1.0+git${SRCPV}" +PR = "r1" S = "${WORKDIR}/git" +inherit native + # Copies example led layout yaml file do_install() { SRC=${S} DEST=${D}${datadir}/phosphor-led-manager install -D ${SRC}/led.yaml ${DEST}/led.yaml } + +require phosphor-led-manager.inc diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-config-mrw-native.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-config-mrw-native.bb index c4724f2e7d..f1082be0df 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-config-mrw-native.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-config-mrw-native.bb @@ -1,19 +1,17 @@ SUMMARY = "Phosphor LED Group Management with MRW generated data" -PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" +DEPENDS += "mrw-native mrw-perl-tools-native" +PROVIDES += "virtual/phosphor-led-manager-config-native" +PR = "r1" inherit mrw-xml inherit native -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="${@bb.utils.contains('DISTRO_FEATURES', 'obmc-mrw', 'yes', 'no', d)}" DEST=${D}${datadir}/phosphor-led-manager - if [ "${USE_MRW}" = "yes" ]; then install -d ${DEST}/ ${STAGING_BINDIR_NATIVE}/perl-native/perl \ diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-error-native_git.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-error-native_git.bb index 0e1baadefb..0eca2ab4e1 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-error-native_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-error-native_git.bb @@ -1,16 +1,14 @@ SUMMARY = "Copy error yaml files to known path for elog parsing" -PR = "r1" -PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" +PV = "1.0+git${SRCPV}" +PR = "r1" + +S = "${WORKDIR}/git" inherit phosphor-dbus-yaml inherit native -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/ @@ -20,3 +18,5 @@ do_install:append() { install ${SRC}/Fru/*.errors.yaml ${DEST}/Fru install ${SRC}/Fru/*.metadata.yaml ${DEST}/Fru } + +require phosphor-led-manager.inc diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-yaml-provider_git.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-yaml-provider_git.bb index 8c009fce38..de6bf7f2bf 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-yaml-provider_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-yaml-provider_git.bb @@ -1,10 +1,11 @@ SUMMARY = "phosphor-led-manager: install phosphor-logging yaml" -PR = "r1" -PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" +PV = "1.0+git${SRCPV}" +PR = "r1" + +S = "${WORKDIR}/git" inherit phosphor-logging-yaml-provider -require phosphor-led-manager.inc -S = "${WORKDIR}/git" +require phosphor-led-manager.inc diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb index b2cf9f7ab4..e32711ef79 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb @@ -1,68 +1,41 @@ SUMMARY = "Phosphor LED Group Management Daemon" DESCRIPTION = "Daemon to cater to triggering actions on LED groups" -PR = "r1" -PV = "1.0+git${SRCPV}" - -require ${PN}.inc - -inherit meson pkgconfig python3native -inherit obmc-phosphor-dbus-service obmc-phosphor-systemd - +DEPENDS += "${PYTHON_PN}-native" +DEPENDS += "${PYTHON_PN}-pyyaml-native" +DEPENDS += "${PYTHON_PN}-inflection-native" +DEPENDS += "cli11" +DEPENDS += "nlohmann-json" +DEPENDS += "phosphor-logging" +DEPENDS += "sdbusplus ${PYTHON_PN}-sdbus++-native" +DEPENDS += "systemd" PACKAGECONFIG ??= "\ ${@oe.utils.conditional( \ 'PREFERRED_PROVIDER_virtual/${PN}-config-native', \ 'phosphor-led-manager-config-example-native', \ 'use-json', 'use-yaml', d)} \ " - PACKAGECONFIG[use-json] = "-Duse-json=enabled,,,,,use-yaml" PACKAGECONFIG[use-yaml] = "-Duse-json=disabled,,virtual/${PN}-config-native,,,use-json" PACKAGECONFIG[use-lamp-test] = "-Duse-lamp-test=enabled, -Duse-lamp-test=disabled" PACKAGECONFIG[monitor-operational-status] = "-Dmonitor-operational-status=enabled, \ -Dmonitor-operational-status=disabled" +PV = "1.0+git${SRCPV}" +PR = "r1" SYSTEMD_PACKAGES = "${PN} ${PN}-faultmonitor" -PACKAGE_BEFORE_PN += "${PN}-faultmonitor" - -DEPENDS += "${PYTHON_PN}-native" -DEPENDS += "${PYTHON_PN}-pyyaml-native" -DEPENDS += "${PYTHON_PN}-inflection-native" -DEPENDS += "cli11" -DEPENDS += "nlohmann-json" -DEPENDS += "phosphor-logging" -DEPENDS += "sdbusplus ${PYTHON_PN}-sdbus++-native" -DEPENDS += "systemd" - -RDEPENDS:${PN} += "bash" - S = "${WORKDIR}/git" - -FILES:${PN}-faultmonitor += "${bindir}/phosphor-fru-fault-monitor" - -DBUS_SERVICE:${PN} += "xyz.openbmc_project.LED.GroupManager.service" - SYSTEMD_SERVICE:${PN} += "obmc-led-group-start@.service obmc-led-group-stop@.service" SYSTEMD_SERVICE:${PN}-faultmonitor += "obmc-fru-fault-monitor.service" - SYSTEMD_LINK:${PN} += "../obmc-led-group-start@.service:multi-user.target.wants/obmc-led-group-start@bmc_booted.service" - -CHASSIS_TARGETS = "poweron poweroff" STATES = "start stop" -TMPLFMT = "obmc-led-group-{1}@.service" -TGTFMT = "obmc-chassis-{0}@0.target" -INSTFMT = "obmc-led-group-{1}@power_on.service" -FMT = "../${TMPLFMT}:${TGTFMT}.wants/${INSTFMT}" SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'FMT', 'CHASSIS_TARGETS', 'STATES')}" - -CHASSIS_BLACKOUT_TGT = "obmc-chassis-blackout@{0}.target" -LED_STOP_SVC = "obmc-led-group-stop@.service" -LED_POWER_STOP_SVC = "obmc-led-group-stop@power_on.service" -CHASSIS_LED_BLACKOUT_FMT = "../${LED_STOP_SVC}:${CHASSIS_BLACKOUT_TGT}.wants/${LED_POWER_STOP_SVC}" SYSTEMD_LINK:${PN} += "${@compose_list(d, 'CHASSIS_LED_BLACKOUT_FMT', 'OBMC_CHASSIS_INSTANCES' )}" - # Install the override to set up a Conflicts relation SYSTEMD_OVERRIDE:${PN} += "bmc_booted.conf:obmc-led-group-start@bmc_booted.service.d/bmc_booted.conf" +inherit meson pkgconfig python3native +inherit obmc-phosphor-dbus-service obmc-phosphor-systemd + EXTRA_OEMESON:append = " -Dtests=disabled" do_compile:prepend() { @@ -74,3 +47,21 @@ do_compile:prepend() { cp "${WORKDIR}/led.yaml" "${S}/led.yaml" fi } + +RDEPENDS:${PN} += "bash" + +FILES:${PN}-faultmonitor += "${bindir}/phosphor-fru-fault-monitor" + +require ${PN}.inc + +PACKAGE_BEFORE_PN += "${PN}-faultmonitor" +DBUS_SERVICE:${PN} += "xyz.openbmc_project.LED.GroupManager.service" +CHASSIS_TARGETS = "poweron poweroff" +TMPLFMT = "obmc-led-group-{1}@.service" +TGTFMT = "obmc-chassis-{0}@0.target" +INSTFMT = "obmc-led-group-{1}@power_on.service" +FMT = "../${TMPLFMT}:${TGTFMT}.wants/${INSTFMT}" +CHASSIS_BLACKOUT_TGT = "obmc-chassis-blackout@{0}.target" +LED_STOP_SVC = "obmc-led-group-stop@.service" +LED_POWER_STOP_SVC = "obmc-led-group-stop@power_on.service" +CHASSIS_LED_BLACKOUT_FMT = "../${LED_STOP_SVC}:${CHASSIS_BLACKOUT_TGT}.wants/${LED_POWER_STOP_SVC}" diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb index 43816efe80..46bfcbd11d 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb @@ -1,29 +1,29 @@ 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" -PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" - -inherit meson pkgconfig -inherit obmc-phosphor-dbus-service - DEPENDS += "sdbusplus" DEPENDS += "systemd" DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "boost" - -DBUS_SERVICE:${PN} += "xyz.openbmc_project.led.controller@.service" - -EXTRA_OEMESON:append = " -Dtests=disabled" +SRCREV = "02f366d68bb9752e6de04db0efc8eb885b19b219" +PV = "1.0+git${SRCPV}" +PR = "r1" SRC_URI += "git://github.com/openbmc/phosphor-led-sysfs;branch=master;protocol=https" SRC_URI += "file://70-leds.rules" -SRCREV = "02f366d68bb9752e6de04db0efc8eb885b19b219" + S = "${WORKDIR}/git" +inherit meson pkgconfig +inherit obmc-phosphor-dbus-service + +EXTRA_OEMESON:append = " -Dtests=disabled" + do_install:append() { install -d ${D}/${nonarch_base_libdir}/udev/rules.d/ install -m 0644 ${WORKDIR}/70-leds.rules ${D}/${nonarch_base_libdir}/udev/rules.d/ } + +DBUS_SERVICE:${PN} += "xyz.openbmc_project.led.controller@.service" diff --git a/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb b/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb index 8183d08afa..909c486c08 100644 --- a/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb +++ b/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb @@ -1,38 +1,34 @@ SUMMARY = "MCTP stack" DESCRIPTION = "MCTP library implementing the MCTP base specification" -PR = "r1" -PV = "1.0+git${SRCPV}" - -inherit systemd -inherit autotools pkgconfig - HOMEPAGE = "https://github.com/openbmc/libmctp" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=0d30807bb7a4f16d36e96b78f9ed8fae" -SRC_URI = "git://github.com/openbmc/libmctp;branch=master;protocol=https \ - file://default" -SRCREV = "fe763e9820668b90c22b0101994ac6bd6cd41c09" - DEPENDS += "autoconf-archive-native \ systemd \ " - -SYSTEMD_SERVICE:${PN} = "mctp-demux.service \ - mctp-demux.socket \ - " - +SRCREV = "fe763e9820668b90c22b0101994ac6bd6cd41c09" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} pcap" PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}, \ --without-systemdsystemunitdir,systemd" - PACKAGECONFIG[astlpc-raw-kcs] = "--enable-astlpc-raw-kcs,--disable-astlpc-raw-kcs,udev,udev" PACKAGECONFIG[pcap] = "--enable-capture,--disable-capture,libpcap," +PV = "1.0+git${SRCPV}" +PR = "r1" -CONFFILES:${PN} = "${sysconfdir}/default/mctp" +SRC_URI = "git://github.com/openbmc/libmctp;branch=master;protocol=https \ + file://default" + +SYSTEMD_SERVICE:${PN} = "mctp-demux.service \ + mctp-demux.socket \ + " +S = "${WORKDIR}/git" + +inherit systemd +inherit autotools pkgconfig do_install:append() { - install -d ${D}${sysconfdir}/default - install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/mctp + install -d ${D}${sysconfdir}/default + install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/mctp } -S = "${WORKDIR}/git" +CONFFILES:${PN} = "${sysconfdir}/default/mctp" diff --git a/meta-phosphor/recipes-phosphor/logging/bios-bmc-smm-error-logger_git.bb b/meta-phosphor/recipes-phosphor/logging/bios-bmc-smm-error-logger_git.bb index e1a2f459e8..139fd0faa9 100644 --- a/meta-phosphor/recipes-phosphor/logging/bios-bmc-smm-error-logger_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/bios-bmc-smm-error-logger_git.bb @@ -1,11 +1,7 @@ SUMMARY = "BIOS BMC SMM Error Logger" DESCRIPTION = "Allows BIOS in SMM to log errors to the BMC" -PR = "r1" -PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -inherit meson pkgconfig systemd - DEPENDS += " \ boost \ fmt \ @@ -16,14 +12,17 @@ DEPENDS += " \ sdbusplus \ phosphor-dbus-interfaces \ " +SRCREV = "3def3c8eede08d82e709333445bc543ef4861bcd" +PV = "0.1+git${SRCPV}" +PR = "r1" -EXTRA_OEMESON = " \ - -Dtests=disabled \ -" +SRC_URI = "git://github.com/openbmc/bios-bmc-smm-error-logger;branch=main;protocol=https" S = "${WORKDIR}/git" +SYSTEMD_SERVICE:${PN} += "xyz.openbmc_project.bios_bmc_smm_error_logger.service" -SRC_URI = "git://github.com/openbmc/bios-bmc-smm-error-logger;branch=main;protocol=https" -SRCREV = "3def3c8eede08d82e709333445bc543ef4861bcd" +inherit meson pkgconfig systemd -SYSTEMD_SERVICE:${PN} += "xyz.openbmc_project.bios_bmc_smm_error_logger.service" +EXTRA_OEMESON = " \ + -Dtests=disabled \ +" diff --git a/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb b/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb index 3b05b9e022..b87dbcc5e1 100644 --- a/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb @@ -1,15 +1,8 @@ SUMMARY = "FFDC collector script" DESCRIPTION = "Command line tool to collect and tar up debug data" -PR = "r1" -PV = "1.0+git${SRCPV}" - -require recipes-phosphor/dump/phosphor-debug-collector.inc - DEPENDS += "systemd" - -RDEPENDS:${PN} += " \ - ${VIRTUAL-RUNTIME_base-utils} \ - " +PV = "1.0+git${SRCPV}" +PR = "r1" S = "${WORKDIR}/git" @@ -18,3 +11,9 @@ do_install() { install -m 0755 ffdc \ ${D}${bindir}/ffdc } + +RDEPENDS:${PN} += " \ + ${VIRTUAL-RUNTIME_base-utils} \ + " + +require recipes-phosphor/dump/phosphor-debug-collector.inc diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb index e574682afc..4da5b49f7a 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb @@ -1,60 +1,55 @@ SUMMARY = "Phosphor Host logger" DESCRIPTION = "Save log messages from host's console to the persistent storage." HOMEPAGE = "https://github.com/openbmc/phosphor-hostlogger" -PR = "r1" -PV = "1.0+git${SRCPV}" - -inherit pkgconfig meson -inherit systemd - # License info LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" - # Dependencies DEPENDS += " \ phosphor-logging \ zlib \ " -RDEPENDS:${PN} += "obmc-console" -RRECOMMENDS:${PN} += "phosphor-debug-collector" +SRCREV = "d68863396c608912a820926d8d98d92499f49ac2" +PV = "1.0+git${SRCPV}" +PR = "r1" + +SRC_URI = "git://github.com/openbmc/phosphor-hostlogger;branch=master;protocol=https" # Source code repository S = "${WORKDIR}/git" -SRC_URI = "git://github.com/openbmc/phosphor-hostlogger;branch=master;protocol=https" -SRCREV = "d68863396c608912a820926d8d98d92499f49ac2" +# Systemd service template +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE:${PN} = "hostlogger@.service" +# Preset systemd units +SYSTEMD_SERVICE:${PN} += "${@'${CUSTOM_SERVICES}' if len('${CUSTOM_SERVICES}') \ + else '${DEFAULT_SERVICE}'}" + +inherit pkgconfig meson +inherit systemd # Disable unit tests EXTRA_OEMESON:append = " -Dtests=disabled" -# Systemd service template -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE:${PN} = "hostlogger@.service" +RDEPENDS:${PN} += "obmc-console" + +RRECOMMENDS:${PN} += "phosphor-debug-collector" # Default service instance to install (single-host mode) DEFAULT_INSTANCE = "ttyVUART0" DEFAULT_SERVICE = "hostlogger@${DEFAULT_INSTANCE}.service" - # Multi-host mode setup - list of configuration files to install, can be added # via SRC_URI in a bbappend. The file name is the name of the service instance, # which should match the corresponding instance of the obmc-console service. CUSTOM_CONFIGS = "${@custom_configs('${WORKDIR}')}" CUSTOM_SERVICES = "${@custom_services('${CUSTOM_CONFIGS}')}" - -# Preset systemd units -SYSTEMD_SERVICE:${PN} += "${@'${CUSTOM_SERVICES}' if len('${CUSTOM_SERVICES}') \ - else '${DEFAULT_SERVICE}'}" - # Gets list of custom config files in a directory def custom_configs(workdir): if os.path.exists(workdir): return ' '.join([f for f in os.listdir(workdir) if f.endswith('.conf')]) - # Get list of custom service instances def custom_services(configs): return ' '.join(['hostlogger@' + i.replace('.conf', '.service') \ for i in configs.split()]) - do_install:append() { # Install config files if [ -n "${CUSTOM_CONFIGS}" ]; then diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-example-native.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-example-native.bb index 88baca5b03..bffa543201 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-example-native.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-example-native.bb @@ -1,17 +1,16 @@ SUMMARY = "Generated callout information for phosphor-logging" -PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit phosphor-logging -inherit native +PROVIDES += "virtual/phosphor-logging-callouts" +PR = "r1" SRC_URI += "file://callouts.yaml" -PROVIDES += "virtual/phosphor-logging-callouts" - S = "${WORKDIR}" +inherit phosphor-logging +inherit native + do_install() { DEST=${D}${callouts_datadir} install -d ${DEST} diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-mrw-native.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-mrw-native.bb index 6bb86915eb..e76e9e7b3b 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-mrw-native.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging-callouts-mrw-native.bb @@ -1,25 +1,22 @@ SUMMARY = "Generated callout information for phosphor-logging" -PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit phosphor-logging -inherit mrw-xml -inherit native - DEPENDS += " \ mrw-native \ mrw-perl-tools-native \ " - PROVIDES += "virtual/phosphor-logging-callouts" +PR = "r1" S = "${WORKDIR}" +inherit phosphor-logging +inherit mrw-xml +inherit native + do_install() { DEST=${D}${callouts_datadir} install -d ${DEST} - ${bindir}/perl-native/perl \ ${bindir}/gen_callouts.pl \ -m ${mrw_datadir}/${MRW_XML} \ diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index df482e68de..ac83d33102 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -2,17 +2,8 @@ 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" -PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" - -inherit pkgconfig meson -inherit python3native -inherit obmc-phosphor-dbus-service -inherit phosphor-logging -inherit phosphor-dbus-yaml - DEPENDS += "systemd" DEPENDS += "${PYTHON_PN}-mako-native" DEPENDS += "${PYTHON_PN}-pyyaml-native" @@ -24,51 +15,56 @@ DEPENDS += "virtual/phosphor-logging-callouts" DEPENDS += "libcereal" DEPENDS += "sdeventplus" DEPENDS += "packagegroup-obmc-yaml-providers" +SRCREV = "f2131442a3dd9ccb44aad106aa6f4c14e3c051ba" +PACKAGECONFIG ??= "" +PACKAGECONFIG[openpower-pels] = " \ + -Dopenpower-pel-extension=enabled, \ + -Dopenpower-pel-extension=disabled, \ + nlohmann-json cli11 pldm python3, \ + python3, \ + " +PV = "1.0+git${SRCPV}" +PR = "r1" -PACKAGE_BEFORE_PN = "${PN}-test" -FILES:${PN}-test = "${bindir}/*-test" - -# Package configuration -LOGGING_PACKAGES = " \ - ${PN}-base \ - phosphor-rsyslog-config \ -" +SRC_URI += "git://github.com/openbmc/phosphor-logging;branch=master;protocol=https" -ALLOW_EMPTY:${PN} = "1" -PACKAGE_BEFORE_PN += "${LOGGING_PACKAGES}" SYSTEMD_PACKAGES = "${LOGGING_PACKAGES}" -DBUS_PACKAGES = "${LOGGING_PACKAGES}" -USERADD_PACKAGES = "${PN}-base" -GROUPADD_PARAM:${PN}-base = "-r phosphor-logging" +S = "${WORKDIR}/git" + +inherit pkgconfig meson +inherit python3native +inherit obmc-phosphor-dbus-service +inherit phosphor-logging +inherit phosphor-dbus-yaml +EXTRA_OEMESON = " \ + -Dtests=disabled \ + -Dyamldir=${STAGING_DIR_TARGET}${yaml_dir} \ + -Dcallout_yaml=${STAGING_DIR_NATIVE}${callouts_datadir}/callouts.yaml \ + " + +FILES:${PN}-test = "${bindir}/*-test" FILES:${PN}-base += " \ ${datadir}/dbus-1 \ ${bindir}/phosphor-log-manager \ ${libdir}/libphosphor_logging.so.* \ " -DBUS_SERVICE:${PN}-base += "xyz.openbmc_project.Logging.service" - -DBUS_SERVICE:phosphor-rsyslog-config += "xyz.openbmc_project.Syslog.Config.service" FILES:phosphor-rsyslog-config += " \ ${bindir}/phosphor-rsyslog-conf \ " -SRC_URI += "git://github.com/openbmc/phosphor-logging;branch=master;protocol=https" -SRCREV = "f2131442a3dd9ccb44aad106aa6f4c14e3c051ba" - -S = "${WORKDIR}/git" - -PACKAGECONFIG ??= "" +ALLOW_EMPTY:${PN} = "1" -PACKAGECONFIG[openpower-pels] = " \ - -Dopenpower-pel-extension=enabled, \ - -Dopenpower-pel-extension=disabled, \ - nlohmann-json cli11 pldm python3, \ - python3, \ - " +USERADD_PACKAGES = "${PN}-base" -EXTRA_OEMESON = " \ - -Dtests=disabled \ - -Dyamldir=${STAGING_DIR_TARGET}${yaml_dir} \ - -Dcallout_yaml=${STAGING_DIR_NATIVE}${callouts_datadir}/callouts.yaml \ - " +PACKAGE_BEFORE_PN = "${PN}-test" +# Package configuration +LOGGING_PACKAGES = " \ + ${PN}-base \ + phosphor-rsyslog-config \ +" +PACKAGE_BEFORE_PN += "${LOGGING_PACKAGES}" +DBUS_PACKAGES = "${LOGGING_PACKAGES}" +GROUPADD_PARAM:${PN}-base = "-r phosphor-logging" +DBUS_SERVICE:${PN}-base += "xyz.openbmc_project.Logging.service" +DBUS_SERVICE:phosphor-rsyslog-config += "xyz.openbmc_project.Syslog.Config.service" diff --git a/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb b/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb index 2070266733..d3172c175d 100644 --- a/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb +++ b/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb @@ -1,44 +1,37 @@ SUMMARY = "Phosphor OpenBMC MBOX Daemon" DESCRIPTION = "Phosphor OpenBMC MBOX Daemon" -PR = "r1" -PV = "1.0+git${SRCPV}" 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" - -S = "${WORKDIR}/git" +PROVIDES += "mboxctl" +SRCREV = "5c9264daedf1aff690e1957c4578d8395b549cff" +# Enable virtual-pnor by DISTRO_FEATURE openpower-virtual-pnor. +PACKAGECONFIG:append:df-openpower-virtual-pnor = " virtual-pnor" +PACKAGECONFIG[virtual-pnor] = "--enable-virtual-pnor,--disable-virtual-pnor" +PV = "1.0+git${SRCPV}" +PR = "r1" SRC_URI += "git://github.com/openbmc/mboxbridge.git;branch=master;protocol=https" - SRC_URI += "file://99-aspeed-lpc-ctrl.rules" -SRCREV="5c9264daedf1aff690e1957c4578d8395b549cff" - -PROVIDES += "mboxctl" - -MBOXD_FLASH_SIZE ??= "32M" +S = "${WORKDIR}/git" SYSTEMD_SUBSTITUTIONS += "FLASH_SIZE:${MBOXD_FLASH_SIZE}:${PN}.service" +SYSTEMD_SERVICE:${PN} += "mboxd.service" +SYSTEMD_SERVICE:${PN} += "mboxd-reload@.service" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_INSTANCES')}" + +inherit autotools pkgconfig +inherit obmc-phosphor-systemd do_install:append() { install -d ${D}/${nonarch_base_libdir}/udev/rules.d install -m 0644 ${WORKDIR}/99-aspeed-lpc-ctrl.rules ${D}/${nonarch_base_libdir}/udev/rules.d } +MBOXD_FLASH_SIZE ??= "32M" TMPL = "mboxd-reload@.service" TGTFMT = "obmc-host-startmin@{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_HOST_INSTANCES')}" - -# Enable virtual-pnor by DISTRO_FEATURE openpower-virtual-pnor. -PACKAGECONFIG:append:df-openpower-virtual-pnor = " virtual-pnor" -PACKAGECONFIG[virtual-pnor] = "--enable-virtual-pnor,--disable-virtual-pnor" diff --git a/meta-phosphor/recipes-phosphor/misc/phosphor-misc_git.bb b/meta-phosphor/recipes-phosphor/misc/phosphor-misc_git.bb index 87c997047f..f2ae988177 100644 --- a/meta-phosphor/recipes-phosphor/misc/phosphor-misc_git.bb +++ b/meta-phosphor/recipes-phosphor/misc/phosphor-misc_git.bb @@ -2,58 +2,53 @@ SUMMARY = "Miscellaneous OpenBMC functions" HOMEPAGE = "https://github.com/openbmc/phosphor-misc" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -PR = "r1" -PV = "1.0+git${SRCPV}" - -SRC_URI = "git://github.com/openbmc/phosphor-misc;branch=master;protocol=https" -SRCREV = "8ae2fcd1cad309c607671dd83a94aa13cc2fbdc6" - -S = "${WORKDIR}/git" - -inherit meson -inherit pkgconfig -inherit systemd - DEPENDS = "systemd" - -PHOSPHOR_MISC_PACKAGES = " \ - ${@bb.utils.contains('PACKAGECONFIG', 'first-boot-set-hostname', '${PN}-first-boot-set-hostname', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'first-boot-set-mac', '${PN}-first-boot-set-mac', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'http-redirect-awk', '${PN}-http-redirect-awk', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'usb-ctrl', '${PN}-usb-ctrl', '', d)} \ - " - -PACKAGES = "${PHOSPHOR_MISC_PACKAGES}" -PACKAGE_BEFORE_PN += "${PHOSPHOR_MISC_PACKAGES}" -SYSTEMD_PACKAGES = "${PHOSPHOR_MISC_PACKAGES}" - +SRCREV = "8ae2fcd1cad309c607671dd83a94aa13cc2fbdc6" PACKAGECONFIG ??= " \ first-boot-set-hostname \ first-boot-set-mac \ http-redirect-awk \ usb-ctrl \ " - PACKAGECONFIG[first-boot-set-hostname] = "-Dfirst-boot-set-hostname=enabled, -Dfirst-boot-set-hostname=disabled" PACKAGECONFIG[first-boot-set-mac] = "-Dfirst-boot-set-mac=enabled, -Dfirst-boot-set-mac=disabled" PACKAGECONFIG[http-redirect-awk] = "-Dhttp-redirect=enabled, -Dhttp-redirect=disabled" PACKAGECONFIG[usb-ctrl] = "-Dusb-ctrl=enabled, -Dusb-ctrl=disabled" +PV = "1.0+git${SRCPV}" +PR = "r1" -# first-boot-set-hostname -FILES:${PN}-first-boot-set-hostname = "${bindir}/first-boot-set-hostname.sh" -SYSTEMD_SERVICE:${PN}-first-boot-set-hostname = "first-boot-set-hostname.service" +SRC_URI = "git://github.com/openbmc/phosphor-misc;branch=master;protocol=https" -# first-boot-set-mac -FILES:${PN}-first-boot-set-mac = "${bindir}/first-boot-set-mac.sh" +S = "${WORKDIR}/git" +SYSTEMD_PACKAGES = "${PHOSPHOR_MISC_PACKAGES}" +SYSTEMD_SERVICE:${PN}-first-boot-set-hostname = "first-boot-set-hostname.service" SYSTEMD_SERVICE:${PN}-first-boot-set-mac = "first-boot-set-mac@.service" - -# http-redirect-awk -FILES:${PN}-http-redirect-awk = "${bindir}/http-redirect.awk" SYSTEMD_SERVICE:${PN}-http-redirect-awk = " \ http-redirect@.service \ http-redirect.socket \ " + +inherit meson +inherit pkgconfig +inherit systemd + +PACKAGES = "${PHOSPHOR_MISC_PACKAGES}" + RDEPENDS:${PN}-http-redirect-awk = "${VIRTUAL-RUNTIME_base-utils}" +# first-boot-set-hostname +FILES:${PN}-first-boot-set-hostname = "${bindir}/first-boot-set-hostname.sh" +# first-boot-set-mac +FILES:${PN}-first-boot-set-mac = "${bindir}/first-boot-set-mac.sh" +# http-redirect-awk +FILES:${PN}-http-redirect-awk = "${bindir}/http-redirect.awk" # usb-ctrl FILES:${PN}-usb-ctrl = "${bindir}/usb-ctrl" + +PHOSPHOR_MISC_PACKAGES = " \ + ${@bb.utils.contains('PACKAGECONFIG', 'first-boot-set-hostname', '${PN}-first-boot-set-hostname', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'first-boot-set-mac', '${PN}-first-boot-set-mac', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'http-redirect-awk', '${PN}-http-redirect-awk', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'usb-ctrl', '${PN}-usb-ctrl', '', d)} \ + " +PACKAGE_BEFORE_PN += "${PHOSPHOR_MISC_PACKAGES}" diff --git a/meta-phosphor/recipes-phosphor/mrw/mrw-api-native.bb b/meta-phosphor/recipes-phosphor/mrw/mrw-api-native.bb index cc92695252..92979b9c46 100644 --- a/meta-phosphor/recipes-phosphor/mrw/mrw-api-native.bb +++ b/meta-phosphor/recipes-phosphor/mrw/mrw-api-native.bb @@ -1,8 +1,12 @@ SUMMARY = "Phosphor OpenBMC machine readable workbook API modules" DESCRIPTION = "The API for the MRW XML generated by the Serverwiz tool" -PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314" +DEPENDS += "libxml-simple-perl-native libjson-perl-native" +SRCREV = "${MRW_API_SRCREV}" +PR = "r1" + +SRC_URI += "${MRW_API_SRC_URI}" S = "${WORKDIR}/git" @@ -11,11 +15,6 @@ inherit perlnative inherit cpan-base inherit mrw-rev -DEPENDS += "libxml-simple-perl-native libjson-perl-native" - -SRC_URI += "${MRW_API_SRC_URI}" -SRCREV = "${MRW_API_SRCREV}" - do_install() { install -d ${D}${PERLLIBDIRS:class-native}/site_perl/${PERLVERSION}/mrw install -m 0755 scripts/Targets.pm ${D}${PERLLIBDIRS:class-native}/site_perl/${PERLVERSION}/mrw/Targets.pm diff --git a/meta-phosphor/recipes-phosphor/mrw/mrw-native_git.bb b/meta-phosphor/recipes-phosphor/mrw/mrw-native_git.bb index d9776021e3..4f98c4dc95 100644 --- a/meta-phosphor/recipes-phosphor/mrw/mrw-native_git.bb +++ b/meta-phosphor/recipes-phosphor/mrw/mrw-native_git.bb @@ -1,7 +1,12 @@ SUMMARY = "Phosphor OpenBMC machine readable workbook" DESCRIPTION = "Pulls down system specific data" -PR = "r1" +LICENSE = "${PHOSPHOR_MRW_LICENSE}" +LIC_FILES_CHKSUM = "${PHOSPHOR_MRW_LIC_FILES_CHKSUM}" +SRCREV = "${PHOSPHOR_MRW_REV}" PV = "1.0+git${SRCPV}" +PR = "r1" + +SRC_URI += "${PHOSPHOR_MRW_URI}" S = "${WORKDIR}/git" @@ -9,17 +14,11 @@ inherit obmc-xmlpatch inherit mrw-xml inherit native -PHOSPHOR_MRW_LICENSE ?= "Apache-2.0" -PHOSPHOR_MRW_LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -PHOSPHOR_MRW_URI ?= "http://missing-mrw-uri" - -LICENSE = "${PHOSPHOR_MRW_LICENSE}" -LIC_FILES_CHKSUM = "${PHOSPHOR_MRW_LIC_FILES_CHKSUM}" -SRC_URI += "${PHOSPHOR_MRW_URI}" -SRCREV = "${PHOSPHOR_MRW_REV}" - do_install() { install -d ${D}/${mrw_datadir} install -m 0644 ${MRW_XML} ${D}/${mrw_datadir} } +PHOSPHOR_MRW_LICENSE ?= "Apache-2.0" +PHOSPHOR_MRW_LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" +PHOSPHOR_MRW_URI ?= "http://missing-mrw-uri" diff --git a/meta-phosphor/recipes-phosphor/mrw/mrw-patch-native_git.bb b/meta-phosphor/recipes-phosphor/mrw/mrw-patch-native_git.bb index c507894c85..95bc0633e1 100644 --- a/meta-phosphor/recipes-phosphor/mrw/mrw-patch-native_git.bb +++ b/meta-phosphor/recipes-phosphor/mrw/mrw-patch-native_git.bb @@ -1,20 +1,19 @@ SUMMARY = "Phosphor machine readable workbook patching script" DESCRIPTION = "Retrieve the script that can patch the MRW XML" -PR = "r1" -PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" +DEPENDS += "python3-native python3-lxml-native" +SRCREV = "${MRW_TOOLS_SRCREV}" +PV = "1.0+git${SRCPV}" +PR = "r1" + +SRC_URI += "${MRW_TOOLS_SRC_URI}" S = "${WORKDIR}/git" inherit mrw-rev inherit native -DEPENDS += "python3-native python3-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/recipes-phosphor/mrw/mrw-perl-tools-native_git.bb b/meta-phosphor/recipes-phosphor/mrw/mrw-perl-tools-native_git.bb index 95ce05ca3a..4d1ae25c54 100644 --- a/meta-phosphor/recipes-phosphor/mrw/mrw-perl-tools-native_git.bb +++ b/meta-phosphor/recipes-phosphor/mrw/mrw-perl-tools-native_git.bb @@ -1,16 +1,16 @@ SUMMARY = "OpenBMC MRW Perl Tools" DESCRIPTION = "OpenBMC Perl tools for the machine readable workbook" -PR = "r1" -PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" +DEPENDS += "libmodule-build-perl-native mrw-api-native yaml-tiny-native" +SRCREV = "${MRW_TOOLS_SRCREV}" +PV = "1.0+git${SRCPV}" +PR = "r1" + +SRC_URI += "${MRW_TOOLS_SRC_URI}" + S = "${WORKDIR}/git" inherit cpan_build inherit mrw-rev inherit native - -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/recipes-phosphor/network/phosphor-network_git.bb b/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb index 2e3ae36353..77d0c3fca6 100644 --- a/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb +++ b/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb @@ -1,18 +1,8 @@ SUMMARY = "Network DBUS object" DESCRIPTION = "Network DBUS object" HOMEPAGE = "http://github.com/openbmc/phosphor-networkd" -PR = "r1" -PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" - -inherit meson pkgconfig -inherit python3native -inherit systemd - -SRC_URI += "git://github.com/openbmc/phosphor-networkd;branch=master;protocol=https" -SRCREV = "61ef4f2b0c1336c78f28252a17f172957ea4c3e7" - DEPENDS += "systemd" DEPENDS += "sdbusplus ${PYTHON_PN}-sdbus++-native" DEPENDS += "sdeventplus" @@ -20,10 +10,8 @@ DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "phosphor-logging" DEPENDS += "libnl" DEPENDS += "stdplus" - +SRCREV = "61ef4f2b0c1336c78f28252a17f172957ea4c3e7" PACKAGECONFIG ??= "uboot-env default-link-local-autoconf default-ipv6-accept-ra persist-mac" - -UBOOT_ENV_RDEPENDS = "${@d.getVar('PREFERRED_PROVIDER_u-boot-fw-utils', True) or 'u-boot-fw-utils'}" PACKAGECONFIG[uboot-env] = "-Duboot-env=true,-Duboot-env=false,,${UBOOT_ENV_RDEPENDS}" PACKAGECONFIG[default-link-local-autoconf] = "-Ddefault-link-local-autoconf=true,-Ddefault-link-local-autoconf=false,," PACKAGECONFIG[default-ipv6-accept-ra] = "-Ddefault-ipv6-accept-ra=true,-Ddefault-ipv6-accept-ra=false,," @@ -31,13 +19,22 @@ PACKAGECONFIG[nic-ethtool] = "-Dnic-ethtool=true,-Dnic-ethtool=false,," PACKAGECONFIG[sync-mac] = "-Dsync-mac=true,-Dsync-mac=false,nlohmann-json," PACKAGECONFIG[hyp-nw-config] = "-Dhyp-nw-config=true, -Dhyp-nw-config=false,," PACKAGECONFIG[persist-mac] = "-Dpersist-mac=true, -persist-mac=false,," +PV = "1.0+git${SRCPV}" +PR = "r1" -S = "${WORKDIR}/git" - -FILES:${PN} += "${datadir}/dbus-1/system.d" +SRC_URI += "git://github.com/openbmc/phosphor-networkd;branch=master;protocol=https" +S = "${WORKDIR}/git" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE:${PN} += "xyz.openbmc_project.Network.service" SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'hyp-nw-config', 'xyz.openbmc_project.Network.Hypervisor.service', '', d)}" +inherit meson pkgconfig +inherit python3native +inherit systemd + EXTRA_OEMESON:append = " -Dtests=disabled" + +FILES:${PN} += "${datadir}/dbus-1/system.d" + +UBOOT_ENV_RDEPENDS = "${@d.getVar('PREFERRED_PROVIDER_u-boot-fw-utils', True) or 'u-boot-fw-utils'}" diff --git a/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb b/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb index ba460ed1e4..c4856fecfe 100644 --- a/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb +++ b/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb @@ -1,25 +1,23 @@ SUMMARY = "SNMP Manager Configuration" DESCRIPTION = "SNMP Manager Configuration." HOMEPAGE = "http://github.com/openbmc/phosphor-snmp" -PR = "r1" -PV = "0.1+git${SRCPV}" - -inherit meson pkgconfig -inherit python3native -inherit obmc-phosphor-dbus-service - LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -SRC_URI += "git://github.com/openbmc/phosphor-snmp;branch=master;protocol=https" -SRCREV = "c0d7cd47d4b198f752be3f497bc3c9ae98bb7141" - -DBUS_SERVICE:${PN} += "xyz.openbmc_project.Network.SNMP.service" - DEPENDS += "systemd" DEPENDS += "sdbusplus ${PYTHON_PN}-sdbus++-native" DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "phosphor-logging" DEPENDS += "net-snmp" +SRCREV = "c0d7cd47d4b198f752be3f497bc3c9ae98bb7141" +PV = "0.1+git${SRCPV}" +PR = "r1" + +SRC_URI += "git://github.com/openbmc/phosphor-snmp;branch=master;protocol=https" S = "${WORKDIR}/git" + +inherit meson pkgconfig +inherit python3native +inherit obmc-phosphor-dbus-service + +DBUS_SERVICE:${PN} += "xyz.openbmc_project.Network.SNMP.service" diff --git a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bb index f7f4fda168..3abd95536c 100644 --- a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bb +++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bb @@ -1,14 +1,13 @@ +# Warning. Add additional providers with whitelists to distro or machine +# configuration and not in recipe context (bbappend) otherwise ipmid will not +# know about your whitelist. SUMMARY = "OpenBMC - IPMI providers" +SUMMARY:${PN}-libs = "Extra providers for ipmid." +PROVIDES = "${PACKAGES}" PR = "r1" inherit packagegroup -PROVIDES = "${PACKAGES}" PACKAGES = "${PN}-libs" -SUMMARY:${PN}-libs = "Extra providers for ipmid." RDEPENDS:${PN}-libs = "${VIRTUAL-RUNTIME_phosphor-ipmi-providers}" - -# Warning. Add additional providers with whitelists to distro or machine -# configuration and not in recipe context (bbappend) otherwise ipmid will not -# know about your whitelist. diff --git a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bb index 546404fa57..872c4f1d58 100644 --- a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bb +++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-phosphor-debugtools.bb @@ -15,7 +15,6 @@ RDEPENDS:${PN} = " \ valgrind \ iperf3 \ " - # Some older arm architectures don't support valgrind, so explicitly remove # it as a dependency from them, but keep it by default in anything newer. RDEPENDS:${PN}:remove:armv5 = "valgrind" diff --git a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-yaml-providers.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-yaml-providers.bb index 919c6b1abf..69283de7ab 100644 --- a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-yaml-providers.bb +++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-yaml-providers.bb @@ -1,19 +1,18 @@ -SUMMARY = "Phosphor OpenBMC - YAML Providers" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - # This is a packagegroup in name and principle but we do not want to inherit # from packagegroup.bbclass. The point of this packagegroup is to get the # sysroot populated with YAML files from the DEPENDS packages and if we inherit # the packagegroup bbclass this doesn't happen, because that bbclass `deltask` # a number that are required. # inherit packagegroup +SUMMARY = "Phosphor OpenBMC - YAML Providers" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" +DEPENDS = "${OBMC_YAML_PROVIDER_RECIPES}" +PR = "r1" + +RDEPENDS:${PN} = "${OBMC_YAML_PROVIDER_RECIPES}" OBMC_YAML_PROVIDER_RECIPES += " \ phosphor-led-manager-yaml-provider \ phosphor-software-manager-yaml-provider \ " - -DEPENDS = "${OBMC_YAML_PROVIDER_RECIPES}" -RDEPENDS:${PN} = "${OBMC_YAML_PROVIDER_RECIPES}" diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb b/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb index 4c9cbc983a..bf67245bca 100644 --- a/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb +++ b/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb @@ -1,49 +1,42 @@ SUMMARY = "PLDM Stack" DESCRIPTION = "Implementation of the PLDM specifications" -PR = "r1" -PV = "1.0+git${SRCPV}" - -inherit meson pkgconfig -inherit systemd - -require pldm.inc - DEPENDS += "function2" DEPENDS += "systemd" DEPENDS += "sdeventplus" DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "nlohmann-json" DEPENDS += "cli11" +PV = "1.0+git${SRCPV}" +PR = "r1" S = "${WORKDIR}/git" - SYSTEMD_SERVICE:${PN} += "pldmd.service" SYSTEMD_SERVICE:${PN} += "pldmSoftPowerOff.service" +inherit meson pkgconfig +inherit systemd + EXTRA_OEMESON = " \ -Dtests=disabled \ -Doem-ibm=disabled \ " +pkg_prerm:${PN} () { + LINK="$D$systemd_system_unitdir/obmc-host-shutdown@0.target.wants/pldmSoftPowerOff.service" + rm $LINK + LINK="$D$systemd_system_unitdir/obmc-host-warm-reboot@0.target.wants/pldmSoftPowerOff.service" + rm $LINK +} # Install pldmSoftPowerOff.service in correct targets pkg_postinst:${PN} () { - mkdir -p $D$systemd_system_unitdir/obmc-host-shutdown@0.target.wants LINK="$D$systemd_system_unitdir/obmc-host-shutdown@0.target.wants/pldmSoftPowerOff.service" TARGET="../pldmSoftPowerOff.service" ln -s $TARGET $LINK - mkdir -p $D$systemd_system_unitdir/obmc-host-warm-reboot@0.target.wants LINK="$D$systemd_system_unitdir/obmc-host-warm-reboot@0.target.wants/pldmSoftPowerOff.service" TARGET="../pldmSoftPowerOff.service" ln -s $TARGET $LINK } -pkg_prerm:${PN} () { - - LINK="$D$systemd_system_unitdir/obmc-host-shutdown@0.target.wants/pldmSoftPowerOff.service" - rm $LINK - - LINK="$D$systemd_system_unitdir/obmc-host-warm-reboot@0.target.wants/pldmSoftPowerOff.service" - rm $LINK -} +require pldm.inc diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links-monitor.bb b/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links-monitor.bb index 01ddecbe0b..b7f4bc8d5c 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links-monitor.bb +++ b/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links-monitor.bb @@ -1,33 +1,27 @@ SUMMARY = "Phosphor Power Monitor services installation" -PR = "r1" - LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" +PR = "r1" inherit allarch RDEPENDS:${PN}-monitor += "phosphor-power-monitor" -ALLOW_EMPTY:${PN} = "1" - - +pkg_prerm:${PN}() { + [ -z "${OBMC_POWER_SUPPLY_INSTANCES}" ] && echo "No power supply instance defined" && exit 1 + for inst in ${OBMC_POWER_SUPPLY_INSTANCES}; do + LINK="$D$systemd_system_unitdir/multi-user.target.requires/power-supply-monitor@$inst.service" + rm $LINK + done +} pkg_postinst:${PN}() { - mkdir -p $D$systemd_system_unitdir/multi-user.target.requires - - [ -z "${OBMC_POWER_SUPPLY_INSTANCES}" ] && echo "No power supply instance defined" && exit 1 - - for inst in ${OBMC_POWER_SUPPLY_INSTANCES}; do - LINK="$D$systemd_system_unitdir/multi-user.target.requires/power-supply-monitor@$inst.service" - TARGET="../power-supply-monitor@.service" - ln -s $TARGET $LINK - done + mkdir -p $D$systemd_system_unitdir/multi-user.target.requires + [ -z "${OBMC_POWER_SUPPLY_INSTANCES}" ] && echo "No power supply instance defined" && exit 1 + for inst in ${OBMC_POWER_SUPPLY_INSTANCES}; do + LINK="$D$systemd_system_unitdir/multi-user.target.requires/power-supply-monitor@$inst.service" + TARGET="../power-supply-monitor@.service" + ln -s $TARGET $LINK + done } -pkg_prerm:${PN}() { - [ -z "${OBMC_POWER_SUPPLY_INSTANCES}" ] && echo "No power supply instance defined" && exit 1 - - for inst in ${OBMC_POWER_SUPPLY_INSTANCES}; do - LINK="$D$systemd_system_unitdir/multi-user.target.requires/power-supply-monitor@$inst.service" - rm $LINK - done -} +ALLOW_EMPTY:${PN} = "1" diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links-sequencer.bb b/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links-sequencer.bb index 84ca499deb..f7863d4e76 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links-sequencer.bb +++ b/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links-sequencer.bb @@ -1,31 +1,27 @@ SUMMARY = "Phosphor Power Sequencer services installation" -PR = "r1" - LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" +PR = "r1" inherit allarch RDEPENDS:${PN} += "phosphor-power-sequencer" -ALLOW_EMPTY:${PN} = "1" - +pkg_prerm:${PN}() { + LINK="$D$systemd_system_unitdir/obmc-chassis-poweron@0.target.wants/pseq-monitor.service" + rm $LINK + LINK="$D$systemd_system_unitdir/obmc-chassis-poweron@0.target.wants/pseq-monitor-pgood.service" + rm $LINK +} pkg_postinst:${PN}() { - mkdir -p $D$systemd_system_unitdir/obmc-chassis-poweron@0.target.wants - mkdir -p $D$systemd_system_unitdir/multi-user.target.requires - - LINK="$D$systemd_system_unitdir/obmc-chassis-poweron@0.target.wants/pseq-monitor.service" - TARGET="../pseq-monitor.service" - ln -s $TARGET $LINK - - LINK="$D$systemd_system_unitdir/obmc-chassis-poweron@0.target.wants/pseq-monitor-pgood.service" - TARGET="../pseq-monitor-pgood.service" - ln -s $TARGET $LINK + mkdir -p $D$systemd_system_unitdir/obmc-chassis-poweron@0.target.wants + mkdir -p $D$systemd_system_unitdir/multi-user.target.requires + LINK="$D$systemd_system_unitdir/obmc-chassis-poweron@0.target.wants/pseq-monitor.service" + TARGET="../pseq-monitor.service" + ln -s $TARGET $LINK + LINK="$D$systemd_system_unitdir/obmc-chassis-poweron@0.target.wants/pseq-monitor-pgood.service" + TARGET="../pseq-monitor-pgood.service" + ln -s $TARGET $LINK } -pkg_prerm:${PN}() { - LINK="$D$systemd_system_unitdir/obmc-chassis-poweron@0.target.wants/pseq-monitor.service" - rm $LINK - LINK="$D$systemd_system_unitdir/obmc-chassis-poweron@0.target.wants/pseq-monitor-pgood.service" - rm $LINK -} +ALLOW_EMPTY:${PN} = "1" diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links.bb b/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links.bb index 4a5cdad305..c33e263a22 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links.bb +++ b/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links.bb @@ -1,12 +1,10 @@ # TODO: This is splitted into two recipes; # To avoid build error, this is kept for now. # Remove me when the refactor of phosphor-power recipe is finished - SUMMARY = "Phosphor Power services installation" -PR = "r1" - LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" +PR = "r1" inherit allarch diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-psu-software-manager_git.bb b/meta-phosphor/recipes-phosphor/power/phosphor-psu-software-manager_git.bb index 8c171d625c..f87f13a56b 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-psu-software-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/power/phosphor-psu-software-manager_git.bb @@ -1,34 +1,41 @@ +# The below configs are expected to be overriden by machine layer +SUMMARY = "Phosphor PSU software manager" +DESCRIPTION = "Providing PSU firmware version and upgrade" HOMEPAGE = "https://github.com/openbmc/phosphor-psu-code-mgmt" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI += "git://github.com/openbmc/phosphor-psu-code-mgmt;branch=master;protocol=https" +DEPENDS = " \ + phosphor-logging \ + phosphor-dbus-interfaces \ + sdbusplus \ + openssl \ + " SRCREV = "97092314b107744e290b3fd6cf0eeef43247400c" -SUMMARY = "Phosphor PSU software manager" -DESCRIPTION = "Providing PSU firmware version and upgrade" - -PR = "r1" PV = "1.0+git${SRCPV}" +PR = "r1" + +SRC_URI += "git://github.com/openbmc/phosphor-psu-code-mgmt;branch=master;protocol=https" + +S = "${WORKDIR}/git" +SYSTEMD_SERVICE:${PN} = "xyz.openbmc_project.Software.Psu.Updater.service" +SYSTEMD_SERVICE:${PN} += "psu-update@.service" inherit meson inherit pkgconfig inherit obmc-phosphor-systemd -S = "${WORKDIR}/git" - -DEPENDS = " \ - phosphor-logging \ - phosphor-dbus-interfaces \ - sdbusplus \ - openssl \ - " +EXTRA_OEMESON = " \ + -Dtests=disabled \ + ${PSU_VERSION_UTIL} \ + ${PSU_VERSION_COMPARE_UTIL} \ + ${PSU_UPDATE_SERVICE} \ + " # The default config of this repo depends on utils from phosphor-power. # If your system does not depend on phosphor-power, please use # RDEPENDS:${PN}:remove to remove the dependency. RDEPENDS:${PN} += "phosphor-power" -# The below configs are expected to be overriden by machine layer - ## The psutils here comes from phosphor-power repo where ## * PSU_VERSION_UTIL accepts a PSU inventory path and returns the PSU ## firmware version string @@ -36,17 +43,6 @@ RDEPENDS:${PN} += "phosphor-power" ## the newest version string PSU_VERSION_UTIL ?= "-DPSU_VERSION_UTIL='/usr/bin/psutils --raw --get-version'" PSU_VERSION_COMPARE_UTIL ?= "-DPSU_VERSION_COMPARE_UTIL='/usr/bin/psutils --raw --compare'" - ## The psu-update@.service from repo is an example service that only prints a log and fails ## Override it in a machine layer to invoke the psu update util PSU_UPDATE_SERVICE ?= "-DPSU_UPDATE_SERVICE=psu-update@.service" - -EXTRA_OEMESON = " \ - -Dtests=disabled \ - ${PSU_VERSION_UTIL} \ - ${PSU_VERSION_COMPARE_UTIL} \ - ${PSU_UPDATE_SERVICE} \ - " - -SYSTEMD_SERVICE:${PN} = "xyz.openbmc_project.Software.Psu.Updater.service" -SYSTEMD_SERVICE:${PN} += "psu-update@.service" diff --git a/meta-phosphor/recipes-phosphor/preinit-mounts/preinit-mounts.bb b/meta-phosphor/recipes-phosphor/preinit-mounts/preinit-mounts.bb index eb8e39cd06..83f52d4dae 100644 --- a/meta-phosphor/recipes-phosphor/preinit-mounts/preinit-mounts.bb +++ b/meta-phosphor/recipes-phosphor/preinit-mounts/preinit-mounts.bb @@ -1,24 +1,24 @@ -inherit allarch -inherit update-alternatives - LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -RDEPENDS:${PN} += "${VIRTUAL-RUNTIME_base-utils}" - SRC_URI += "file://init" -FILES:${PN} += "${base_sbindir}/init" +inherit allarch +inherit update-alternatives do_install() { - install -d ${D}/${base_sbindir} - install -m 0755 ${WORKDIR}/init ${D}/${base_sbindir}/preinit-mounts + 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" +RDEPENDS:${PN} += "${VIRTUAL-RUNTIME_base-utils}" + +FILES:${PN} += "${base_sbindir}/init" +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" + +ALTERNATIVE:${PN} = "init" +ALTERNATIVE_TARGET[init] = "${base_sbindir}/preinit-mounts" diff --git a/meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb b/meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb index 6b773dff12..d9da9779b7 100644 --- a/meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb +++ b/meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb @@ -1,6 +1,3 @@ -SUMMARY = "Journal IPMI SEL Logger" -DESCRIPTION = "Utility to write IPMI SEL records to the journal" - # SEL Logger has the ability to monitor and automatically log SEL records for # various types of events, but this is disabled by default. The following # flags can be set in a .bbappend to enable specific types of event @@ -8,26 +5,16 @@ DESCRIPTION = "Utility to write IPMI SEL records to the journal" # # SEL_LOGGER_MONITOR_THRESHOLD_EVENTS: # Monitors and logs SEL records for threshold sensor events - -inherit pkgconfig meson systemd -S = "${WORKDIR}/git" - +SUMMARY = "Journal IPMI SEL Logger" +DESCRIPTION = "Utility to write IPMI SEL records to the journal" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - DEPENDS += " \ boost \ sdbusplus \ systemd \ " - -SRC_URI = "git://github.com/openbmc/phosphor-sel-logger.git;protocol=https;branch=master" SRCREV = "628058fadb9d4c35dbe2c9636f3e6e93767e9526" - -PV = "0.1+git${SRCPV}" - -SYSTEMD_SERVICE:${PN} += "xyz.openbmc_project.Logging.IPMI.service" - PACKAGECONFIG ??= "" PACKAGECONFIG[log-threshold] = "-Dlog-threshold=true,-Dlog-threshold=false," PACKAGECONFIG[log-pulse] = "-Dlog-pulse=true,-Dlog-pulse=false," @@ -35,3 +22,11 @@ PACKAGECONFIG[log-watchdog] = "-Dlog-watchdog=true,-Dlog-watchdog=false," PACKAGECONFIG[log-alarm] = "-Dlog-alarm=true,-Dlog-alarm=false," PACKAGECONFIG[send-to-logger] = "-Dsend-to-logger=true,-Dsend-to-logger=false,phosphor-logging" PACKAGECONFIG[clears-sel] = "-Dclears-sel=true,-Dclears-sel=false" +PV = "0.1+git${SRCPV}" + +SRC_URI = "git://github.com/openbmc/phosphor-sel-logger.git;protocol=https;branch=master" + +S = "${WORKDIR}/git" +SYSTEMD_SERVICE:${PN} += "xyz.openbmc_project.Logging.IPMI.service" + +inherit pkgconfig meson systemd diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index 3b012f764a..8c5b27711c 100644 --- a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb @@ -1,14 +1,17 @@ SUMMARY = "dbus-sensors" DESCRIPTION = "Dbus Sensor Services Configured from D-Bus" - -SRC_URI = "git://github.com/openbmc/dbus-sensors.git;branch=master;protocol=https" -SRCREV = "e330c0c1feedc765f8bef3fc0215c764e43bfc5c" - -PV = "0.1+git${SRCPV}" - LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - +DEPENDS = " \ + boost \ + i2c-tools \ + libgpiod \ + liburing \ + nlohmann-json \ + phosphor-logging \ + sdbusplus \ + " +SRCREV = "e330c0c1feedc765f8bef3fc0215c764e43bfc5c" PACKAGECONFIG ??= " \ adcsensor \ intelcpusensor \ @@ -21,7 +24,6 @@ PACKAGECONFIG ??= " \ psusensor \ external \ " - PACKAGECONFIG[adcsensor] = "-Dadc=enabled, -Dadc=disabled" PACKAGECONFIG[intelcpusensor] = "-Dintel-cpu=enabled, -Dintel-cpu=disabled" PACKAGECONFIG[exitairtempsensor] = "-Dexit-air=enabled, -Dexit-air=disabled" @@ -33,6 +35,9 @@ PACKAGECONFIG[mcutempsensor] = "-Dmcu=enabled, -Dmcu=disabled" PACKAGECONFIG[psusensor] = "-Dpsu=enabled, -Dpsu=disabled" PACKAGECONFIG[nvmesensor] = "-Dnvme=enabled, -Dnvme=disabled" PACKAGECONFIG[external] = "-Dexternal=enabled, -Dexternal=disabled" +PV = "0.1+git${SRCPV}" + +SRC_URI = "git://github.com/openbmc/dbus-sensors.git;branch=master;protocol=https" SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'adcsensor', \ 'xyz.openbmc_project.adcsensor.service', \ @@ -67,18 +72,8 @@ SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'nvmesensor', \ SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'external', \ 'xyz.openbmc_project.externalsensor.service', \ '', d)}" +S = "${WORKDIR}/git" -DEPENDS = " \ - boost \ - i2c-tools \ - libgpiod \ - liburing \ - nlohmann-json \ - phosphor-logging \ - sdbusplus \ - " inherit pkgconfig meson systemd -S = "${WORKDIR}/git" - EXTRA_OEMESON:append = " -Dtests=disabled" diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon-config-mrw.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon-config-mrw.bb index d1e97c4e0d..6cc04ac622 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon-config-mrw.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon-config-mrw.bb @@ -1,54 +1,44 @@ SUMMARY = "Phosphor hwmon configuration generator" DESCRIPTION = "Generate phosphor-hwmon configuration from an MRW." -PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" +DEPENDS += "mrw-perl-tools-native mrw-native" +PR = "r1" 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 } +do_install[postfuncs] += "install_conf_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/recipes-phosphor/sensors/phosphor-hwmon_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb index 160abb2d99..516fc815f4 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb @@ -1,23 +1,7 @@ SUMMARY = "OpenBMC hwmon poller" DESCRIPTION = "OpenBMC hwmon poller." -PR = "r1" -PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" - -inherit pkgconfig meson -inherit obmc-phosphor-systemd - -PACKAGECONFIG ??= "" -# Meson configure option to enable/disable max31785-msl -PACKAGECONFIG[max31785-msl] = "-Denable-max31785-msl=true, -Denable-max31785-msl=false" - -PACKAGE_BEFORE_PN = "max31785-msl" -SYSTEMD_PACKAGES = "${PN} max31785-msl" - -SYSTEMD_SERVICE:${PN} = "xyz.openbmc_project.Hwmon@.service" -SYSTEMD_SERVICE:max31785-msl = "${@bb.utils.contains('PACKAGECONFIG', 'max31785-msl', 'phosphor-max31785-msl@.service', '', d)}" - DEPENDS += " \ sdbusplus \ sdeventplus \ @@ -27,27 +11,37 @@ DEPENDS += " \ gpioplus \ cli11 \ " +SRCREV = "5e5259bf6710f22d3b78667098e56fa0e4895160" +PACKAGECONFIG ??= "" +# Meson configure option to enable/disable max31785-msl +PACKAGECONFIG[max31785-msl] = "-Denable-max31785-msl=true, -Denable-max31785-msl=false" +PV = "1.0+git${SRCPV}" +PR = "r1" + +SRC_URI += "git://github.com/openbmc/phosphor-hwmon;branch=master;protocol=https" + +SYSTEMD_PACKAGES = "${PN} max31785-msl" +SYSTEMD_SERVICE:${PN} = "xyz.openbmc_project.Hwmon@.service" +SYSTEMD_SERVICE:max31785-msl = "${@bb.utils.contains('PACKAGECONFIG', 'max31785-msl', 'phosphor-max31785-msl@.service', '', d)}" +S = "${WORKDIR}/git" + +inherit pkgconfig meson +inherit obmc-phosphor-systemd EXTRA_OEMESON:append = " -Dtests=disabled" -FILES:${PN} += "${base_libdir}/systemd/system/xyz.openbmc_project.Hwmon@.service" RDEPENDS:${PN} += "\ bash \ " +RDEPENDS:max31785-msl = "${VIRTUAL-RUNTIME_base-utils} i2c-tools bash" RRECOMMENDS:${PN} += "${VIRTUAL-RUNTIME_phosphor-hwmon-config}" +FILES:${PN} += "${base_libdir}/systemd/system/xyz.openbmc_project.Hwmon@.service" FILES:max31785-msl = "\ ${base_libdir}/systemd/system/phosphor-max31785-msl@.service \ ${bindir}/max31785-msl \ " -RDEPENDS:max31785-msl = "${VIRTUAL-RUNTIME_base-utils} i2c-tools bash" - -SRC_URI += "git://github.com/openbmc/phosphor-hwmon;branch=master;protocol=https" - -SRCREV = "5e5259bf6710f22d3b78667098e56fa0e4895160" - -S = "${WORKDIR}/git" # The following postinstall script iterate over hwmon env files: # 1. It adds HW_SENSOR_ID value if not set. The value being calculated @@ -56,7 +50,6 @@ S = "${WORKDIR}/git" pkg_postinst:${PN}() { hwmon_dir="$D/etc/default/obmc/hwmon" dbus_dir="$D/${datadir}/dbus-1/system.d" - if [ -n "$D" -a -d "${hwmon_dir}" ]; then # Remove existing links and replace with actual copy of the file to prevent # HW_SENSOR_ID variable override for different sensors' instances. @@ -65,22 +58,17 @@ pkg_postinst:${PN}() { rm -f "${f}" cp "${path}" "${f}" done - find "${hwmon_dir}" -type f -name \*.conf | while read f; do path="/${f##${hwmon_dir}/}" path="${path%.conf}" sensor_id="$(printf "%s" "${path}" | sha256sum | cut -d\ -f1)" acl_file="${dbus_dir}/xyz.openbmc_project.Hwmon-${sensor_id}.conf" - egrep -q '^HW_SENSOR_ID\s*=' "${f}" || printf "\n# Sensor id for %s\nHW_SENSOR_ID = \"%s\"\n" "${path}" "${sensor_id}" >> "${f}" - # Extract HW_SENSOR_ID that could be either quoted or unquoted string. sensor_id="$(sed -n 's,^HW_SENSOR_ID\s*=\s*"\?\(.[^" ]\+\)\s*"\?,\1,p' "${f}")" - [ ! -f "${acl_file}" ] || continue path_s="$(echo "${path}" | sed 's,\-\-,\\-\\-,g')" - cat <<EOF>"${acl_file}" <!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> @@ -95,3 +83,5 @@ EOF done fi } + +PACKAGE_BEFORE_PN = "max31785-msl" diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb index be336de19e..1346ddda68 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb @@ -1,21 +1,20 @@ SUMMARY = "NVMe Drive Manager" DESCRIPTION = "Daemon to monitor and report the status of NVMe drives" HOMEPAGE = "https://github.com/openbmc/phosphor-nvme" -PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -inherit meson pkgconfig -inherit systemd - DEPENDS += "sdbusplus" DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "sdeventplus" DEPENDS += "phosphor-logging" DEPENDS += "nlohmann-json" +SRCREV = "d4f5199251f2acbcf007c9bc163fd65d3695655b" +PR = "r1" SRC_URI = "git://github.com/openbmc/phosphor-nvme.git;protocol=https;branch=master" -SRCREV = "d4f5199251f2acbcf007c9bc163fd65d3695655b" -S = "${WORKDIR}/git" +S = "${WORKDIR}/git" SYSTEMD_SERVICE:${PN} = "xyz.openbmc_project.nvme.manager.service" + +inherit meson pkgconfig +inherit systemd diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb index d714e263ff..7af012c025 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb @@ -1,13 +1,8 @@ SUMMARY = "Virtual Sensors" DESCRIPTION = "virtual sensors created from existing sensors and config data" HOMEPAGE = "https://github.com/openbmc/phosphor-virtual-sensor" -PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=9e69ba356fa59848ffd865152a3ccc13" - -inherit meson pkgconfig -inherit systemd - DEPENDS:append = "\ exprtk \ nlohmann-json \ @@ -15,9 +10,13 @@ DEPENDS:append = "\ phosphor-logging \ sdbusplus \ " +SRCREV = "dc7770153b8fdfca26f1e7fd038033dff6b20456" +PR = "r1" SRC_URI = "git://github.com/openbmc/phosphor-virtual-sensor.git;protocol=https;branch=master" -SRCREV = "dc7770153b8fdfca26f1e7fd038033dff6b20456" -S = "${WORKDIR}/git" +S = "${WORKDIR}/git" SYSTEMD_SERVICE:${PN} = "phosphor-virtual-sensor.service" + +inherit meson pkgconfig +inherit systemd diff --git a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults-native.bb b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults-native.bb index 4aac9bf60f..11271a47fe 100644 --- a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults-native.bb +++ b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults-native.bb @@ -1,25 +1,22 @@ SUMMARY = "Default settings" -PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit phosphor-settings-manager -inherit native +PROVIDES += "virtual/phosphor-settings-defaults" +PR = "r1" SRC_URI += "file://defaults.yaml" SRC_URI += "file://host-template.yaml" -PROVIDES += "virtual/phosphor-settings-defaults" - SETTINGS_HOST_TEMPLATES:append = " host-template.yaml" - S = "${WORKDIR}" +inherit phosphor-settings-manager +inherit native + do_install() { DEST=${D}${settings_datadir} install -d ${DEST} install defaults.yaml ${DEST} - for i in ${OBMC_HOST_INSTANCES}; do for f in ${SETTINGS_HOST_TEMPLATES}; diff --git a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bb b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bb index a67d6819dc..9122522ba5 100644 --- a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bb +++ b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bb @@ -1,31 +1,25 @@ # 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" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit phosphor-settings-manager -inherit mrw-xml -inherit native - DEPENDS += "mrw-native mrw-perl-tools-native" +PR = "r1" SRC_URI += "file://mrw-override-settings.yaml" S = "${WORKDIR}" -MRW_EXPRESSION_VARS ?= "" +inherit phosphor-settings-manager +inherit mrw-xml +inherit native 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 \ @@ -35,3 +29,5 @@ do_install() { ${MRW_EXPRESSION_VARS} \ -f } + +MRW_EXPRESSION_VARS ?= "" diff --git a/meta-phosphor/recipes-phosphor/skeleton/obmc-libobmc-intf_git.bb b/meta-phosphor/recipes-phosphor/skeleton/obmc-libobmc-intf_git.bb index 77a2537698..54c5991d24 100644 --- a/meta-phosphor/recipes-phosphor/skeleton/obmc-libobmc-intf_git.bb +++ b/meta-phosphor/recipes-phosphor/skeleton/obmc-libobmc-intf_git.bb @@ -1,18 +1,28 @@ 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" +DEPENDS += "glib-2.0" +DEPENDS += "cjson" PV = "1.0+git${SRCPV}" +PR = "r1" + +SRC_URI += "file://gpio_defs.json" + +SKELETON_DIR = "libopenbmc_intf" inherit skeleton inherit pkgconfig -DEPENDS += "glib-2.0" -DEPENDS += "cjson" - -SKELETON_DIR = "libopenbmc_intf" +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/ +} -SRC_URI += "file://gpio_defs.json" +# Ensure the library is not in the dev package +FILES_SOLIBSDEV = "" +# Now add the link to the production package +FILES:${PN} += "${libdir}/libopenbmc_intf.so" # Users of libopenbmc_intf use custom makefiles that do not # support the proper library version detection and linking. @@ -21,16 +31,3 @@ SRC_URI += "file://gpio_defs.json" # This next line tells bitbake to skip the check which # ensures no links are put in the rootfs INSANE_SKIP:${PN} += "dev-so" - -# Ensure the library is not in the dev package -FILES_SOLIBSDEV = "" - -# Now add the link to the production package -FILES:${PN} += "${libdir}/libopenbmc_intf.so" - -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/recipes-phosphor/smbios/smbios-mdr_git.bb b/meta-phosphor/recipes-phosphor/smbios/smbios-mdr_git.bb index 34e1e5d2c1..999d86cc35 100644 --- a/meta-phosphor/recipes-phosphor/smbios/smbios-mdr_git.bb +++ b/meta-phosphor/recipes-phosphor/smbios/smbios-mdr_git.bb @@ -1,16 +1,8 @@ -HOMEPAGE = "http://github.com/openbmc/smbios-mdr" SUMMARY = "Extract CPU and Memory Inventory from SMSMBIOS Table and PECI" DESCRIPTION = "This package parses SMBIOS tables, reads Intel CPU PIROM and PECI and provides a dedicated IPMI blob to receive SMBIOS tables sent from LinuxBoot" - -PR = "r1" -PV = "1.0+git${SRCPV}" - +HOMEPAGE = "http://github.com/openbmc/smbios-mdr" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" - -inherit cmake pkgconfig systemd -inherit obmc-phosphor-ipmiprovider-symlink - DEPENDS += " \ boost \ systemd \ @@ -18,22 +10,27 @@ DEPENDS += " \ phosphor-dbus-interfaces \ phosphor-logging \ " - +SRCREV = "b492838a92351ecae20a80c9f3c176507f6f72f4" PACKAGECONFIG ?= "cpuinfo" PACKAGECONFIG[smbios-no-dimm] = "-DDIMM_DBUS=OFF,-DDIMM_DBUS=ON" PACKAGECONFIG[cpuinfo] = "-DCPU_INFO=ON,-DCPU_INFO=OFF,libpeci i2c-tools" PACKAGECONFIG[smbios-ipmi-blob] = "-DIPMI_BLOB=ON,-DIPMI_BLOB=OFF,phosphor-ipmi-blobs" +PV = "1.0+git${SRCPV}" +PR = "r1" -EXTRA_OECMAKE = "-DYOCTO=ON" - -S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/smbios-mdr.git;branch=master;protocol=https" -SRCREV = "b492838a92351ecae20a80c9f3c176507f6f72f4" +S = "${WORKDIR}/git" SYSTEMD_SERVICE:${PN} += "smbios-mdrv2.service" SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'cpuinfo', 'xyz.openbmc_project.cpuinfo.service', '', d)}" +inherit cmake pkgconfig systemd +inherit obmc-phosphor-ipmiprovider-symlink + +EXTRA_OECMAKE = "-DYOCTO=ON" + FILES:${PN}:append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" FILES:${PN}:append = " ${libdir}/blob-ipmid/lib*${SOLIBS}" -FILES:${PN}-dev:append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV}" +FILES:${PN}-dev:append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV}" + BLOBIPMI_PROVIDER_LIBRARY += "${@bb.utils.contains('PACKAGECONFIG', 'smbios-ipmi-blob', 'libsmbiosstore.so', '', d)}" diff --git a/meta-phosphor/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb b/meta-phosphor/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb index a37cf59e60..94647db614 100644 --- a/meta-phosphor/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb @@ -4,22 +4,21 @@ DESCRIPTION = "Applications must use service manager daemon to configure \ instead of directly controlling the same using 'systemd' or \ 'iptables'." HOMEPAGE = "https://github.com/openbmc/service-config-manager" -PR = "r1" -PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=7becf906c8f8d03c237bad13bc3dac53" - -SRC_URI = "git://github.com/openbmc/service-config-manager;branch=master;protocol=https" +DEPENDS = " \ + boost \ + phosphor-logging \ + sdbusplus \ + systemd \ + " SRCREV = "af2b835f9ae7edd06cf234f5b95b7cd51cb80ebc" +PV = "1.0+git${SRCPV}" +PR = "r1" -inherit meson pkgconfig systemd +SRC_URI = "git://github.com/openbmc/service-config-manager;branch=master;protocol=https" S = "${WORKDIR}/git" SYSTEMD_SERVICE:${PN} = "srvcfg-manager.service" -DEPENDS = " \ - boost \ - phosphor-logging \ - sdbusplus \ - systemd \ - "
\ No newline at end of file +inherit meson pkgconfig systemd diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb b/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb index 9b8df2cbe3..7de293812f 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb @@ -2,33 +2,27 @@ SUMMARY = "Phosphor post code manager" DESCRIPTION = "Phosphor post Code Manager monitors post code posted on dbus \ interface /xyz/openbmc_project/state/boot/raw by snoopd daemon and save them \ in a file under /var/lib for history." +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" +SRCREV = "a27519e987a8341585e50913930862825c48cd26" +PV = "1.0+git${SRCPV}" SRC_URI = "git://github.com/openbmc/phosphor-post-code-manager.git;branch=master;protocol=https" -SRCREV = "a27519e987a8341585e50913930862825c48cd26" S = "${WORKDIR}/git" -PV = "1.0+git${SRCPV}" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - inherit meson pkgconfig systemd - def get_service(d): service_list = "xyz.openbmc_project.State.Boot.PostCode.service xyz.openbmc_project.State.Boot.PostCode@.service " if(d.getVar('OBMC_HOST_INSTANCES') == '0'): return service_list else: return service_list+" ".join(["xyz.openbmc_project.State.Boot.PostCode@{}.service".format(x) for x in d.getVar('OBMC_HOST_INSTANCES').split()]) - SYSTEMD_SERVICE:${PN} = "${@get_service(d)}" - DEPENDS += " \ sdbusplus \ phosphor-dbus-interfaces \ phosphor-logging \ libcereal \ " - diff --git a/meta-phosphor/recipes-phosphor/storage/estoraged.bb b/meta-phosphor/recipes-phosphor/storage/estoraged.bb index 92c92d7a05..18dd54758f 100644 --- a/meta-phosphor/recipes-phosphor/storage/estoraged.bb +++ b/meta-phosphor/recipes-phosphor/storage/estoraged.bb @@ -1,11 +1,7 @@ SUMMARY = "Encrypted storage management daemon" DESCRIPTION = "Provides a D-Bus interface to manage an encrypted storage device" -PR = "r1" -PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -inherit meson pkgconfig systemd - DEPENDS += "systemd" DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "cryptsetup" @@ -13,14 +9,18 @@ DEPENDS += "openssl" DEPENDS += "phosphor-logging" DEPENDS += "sdbusplus" DEPENDS += "stdplus" +SRCREV = "da5e96a7e322d4a6bfef21438266114e55682161" +PV = "0.1+git${SRCPV}" +PR = "r1" -RDEPENDS:${PN} += "e2fsprogs" - -EXTRA_OEMESON = "-Dtests=disabled" - -S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/estoraged.git;branch=master;protocol=https" -SRCREV = "da5e96a7e322d4a6bfef21438266114e55682161" +S = "${WORKDIR}/git" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE:${PN} += "xyz.openbmc_project.eStoraged.service" + +inherit meson pkgconfig systemd + +EXTRA_OEMESON = "-Dtests=disabled" + +RDEPENDS:${PN} += "e2fsprogs" diff --git a/meta-phosphor/recipes-phosphor/system/obmc-control-bmc_git.bb b/meta-phosphor/recipes-phosphor/system/obmc-control-bmc_git.bb index 70dac0ad7f..b63994a9fa 100644 --- a/meta-phosphor/recipes-phosphor/system/obmc-control-bmc_git.bb +++ b/meta-phosphor/recipes-phosphor/system/obmc-control-bmc_git.bb @@ -1,14 +1,14 @@ 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" PV = "1.0+git${SRCPV}" +PR = "r1" + +SKELETON_DIR = "bmcctl" 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/recipes-phosphor/telemetry/telemetry_git.bb b/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb index ae4135068a..57dd3ef2af 100644 --- a/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb +++ b/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb @@ -1,27 +1,23 @@ SUMMARY = "Telemetry service" DESCRIPTION = "Middleware between Redfish Telemetry Service and dbus-sensors" HOMEPAGE = "https://github.com/openbmc/telemetry" - LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" - -SRC_URI = "git://github.com/openbmc/telemetry;branch=master;protocol=https" - -PV = "1.0+git${SRCPV}" -SRCREV = "a8182beb1129b0608d2ddfb82895194ea3485288" - -S = "${WORKDIR}/git" - -inherit pkgconfig meson -inherit systemd - DEPENDS = "boost \ gtest \ nlohmann-json \ phosphor-logging \ sdbusplus \ systemd" +SRCREV = "a8182beb1129b0608d2ddfb82895194ea3485288" +PV = "1.0+git${SRCPV}" +SRC_URI = "git://github.com/openbmc/telemetry;branch=master;protocol=https" + +S = "${WORKDIR}/git" SYSTEMD_SERVICE:${PN} = "xyz.openbmc_project.Telemetry.service" -EXTRA_OEMESON = "-Dbuildtest=false" +inherit pkgconfig meson +inherit systemd + +EXTRA_OEMESON = "-Dbuildtest=false" diff --git a/meta-phosphor/recipes-phosphor/trace-enable/trace-enable.bb b/meta-phosphor/recipes-phosphor/trace-enable/trace-enable.bb index 37d5a035cf..e9456cb9f7 100644 --- a/meta-phosphor/recipes-phosphor/trace-enable/trace-enable.bb +++ b/meta-phosphor/recipes-phosphor/trace-enable/trace-enable.bb @@ -3,19 +3,12 @@ DESCRIPTION = "Enable Linux trace events based on a configuration file" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -RDEPENDS:${PN} = " \ - ${@d.getVar('PREFERRED_PROVIDER_u-boot-fw-utils', True) or 'u-boot-fw-utils'} \ - bash \ -" - -S = "${WORKDIR}" - SRC_URI += " file://trace-enable" -TRACE_EVENTS = "" +S = "${WORKDIR}" +SYSTEMD_SERVICE:${PN} = "trace-enable.service" -FILES:${PN} += "${sysconfdir}/trace-events.conf" -FILES:${PN} += "${libexecdir}/trace-enable" +inherit obmc-phosphor-systemd do_install:append() { install -d ${D}${sysconfdir} @@ -25,11 +18,16 @@ do_install:append() { done echo >> ${D}${sysconfdir}/trace-events.conf chmod 0644 ${D}${sysconfdir}/trace-events.conf - install -d ${D}${libexecdir} install -m 0755 ${WORKDIR}/trace-enable ${D}${libexecdir} } -SYSTEMD_SERVICE:${PN} = "trace-enable.service" +RDEPENDS:${PN} = " \ + ${@d.getVar('PREFERRED_PROVIDER_u-boot-fw-utils', True) or 'u-boot-fw-utils'} \ + bash \ +" -inherit obmc-phosphor-systemd +FILES:${PN} += "${sysconfdir}/trace-events.conf" +FILES:${PN} += "${libexecdir}/trace-enable" + +TRACE_EVENTS = "" diff --git a/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb b/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb index 63cbf21e51..af5739cdde 100644 --- a/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb @@ -1,33 +1,28 @@ SUMMARY = "Phosphor User Manager Daemon" DESCRIPTION = "Daemon that does user management" HOMEPAGE = "http://github.com/openbmc/phosphor-user-manager" -PR = "r1" -PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" - -inherit meson pkgconfig -inherit obmc-phosphor-dbus-service - DEPENDS += "sdbusplus" DEPENDS += "phosphor-logging" DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "boost" DEPENDS += "nss-pam-ldapd" DEPENDS += "systemd" -PACKAGE_BEFORE_PN = "phosphor-ldap" +SRCREV = "0076afe155adbf9f1774fafe5e190926224a650e" +PV = "1.0+git${SRCPV}" +PR = "r1" -EXTRA_OEMESON = "-Dtests=disabled" +SRC_URI += "git://github.com/openbmc/phosphor-user-manager;branch=master;protocol=https" + +S = "${WORKDIR}/git" +inherit meson pkgconfig +inherit obmc-phosphor-dbus-service inherit useradd -USERADD_PACKAGES = "${PN} phosphor-ldap" -DBUS_PACKAGES = "${USERADD_PACKAGES}" -# add groups needed for privilege maintenance -GROUPADD_PARAM:${PN} = "priv-admin; priv-operator; priv-user " -GROUPADD_PARAM:phosphor-ldap = "priv-admin; priv-operator; priv-user " +EXTRA_OEMESON = "-Dtests=disabled" -DBUS_SERVICE:${PN} += "xyz.openbmc_project.User.Manager.service" FILES:phosphor-ldap += " \ ${bindir}/phosphor-ldap-conf \ " @@ -36,9 +31,15 @@ FILES:${PN} += " \ ${datadir}/dbus-1 \ ${datadir}/phosphor-certificate-manager \ " + +USERADD_PACKAGES = "${PN} phosphor-ldap" + +PACKAGE_BEFORE_PN = "phosphor-ldap" +DBUS_PACKAGES = "${USERADD_PACKAGES}" +# add groups needed for privilege maintenance +GROUPADD_PARAM:${PN} = "priv-admin; priv-operator; priv-user " +GROUPADD_PARAM:phosphor-ldap = "priv-admin; priv-operator; priv-user " +DBUS_SERVICE:${PN} += "xyz.openbmc_project.User.Manager.service" DBUS_SERVICE:phosphor-ldap = " \ xyz.openbmc_project.Ldap.Config.service \ " -SRC_URI += "git://github.com/openbmc/phosphor-user-manager;branch=master;protocol=https" -SRCREV = "0076afe155adbf9f1774fafe5e190926224a650e" -S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/video/fbterm_git.bb b/meta-phosphor/recipes-phosphor/video/fbterm_git.bb index 568bbc640b..9024b6404e 100644 --- a/meta-phosphor/recipes-phosphor/video/fbterm_git.bb +++ b/meta-phosphor/recipes-phosphor/video/fbterm_git.bb @@ -1,29 +1,25 @@ HOMEPAGE = "https://github.com/jk-ozlabs/fbterm" LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=d8e20eece214df8ef953ed5857862150" +DEPENDS += "freetype" +DEPENDS += "fontconfig" +SRCREV = "c15430560aeb82a27358cc320af4a29e1296e6c1" +PV = "1.7+git${SRCPV}" +PR = "r1" SRC_URI += "git://github.com/jk-ozlabs/fbterm.git;nobranch=1;protocol=https" SRC_URI += "file://fb.modes" -PR = "r1" - -LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=d8e20eece214df8ef953ed5857862150" -DEPENDS += "freetype" -DEPENDS += "fontconfig" +S = "${WORKDIR}/git" +SYSTEMD_SERVICE:${PN} += "fbterm.service" +SYSTEMD_ENVIRONMENT_FILE:${PN} += "fbterm" 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/recipes-phosphor/video/uart-render-controller_git.bb b/meta-phosphor/recipes-phosphor/video/uart-render-controller_git.bb index 387be0f443..f2c39df4b0 100644 --- a/meta-phosphor/recipes-phosphor/video/uart-render-controller_git.bb +++ b/meta-phosphor/recipes-phosphor/video/uart-render-controller_git.bb @@ -1,29 +1,25 @@ HOMEPAGE = "https://github.com/jk-ozlabs/uart-render-controller" LICENSE = "GPL-2.0-or-later" - -SRC_URI += "git://github.com/jk-ozlabs/uart-render-controller;branch=master;protocol=https" -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} += "fbterm" - SRCREV = "08e854a6c425011d029e4e02241afee5060f15eb" PV = "0.1+git${SRCPV}" +PR = "r1" -S = "${WORKDIR}/git" +SRC_URI += "git://github.com/jk-ozlabs/uart-render-controller;branch=master;protocol=https" +SRC_URI += "file://uart-render-controller.service" +S = "${WORKDIR}/git" SYSTEMD_SERVICE:${PN} += "uart-render-controller.service" +inherit autotools +inherit pkgconfig +inherit systemd + do_install:append() { install -d ${D}${systemd_system_unitdir} install -m 0644 ${WORKDIR}/uart-render-controller.service ${D}${systemd_system_unitdir}/ } + +RDEPENDS:${PN} += "fbterm" diff --git a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb index 6941ae8b33..b997b99750 100644 --- a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb +++ b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb @@ -1,20 +1,18 @@ +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" +DEPENDS:prepend = "nodejs-native " +SRCREV = "e16bb5c35893591eab048ae4ef646a9e5e2f7e94" +PV = "1.0+git${SRCPV}" # This recipe requires online access to build, as it uses NPM for dependency # management and resolution. PR = "r1" -PV = "1.0+git${SRCPV}" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/phosphor-webui.git;branch=master;protocol=https" -SRCREV = "e16bb5c35893591eab048ae4ef646a9e5e2f7e94" -S = "${WORKDIR}/git" -DEPENDS:prepend = "nodejs-native " +S = "${WORKDIR}/git" inherit allarch -FILES:${PN} += "${datadir}/www/*" - do_compile () { bbwarn "phosphor-webui is deprecated and has been replaced with webui-vue" cd ${S} @@ -22,7 +20,6 @@ do_compile () { 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 @@ -31,3 +28,4 @@ do_install () { find ${D}${datadir}/www -type d -exec chmod a=rx,u+w '{}' + } +FILES:${PN} += "${datadir}/www/*" diff --git a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb index ee0a386a30..2678e60d07 100644 --- a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb +++ b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb @@ -1,16 +1,3 @@ -# This recipe requires online access to build, as it uses NPM for dependency -# management and resolution. -PR = "r1" -PV = "1.0+git${SRCPV}" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" - -SRC_URI = "git://github.com/openbmc/webui-vue.git;branch=master;protocol=https" -SRCREV = "d9566225f1c25b1892c332e0f3a16c1b5e4ba714" -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 @@ -19,31 +6,39 @@ DEPENDS:prepend = "nodejs-native " # 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 +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" +DEPENDS:prepend = "nodejs-native " +SRCREV = "d9566225f1c25b1892c332e0f3a16c1b5e4ba714" +PV = "1.0+git${SRCPV}" +# This recipe requires online access to build, as it uses NPM for dependency +# management and resolution. +PR = "r1" + +SRC_URI = "git://github.com/openbmc/webui-vue.git;branch=master;protocol=https" + +S = "${WORKDIR}/git" inherit allarch +EXTRA_OENPM ?= "" + export CXX = "${BUILD_CXX}" export CC = "${BUILD_CC}" export CFLAGS = "${BUILD_CFLAGS}" export CPPFLAGS = "${BUILD_CPPFLAGS}" export CXXFLAGS = "${BUILD_CXXFLAGS}" -FILES:${PN} += "${datadir}/www/*" - -EXTRA_OENPM ?= "" - -# Workaround +# Workaround # Network access from task are disabled by default on Yocto 3.5 # https://git.yoctoproject.org/poky/tree/documentation/migration-guides/migration-3.5.rst#n25 do_compile[network] = "1" - do_compile () { cd ${S} rm -rf node_modules npm --loglevel info --proxy=${http_proxy} --https-proxy=${https_proxy} install npm run build ${EXTRA_OENPM} } - do_install () { # create directory structure install -d ${D}${datadir}/www @@ -52,3 +47,4 @@ do_install () { find ${D}${datadir}/www -type d -exec chmod a=rx,u+w '{}' + } +FILES:${PN} += "${datadir}/www/*" diff --git a/meta-phosphor/recipes-support/boost/boost_%.bbappend b/meta-phosphor/recipes-support/boost/boost_%.bbappend index 475c830c7b..eb16acaa21 100644 --- a/meta-phosphor/recipes-support/boost/boost_%.bbappend +++ b/meta-phosphor/recipes-support/boost/boost_%.bbappend @@ -1,3 +1,5 @@ +PACKAGECONFIG:openbmc-phosphor:class-target = "" + #This is largely to improve our build times by not building or installing #modules that OpenBMC does not use by our coding standard. Another thing to #note is that for most targets, coroutine and context libraries are also added @@ -9,5 +11,3 @@ #https://github.com/openbmc/docs/blob/master/cpp-style-and-conventions.md#boost # BOOST_LIBS:openbmc-phosphor:class-target = "chrono thread context coroutine" -PACKAGECONFIG:openbmc-phosphor:class-target = "" - diff --git a/meta-phosphor/recipes-support/nss-pam-ldapd/nss-pam-ldapd_0.9.8.bb b/meta-phosphor/recipes-support/nss-pam-ldapd/nss-pam-ldapd_0.9.8.bb index 04e6a7e096..8c699a8b44 100644 --- a/meta-phosphor/recipes-support/nss-pam-ldapd/nss-pam-ldapd_0.9.8.bb +++ b/meta-phosphor/recipes-support/nss-pam-ldapd/nss-pam-ldapd_0.9.8.bb @@ -5,57 +5,49 @@ DESCRIPTION = "\ system information from LDAP. It is used by the libnss-ldapd and \ libpam-ldapd packages but is not very useful by itself. \ " - HOMEPAGE = "http://arthurdejong.org/nss-pam-ldapd/" - +SECTION = "base" LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" -SECTION = "base" - FILESEXTRAPATHS:prepend := "${THISDIR}/files:" +DEPENDS += "libpam openldap krb5" SRC_URI = "\ - http://arthurdejong.org/nss-pam-ldapd/${BPN}-${PV}.tar.gz \ - file://nslcd.init \ - file://nslcd.service \ - " - -inherit autotools - + http://arthurdejong.org/nss-pam-ldapd/${BPN}-${PV}.tar.gz \ + file://nslcd.init \ + file://nslcd.service \ + " SRC_URI[md5sum] = "8c99fdc54f4bf9aca8c5f53fdb1403ff" SRC_URI[sha256sum] = "ef7362e7f2003da8c7beb7bcc03c30494acf712625aaac8badc6e7eb16f3453f" -DEPENDS += "libpam openldap krb5" +SYSTEMD_SERVICE:${PN} = "nslcd.service" -RDEPENDS:${PN} += "nscd" +inherit autotools +inherit update-rc.d systemd EXTRA_OECONF = "\ - --disable-pynslcd \ - --libdir=${base_libdir} \ - --with-pam-seclib-dir=${base_libdir}/security \ - " - -CONFFILES:${PN} += "${sysconfdir}/nslcd.conf" - -FILES:${PN} += "${base_libdir}/security ${datadir}" -FILES:${PN}-dbg += "${base_libdir}/security/.debug" - -LDAP_DN ?= "dc=my-domain,dc=com" + --disable-pynslcd \ + --libdir=${base_libdir} \ + --with-pam-seclib-dir=${base_libdir}/security \ + " do_install:append() { - install -D -m 0755 ${WORKDIR}/nslcd.init ${D}${sysconfdir}/init.d/nslcd + install -D -m 0755 ${WORKDIR}/nslcd.init ${D}${sysconfdir}/init.d/nslcd + sed -i -e 's/^uid nslcd/# uid nslcd/;' ${D}${sysconfdir}/nslcd.conf + sed -i -e 's/^gid nslcd/# gid nslcd/;' ${D}${sysconfdir}/nslcd.conf + sed -i -e 's/^base dc=example,dc=com/base ${LDAP_DN}/;' ${D}${sysconfdir}/nslcd.conf + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/nslcd.service ${D}${systemd_system_unitdir} +} - sed -i -e 's/^uid nslcd/# uid nslcd/;' ${D}${sysconfdir}/nslcd.conf - sed -i -e 's/^gid nslcd/# gid nslcd/;' ${D}${sysconfdir}/nslcd.conf - sed -i -e 's/^base dc=example,dc=com/base ${LDAP_DN}/;' ${D}${sysconfdir}/nslcd.conf +RDEPENDS:${PN} += "nscd" - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/nslcd.service ${D}${systemd_system_unitdir} -} +FILES:${PN} += "${base_libdir}/security ${datadir}" +FILES:${PN}-dbg += "${base_libdir}/security/.debug" -inherit update-rc.d systemd +CONFFILES:${PN} += "${sysconfdir}/nslcd.conf" INITSCRIPT_NAME = "nslcd" INITSCRIPT_PARAMS = "defaults" -SYSTEMD_SERVICE:${PN} = "nslcd.service" +LDAP_DN ?= "dc=my-domain,dc=com" diff --git a/meta-phosphor/recipes-support/nss-pam-ldapd_fix/nss-pam-ldapd_%.bbappend b/meta-phosphor/recipes-support/nss-pam-ldapd_fix/nss-pam-ldapd_%.bbappend index 58ab64aae7..98f94a7af0 100644 --- a/meta-phosphor/recipes-support/nss-pam-ldapd_fix/nss-pam-ldapd_%.bbappend +++ b/meta-phosphor/recipes-support/nss-pam-ldapd_fix/nss-pam-ldapd_%.bbappend @@ -1,5 +1,4 @@ do_install:append() { sed -i -e '$anss_initgroups_ignoreusers ALLLOCAL' ${D}${sysconfdir}/nslcd.conf - install -m 0644 ${D}${sysconfdir}/nslcd.conf ${D}${sysconfdir}/nslcd.conf.default } diff --git a/meta-phosphor/recipes-support/rng-tools/rng-tools_%.bbappend b/meta-phosphor/recipes-support/rng-tools/rng-tools_%.bbappend index 98e8130a45..ab6f528af7 100644 --- a/meta-phosphor/recipes-support/rng-tools/rng-tools_%.bbappend +++ b/meta-phosphor/recipes-support/rng-tools/rng-tools_%.bbappend @@ -1,17 +1,14 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI += "file://10-nice.conf" - PACKAGECONFIG:remove = "\ ${@bb.utils.contains('MACHINE_FEATURES', 'hw-rng', \ 'libjitterentropy', '', d)}\ " -inherit systemd +SRC_URI += "file://10-nice.conf" -FILES:${PN} += "${systemd_system_unitdir}/rngd.service.d" +inherit systemd do_install:append() { - # When using systemd and using libjitterentropy, install a config # which runs rngd at a 'nice' priority. libjitterentropy uses a # lot of CPU early on in the boot process and makes the whole boot @@ -24,3 +21,5 @@ do_install:append() { fi fi } + +FILES:${PN} += "${systemd_system_unitdir}/rngd.service.d" diff --git a/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb b/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb index f68629f920..52378e8bbe 100755 --- a/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb +++ b/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb @@ -1,15 +1,13 @@ SUMMARY = "Chassis Power Control service for Intel based platforms" DESCRIPTION = "Chassis Power Control service for Intel based platforms" - -SRC_URI = "git://github.com/openbmc/x86-power-control.git;protocol=https;branch=master" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRCREV = "8643c79740d21f4a21184de729c19f9aec0f7c48" - PV = "1.0+git${SRCPV}" -S = "${WORKDIR}/git" +SRC_URI = "git://github.com/openbmc/x86-power-control.git;protocol=https;branch=master" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" +S = "${WORKDIR}/git" inherit meson systemd pkgconfig inherit obmc-phosphor-dbus-service @@ -19,12 +17,9 @@ def get_service(d): return "xyz.openbmc_project.Chassis.Control.Power@0.service" else: return " ".join(["xyz.openbmc_project.Chassis.Control.Power@{}.service".format(x) for x in d.getVar('OBMC_HOST_INSTANCES').split()]) - SYSTEMD_SERVICE:${PN} = "${@get_service(d)}" - SYSTEMD_SERVICE:${PN} += "chassis-system-reset.service \ chassis-system-reset.target" - DEPENDS += " \ boost \ i2c-tools \ diff --git a/meta-phosphor/recipes-x86/libpeci/libpeci_git.bb b/meta-phosphor/recipes-x86/libpeci/libpeci_git.bb index 78d40f08f1..a5033f7471 100644 --- a/meta-phosphor/recipes-x86/libpeci/libpeci_git.bb +++ b/meta-phosphor/recipes-x86/libpeci/libpeci_git.bb @@ -1,17 +1,15 @@ SUMMARY = "PECI Library" DESCRIPTION = "PECI Library" - LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=7becf906c8f8d03c237bad13bc3dac53" -inherit cmake pkgconfig systemd +SRCREV = "58dac1fdb2c4656f151509be4105ea0be3ab1988" +PACKAGECONFIG ??= "" +PACKAGECONFIG[dbus-raw-peci] = "-DDBUS_RAW_PECI=ON,-DDBUS_RAW_PECI=OFF,boost sdbusplus" +PV = "0.1+git${SRCPV}" SRC_URI = "git://github.com/openbmc/libpeci;branch=master;protocol=https" -PV = "0.1+git${SRCPV}" -SRCREV = "58dac1fdb2c4656f151509be4105ea0be3ab1988" - S = "${WORKDIR}/git" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[dbus-raw-peci] = "-DDBUS_RAW_PECI=ON,-DDBUS_RAW_PECI=OFF,boost sdbusplus" SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'dbus-raw-peci', 'com.intel.peci.service', '', d)}" + +inherit cmake pkgconfig systemd diff --git a/meta-phosphor/recipes-x86/peci-pcie/peci-pcie_git.bb b/meta-phosphor/recipes-x86/peci-pcie/peci-pcie_git.bb index 19974e710f..c5fda1bdd5 100644 --- a/meta-phosphor/recipes-x86/peci-pcie/peci-pcie_git.bb +++ b/meta-phosphor/recipes-x86/peci-pcie/peci-pcie_git.bb @@ -1,20 +1,17 @@ SUMMARY = "PECI PCIe" DESCRIPTION = "Gathers PCIe information using PECI \ and provides it on D-Bus" - LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=7becf906c8f8d03c237bad13bc3dac53" -inherit cmake pkgconfig systemd - -SRC_URI = "git://github.com/openbmc/peci-pcie;branch=master;protocol=https" - DEPENDS = "boost sdbusplus libpeci" - -PV = "0.1+git${SRCPV}" SRCREV = "be1fdbfddb8f753132e781109e72b5f2c64140a2" +PV = "0.1+git${SRCPV}" -S = "${WORKDIR}/git" +SRC_URI = "git://github.com/openbmc/peci-pcie;branch=master;protocol=https" +S = "${WORKDIR}/git" SYSTEMD_SERVICE:${PN} += "xyz.openbmc_project.PCIe.service" +inherit cmake pkgconfig systemd + EXTRA_OECMAKE = "-DYOCTO=1" |