commit 14d7e2fa6e82c1d2b8ab90052b271cf2ef23b085
author James Zheng <alphetis@google.com> Mon Dec 01 05:45:30 2025 +0000
committer James Zheng <alphetis@google.com> Fri Dec 05 10:47:51 2025 -0800
tree 1bfb0024a926b556d96ba410a7704f17afc10b9e
parent b2e222002de86d80d5e91f56bf151989a625e20a

Disable phosphor-pid-control if tlbmc-thermal-control is on

Tested:
Manually verified

fusion2:
N/A

Google-Bug-Id: 463718795
Change-Id: I5495a1576f16ce752d0d8e87aa2e18ac5ce97108
Signed-off-by: James Zheng <alphetis@google.com>

recipes-phosphor/images/obmc-phosphor-image.bbappend

diff --git a/recipes-phosphor/images/obmc-phosphor-image.bbappend b/recipes-phosphor/images/obmc-phosphor-image.bbappend
index 1c63c83..107ab06 100644
--- a/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ b/recipes-phosphor/images/obmc-phosphor-image.bbappend
@@ -19,6 +19,8 @@
 OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = " gbmc-hosts-gen"
 OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = " gbmc-dump-ramoops"
 OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = " coredump-config"
+OBMC_IMAGE_EXTRA_INSTALL:remove:gbmc = '${@bb.utils.contains("DISTRO_FEATURES", "tlbmc tlbmc-thermal-control", \
+  " phosphor-pid-control", "", d)}'
 OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = '${@bb.utils.contains("MACHINE_FEATURES", "gbmc-baremetal", \
   " bare-metal-setup", "", d)}'
 OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = '${@bb.utils.contains("MACHINE_FEATURES", "gbmc-baremetal", \