Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .rpmignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,16 @@
#

el8/daos-*tests*.rpm
el8/daos-firmware*.rpm
el8/daos-mofed*.rpm
el8/daos-serialize*.rpm
el8/ucx*.rpm

el9/daos-*tests*.rpm
el9/daos-firmware*.rpm
el9/daos-mofed*.rpm
el9/daos-serialize*.rpm
el9/ucx*.rpm

leap15/daos-*tests*.rpm
leap15/daos-firmware*.rpm
leap15/daos-mofed*.rpm
leap15/daos-serialize*.rpm
leap15/openucx*.rpm
Expand Down
1 change: 0 additions & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,6 @@ void fixup_rpmlintrc() {
'/usr/bin/daos',
'/usr/bin/daos_agent',
'/usr/bin/hello_drpc',
'/usr/bin/daos_firmware',
'/usr/bin/daos_admin',
'/usr/bin/daos_server',
'/usr/bin/ddb']
Expand Down
1 change: 0 additions & 1 deletion site_scons/prereq_tools/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,6 @@ def __init__(self, env, opts):
PathVariable.PathIsDirCreate))
opts.Add('USE_INSTALLED', 'Comma separated list of preinstalled dependencies', 'none')
opts.Add(('MPI_PKG', 'Specifies name of pkg-config to load for MPI', None))
opts.Add(BoolVariable('FIRMWARE_MGMT', 'Build in device firmware management.', False))
opts.Add(EnumVariable('BUILD_TYPE', "Set the build type", 'release',
['dev', 'debug', 'release'], ignorecase=1))
opts.Add(EnumVariable('TARGET_TYPE', "Set the prerequisite type", 'default',
Expand Down
1 change: 0 additions & 1 deletion src/control/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,6 @@ The following build tags are applied automatically to include all testable code:

| Tag | What it enables |
|---|---|
| `firmware` | Firmware management command and handler |
| `fault_injection` | Fault injection support in server and client library |
| `test_stubs` | C library stubs (`libdaos`, `libgurt`) that avoid linking against the real shared libraries during unit tests |
| `spdk` | SPDK NVMe and BDev bindings |
Expand Down
11 changes: 0 additions & 11 deletions src/control/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,9 @@ from os import urandom
from os.path import join


def is_firmware_mgmt_build(benv):
"Check whether this build has firmware management enabled."
return benv["FIRMWARE_MGMT"] == 1


def get_build_tags(benv):
"Get custom go build tags."
tags = ["spdk"]
if is_firmware_mgmt_build(benv):
tags.append("firmware")
if not is_release_build(benv):
tags.append("fault_injection")
tags.append("pprof")
Expand Down Expand Up @@ -229,10 +222,6 @@ def scons():
aenv.d_add_rpaths(None, True, True)
install_go_bin(aenv, 'daos_server_helper', libs=['nvme_control'])

if is_firmware_mgmt_build(aenv):
print("(EXPERIMENTAL) Building DAOS firmware tools")
install_go_bin(aenv, "daos_firmware_helper", libs=['nvme_control'])

ddb_env = aenv.Clone()
ddb_env.AppendUnique(RPATH_FULL=['$PREFIX/lib64/daos_srv'])
ddb_env.d_add_rpaths(None, True, True)
Expand Down
145 changes: 0 additions & 145 deletions src/control/cmd/daos_firmware_helper/handler.go

This file was deleted.

Loading
Loading