Skip to content

Commit e3b09c6

Browse files
committed
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 30ab702 commit e3b09c6

File tree

5 files changed

+19
-11
lines changed

5 files changed

+19
-11
lines changed

BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ load("@bazel_skylib//lib:dicts.bzl", "dicts")
33

44
# See https://github.com/bazelbuild/bazel/issues/7899
55
load("@bazel_tools//tools/python:toolchain.bzl", "py_runtime_pair")
6-
load("@bazeldnf//:def.bzl", "bazeldnf")
6+
load("@bazeldnf//bazeldnf:defs.bzl", "bazeldnf")
77
load("@buildifier_prebuilt//:rules.bzl", "buildifier")
88
load("@com_github_ash2k_bazel_tools//goimports:def.bzl", "goimports")
99
load(

WORKSPACE

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -186,20 +186,31 @@ 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//:deps.bzl", "bazeldnf_dependencies", "rpm")
196+
load("@bazeldnf//bazeldnf:defs.bzl", "rpm")
197+
load(
198+
"@bazeldnf//bazeldnf:repositories.bzl",
199+
"bazeldnf_dependencies",
200+
"bazeldnf_register_toolchains",
201+
)
197202
load(
198203
"@io_bazel_rules_go//go:deps.bzl",
199204
"go_register_toolchains",
200205
"go_rules_dependencies",
201206
)
202207

208+
bazeldnf_dependencies()
209+
210+
bazeldnf_register_toolchains(
211+
name = "bazeldnf_prebuilt",
212+
)
213+
203214
go_rules_dependencies()
204215

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

236247
gazelle_dependencies()
237248

238-
bazeldnf_dependencies()
239-
240249
# Winrmcli dependencies
241250
go_repository(
242251
name = "com_github_masterzen_winrmcli",

cmd/virt-launcher/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@bazeldnf//:deps.bzl", "xattrs")
1+
load("@bazeldnf//bazeldnf:defs.bzl", "xattrs")
22
load(
33
"@io_bazel_rules_docker//container:container.bzl",
44
"container_image",

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="7b6c1afd5a044d144c3b5c4b7aab4c2046956b23"
29+
sandbox_hash="61deaceec112417ee9ce4dda389e4e41e7daca23"
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//:def.bzl", "bazeldnf")
2-
load("@bazeldnf//:deps.bzl", "rpm", "rpmtree", "tar2files")
1+
load("@bazeldnf//bazeldnf:defs.bzl", "bazeldnf", "rpm", "rpmtree", "tar2files")
32

43
bazeldnf(
54
name = "sandbox_x86_64",

0 commit comments

Comments
 (0)