a47e082e | 03-Jan-2024 |
Andrew Jeffery <andrew@codeconstruct.com.au> |
subprojects: Bump boost to 1.83
Bump to avoid issues such as the following:
``` In file included from ../src/Utils.hpp:3, from ../src/Thresholds.hpp:3, from ../src
subprojects: Bump boost to 1.83
Bump to avoid issues such as the following:
``` In file included from ../src/Utils.hpp:3, from ../src/Thresholds.hpp:3, from ../src/sensor.hpp:6, from ../src/PwmSensor.hpp:3, from ../src/PwmSensor.cpp:17: ../src/VariantVisitors.hpp:18:10: fatal error: boost/type_index.hpp: No such file or directory 18 | #include <boost/type_index.hpp> | ^~~~~~~~~~~~~~~~~~~~~~ ```
1.83 is used by openbmc/openbmc@43471c8c565d346c1727ba2360db373035234c26
With the bump I can now successfully build dbus-sensors on Debian Bookworm with `meson setup --cross-file=gcc-13 build`[1], even if boost libraries and headers of varying version are installed via `apt`.
[1]: https://amboar.github.io/notes/2023/09/12/unstable-gcc-on-debian-stable.html
Change-Id: I43cb95167ede3271cc6ce6ea6ea5421911b575c0 Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au>
show more ...
|
1d7b4788 | 03-Jan-2024 |
Andrew Jeffery <andrew@codeconstruct.com.au> |
meson: Improve boost integration
Currently we hit the following:
``` $ meson setup --force-fallback-for=boost build ... WARNING: Subproject 'boost' did not override 'boost' dependency and no variab
meson: Improve boost integration
Currently we hit the following:
``` $ meson setup --force-fallback-for=boost build ... WARNING: Subproject 'boost' did not override 'boost' dependency and no variable name specified Dependency boost from subproject subprojects/boost found: NO meson.build:57: WARNING: include_directories sandbox violation! The project is trying to access the directory 'subprojects/boost_1_79_0/' which belongs to a different subproject. This is a problem as it hardcodes the relative paths of these two projects. This makes it impossible to compile the project in any other directory layout and also prevents the subproject from changing its own directory layout.
Instead of poking directly at the internals the subproject should be executed and it should set a variable that the caller can then use. Something like:
# In subproject some_dep = declare_dependency(include_directories: include_directories('include'))
# In subproject wrap file [provide] some = some_dep
# In parent project some_dep = dependency('some') executable(..., dependencies: [some_dep])
This warning will become a hard error in a future Meson release.
meson.build:57:14: ERROR: Include dir subprojects/boost_1_79_0/ does not exist. ```
Address the sandbox violation and reduce the amount of configuration noise in meson.build by providing an appropriate wrap via packagefiles.
Change-Id: I4063764d2c3a00f58d3c83712092303538b64843 Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au>
show more ...
|
bb1faac3 | 04-Jan-2024 |
Andrew Jeffery <andrew@codeconstruct.com.au> |
subprojects: Bump liburing to 2.4-2
With the bump we receive the fix in af29310a780e ("liburing: override "liburing" dependency name") from mesonbuild/wrapdb, which addresses the following warning:
subprojects: Bump liburing to 2.4-2
With the bump we receive the fix in af29310a780e ("liburing: override "liburing" dependency name") from mesonbuild/wrapdb, which addresses the following warning:
``` WARNING: Subproject 'liburing' did not override 'liburing' dependency and no variable name specified Dependency liburing from subproject subprojects/liburing-liburing-2.2 found: NO ```
The wrap file content was changed via `meson wrap upgrade`.
Change-Id: I4cabb81348986cd376c592509e083be60b27fd2f Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au>
show more ...
|
ab570a60 | 07-Dec-2023 |
Patrick Williams <patrick@stwcx.xyz> |
meson: adjust nlohmann-json dependency
Simplify meson dependency logic and align wrap file name choice with other repositories.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Change-Id: I53883
meson: adjust nlohmann-json dependency
Simplify meson dependency logic and align wrap file name choice with other repositories.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Change-Id: I5388303c3a5227cfd3981878354cc62b90ebcb99
show more ...
|
b886bfc5 | 11-Oct-2023 |
Andrew Jeffery <andrew@codeconstruct.com.au> |
subprojects: Fix libpeci provide variable name
Since its introduction in libpeci with df5c868a14eb ("Declare meson dependency") the variable has been named `libpeci_dep`. It also appears that since
subprojects: Fix libpeci provide variable name
Since its introduction in libpeci with df5c868a14eb ("Declare meson dependency") the variable has been named `libpeci_dep`. It also appears that since its inception in 77141acb7f09 ("IntelCPUSensor: Use libpeci when communicating via peci-legacy") the variable name has been wrong in the dbus-sensors wrap.
Fix the debus-sensors wrap so we can build with libpeci as a meson subproject.
Tested:
Before:
``` $ meson subprojects purge --confirm && rm -rf build ... $ meson setup build ... Executing subproject libpeci
libpeci| Project name: libpeci libpeci| Project version: 1.0 libpeci| C compiler for the host machine: ccache cc (gcc 12.2.0 "cc (Debian 12.2.0-14) 12.2.0") libpeci| C linker for the host machine: cc ld.mold 1.10.1 libpeci| C++ compiler for the host machine: ccache c++ (gcc 12.2.0 "c++ (Debian 12.2.0-14) 12.2.0") libpeci| C++ linker for the host machine: c++ ld.mold 1.10.1 libpeci| Dependency sdbusplus found: YES 1.0.0 (cached) libpeci| Dependency systemd found: YES 252 (cached) libpeci| Dependency boost found: YES 1.81.0 (cached) libpeci| Build targets in project: 664 libpeci| Subproject libpeci finished.
WARNING: Variable 'peci_dep' in the subproject 'subprojects/libpeci' is not found Dependency libpeci from subproject subprojects/libpeci found: NO
src/meson.build:64:15: ERROR: Dependency 'libpeci' is required but not found. ```
After:
``` $ meson setup build ... Executing subproject libpeci
libpeci| Project name: libpeci libpeci| Project version: 1.0 libpeci| C compiler for the host machine: ccache cc (gcc 12.2.0 "cc (Debian 12.2.0-14) 12.2.0") libpeci| C linker for the host machine: cc ld.mold 1.10.1 libpeci| C++ compiler for the host machine: ccache c++ (gcc 12.2.0 "c++ (Debian 12.2.0-14) 12.2.0") libpeci| C++ linker for the host machine: c++ ld.mold 1.10.1 libpeci| Dependency sdbusplus found: YES 1.0.0 (cached) libpeci| Dependency systemd found: YES 252 (cached) libpeci| Dependency boost found: YES 1.81.0 (cached) libpeci| Build targets in project: 664 libpeci| Subproject libpeci finished.
Dependency libpeci from subproject subprojects/libpeci found: YES 1.0 ... ```
Change-Id: I18f9e89a25c184d7fdc38aea01ff5dbee118a974 Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au>
show more ...
|
77141acb | 14-Mar-2023 |
Oleksandr Shulzhenko <oleksandr.shulzhenko.viktorovych@intel.com> |
IntelCPUSensor: Use libpeci when communicating via peci-legacy
When using peci-legacy the general approach is to use libpeci as the middleware to communicate with peci core from userspace. Integrate
IntelCPUSensor: Use libpeci when communicating via peci-legacy
When using peci-legacy the general approach is to use libpeci as the middleware to communicate with peci core from userspace. Integrate libpeci with IntelCPUSensor and use library functions to issue peci commands where necessary.
Tested: hwmons are succesfully created in the same way they were created using ioctl.
Change-Id: I4ecd70e604d447a4066dc5fb8d902992cb97cadf Signed-off-by: Oleksandr Shulzhenko <oleksandr.shulzhenko.viktorovych@intel.com>
show more ...
|
16966b55 | 15-Sep-2021 |
Ed Tanous <edtanous@google.com> |
Enable an io-uring build
There exists a bug where calls that we previously thought were non-blocking, actually do block when used with hwmon or filesystem fds. This causes high latencies on the dbus
Enable an io-uring build
There exists a bug where calls that we previously thought were non-blocking, actually do block when used with hwmon or filesystem fds. This causes high latencies on the dbus interfaces when lots of sensors are used in a single daemon, as is the case in PSUSensor.
This patchset moves the PSUSensor code over to using io-uring, through boost asio, using the random_access_file class. This helps with performance in a number of ways, the largest of which being that sensor reads are no longer blocking.
Tested:
Booted the sensor system on Tyan S7106; dbus-monitor shows sensors scanning normally.
Signed-off-by: Ed Tanous <edtanous@google.com> Change-Id: I654eafcfab5a24b65b89c204ab43d81c7ae064cf
show more ...
|
3f556a84 | 21-Mar-2022 |
Patrick Williams <patrick@stwcx.xyz> |
meson: simplify dependencies
Leverage wrapfile `[provide]` directives to simplify the dependency searching in the meson.build.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Change-Id: If0797a
meson: simplify dependencies
Leverage wrapfile `[provide]` directives to simplify the dependency searching in the meson.build.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Change-Id: If0797ab803bbc5b254487e2050c69deceb829976
show more ...
|
5431c49a | 01-Mar-2022 |
Ed Tanous <edtanous@google.com> |
Don't tidy/format files in subproject
This pattern and files are copied from bmcweb.
Signed-off-by: Ed Tanous <edtanous@google.com> Change-Id: I84d1bb3386cdf7426b497a92137ec87345dc77cb |
08d684ac | 27-Aug-2021 |
Patrick Williams <patrick@stwcx.xyz> |
build: add phosphor-logging dep and wrap
Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Change-Id: I75d0e33c2e0432ef77e4d8618ebf28c6e4b3d8d0 |
1889ebf1 | 27-Aug-2021 |
Patrick Williams <patrick@stwcx.xyz> |
build: add wrapfile for nlohmann-json
Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Change-Id: I1d2c67b7a9db8e0e307d0b5d9efba1ae17c01de3 |
3911b821 | 27-Aug-2021 |
Patrick Williams <patrick@stwcx.xyz> |
build: add wrapfile for libgpiod
Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Change-Id: I6e9b3f12bcf05e60278457e561c29eeff4472585 |
2f20c5ab | 27-May-2021 |
Andrew Jeffery <andrew@aj.id.au> |
meson: Add googletest as a subproject
Signed-off-by: Andrew Jeffery <andrew@aj.id.au> Change-Id: I1a8088721006a3434606ec15324f84670581302e |
3f2e0524 | 26-May-2021 |
Andrew Jeffery <andrew@aj.id.au> |
meson: Add sdbusplus as a subproject
Signed-off-by: Andrew Jeffery <andrew@aj.id.au> Change-Id: I0d39c126e351b6ecae1a1c82904f5298065b184f |