openstack/pyeclib
Code Issues Proposed changes

Merge "pack_wheel: Add --require-isal argument"

Browse Source
This commit is contained in:
Zuul
2025-06-21 18:10:31 +00:00
committed by Gerrit Code Review
parent e99ece1195 037366e9bb
commit cf5464265b
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@@ -56,4 +56,4 @@ RUN cd /opt/src/liberasurecode*/ && \
make install make install
COPY . /opt/src/pyeclib/ COPY . /opt/src/pyeclib/
ENTRYPOINT ["/bin/sh", "-c", "/opt/python/${PYTHON_VERSION}/bin/python3 /opt/src/pyeclib/pack_wheel.py /opt/src/pyeclib/ --repair --so-suffix=${SO_SUFFIX} --wheel-dir=/output"] ENTRYPOINT ["/bin/sh", "-c", "/opt/python/${PYTHON_VERSION}/bin/python3 /opt/src/pyeclib/pack_wheel.py /opt/src/pyeclib/ --repair --so-suffix=${SO_SUFFIX} --wheel-dir=/output --require-isal"]

11
pack_wheel.py
View File

@@ -113,7 +113,7 @@ def build_wheel(src_dir):
raise raise
def repack_wheel(whl, so_suffix, out_whl=None): def repack_wheel(whl, so_suffix, out_whl=None, require_isal=False):
""" """
Repack a wheel to bundle in liberasurecode libraries. Repack a wheel to bundle in liberasurecode libraries.
@@ -130,14 +130,14 @@ def repack_wheel(whl, so_suffix, out_whl=None):
zf = zipfile.ZipFile(whl, 'r') zf = zipfile.ZipFile(whl, 'r')
zf.extractall(tmp) zf.extractall(tmp)
relocate_libs(tmp, so_suffix) relocate_libs(tmp, so_suffix, require_isal)
rebuild_dist_info_record(tmp) rebuild_dist_info_record(tmp)
build_zip(tmp, out_whl) build_zip(tmp, out_whl)
finally: finally:
shutil.rmtree(tmp) shutil.rmtree(tmp)
def relocate_libs(tmp, so_suffix): def relocate_libs(tmp, so_suffix, require_isal=False):
""" """
Bundle libraries into a unpacked-wheel tree. Bundle libraries into a unpacked-wheel tree.
@@ -174,7 +174,7 @@ def relocate_libs(tmp, so_suffix):
maybe_add_needed(relocated_libec, os.path.basename(builtin_rs_vand)) maybe_add_needed(relocated_libec, os.path.basename(builtin_rs_vand))
# Nobody actually links against this, but we want it anyway if available # Nobody actually links against this, but we want it anyway if available
isal = locate_library('isal', missing_ok=True) isal = locate_library('isal', missing_ok=not require_isal)
if isal: if isal:
relocated_isal = inject(isal) relocated_isal = inject(isal)
maybe_add_needed(relocated_libec, os.path.basename(relocated_isal)) maybe_add_needed(relocated_libec, os.path.basename(relocated_isal))
@@ -324,11 +324,12 @@ def main():
parser.add_argument('-w', '--wheel-dir', default='.') parser.add_argument('-w', '--wheel-dir', default='.')
parser.add_argument('-s', '--so-suffix', default='-pyeclib') parser.add_argument('-s', '--so-suffix', default='-pyeclib')
parser.add_argument('-r', '--repair', action='store_true') parser.add_argument('-r', '--repair', action='store_true')
parser.add_argument('--require-isal', action='store_true')
args = parser.parse_args() args = parser.parse_args()
whl = build_wheel(args.src_dir) whl = build_wheel(args.src_dir)
whl_dir = os.path.dirname(whl) whl_dir = os.path.dirname(whl)
try: try:
repack_wheel(whl, args.so_suffix) repack_wheel(whl, args.so_suffix, require_isal=args.require_isal)
if args.repair: if args.repair:
whl = repair_wheel(whl) whl = repair_wheel(whl)
output_whl = os.path.join( output_whl = os.path.join(