rpm: Simplify ignores for libguestfs image

If we ignore the libvirt-daemon-kvm package, which is a meta-package that brings in not only the QEMU driver but also a number of other things that we don't care about in the context of KubeVirt, we can simplify things a bit. In addition to that, there are a few more ignores that we can drop without affecting the results. Signed-off-by: Andrea Bolognani <[email protected]>
rbo · Oct 26, 2021 · f631dc0 · f631dc0
1 parent e66c548
commit f631dc0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 15 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -3320,15 +3320,6 @@ rpm(
     ],
 )
 
-rpm(
-    name = "libvirt-daemon-kvm-0__7.6.0-4.el8s.x86_64",
-    sha256 = "e2efb18ea44cb09c6bc2dca2dea58a97194efa29adb8f9edf068b2c099c46443",
-    urls = [
-        "http://mirror.centos.org/centos/8-stream/virt/x86_64/advancedvirt-common/Packages/l/libvirt-daemon-kvm-7.6.0-4.el8s.x86_64.rpm",
-        "https://storage.googleapis.com/builddeps/e2efb18ea44cb09c6bc2dca2dea58a97194efa29adb8f9edf068b2c099c46443",
-    ],
-)
-
 rpm(
     name = "libvirt-devel-0__7.0.0-14.el8s.aarch64",
     sha256 = "9e5181ed299dbcdb014060e1215378db71c7e6f260c88905e09066196e6241bc",

diff --git a/hack/bootstrap.sh b/hack/bootstrap.sh
@@ -26,7 +26,7 @@ KUBEVIRT_NO_BAZEL=${KUBEVIRT_NO_BAZEL:-false}
 HOST_ARCHITECTURE="$(uname -m)"
 
 sandbox_root=${SANDBOX_DIR}/default/root
-sandbox_hash="60da5c44e20f876381888ac8d53e1283807d2236"
+sandbox_hash="eb9078b6a5c5c56fd7836bdf8431040f8b5543f5"
 
 function kubevirt::bootstrap::regenerate() {
     (

diff --git a/hack/rpm-deps.sh b/hack/rpm-deps.sh
@@ -243,11 +243,11 @@ 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 '^usbredir' \
+    --force-ignore-with-dependencies '^dbus'
 
 # remove all RPMs which are no longer referenced by a rpmtree
 bazel run \

diff --git a/rpm/BUILD.bazel b/rpm/BUILD.bazel
@@ -889,7 +889,6 @@ rpmtree(
         "@libverto-0__0.3.0-5.el8.x86_64//rpm",
         "@libvirt-daemon-0__7.0.0-14.el8s.x86_64//rpm",
         "@libvirt-daemon-driver-qemu-0__7.0.0-14.el8s.x86_64//rpm",
-        "@libvirt-daemon-kvm-0__7.6.0-4.el8s.x86_64//rpm",
         "@libvirt-libs-0__7.0.0-14.el8s.x86_64//rpm",
         "@libxcrypt-0__4.1.1-6.el8.x86_64//rpm",
         "@libxkbcommon-0__0.9.1-1.el8.x86_64//rpm",