Skip to content

Commit 23e4bbc

Browse files
committed
fix 16435fd
1 parent 16435fd commit 23e4bbc

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

platform/ceph/BUILD.bazel

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ LIBRARIES = [
7272
cmake_external(
7373
name = "ceph",
7474
binaries = BINARIES,
75-
shared_libraries = LIBRARIES,
7675
cache_entries = {
7776
"WITH_MANPAGE": "off",
7877
"WITH_PYTHON3": "off",
@@ -92,28 +91,35 @@ cmake_external(
9291
"WITH_MGR_DASHBOARD_FRONTEND": "off",
9392
},
9493
lib_source = "@ceph//:source",
95-
make_commands = ["make -j12", "make install"],
94+
make_commands = [
95+
"make -j12",
96+
"make install",
97+
],
98+
shared_libraries = LIBRARIES,
9699
)
97100

98101
unpack_filegroup(
99-
names = BINARIES + LIBRARIES,
100102
src = ":ceph",
103+
names = BINARIES + LIBRARIES,
101104
)
102105

103106
oci_include = {
104-
":" + binary: "/usr/bin/" + binary for binary in BINARIES
107+
":" + binary: "/usr/bin/" + binary
108+
for binary in BINARIES
105109
}
110+
106111
oci_include.update({
107-
":" + library: "/usr/lib/" + basename(library) for library in LIBRARIES
112+
":" + library: "/usr/lib/" + basename(library)
113+
for library in LIBRARIES
108114
})
109115

110116
homeworld_oci(
111117
name = "oci",
112118
bin = oci_include,
119+
visibility = ["//visibility:public"],
113120
deps = [
114121
":debian-for-ceph.tgz",
115122
],
116-
visibility = ["//visibility:public"],
117123
)
118124

119125
debinstall(

platform/ceph/deps_early.bzl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ def ceph_dependencies_early():
55
name = "rules_foreign_cc",
66
remote = "https://github.com/bazelbuild/rules_foreign_cc",
77
commit = "ed3db61a55c13da311d875460938c42ee8bbc2a5",
8-
98
patches = [
109
# we need this patch so that bazel's -D__DATE__="redacted" CFLAG doesn't become
1110
# -D__DATE__=redacted, which causes code that uses __DATE__ to break.
@@ -16,6 +15,5 @@ def ceph_dependencies_early():
1615
# we need this so that we can correctly reference the generated libraries
1716
"//ceph:foreign_cc/0002-more-output-groups.patch",
1817
],
19-
20-
shallow_since = "1574792034 +0100"
18+
shallow_since = "1574792034 +0100",
2119
)

platform/ceph/unpack.bzl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ def basename(name):
22
name_fragments = name.split("/")
33
return name_fragments[-1]
44

5-
65
# for unpacking results from foreign_cc cmake builds
76
def unpack_filegroup(names, src):
87
for name in names:

0 commit comments

Comments
 (0)