Skip to content

Commit

Permalink
Merge pull request #6657 from andreabolognani/virt-update
Browse files Browse the repository at this point in the history
rpm: Update libvirt and QEMU
  • Loading branch information
kubevirt-bot committed Oct 27, 2021
2 parents 828dd03 + e7896ee commit 03c314a
Show file tree
Hide file tree
Showing 11 changed files with 446 additions and 669 deletions.
687 changes: 225 additions & 462 deletions WORKSPACE

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ require (
kubevirt.io/containerized-data-importer v1.36.0
kubevirt.io/controller-lifecycle-operator-sdk v0.2.0
kubevirt.io/qe-tools v0.1.6
libvirt.org/go/libvirt v1.7005.0
libvirt.org/go/libvirt v1.7005.1
mvdan.cc/sh/v3 v3.1.1
sigs.k8s.io/yaml v1.2.0
)
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1283,8 +1283,8 @@ kubevirt.io/controller-lifecycle-operator-sdk v0.2.0 h1:/6baCbfeFl3z09nCPNAeCgTR
kubevirt.io/controller-lifecycle-operator-sdk v0.2.0/go.mod h1:ZJhLceiY2Gl5CXFGSp5eMGt/sksOiJP0289nAZFCQf0=
kubevirt.io/qe-tools v0.1.6 h1:S6z9CATmgV2/z9CWetij++Rhu7l/Z4ObZqerLdNMo0Y=
kubevirt.io/qe-tools v0.1.6/go.mod h1:PJyH/YXC4W0AmxfheDmXWMbLNsMSboVGXKpMAwfKzVE=
libvirt.org/go/libvirt v1.7005.0 h1:0ybKEADC0F2Os/EPs0eW+NhsHEQs5qjVBYkOSnndaKo=
libvirt.org/go/libvirt v1.7005.0/go.mod h1:1WiFE8EjZfq+FCVog+rvr1yatKbKZ9FaFMZgEqxEJqQ=
libvirt.org/go/libvirt v1.7005.1 h1:t8qFjP2De2O3xL93h6p3C3JWL4wV9oFc1QLuMq9ziN0=
libvirt.org/go/libvirt v1.7005.1/go.mod h1:1WiFE8EjZfq+FCVog+rvr1yatKbKZ9FaFMZgEqxEJqQ=
mvdan.cc/editorconfig v0.1.1-0.20200121172147-e40951bde157 h1:VBYz8greWWP8BDpRX0v7SDv/8rNlZVmdHdO4ZSsHj/E=
mvdan.cc/editorconfig v0.1.1-0.20200121172147-e40951bde157/go.mod h1:Ge4atmRUYqueGppvJ7JNrtqpqokoJEFxYbP0Z+WeKS8=
mvdan.cc/sh/v3 v3.1.1 h1:niuYC5Ug0KzLuN6CNX3ru37v4MkVD5Wm9T4Mk2eJr9A=
Expand Down
2 changes: 1 addition & 1 deletion hack/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ KUBEVIRT_NO_BAZEL=${KUBEVIRT_NO_BAZEL:-false}
HOST_ARCHITECTURE="$(uname -m)"

sandbox_root=${SANDBOX_DIR}/default/root
sandbox_hash="46bc375f2dd8e72a015e83f245e4931e89f2df0d"
sandbox_hash="40c3c43df355e45a8f47172763f636fededf9216"

function kubevirt::bootstrap::regenerate() {
(
Expand Down
14 changes: 7 additions & 7 deletions hack/rpm-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ source hack/common.sh
source hack/bootstrap.sh
source hack/config.sh

LIBVIRT_VERSION=0:7.0.0-14.el8s
QEMU_VERSION=15:5.2.0-16.el8s
LIBVIRT_VERSION=0:7.6.0-4.el8s
QEMU_VERSION=15:6.0.0-33.el8s
SEABIOS_VERSION=0:1.14.0-1.el8s
EDK2_VERSION=0:20200602gitca407c7246bf-4.el8
LIBGUESTFS_VERSION=1:1.44.0-3.el8s
Expand Down Expand Up @@ -43,7 +43,7 @@ testimage_base="
iputils
nmap-ncat
procps-ng
qemu-img
qemu-img-${QEMU_VERSION}
util-linux
which
"
Expand Down Expand Up @@ -139,6 +139,7 @@ launcherbase_base="
"
launcherbase_x86_64="
edk2-ovmf-${EDK2_VERSION}
qemu-kvm-hw-usbredir-${QEMU_VERSION}
seabios-${SEABIOS_VERSION}
"
launcherbase_aarch64="
Expand Down Expand Up @@ -243,11 +244,10 @@ bazel run \
$libguestfstools_x86_64 \
--force-ignore-with-dependencies '^(kernel-|linux-firmware)' \
--force-ignore-with-dependencies '^(python[3]{0,1}-|perl[3]{0,1}-)' \
--force-ignore-with-dependencies '^(mesa-|libwayland-|selinux-policy|mozjs60)' \
--force-ignore-with-dependencies '^(libvirt-daemon-driver-storage|swtpm)' \
--force-ignore-with-dependencies '^mozjs60' \
--force-ignore-with-dependencies '^(libvirt-daemon-kvm|swtpm)' \
--force-ignore-with-dependencies '^(man-db|mandoc)' \
--force-ignore-with-dependencies '^(dbus|glusterfs|libX11|qemu-kvm-block|trousers|usbredir)' \
--force-ignore-with-dependencies '^(gstreamer1|kbd|libX)'
--force-ignore-with-dependencies '^dbus'

# remove all RPMs which are no longer referenced by a rpmtree
bazel run \
Expand Down
383 changes: 198 additions & 185 deletions rpm/BUILD.bazel

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion vendor/libvirt.org/go/libvirt/.gitlab-ci.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/libvirt.org/go/libvirt/README.rst

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions vendor/libvirt.org/go/libvirt/callbacks.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions vendor/libvirt.org/go/libvirt/domain.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1009,7 +1009,7 @@ kubevirt.io/controller-lifecycle-operator-sdk/pkg/sdk/api
## explicit
kubevirt.io/qe-tools/pkg/ginkgo-reporters
kubevirt.io/qe-tools/pkg/polarion-xml
# libvirt.org/go/libvirt v1.7005.0
# libvirt.org/go/libvirt v1.7005.1
## explicit
libvirt.org/go/libvirt
# mvdan.cc/editorconfig v0.1.1-0.20200121172147-e40951bde157
Expand Down

0 comments on commit 03c314a

Please sign in to comment.