diff --git a/platform/ceph/BUILD.bazel b/platform/ceph/BUILD.bazel index a2dffdf04..de9e40b5e 100644 --- a/platform/ceph/BUILD.bazel +++ b/platform/ceph/BUILD.bazel @@ -72,7 +72,6 @@ LIBRARIES = [ cmake_external( name = "ceph", binaries = BINARIES, - shared_libraries = LIBRARIES, cache_entries = { "WITH_MANPAGE": "off", "WITH_PYTHON3": "off", @@ -92,28 +91,35 @@ cmake_external( "WITH_MGR_DASHBOARD_FRONTEND": "off", }, lib_source = "@ceph//:source", - make_commands = ["make -j12", "make install"], + make_commands = [ + "make -j12", + "make install", + ], + shared_libraries = LIBRARIES, ) unpack_filegroup( - names = BINARIES + LIBRARIES, src = ":ceph", + names = BINARIES + LIBRARIES, ) oci_include = { - ":" + binary: "/usr/bin/" + binary for binary in BINARIES + ":" + binary: "/usr/bin/" + binary + for binary in BINARIES } + oci_include.update({ - ":" + library: "/usr/lib/" + basename(library) for library in LIBRARIES + ":" + library: "/usr/lib/" + basename(library) + for library in LIBRARIES }) homeworld_oci( name = "oci", bin = oci_include, + visibility = ["//visibility:public"], deps = [ ":debian-for-ceph.tgz", ], - visibility = ["//visibility:public"], ) debinstall( diff --git a/platform/ceph/deps_early.bzl b/platform/ceph/deps_early.bzl index d6e864f51..edbc91362 100644 --- a/platform/ceph/deps_early.bzl +++ b/platform/ceph/deps_early.bzl @@ -5,7 +5,6 @@ def ceph_dependencies_early(): name = "rules_foreign_cc", remote = "https://github.com/bazelbuild/rules_foreign_cc", commit = "ed3db61a55c13da311d875460938c42ee8bbc2a5", - patches = [ # we need this patch so that bazel's -D__DATE__="redacted" CFLAG doesn't become # -D__DATE__=redacted, which causes code that uses __DATE__ to break. @@ -16,6 +15,5 @@ def ceph_dependencies_early(): # we need this so that we can correctly reference the generated libraries "//ceph:foreign_cc/0002-more-output-groups.patch", ], - - shallow_since = "1574792034 +0100" + shallow_since = "1574792034 +0100", ) diff --git a/platform/ceph/unpack.bzl b/platform/ceph/unpack.bzl index fa951af36..cbb5d1429 100644 --- a/platform/ceph/unpack.bzl +++ b/platform/ceph/unpack.bzl @@ -2,7 +2,6 @@ def basename(name): name_fragments = name.split("/") return name_fragments[-1] - # for unpacking results from foreign_cc cmake builds def unpack_filegroup(names, src): for name in names: