Skip to content

Commit a0439e1

Browse files
rmohrbrianmcarey
authored andcommitted
Bump to bazeldnf version xattr fixes and better new bazel verison compatibility
The new version has a few fixes which are potentially hit on newer bazel versions due to plugin code changes and is also module ready in principle. Most notably it brings in rmohr/bazeldnf#135. Signed-off-by: Roman Mohr <rmohr@google.com>
1 parent ae22116 commit a0439e1

File tree

5 files changed

+37
-13
lines changed

5 files changed

+37
-13
lines changed

BUILD.bazel

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,22 @@
11
# See https://github.com/bazelbuild/bazel/issues/7899
22
load("@bazel_tools//tools/python:toolchain.bzl", "py_runtime_pair")
3+
load("@bazeldnf//bazeldnf:defs.bzl", "bazeldnf")
4+
load("@buildifier_prebuilt//:rules.bzl", "buildifier")
5+
load("@com_github_ash2k_bazel_tools//goimports:def.bzl", "goimports")
6+
load(
7+
"@io_bazel_rules_docker//container:container.bzl",
8+
"container_bundle",
9+
)
10+
load("@io_bazel_rules_docker//contrib:passwd.bzl", "passwd_entry", "passwd_file")
11+
12+
# heads up: docker_push is loaded from contrib:push-all, while container_push is loaded earlier from container:container
13+
load("@io_bazel_rules_docker//contrib:push-all.bzl", "docker_push")
14+
load(
15+
"@io_bazel_rules_docker//repositories:repositories.bzl",
16+
container_repositories = "repositories",
17+
)
18+
load("@io_bazel_rules_go//go:def.bzl", "go_library", "nogo")
19+
load("@rules_pkg//:pkg.bzl", "pkg_tar")
320

421
py_runtime(
522
name = "py2_runtime",
@@ -25,11 +42,8 @@ toolchain(
2542
toolchain_type = "@bazel_tools//tools/python:toolchain_type",
2643
)
2744

28-
load("@io_bazel_rules_go//go:def.bzl", "go_library")
2945
load("@bazel_gazelle//:def.bzl", "gazelle")
3046
load("@io_bazel_rules_go//go:def.bzl", "nogo")
31-
load("@com_github_ash2k_bazel_tools//goimports:def.bzl", "goimports")
32-
load("@bazeldnf//:def.bzl", "bazeldnf")
3347

3448
goimports(
3549
name = "goimports",

WORKSPACE

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -186,19 +186,30 @@ http_file(
186186

187187
http_archive(
188188
name = "bazeldnf",
189-
sha256 = "fb24d80ad9edad0f7bd3000e8cffcfbba89cc07e495c47a7d3b1f803bd527a40",
189+
sha256 = "286de512159f34ca3dcec01d0598eb7f502ab73c8f93e2ccb7a5a351c927cd84",
190+
strip_prefix = "bazeldnf-e72ea52c428aff923ded3e95d6ddbe7c43835e10",
190191
urls = [
191-
"https://github.com/rmohr/bazeldnf/releases/download/v0.5.9/bazeldnf-v0.5.9.tar.gz",
192-
"https://storage.googleapis.com/builddeps/fb24d80ad9edad0f7bd3000e8cffcfbba89cc07e495c47a7d3b1f803bd527a40",
192+
"https://github.com/rmohr/bazeldnf/archive/e72ea52c428aff923ded3e95d6ddbe7c43835e10.tar.gz",
193193
],
194194
)
195195

196+
load("@bazeldnf//bazeldnf:defs.bzl", "rpm")
197+
load(
198+
"@bazeldnf//bazeldnf:repositories.bzl",
199+
"bazeldnf_dependencies",
200+
"bazeldnf_register_toolchains",
201+
)
196202
load(
197203
"@io_bazel_rules_go//go:deps.bzl",
198204
"go_register_toolchains",
199205
"go_rules_dependencies",
200206
)
201-
load("@bazeldnf//:deps.bzl", "bazeldnf_dependencies", "rpm")
207+
208+
bazeldnf_dependencies()
209+
210+
bazeldnf_register_toolchains(
211+
name = "bazeldnf_prebuilt",
212+
)
202213

203214
go_rules_dependencies()
204215

@@ -235,8 +246,6 @@ go_repository(
235246

236247
gazelle_dependencies()
237248

238-
bazeldnf_dependencies()
239-
240249
load(
241250
"@bazel_tools//tools/build_defs/repo:git.bzl",
242251
"git_repository",

cmd/virt-launcher/BUILD.bazel

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
load("@bazeldnf//bazeldnf:defs.bzl", "xattrs")
2+
load("@io_bazel_rules_docker//contrib:group.bzl", "group_entry", "group_file")
3+
load("@io_bazel_rules_docker//contrib:passwd.bzl", "passwd_entry", "passwd_file")
14
load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
2-
load("@bazeldnf//:deps.bzl", "xattrs")
35

46
go_library(
57
name = "go_default_library",

hack/bootstrap.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ KUBEVIRT_NO_BAZEL=${KUBEVIRT_NO_BAZEL:-false}
2626
HOST_ARCHITECTURE="$(uname -m)"
2727

2828
sandbox_root=${SANDBOX_DIR}/default/root
29-
sandbox_hash="bab0ffa7bdb8b38b7de1cb73b30622a973ce29b3"
29+
sandbox_hash="4ad6466f6f170f1b590f48f86c39db7a99cedfc6"
3030

3131
function kubevirt::bootstrap::regenerate() {
3232
(

rpm/BUILD.bazel

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
load("@bazeldnf//:deps.bzl", "rpm", "rpmtree", "tar2files")
2-
load("@bazeldnf//:def.bzl", "bazeldnf")
1+
load("@bazeldnf//bazeldnf:defs.bzl", "bazeldnf", "rpm", "rpmtree", "tar2files")
32

43
bazeldnf(
54
name = "sandbox_x86_64",

0 commit comments

Comments
 (0)