Remove use of system patchelf

Replace with set_runpath & set_runpath_tree

CMK-31095

Change-Id: I245ccc33ccb8f272a022e811d5034069b66f0c9a
(cherry picked from commit 65969ff)

Author: nigelgbanks

bazel/rules/make_deployable.bzl

@@ -1,70 +1,6 @@
-# Rules to fix binaries for deployment.
-# For example setting the RPATH
-load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo")
-
-# Set RPATH for a whole directory with unknown file names
-def _make_deployable_dir_impl(ctx):
-    output_dir = ctx.actions.declare_directory(ctx.attr.input_dir)
-
-    ctx.actions.run_shell(
-        inputs = [ctx.file.src],
-        outputs = [output_dir],
-        command = """
-            mkdir -p {output_path}
-            cp -r -L {src_path}/{input_dir}/* {output_path}
-
-            chmod u+w -R {output_path}
-
-            file -L {output_path}/* \\
-                | grep ELF | cut -d ':' -f1 \\
-                | xargs patchelf --force-rpath --set-rpath "{rpath}"
-
-        """.format(output_path = output_dir.path, src_path = ctx.file.src.path, input_dir = ctx.attr.input_dir, rpath = ctx.attr.rpath),
-    )
-
-    return [DefaultInfo(files = depset([output_dir]))]
-
-make_deployable_dir = rule(
-    implementation = _make_deployable_dir_impl,
-    attrs = {
-        "src": attr.label(allow_single_file = True, providers = ["files"], mandatory = True),  # gendir input
-        "input_dir": attr.string(mandatory = True),
-        "rpath": attr.string(mandatory = True),
-    },
-)
-
-# Set RPATH for a whole directory with known file names
-def _make_deployable_file_impl(ctx):
-    out_file = ctx.actions.declare_file(ctx.attr.out)
-
-    ctx.actions.run_shell(
-        inputs = [ctx.file.src],
-        outputs = [out_file],
-        command = """
-            if [ -d {input_path} ]; then
-                INPUT_FILE_PATH="{input_path}/{filename}"
-            else
-                INPUT_FILE_PATH="{input_path}"
-                # assert: filename must be suffix of input_path
-            fi
-            cp -r -L $INPUT_FILE_PATH {file_dir}
-            chmod u+w -R {file_dir}
-            file -L  {file_dir} \\
-                | grep ELF | cut -d ':' -f1 \\
-                | xargs patchelf --force-rpath --set-rpath "{rpath}"
-        """.format(input_path = ctx.file.src.path, filename = ctx.attr.out, file_dir = out_file.path, rpath = ctx.attr.rpath),
-    )
+"""Rules to prepare binaries for deployment by replacing strings."""
 
-    return [DefaultInfo(files = depset([out_file]))]
-
-make_deployable_file = rule(
-    implementation = _make_deployable_file_impl,
-    attrs = {
-        "src": attr.label(allow_single_file = True, providers = ["files"], mandatory = True),  # gendir input
-        "out": attr.string(mandatory = True),
-        "rpath": attr.string(mandatory = True),
-    },
-)
+load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo")
 
 def _string_replace_impl(ctx):
     output_dir = ctx.actions.declare_directory(ctx.label.name)

bazel/rules/patchelf.bzl

@@ -93,7 +93,7 @@ set_soname = rule(
 )
 
 def _set_runpath_tree_impl(ctx):
-    """Patches ELF .so files within a TreeArtifact with depth-relative RUNPATH."""
+    """Patches ELF files within a TreeArtifact with depth-relative RUNPATH."""
     patchelf = ctx.executable._patchelf
     tool = ctx.executable._tool
     src = ctx.file.src
@@ -119,7 +119,7 @@ set_runpath_tree = rule(
         ),
         "src": attr.label(
             allow_single_file = True,
-            doc = "TreeArtifact directory whose ELF .so files will be patched",
+            doc = "TreeArtifact directory whose ELF files will be patched",
             mandatory = True,
         ),
         "_patchelf": attr.label(
@@ -133,5 +133,5 @@ set_runpath_tree = rule(
             executable = True,
         ),
     },
-    doc = "Sets the RUNPATH of all ELF .so files within a directory TreeArtifact to depth-relative paths",
+    doc = "Sets the RUNPATH of all ELF files within a directory TreeArtifact to depth-relative paths",
 )

bazel/rules/set_runpath_tree.py

@@ -2,25 +2,30 @@
 # Copyright (C) 2026 Checkmk GmbH - License: GNU General Public License v2
 # This file is part of Checkmk (https://checkmk.com). It is subject to the terms and
 # conditions defined in the file COPYING, which is part of this source code package.
-"""Patches ELF .so files in a directory tree with depth-relative $ORIGIN rpaths."""
+"""Patches ELF files in a directory tree with depth-relative $ORIGIN rpaths."""
 
 import os
-import re
 import shutil
 import subprocess
 import sys
 
-_SO_PATTERN = re.compile(r"\.so(\.\d+)*$")
+
+def _is_elf(filepath: str) -> bool:
+    try:
+        with open(filepath, "rb") as f:
+            return f.read(4) == b"\x7fELF"
+    except OSError:
+        return False
 
 
 def _patch_elf_files(directory: str, patchelf: str, base_rpath: str) -> None:
     for dirpath, _, filenames in os.walk(directory):
         for filename in filenames:
-            if not _SO_PATTERN.search(filename):
-                continue
             filepath = os.path.join(dirpath, filename)
             if os.path.islink(filepath):
                 continue
+            if not _is_elf(filepath):
+                continue
             rel_dir = os.path.relpath(dirpath, directory)
             depth = len(rel_dir.split(os.sep)) if rel_dir != "." else 0
             extra_ups = "/".join([".."] * (depth - 1)) if depth > 1 else ""

omd/packages/Python/BUILD

@@ -1,7 +1,10 @@
+load("@aspect_bazel_lib//lib:copy_file.bzl", "copy_file")
+load("@aspect_bazel_lib//lib:copy_to_directory.bzl", "copy_to_directory")
+load("@aspect_bazel_lib//lib:directory_path.bzl", "directory_path")
 load("@rules_pkg//pkg:mappings.bzl", "pkg_attributes", "pkg_filegroup", "pkg_files", "pkg_mklink", "strip_prefix")
 load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
-load("//bazel/rules:exclude_from_filegroup.bzl", "exclude_from_filegroup")
-load("//bazel/rules:make_deployable.bzl", "make_deployable_dir", "string_replace")
+load("//bazel/rules:make_deployable.bzl", "string_replace")
+load("//bazel/rules:patchelf.bzl", "set_runpath", "set_runpath_tree")
 load("//omd/packages/Python:version.bzl", "PYTHON_MAJOR_DOT_MINOR", "PYTHON_VERSION_MAJOR")
 
 exports_files([
@@ -78,40 +81,71 @@ share_symlinks = [
 
 symlinks = bin_symlinks + lib_symlinks + pkgconfig_symlinks + share_symlinks
 
-# Deployable means binaries are prepared to be packaged.
-genrule(
-    name = "python_bin_deployable",
-    srcs = ["@python//:gen_dir"],
-    outs = bin_paths,
-    cmd = """
-        BIN=$$(find $(location @python//:gen_dir) -name bin)
-        rsync -r -L --chmod='u+w' $$BIN $$(realpath $(RULEDIR))
+filegroup(
+    name = "python_gen_dir",
+    srcs = ["@python"],
+    output_group = "gen_dir",
+    tags = ["manual"],
+)
+
+[directory_path(
+    name = "python_bin_path_%s" % f.replace("/", "_").replace(".", "_"),
+    directory = ":python_gen_dir",
+    path = f,
+    tags = ["manual"],
+) for f in bin_paths]
+
+[copy_file(
+    name = "python_bin_copy_%s" % f.replace("/", "_").replace(".", "_"),
+    src = ":python_bin_path_%s" % f.replace("/", "_").replace(".", "_"),
+    out = f.split("/")[-1],
+    tags = ["manual"],
+) for f in bin_paths]
+
+elf_bin_paths = [
+    "bin/python%s" % PYTHON_MAJOR_DOT_MINOR,
+]
 
-        # set RPATH for all ELF binaries we find
-        file -L $(OUTS) \\
-            | grep ELF | cut -d ':' -f1 \\
-            | xargs patchelf --force-rpath --set-rpath "\\$$ORIGIN/../lib"
-    """,
+script_bin_paths = [f for f in bin_paths if f not in elf_bin_paths]
+
+set_runpath(
+    name = "python_bin_deployable",
+    srcs = [":python_bin_copy_%s" % f.replace("/", "_").replace(".", "_") for f in elf_bin_paths],
+    rpaths = ["$ORIGIN/../lib"],
     tags = ["manual"],
 )
 
 pkg_files(
     name = "python_bin_pkg",
     srcs = [
         ":python_bin_deployable",
-    ],
+    ] + [":python_bin_copy_%s" % f.replace("/", "_").replace(".", "_") for f in script_bin_paths],
     attributes = pkg_attributes(
         mode = "0755",
     ),
     prefix = "bin",
     tags = ["manual"],
 )
 
-make_deployable_dir(
+directory_path(
+    name = "python_lib_dynload_path",
+    directory = ":python_gen_dir",
+    path = "lib/python%s/lib-dynload" % PYTHON_MAJOR_DOT_MINOR,
+    tags = ["manual"],
+)
+
+copy_to_directory(
+    name = "python_lib_dynload_copy",
+    srcs = [":python_lib_dynload_path"],
+    include_external_repositories = ["**"],
+    root_paths = ["**/lib-dynload"],
+    tags = ["manual"],
+)
+
+set_runpath_tree(
     name = "python_lib_dynload_deployable",
-    src = "@python//:gen_dir",
-    input_dir = "lib/python%s/lib-dynload" % PYTHON_MAJOR_DOT_MINOR,
-    rpath = "\\$ORIGIN/../..",
+    src = ":python_lib_dynload_copy",
+    rpath = "$ORIGIN/../..",
     tags = ["manual"],
 )
 
@@ -121,7 +155,8 @@ pkg_files(
     attributes = pkg_attributes(
         mode = "0755",
     ),
-    prefix = "lib/python%s/" % PYTHON_MAJOR_DOT_MINOR,
+    prefix = "lib/python%s/lib-dynload" % PYTHON_MAJOR_DOT_MINOR,
+    strip_prefix = "python_lib_dynload_deployable",
     tags = ["manual"],
 )
 
@@ -136,7 +171,7 @@ pkg_filegroup(
     name = "python_bin_symlinks_pkg",
     srcs = [
         ":%s" % link_name
-        for link_name, target in bin_symlinks
+        for link_name, _ in bin_symlinks
     ],
     prefix = "bin",
     tags = ["manual"],
@@ -146,7 +181,7 @@ pkg_filegroup(
     name = "python_lib_symlinks_pkg",
     srcs = [
         ":%s" % link_name
-        for link_name, target in lib_symlinks
+        for link_name, _ in lib_symlinks
     ],
     prefix = "lib",
     tags = ["manual"],
@@ -156,7 +191,7 @@ pkg_filegroup(
     name = "python_pkgconfig_symlinks_pkg",
     srcs = [
         ":%s" % link_name
-        for link_name, target in pkgconfig_symlinks
+        for link_name, _ in pkgconfig_symlinks
     ],
     prefix = "lib/pkgconfig",
     tags = ["manual"],
@@ -166,7 +201,7 @@ pkg_filegroup(
     name = "python_share_symlinks_pkg",
     srcs = [
         ":%s" % link_name
-        for link_name, target in share_symlinks
+        for link_name, _ in share_symlinks
     ],
     prefix = "share/man/man1",
     tags = ["manual"],
@@ -179,15 +214,21 @@ pkg_filegroup(
 # the RPATH needs patching, symlinking.
 # This target should contain all files that are not referenced
 # explicitly somewhere else.
-exclude_from_filegroup(
+copy_to_directory(
     name = "python_rest",
-    src = "@python//:gen_dir",
-    excludes = ["lib/python%s/lib-dynload" % PYTHON_MAJOR_DOT_MINOR] +
-               bin_paths +
-               ["bin/%s" % i[0] for i in bin_symlinks] +
-               ["lib/%s" % i[0] for i in lib_symlinks] +
-               ["lib/pkgconfig/%s" % i[0] for i in pkgconfig_symlinks] +
-               ["share/man/man1/%s" % i[0] for i in share_symlinks],
+    srcs = ["@python"],
+    exclude_srcs_patterns =
+        ["lib/python%s/lib-dynload/**" % PYTHON_MAJOR_DOT_MINOR] +
+        ["lib/%s" % i[0] for i in lib_symlinks] +
+        ["lib/pkgconfig/%s" % i[0] for i in pkgconfig_symlinks] +
+        ["share/man/man1/%s" % i[0] for i in share_symlinks],
+    include_external_repositories = ["**"],
+    include_srcs_patterns = [
+        "include/**",
+        "lib/**",
+        "share/**",
+    ],
+    root_paths = ["python"],
     tags = ["manual"],
 )
 

omd/packages/Python/BUILD.Python.bazel

@@ -114,9 +114,3 @@ configure_make(
     visibility = ["//visibility:public"],
     deps = ["@openssl"],
 )
-
-filegroup(
-    name = "gen_dir",
-    srcs = [":python"],
-    output_group = "gen_dir",
-)

omd/packages/freetds/BUILD

@@ -1,16 +1,28 @@
+load("@aspect_bazel_lib//lib:copy_to_directory.bzl", "copy_to_directory")
+load("@aspect_bazel_lib//lib:directory_path.bzl", "directory_path")
 load("@rules_pkg//pkg:mappings.bzl", "filter_directory", "pkg_filegroup", "pkg_files", "pkg_mklink", "strip_prefix")
 load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
-load("//bazel/rules:exclude_from_filegroup.bzl", "exclude_from_filegroup")
-load("//bazel/rules:make_deployable.bzl", "make_deployable_dir")
+load("//bazel/rules:patchelf.bzl", "set_runpath_tree")
 
-exclude_from_filegroup(
+filegroup(
+    name = "freetds_gen_dir",
+    srcs = ["@freetds"],
+    output_group = "gen_dir",
+    tags = ["manual"],
+)
+
+directory_path(
+    name = "freetds_include_dir",
+    directory = ":freetds_gen_dir",
+    path = "include",
+    tags = ["manual"],
+)
+
+copy_to_directory(
     name = "freetds_include",
-    src = "@freetds//:gen_dir",
-    excludes = [
-        "share",
-        "etc",
-        "lib",
-    ],
+    srcs = [":freetds_include_dir"],
+    include_external_repositories = ["**"],
+    root_paths = ["**/freetds"],
     tags = ["manual"],
 )
 
@@ -19,15 +31,29 @@ pkg_files(
     srcs = [
         ":freetds_include",
     ],
-    strip_prefix = strip_prefix.from_pkg("rest"),
+    strip_prefix = strip_prefix.from_pkg("freetds_include"),
+    tags = ["manual"],
+)
+
+directory_path(
+    name = "freetds_lib_dir",
+    directory = ":freetds_gen_dir",
+    path = "lib",
+    tags = ["manual"],
+)
+
+copy_to_directory(
+    name = "freetds_lib_copy",
+    srcs = [":freetds_lib_dir"],
+    include_external_repositories = ["**"],
+    root_paths = ["**/lib"],
     tags = ["manual"],
 )
 
-make_deployable_dir(
+set_runpath_tree(
     name = "freetds_lib_deployable",
-    src = "@freetds//:gen_dir",
-    input_dir = "lib",
-    rpath = "\\$ORIGIN",
+    src = ":freetds_lib_copy",
+    rpath = "$ORIGIN",
     tags = ["manual"],
 )