diff options
| author | Matthew Barth <msbarth@us.ibm.com> | 2020-11-17 17:45:59 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2020-11-20 16:38:25 +0300 |
| commit | 3afbeed0a4cfb7ba8a9f776f2f0c64c6ff2abd80 (patch) | |
| tree | e735f44237f339ac27d4590b74a13214d9859fb7 | |
| parent | a4cdd19937cade97f1a719fa338211c5a6e32013 (diff) | |
| download | openbmc-3afbeed0a4cfb7ba8a9f776f2f0c64c6ff2abd80.tar.xz | |
sensors:max31785-msl: Make max31785-msl package be "opt-in"
By default, the max31785-msl package was getting installed in all images
including phosphor-hwmon. A fix was done in the phosphor-hwmon repo to
make this be an "opt-in" configure option to install the max31785-msl
application. This makes the max31785-msl a package config on the
phosphor-hwmon recipe where its not included unless explicitly appended
in a bbappend file in a machine layer.
ex.)
PACKAGECONFIG_append_ibm-ac-server = " max31785-msl"
SYSTEMD_ENVIRONMENT_FILE_max31785-msl_append_ibm-ac-server = " obmc/hwmon-max31785/max31785.conf"
SYSTEMD_LINK_max31785-msl_append_ibm-ac-server = " ../phosphor-max31785-msl@.service:multi-user.target.wants/phosphor-max31785-msl@${MACHINE}.service"
Tested:
Built image without appending the max31785-msl package
Verified no files related to it were in the image
Build image appending the max31785-msl package
Verified all related files were in the image
(From meta-phosphor rev: 22546d9032e077cddd4cef325080315e51720016)
Change-Id: Iacd8e4194f4749b023463965514ff6f73beb4739
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
| -rw-r--r-- | meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb index 5c98e745e..de7c02506 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb @@ -8,11 +8,17 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" inherit autotools pkgconfig inherit obmc-phosphor-systemd +PACKAGECONFIG ??= "" +# Autotools configure option to enable/disable max31785-msl +PACKAGECONFIG[max31785-msl] = "--enable-max31785-msl, --disable-max31785-msl" +# 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 = "phosphor-max31785-msl@.service" +SYSTEMD_SERVICE_max31785-msl = "${@bb.utils.contains('PACKAGECONFIG', 'max31785-msl', 'phosphor-max31785-msl@.service', '', d)}" DEPENDS += "autoconf-archive-native" DEPENDS += " \ |