Deprecate the support for x86 sdk
OpenBMC as a project has moved away from using yocto x86 sdks for unit
testing. Instead now the preferred way to build and test code is by two
ways:
1. Leveraging the meson subproject support
2. Using openbmc docker container
Since x86 sdks needed some weird hacks in the code base like figuring
out the linker arguments ourselves & running custom bash commands from
the meson build files. Also with changing yocto code base, its a large
maintainer burden to make sure this support works.
Tested:
Code builds & unit tests are passed with both the approaches mentioned
above.
Change-Id: Iaf55e2c003ffd9ee1a295de5bdfd14d81222e94b
Signed-off-by: Manojkiran Eda <manojkiran.eda@gmail.com>
diff --git a/README.md b/README.md
index 4062280..c7ddc7f 100644
--- a/README.md
+++ b/README.md
@@ -14,13 +14,9 @@
meson setup builddir && meson setup test -C builddir
```
-Alternatively, tests can be run in the OpenBMC CI docker container, or with an
-OpenBMC x86 sdk(see below for x86 steps).
-
-```
-meson setup -Doe-sdk=enabled build
-ninja -C build test
-```
+Alternatively, tests can be run in the OpenBMC CI docker container using
+[these](https://github.com/openbmc/docs/blob/master/testing/local-ci-build.md)
+steps.
## To enable pldm verbosity
diff --git a/common/test/meson.build b/common/test/meson.build
index bedb93e..e7a3ac7 100644
--- a/common/test/meson.build
+++ b/common/test/meson.build
@@ -9,8 +9,6 @@
foreach t : tests
test(t, executable(t.underscorify(), t + '.cpp',
implicit_include_directories: false,
- link_args: dynamic_linker,
- build_rpath: get_option('oe-sdk').allowed() ? rpath : '',
dependencies: [
common_test_src,
gtest,
diff --git a/fw-update/test/meson.build b/fw-update/test/meson.build
index ce47e57..5749e14 100644
--- a/fw-update/test/meson.build
+++ b/fw-update/test/meson.build
@@ -17,8 +17,6 @@
test(t, executable(t.underscorify(), t + '.cpp',
implicit_include_directories: false,
include_directories: '../../pldmd',
- link_args: dynamic_linker,
- build_rpath: get_option('oe-sdk').allowed() ? rpath : '',
dependencies: [
fw_update_test_src,
gmock,
diff --git a/host-bmc/test/meson.build b/host-bmc/test/meson.build
index 9c4a0dd..30f6624 100644
--- a/host-bmc/test/meson.build
+++ b/host-bmc/test/meson.build
@@ -17,8 +17,6 @@
test(t, executable(t.underscorify(), t + '.cpp',
test_sources,
implicit_include_directories: false,
- link_args: dynamic_linker,
- build_rpath: get_option('oe-sdk').allowed() ? rpath : '',
dependencies: [
gtest,
gmock,
diff --git a/libpldmresponder/test/meson.build b/libpldmresponder/test/meson.build
index f2242c4..d7d3deb 100644
--- a/libpldmresponder/test/meson.build
+++ b/libpldmresponder/test/meson.build
@@ -34,8 +34,6 @@
test(t, executable(t.underscorify(), t + '.cpp',
implicit_include_directories: false,
include_directories: [ '../../requester', '../../pldmd' ],
- link_args: dynamic_linker,
- build_rpath: get_option('oe-sdk').allowed() ? rpath : '',
dependencies: [
libpldm_dep,
libpldmresponder_dep,
diff --git a/meson.build b/meson.build
index b0ca947..93b4728 100644
--- a/meson.build
+++ b/meson.build
@@ -94,20 +94,6 @@
CLI11_dep = dependency('CLI11')
endif
-if get_option('oe-sdk').allowed()
- # Setup OE SYSROOT
- OECORE_TARGET_SYSROOT = run_command('sh', '-c', 'echo $OECORE_TARGET_SYSROOT').stdout().strip()
- if OECORE_TARGET_SYSROOT == ''
- error('Unable to get $OECORE_TARGET_SYSROOT, check your environment.')
- endif
- message('OE_SYSROOT: ' + OECORE_TARGET_SYSROOT)
- rpath = ':'.join([OECORE_TARGET_SYSROOT + '/lib', OECORE_TARGET_SYSROOT + '/usr/lib'])
- ld_so = run_command('sh', '-c', 'find ' + OECORE_TARGET_SYSROOT + '/lib/ld-*.so | sort -r -n | head -n1').stdout().strip()
- dynamic_linker = ['-Wl,-dynamic-linker,' + ld_so]
-else
- dynamic_linker = []
-endif
-
if get_option('tests').allowed()
gtest = dependency('gtest', main: true, disabler: true, required: false)
gmock = dependency('gmock', disabler: true, required: false)
diff --git a/meson.options b/meson.options
index 8449821..d52506e 100644
--- a/meson.options
+++ b/meson.options
@@ -7,13 +7,6 @@
)
option(
- 'oe-sdk',
- type: 'feature',
- value: 'disabled',
- description: 'Enable OE SDK'
-)
-
-option(
'utilities',
type: 'feature',
value: 'enabled',
diff --git a/requester/test/meson.build b/requester/test/meson.build
index 328bacf..29f4303 100644
--- a/requester/test/meson.build
+++ b/requester/test/meson.build
@@ -7,8 +7,6 @@
test(t, executable(t.underscorify(), t + '.cpp',
implicit_include_directories: false,
include_directories: [ '../../', '../../pldmd' ],
- link_args: dynamic_linker,
- build_rpath: get_option('oe-sdk').allowed() ? rpath : '',
dependencies: [
gtest,
gmock,
diff --git a/test/meson.build b/test/meson.build
index b4739d9..a1b3549 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -9,8 +9,6 @@
foreach t : tests
test(t, executable(t.underscorify(), t + '.cpp',
implicit_include_directories: false,
- link_args: dynamic_linker,
- build_rpath: get_option('oe-sdk').allowed() ? rpath : '',
dependencies: [
libpldm_dep,
nlohmann_json_dep,