Skip to content

Commit

Permalink
fix 16435fd
Browse files Browse the repository at this point in the history
  • Loading branch information
celskeggs committed Feb 29, 2020
1 parent 16435fd commit 23e4bbc
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 10 deletions.
18 changes: 12 additions & 6 deletions platform/ceph/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ LIBRARIES = [
cmake_external(
name = "ceph",
binaries = BINARIES,
shared_libraries = LIBRARIES,
cache_entries = {
"WITH_MANPAGE": "off",
"WITH_PYTHON3": "off",
Expand All @@ -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(
Expand Down
4 changes: 1 addition & 3 deletions platform/ceph/deps_early.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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",
)
1 change: 0 additions & 1 deletion platform/ceph/unpack.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 23e4bbc

Please sign in to comment.