Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2024-10-01 01:36:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

bazel: use patched RPATH in bootstrapper and disk-mapper binaries

Browse Source
This commit is contained in:
Malte Poll 2023-11-23 17:47:58 +01:00
parent e0739a67f9
commit ee3ff9ac01
4 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/actions/build_bootstrapper/action.yml vendored
View File

@ -18,7 +18,7 @@ runs:
run: | run: |
echo "::group::Build the bootstrapper" echo "::group::Build the bootstrapper"
mkdir -p "$(dirname "${OUTPUT_PATH}")" mkdir -p "$(dirname "${OUTPUT_PATH}")"
label=//bootstrapper/cmd/bootstrapper:bootstrapper_linux_amd64 label=//bootstrapper/cmd/bootstrapper:bootstrapper_patched
bazel build "${label}" bazel build "${label}"
repository_root=$(git rev-parse --show-toplevel) repository_root=$(git rev-parse --show-toplevel)
out_rel=$(bazel cquery --output=files "${label}") out_rel=$(bazel cquery --output=files "${label}")

4
bazel/devbuild/BUILD.bazel
View File

@ -6,7 +6,7 @@ sh_template(
data = [ data = [
":devbuild_cli_edition", ":devbuild_cli_edition",
"//bazel/release:container_sums", "//bazel/release:container_sums",
"//bootstrapper/cmd/bootstrapper:bootstrapper_linux_amd64", "//bootstrapper/cmd/bootstrapper:bootstrapper_patched",
"//cli:cli_edition_host", "//cli:cli_edition_host",
"//debugd/cmd/cdbg:cdbg_host", "//debugd/cmd/cdbg:cdbg_host",
"//terraform-provider-constellation:terraform_rc", "//terraform-provider-constellation:terraform_rc",
@ -15,7 +15,7 @@ sh_template(
"@yq_toolchains//:resolved_toolchain", "@yq_toolchains//:resolved_toolchain",
], ],
substitutions = { substitutions = {
"@@BOOTSTRAPPER@@": "$(rootpath //bootstrapper/cmd/bootstrapper:bootstrapper_linux_amd64)", "@@BOOTSTRAPPER@@": "$(rootpath //bootstrapper/cmd/bootstrapper:bootstrapper_patched)",
"@@CDBG@@": "$(rootpath //debugd/cmd/cdbg:cdbg_host)", "@@CDBG@@": "$(rootpath //debugd/cmd/cdbg:cdbg_host)",
"@@CLI@@": "$(rootpath //cli:cli_edition_host)", "@@CLI@@": "$(rootpath //cli:cli_edition_host)",
"@@CONTAINER_SUMS@@": "$(rootpath //bazel/release:container_sums)", "@@CONTAINER_SUMS@@": "$(rootpath //bazel/release:container_sums)",

15
bootstrapper/cmd/bootstrapper/BUILD.bazel
View File

@ -1,6 +1,7 @@
load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library") load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
load("@rules_pkg//:pkg.bzl", "pkg_tar") load("@rules_pkg//:pkg.bzl", "pkg_tar")
load("//bazel/go:platform.bzl", "platform_binary") load("//bazel/go:platform.bzl", "platform_binary")
load("//bazel/patchelf:patchelf.bzl", "patchelf")
go_library( go_library(
name = "bootstrapper_lib", name = "bootstrapper_lib",
@ -61,17 +62,25 @@ go_binary(
platform_binary( platform_binary(
name = "bootstrapper_linux_amd64", name = "bootstrapper_linux_amd64",
platform = "@zig_sdk//libc_aware/platform:linux_amd64_gnu.2.23", platform = "//bazel/platforms:constellation_os",
target_file = ":bootstrapper", target_file = ":bootstrapper",
)
patchelf(
name = "bootstrapper_patched",
src = ":bootstrapper_linux_amd64",
out = "bootstrapper_with_nix_rpath",
interpreter = "@cryptsetup_x86_64-linux//:dynamic-linker",
rpath = "@cryptsetup_x86_64-linux//:rpath",
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
) )
pkg_tar( pkg_tar(
name = "bootstrapper-package", name = "bootstrapper-package",
srcs = [ srcs = [
":bootstrapper_linux_amd64", ":bootstrapper_patched",
], ],
mode = "0755", mode = "0755",
remap_paths = {"/platform:linux_amd64_gnu.2.23": "/usr/bin/bootstrapper"}, remap_paths = {"/bootstrapper_with_nix_rpath": "/usr/bin/bootstrapper"},
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
) )

15
disk-mapper/cmd/BUILD.bazel
View File

@ -1,6 +1,7 @@
load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library") load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
load("@rules_pkg//:pkg.bzl", "pkg_tar") load("@rules_pkg//:pkg.bzl", "pkg_tar")
load("//bazel/go:platform.bzl", "platform_binary") load("//bazel/go:platform.bzl", "platform_binary")
load("//bazel/patchelf:patchelf.bzl", "patchelf")
go_library( go_library(
name = "cmd_lib", name = "cmd_lib",
@ -41,17 +42,25 @@ go_binary(
platform_binary( platform_binary(
name = "disk-mapper_linux_amd64", name = "disk-mapper_linux_amd64",
platform = "@zig_sdk//libc_aware/platform:linux_amd64_gnu.2.23", platform = "//bazel/platforms:constellation_os",
target_file = ":cmd", target_file = ":cmd",
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
) )
patchelf(
name = "disk-mapper_patched",
src = ":disk-mapper_linux_amd64",
out = "disk-mapper_with_nix_rpath",
interpreter = "@cryptsetup_x86_64-linux//:dynamic-linker",
rpath = "@cryptsetup_x86_64-linux//:rpath",
)
pkg_tar( pkg_tar(
name = "disk-mapper-package", name = "disk-mapper-package",
srcs = [ srcs = [
":disk-mapper_linux_amd64", ":disk-mapper_patched",
], ],
mode = "0755", mode = "0755",
remap_paths = {"/platform:linux_amd64_gnu.2.23": "/usr/sbin/disk-mapper"}, remap_paths = {"/disk-mapper_with_nix_rpath": "/usr/sbin/disk-mapper"},
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
) )