Advertisement
Guest User

Untitled

a guest
Mar 20th, 2019
146
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 4.94 KB | None | 0 0
  1. diff --git a/BUILD.bazel b/BUILD.bazel
  2. index b2bfe1c10..aa8238490 100644
  3. --- a/BUILD.bazel
  4. +++ b/BUILD.bazel
  5. @@ -21,14 +21,14 @@ genrule(
  6.      name = "libvirt-shared-libs",
  7.      srcs = ["@libvirt_libs//file"],
  8.      outs = [
  9. -        "libvirt.so.0.4102.0",
  10. -        "libvirt-lxc.so.0.4102.0",
  11. -        "libvirt-qemu.so.0.4102.0",
  12. +        "libvirt.so.0.5001.0",
  13. +        "libvirt-lxc.so.0.5001.0",
  14. +        "libvirt-qemu.so.0.5001.0",
  15.      ],
  16.      cmd = "\n".join([
  17. -        "rpm2archive $(location @libvirt_libs//file)",
  18. -        "tar -xzf $(location @libvirt_libs//file).tgz",
  19. -        "cp -R usr/lib64/*.so.0.4102.0 $(@D)",
  20. +        "rpm2cpio $(location @libvirt_libs//file) | cpio -idmv",
  21. +        "ls",
  22. +        "cp -R usr/lib64/*.so.0.5001.0 $(@D)",
  23.      ]),
  24.  )
  25.  
  26. @@ -64,8 +64,7 @@ genrule(
  27.          "libvirt/virterror.h",
  28.      ],
  29.      cmd = "\n".join([
  30. -        "rpm2archive $(location @libvirt_devel//file)",
  31. -        "tar -xzf $(location @libvirt_devel//file).tgz",
  32. +        "rpm2cpio $(location @libvirt_devel//file) | cpio -idmv",
  33.          "cp -R usr/include/libvirt $(@D)",
  34.      ]),
  35.  )
  36. diff --git a/WORKSPACE b/WORKSPACE
  37. index 814288918..edaab9550 100644
  38. --- a/WORKSPACE
  39. +++ b/WORKSPACE
  40. @@ -39,14 +39,14 @@ git_repository(
  41.  http_file(
  42.      name = "libvirt_libs",
  43.      urls = [
  44. -        "https://rpmfind.net/linux/fedora-secondary/releases/28/Everything/ppc64le/os/Packages/l/libvirt-libs-4.1.0-2.fc28.ppc64le.rpm",
  45. +        "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",
  46.      ],
  47.  )
  48.  
  49.  http_file(
  50.      name = "libvirt_devel",
  51.      urls = [
  52. -        "https://rpmfind.net/linux/fedora-secondary/releases/28/Everything/ppc64le/os/Packages/l/libvirt-devel-4.1.0-2.fc28.ppc64le.rpm",
  53. +        "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",
  54.      ],
  55.  )
  56.  
  57. @@ -77,7 +77,7 @@ http_file(
  58.  
  59.  http_file(
  60.      name = "virtio_win_image",
  61. -    sha256 = "7a770f738d5853378204648a583d559753920f4f95aa54b5d4c6ff16ab37eaea",
  62. +    sha256 = "594678f509ba6827c7b75d076ecfb64d45c6ad95e9fccba7258e6eee9a6a3560",
  63.      urls = [
  64.          "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/latest-virtio/virtio-win.iso",
  65.      ],
  66. @@ -196,9 +196,9 @@ http_file(
  67.  
  68.  http_file(
  69.      name = "libstdc",
  70. -    sha256 = "91e909dda77de31d5653e14e342bb4f0c0e44a82e688d343a192b3ed71479708",
  71. +    sha256 = "61743bc70033f02604fc18991f2a06efebd3b0f55abcbf5b1f7bd3e3cdca6293",
  72.      urls = [
  73. -        "https://dl.fedoraproject.org/pub/fedora/linux/updates/28/Everything/x86_64/Packages/l/libstdc++-8.2.1-6.fc28.x86_64.rpm",
  74. +        "https://dl.fedoraproject.org/pub/fedora/linux/updates/28/Everything/x86_64/Packages/l/libstdc++-8.3.1-2.fc28.x86_64.rpm",
  75.      ],
  76.  )
  77.  
  78. diff --git a/hack/bazel-generate.sh b/hack/bazel-generate.sh
  79. index 620bfb580..123c640e7 100755
  80. --- a/hack/bazel-generate.sh
  81. +++ b/hack/bazel-generate.sh
  82. @@ -7,8 +7,9 @@ rm -f vendor/github.com/libvirt/libvirt-go/BUILD.bazel
  83.  bazel run //:gazelle
  84.  
  85.  # inject changes to libvirt BUILD file
  86. -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
  87. -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
  88. +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
  89. +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
  90. +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
  91.  
  92.  # allign BAZEL files to a single format
  93.  bazel run //:buildifier
  94. diff --git a/vendor/github.com/libvirt/libvirt-go/BUILD.bazel b/vendor/github.com/libvirt/libvirt-go/BUILD.bazel
  95. index f6c797bef..cce5678e3 100644
  96. --- a/vendor/github.com/libvirt/libvirt-go/BUILD.bazel
  97. +++ b/vendor/github.com/libvirt/libvirt-go/BUILD.bazel
  98. @@ -86,7 +86,8 @@ go_library(
  99.          "//:libvirt-libs",
  100.      ],
  101.      cgo = True,
  102. -    copts = ["-Ibazel-out/k8-fastbuild/genfiles"],
  103. +    clinkopts = ["-Wl,-unresolved-symbols=ignore-in-shared-libs"],
  104. +    copts = ["-Ibazel-out/ppc-fastbuild/genfiles"],
  105.      importmap = "kubevirt.io/kubevirt/vendor/github.com/libvirt/libvirt-go",
  106.      importpath = "github.com/libvirt/libvirt-go",
  107.      visibility = ["//visibility:public"],
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement