Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

control:ibm,Rainier: Add hot PCIe card #53

Merged
merged 2 commits into from
Jan 16, 2025

Conversation

spinler
Copy link
Contributor

@spinler spinler commented Jan 16, 2025

Add the 'Moso' card to all Rainier models.

Also cherry picked in a commit from master that went in a while ago to fix a fail due to an updated glibc, which CI must have now.

Change-Id: I2ad38ea9926f76fe9324052ef68045bd086dcb63

@spinler
Copy link
Contributor Author

spinler commented Jan 16, 2025

seems unrelated:

FAILED: monitor/phosphor-fan-monitor.p/.._hwmon_ffdc.cpp.o 
c++ -Imonitor/phosphor-fan-monitor.p -Imonitor -I../monitor -I. -I.. -I/usr/local/include -fdiagnostics-color=never -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Wpedantic -Werror -std=c++20 -O0 -g -DBOOST_ASIO_DISABLE_THREADS -DBOOST_ALL_NO_LIB -DBOOST_SYSTEM_NO_DEPRECATED -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_COROUTINES_NO_DEPRECATION_WARNING -MD -MQ monitor/phosphor-fan-monitor.p/.._hwmon_ffdc.cpp.o -MF monitor/phosphor-fan-monitor.p/.._hwmon_ffdc.cpp.o.d -o monitor/phosphor-fan-monitor.p/.._hwmon_ffdc.cpp.o -c ../hwmon_ffdc.cpp
../hwmon_ffdc.cpp: In function ‘std::vector<std::__cxx11::basic_string<char>, std::allocator<std::__cxx11::basic_string<char> > > phosphor::fan::monitor::util::executeCommand(const std::string&)’:
../hwmon_ffdc.cpp:26:44: error: ignoring attributes on template argument ‘int (*)(FILE*)’ [-Werror=ignored-attributes]
   26 |     std::unique_ptr<FILE, decltype(&pclose)> pipe(popen(command.c_str(), "r"),
      |                                            ^
cc1plus: all warnings being treated as errors

williamspatrick and others added 2 commits January 16, 2025 13:46
An upcoming Yocto update reveiled a compile failure due to ignoring the
return value from `pclose` when used as a unique_ptr deleter.  Switch
to a lambda indirection where the return is explicitly ignored.

Signed-off-by: Patrick Williams <[email protected]>
Change-Id: Ifa5d3f346f75d37075df78acf916dde8fc1ead69
Add the 'Moso' card to all Rainier models.

Signed-off-by: Matt Spinler <[email protected]>
Change-Id: I2ad38ea9926f76fe9324052ef68045bd086dcb63
@rfrandse rfrandse merged commit d022932 into ibm-openbmc:1050 Jan 16, 2025
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants