Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/BUILD.bazel b/BUILD.bazel
- index b2bfe1c10..aa8238490 100644
- --- a/BUILD.bazel
- +++ b/BUILD.bazel
- @@ -21,14 +21,14 @@ genrule(
- name = "libvirt-shared-libs",
- srcs = ["@libvirt_libs//file"],
- outs = [
- - "libvirt.so.0.4102.0",
- - "libvirt-lxc.so.0.4102.0",
- - "libvirt-qemu.so.0.4102.0",
- + "libvirt.so.0.5001.0",
- + "libvirt-lxc.so.0.5001.0",
- + "libvirt-qemu.so.0.5001.0",
- ],
- cmd = "\n".join([
- - "rpm2archive $(location @libvirt_libs//file)",
- - "tar -xzf $(location @libvirt_libs//file).tgz",
- - "cp -R usr/lib64/*.so.0.4102.0 $(@D)",
- + "rpm2cpio $(location @libvirt_libs//file) | cpio -idmv",
- + "ls",
- + "cp -R usr/lib64/*.so.0.5001.0 $(@D)",
- ]),
- )
- @@ -64,8 +64,7 @@ genrule(
- "libvirt/virterror.h",
- ],
- cmd = "\n".join([
- - "rpm2archive $(location @libvirt_devel//file)",
- - "tar -xzf $(location @libvirt_devel//file).tgz",
- + "rpm2cpio $(location @libvirt_devel//file) | cpio -idmv",
- "cp -R usr/include/libvirt $(@D)",
- ]),
- )
- diff --git a/WORKSPACE b/WORKSPACE
- index 814288918..edaab9550 100644
- --- a/WORKSPACE
- +++ b/WORKSPACE
- @@ -39,14 +39,14 @@ git_repository(
- http_file(
- name = "libvirt_libs",
- urls = [
- - "https://rpmfind.net/linux/fedora-secondary/releases/28/Everything/ppc64le/os/Packages/l/libvirt-libs-4.1.0-2.fc28.ppc64le.rpm",
- + "https://copr-be.cloud.fedoraproject.org/results/%40virtmaint-sig/virt-preview/fedora-28-ppc64le/00865354-libvirt/libvirt-libs-5.1.0-2.fc28.ppc64le.rpm",
- ],
- )
- http_file(
- name = "libvirt_devel",
- urls = [
- - "https://rpmfind.net/linux/fedora-secondary/releases/28/Everything/ppc64le/os/Packages/l/libvirt-devel-4.1.0-2.fc28.ppc64le.rpm",
- + "https://copr-be.cloud.fedoraproject.org/results/%40virtmaint-sig/virt-preview/fedora-28-ppc64le/00865354-libvirt/libvirt-devel-5.1.0-2.fc28.ppc64le.rpm",
- ],
- )
- @@ -77,7 +77,7 @@ http_file(
- http_file(
- name = "virtio_win_image",
- - sha256 = "7a770f738d5853378204648a583d559753920f4f95aa54b5d4c6ff16ab37eaea",
- + sha256 = "594678f509ba6827c7b75d076ecfb64d45c6ad95e9fccba7258e6eee9a6a3560",
- urls = [
- "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/latest-virtio/virtio-win.iso",
- ],
- @@ -196,9 +196,9 @@ http_file(
- http_file(
- name = "libstdc",
- - sha256 = "91e909dda77de31d5653e14e342bb4f0c0e44a82e688d343a192b3ed71479708",
- + sha256 = "61743bc70033f02604fc18991f2a06efebd3b0f55abcbf5b1f7bd3e3cdca6293",
- urls = [
- - "https://dl.fedoraproject.org/pub/fedora/linux/updates/28/Everything/x86_64/Packages/l/libstdc++-8.2.1-6.fc28.x86_64.rpm",
- + "https://dl.fedoraproject.org/pub/fedora/linux/updates/28/Everything/x86_64/Packages/l/libstdc++-8.3.1-2.fc28.x86_64.rpm",
- ],
- )
- diff --git a/hack/bazel-generate.sh b/hack/bazel-generate.sh
- index 620bfb580..123c640e7 100755
- --- a/hack/bazel-generate.sh
- +++ b/hack/bazel-generate.sh
- @@ -7,8 +7,9 @@ rm -f vendor/github.com/libvirt/libvirt-go/BUILD.bazel
- bazel run //:gazelle
- # inject changes to libvirt BUILD file
- -bazel run --run_under='cd /root/go/src/kubevirt.io/kubevirt &&' -- @com_github_bazelbuild_buildtools//buildozer 'add cdeps //:libvirt-libs //:libvirt-headers' //vendor/github.com/libvirt/libvirt-go:go_default_library
- -bazel run --run_under='cd /root/go/src/kubevirt.io/kubevirt &&' -- @com_github_bazelbuild_buildtools//buildozer 'add copts -Ibazel-out/k8-fastbuild/genfiles' //vendor/github.com/libvirt/libvirt-go:go_default_library
- +bazel run --run_under='cd /root/kubevirt &&' -- @com_github_bazelbuild_buildtools//buildozer 'add cdeps //:libvirt-libs //:libvirt-headers' //vendor/github.com/libvirt/libvirt-go:go_default_library
- +bazel run --run_under='cd /root/kubevirt &&' -- @com_github_bazelbuild_buildtools//buildozer 'add copts -Ibazel-out/ppc-fastbuild/genfiles' //vendor/github.com/libvirt/libvirt-go:go_default_library
- +bazel run --run_under='cd /root/kubevirt &&' -- @com_github_bazelbuild_buildtools//buildozer 'add clinkopts -Wl,-unresolved-symbols=ignore-in-shared-libs' //vendor/github.com/libvirt/libvirt-go:go_default_library
- # allign BAZEL files to a single format
- bazel run //:buildifier
- diff --git a/vendor/github.com/libvirt/libvirt-go/BUILD.bazel b/vendor/github.com/libvirt/libvirt-go/BUILD.bazel
- index f6c797bef..cce5678e3 100644
- --- a/vendor/github.com/libvirt/libvirt-go/BUILD.bazel
- +++ b/vendor/github.com/libvirt/libvirt-go/BUILD.bazel
- @@ -86,7 +86,8 @@ go_library(
- "//:libvirt-libs",
- ],
- cgo = True,
- - copts = ["-Ibazel-out/k8-fastbuild/genfiles"],
- + clinkopts = ["-Wl,-unresolved-symbols=ignore-in-shared-libs"],
- + copts = ["-Ibazel-out/ppc-fastbuild/genfiles"],
- importmap = "kubevirt.io/kubevirt/vendor/github.com/libvirt/libvirt-go",
- importpath = "github.com/libvirt/libvirt-go",
- visibility = ["//visibility:public"],
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement