Skip to content

Commit

Permalink
Remove python dep from handler and launcher containers
Browse files Browse the repository at this point in the history 
Python is not used and thus can be removed.

Signed-off-by: Radim Hrazdil <rhrazdil@redhat.com>
  • Loading branch information
Radim Hrazdil committed Oct 14, 2021
1 parent 29f0474 commit 8e160f1
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 156 deletions.
114 changes: 0 additions & 114 deletions WORKSPACE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -703,24 +703,6 @@ rpm(
],
)

rpm(
name = "checkpolicy-0__2.9-1.el8.aarch64",
sha256 = "01b89be34e48d345ba14a3856bba0d1ff94e79798b5f7529a6a0803b97adca15",
urls = [
"http://mirror.centos.org/centos/8-stream/BaseOS/aarch64/os/Packages/checkpolicy-2.9-1.el8.aarch64.rpm",
"https://storage.googleapis.com/builddeps/01b89be34e48d345ba14a3856bba0d1ff94e79798b5f7529a6a0803b97adca15",
],
)

rpm(
name = "checkpolicy-0__2.9-1.el8.x86_64",
sha256 = "d5c283da0d2666742635754626263f6f78e273cd46d83d2d66ed43730a731685",
urls = [
"http://mirror.centos.org/centos/8-stream/BaseOS/x86_64/os/Packages/checkpolicy-2.9-1.el8.x86_64.rpm",
"https://storage.googleapis.com/builddeps/d5c283da0d2666742635754626263f6f78e273cd46d83d2d66ed43730a731685",
],
)

rpm(
name = "chkconfig-0__1.19.1-1.el8.aarch64",
sha256 = "be370bfc2f375cdbfc1079b19423142236770cf67caf74cdb12a7aef8a29c8c5",
Expand Down Expand Up @@ -4126,18 +4108,6 @@ rpm(
urls = ["http://mirror.centos.org/centos/8-stream/BaseOS/x86_64/os/Packages/policycoreutils-2.9-16.el8.x86_64.rpm"],
)

rpm(
name = "policycoreutils-python-utils-0__2.9-16.el8.aarch64",
sha256 = "64a35814fe2fd8f4f5c8b4aba89d40556eaf9cf5fa0ff6a10e6b25b7b0f49f1d",
urls = ["http://mirror.centos.org/centos/8-stream/BaseOS/aarch64/os/Packages/policycoreutils-python-utils-2.9-16.el8.noarch.rpm"],
)

rpm(
name = "policycoreutils-python-utils-0__2.9-16.el8.x86_64",
sha256 = "64a35814fe2fd8f4f5c8b4aba89d40556eaf9cf5fa0ff6a10e6b25b7b0f49f1d",
urls = ["http://mirror.centos.org/centos/8-stream/BaseOS/x86_64/os/Packages/policycoreutils-python-utils-2.9-16.el8.noarch.rpm"],
)

rpm(
name = "polkit-0__0.115-12.el8.aarch64",
sha256 = "cbd709de63c28a95b78bb32e8da27cf062a2008a47c8d799a8d8bb82a00a33e3",
Expand Down Expand Up @@ -4237,24 +4207,6 @@ rpm(
],
)

rpm(
name = "python3-audit-0__3.0-0.17.20191104git1c2f876.el8.aarch64",
sha256 = "122fe05bd35778f2887e7f5cad32e8e93247fbbd71bd3da5ed78f788d529d028",
urls = [
"http://mirror.centos.org/centos/8-stream/BaseOS/aarch64/os/Packages/python3-audit-3.0-0.17.20191104git1c2f876.el8.aarch64.rpm",
"https://storage.googleapis.com/builddeps/122fe05bd35778f2887e7f5cad32e8e93247fbbd71bd3da5ed78f788d529d028",
],
)

rpm(
name = "python3-audit-0__3.0-0.17.20191104git1c2f876.el8.x86_64",
sha256 = "addf80c52d794aed47874eb9d5ddbbaa90cb248fda1634d793054a41da0d92d7",
urls = [
"http://mirror.centos.org/centos/8-stream/BaseOS/x86_64/os/Packages/python3-audit-3.0-0.17.20191104git1c2f876.el8.x86_64.rpm",
"https://storage.googleapis.com/builddeps/addf80c52d794aed47874eb9d5ddbbaa90cb248fda1634d793054a41da0d92d7",
],
)

rpm(
name = "python3-libs-0__3.6.8-42.el8.aarch64",
sha256 = "5c4f6c3636499a2b381816963ce4a28a50339c6a484934495c6c4f5bd56ccebf",
Expand All @@ -4273,42 +4225,6 @@ rpm(
],
)

rpm(
name = "python3-libselinux-0__2.9-5.el8.aarch64",
sha256 = "1a39d5db45d7e97f0a9b564b263ae22d20433bd2f40a6298b8e3ca6a80875da3",
urls = [
"http://mirror.centos.org/centos/8-stream/BaseOS/aarch64/os/Packages/python3-libselinux-2.9-5.el8.aarch64.rpm",
"https://storage.googleapis.com/builddeps/1a39d5db45d7e97f0a9b564b263ae22d20433bd2f40a6298b8e3ca6a80875da3",
],
)

rpm(
name = "python3-libselinux-0__2.9-5.el8.x86_64",
sha256 = "59ba5bf69953a5a2e902b0f08b7187b66d84968852d46a3579a059477547d1a0",
urls = [
"http://mirror.centos.org/centos/8-stream/BaseOS/x86_64/os/Packages/python3-libselinux-2.9-5.el8.x86_64.rpm",
"https://storage.googleapis.com/builddeps/59ba5bf69953a5a2e902b0f08b7187b66d84968852d46a3579a059477547d1a0",
],
)

rpm(
name = "python3-libsemanage-0__2.9-6.el8.aarch64",
sha256 = "bc96ccd4671ee6a42d4ad5bbfbbd67ad397d276e29b4353ca6d67ae9705924a7",
urls = [
"http://mirror.centos.org/centos/8-stream/BaseOS/aarch64/os/Packages/python3-libsemanage-2.9-6.el8.aarch64.rpm",
"https://storage.googleapis.com/builddeps/bc96ccd4671ee6a42d4ad5bbfbbd67ad397d276e29b4353ca6d67ae9705924a7",
],
)

rpm(
name = "python3-libsemanage-0__2.9-6.el8.x86_64",
sha256 = "451d0cb6e2284578e3279b4cbb5ec98e9d98a687556c6b424adf8f1282d4ef58",
urls = [
"http://mirror.centos.org/centos/8-stream/BaseOS/x86_64/os/Packages/python3-libsemanage-2.9-6.el8.x86_64.rpm",
"https://storage.googleapis.com/builddeps/451d0cb6e2284578e3279b4cbb5ec98e9d98a687556c6b424adf8f1282d4ef58",
],
)

rpm(
name = "python3-pip-0__9.0.3-20.el8.aarch64",
sha256 = "b615599db3ac6249e7b18e0c66474e080dc71ee72612bfa0268ea36b1a74e8da",
Expand Down Expand Up @@ -4345,36 +4261,6 @@ rpm(
],
)

rpm(
name = "python3-policycoreutils-0__2.9-16.el8.aarch64",
sha256 = "7a3c06827dcbc0d25af67771caa855af09ef4fd247434da9b484ca7c675baf24",
urls = ["http://mirror.centos.org/centos/8-stream/BaseOS/aarch64/os/Packages/python3-policycoreutils-2.9-16.el8.noarch.rpm"],
)

rpm(
name = "python3-policycoreutils-0__2.9-16.el8.x86_64",
sha256 = "7a3c06827dcbc0d25af67771caa855af09ef4fd247434da9b484ca7c675baf24",
urls = ["http://mirror.centos.org/centos/8-stream/BaseOS/x86_64/os/Packages/python3-policycoreutils-2.9-16.el8.noarch.rpm"],
)

rpm(
name = "python3-setools-0__4.3.0-2.el8.aarch64",
sha256 = "bd4efc248eee5517821027c94e937c69f92bac82243dc7798456fcef51521766",
urls = [
"http://mirror.centos.org/centos/8-stream/BaseOS/aarch64/os/Packages/python3-setools-4.3.0-2.el8.aarch64.rpm",
"https://storage.googleapis.com/builddeps/bd4efc248eee5517821027c94e937c69f92bac82243dc7798456fcef51521766",
],
)

rpm(
name = "python3-setools-0__4.3.0-2.el8.x86_64",
sha256 = "f56992135d789147285215cb062960fedcdf4b3296c62658fa430caa2c20165c",
urls = [
"http://mirror.centos.org/centos/8-stream/BaseOS/x86_64/os/Packages/python3-setools-4.3.0-2.el8.x86_64.rpm",
"https://storage.googleapis.com/builddeps/f56992135d789147285215cb062960fedcdf4b3296c62658fa430caa2c20165c",
],
)

rpm(
name = "python3-setuptools-0__39.2.0-6.el8.aarch64",
sha256 = "c6f27b6e01d80e756408e3c1451e4af00e7d02da0aa24402644c0785118753fe",
Expand Down
2 changes: 1 addition & 1 deletion hack/bootstrap.sh
View file
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="9899f40acd6c5bab091cb37d7f4489661eb40032"
sandbox_hash="46bc375f2dd8e72a015e83f245e4931e89f2df0d"

function kubevirt::bootstrap::regenerate() {
(
Expand Down
5 changes: 4 additions & 1 deletion hack/rpm-deps.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@ launcherbase_base="
libvirt-client-${LIBVIRT_VERSION}
libvirt-daemon-driver-qemu-${LIBVIRT_VERSION}
qemu-kvm-core-${QEMU_VERSION}
python36
"
launcherbase_x86_64="
edk2-ovmf-${EDK2_VERSION}
Expand Down Expand Up @@ -164,6 +163,7 @@ bazel run \
--name launcherbase_x86_64 \
--basesystem centos-stream-release \
--force-ignore-with-dependencies '^mozjs60' \
--force-ignore-with-dependencies 'python' \
$centos_base \
$centos_extra \
$launcherbase_base \
Expand All @@ -177,6 +177,7 @@ bazel run \
--name launcherbase_aarch64 --arch aarch64 \
--basesystem centos-stream-release \
--force-ignore-with-dependencies '^mozjs60' \
--force-ignore-with-dependencies 'python' \
$centos_base \
$centos_extra \
$launcherbase_base \
Expand Down Expand Up @@ -205,6 +206,7 @@ bazel run \
--config=${ARCHITECTURE} \
//:bazeldnf -- rpmtree --public --arch=aarch64 --name handlerbase_aarch64 \
--basesystem centos-stream-release \
--force-ignore-with-dependencies 'python' \
$centos_base \
$centos_extra \
$handler_base \
Expand All @@ -214,6 +216,7 @@ bazel run \
--config=${ARCHITECTURE} \
//:bazeldnf -- rpmtree --public --name handlerbase_x86_64 \
--basesystem centos-stream-release \
--force-ignore-with-dependencies 'python' \
$centos_base \
$centos_extra \
$handler_base \
Expand Down
40 changes: 0 additions & 40 deletions rpm/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,6 @@ rpmtree(
"@centos-gpg-keys-1__8-3.el8.aarch64//rpm",
"@centos-stream-release-0__8.6-1.el8.aarch64//rpm",
"@centos-stream-repos-0__8-3.el8.aarch64//rpm",
"@checkpolicy-0__2.9-1.el8.aarch64//rpm",
"@chkconfig-0__1.19.1-1.el8.aarch64//rpm",
"@coreutils-single-0__8.30-12.el8.aarch64//rpm",
"@cracklib-0__2.9.6-15.el8.aarch64//rpm",
Expand Down Expand Up @@ -363,8 +362,6 @@ rpmtree(
"@filesystem-0__3.8-6.el8.aarch64//rpm",
"@findutils-1__4.6.0-20.el8.aarch64//rpm",
"@gawk-0__4.2.1-2.el8.aarch64//rpm",
"@gdbm-1__1.18-1.el8.aarch64//rpm",
"@gdbm-libs-1__1.18-1.el8.aarch64//rpm",
"@gettext-0__0.19.8.1-17.el8.aarch64//rpm",
"@gettext-libs-0__0.19.8.1-17.el8.aarch64//rpm",
"@glib2-0__2.56.4-156.el8.aarch64//rpm",
Expand Down Expand Up @@ -477,27 +474,12 @@ rpmtree(
"@pcre-0__8.42-6.el8.aarch64//rpm",
"@pcre2-0__10.32-2.el8.aarch64//rpm",
"@pixman-0__0.38.4-1.el8.aarch64//rpm",
"@platform-python-0__3.6.8-42.el8.aarch64//rpm",
"@platform-python-pip-0__9.0.3-20.el8.aarch64//rpm",
"@platform-python-setuptools-0__39.2.0-6.el8.aarch64//rpm",
"@policycoreutils-0__2.9-16.el8.aarch64//rpm",
"@policycoreutils-python-utils-0__2.9-16.el8.aarch64//rpm",
"@polkit-0__0.115-12.el8.aarch64//rpm",
"@polkit-libs-0__0.115-12.el8.aarch64//rpm",
"@polkit-pkla-compat-0__0.1-12.el8.aarch64//rpm",
"@popt-0__1.18-1.el8.aarch64//rpm",
"@procps-ng-0__3.3.15-6.el8.aarch64//rpm",
"@python3-audit-0__3.0-0.17.20191104git1c2f876.el8.aarch64//rpm",
"@python3-libs-0__3.6.8-42.el8.aarch64//rpm",
"@python3-libselinux-0__2.9-5.el8.aarch64//rpm",
"@python3-libsemanage-0__2.9-6.el8.aarch64//rpm",
"@python3-pip-0__9.0.3-20.el8.aarch64//rpm",
"@python3-pip-wheel-0__9.0.3-20.el8.aarch64//rpm",
"@python3-policycoreutils-0__2.9-16.el8.aarch64//rpm",
"@python3-setools-0__4.3.0-2.el8.aarch64//rpm",
"@python3-setuptools-0__39.2.0-6.el8.aarch64//rpm",
"@python3-setuptools-wheel-0__39.2.0-6.el8.aarch64//rpm",
"@python36-0__3.6.8-38.module_el8.5.0__plus__895__plus__a459eca8.aarch64//rpm",
"@qemu-img-15__5.2.0-16.el8s.aarch64//rpm",
"@qemu-kvm-common-15__5.2.0-16.el8s.aarch64//rpm",
"@qemu-kvm-core-15__5.2.0-16.el8s.aarch64//rpm",
Expand Down Expand Up @@ -537,8 +519,6 @@ rpmtree(
"/var/run": "../run",
"/usr/sbin/iptables": "/usr/sbin/iptables-legacy",
"/usr/bin/nc": "/usr/bin/ncat",
"/usr/bin/python": "/usr/bin/python3.6",
"/usr/bin/python3": "/usr/bin/python3.6",
},
visibility = ["//visibility:public"],
)
Expand All @@ -562,7 +542,6 @@ rpmtree(
"@centos-gpg-keys-1__8-3.el8.x86_64//rpm",
"@centos-stream-release-0__8.6-1.el8.x86_64//rpm",
"@centos-stream-repos-0__8-3.el8.x86_64//rpm",
"@checkpolicy-0__2.9-1.el8.x86_64//rpm",
"@chkconfig-0__1.19.1-1.el8.x86_64//rpm",
"@coreutils-single-0__8.30-12.el8.x86_64//rpm",
"@cracklib-0__2.9.6-15.el8.x86_64//rpm",
Expand Down Expand Up @@ -593,8 +572,6 @@ rpmtree(
"@filesystem-0__3.8-6.el8.x86_64//rpm",
"@findutils-1__4.6.0-20.el8.x86_64//rpm",
"@gawk-0__4.2.1-2.el8.x86_64//rpm",
"@gdbm-1__1.18-1.el8.x86_64//rpm",
"@gdbm-libs-1__1.18-1.el8.x86_64//rpm",
"@gettext-0__0.19.8.1-17.el8.x86_64//rpm",
"@gettext-libs-0__0.19.8.1-17.el8.x86_64//rpm",
"@glib2-0__2.56.4-156.el8.x86_64//rpm",
Expand Down Expand Up @@ -709,27 +686,12 @@ rpmtree(
"@pcre-0__8.42-6.el8.x86_64//rpm",
"@pcre2-0__10.32-2.el8.x86_64//rpm",
"@pixman-0__0.38.4-1.el8.x86_64//rpm",
"@platform-python-0__3.6.8-42.el8.x86_64//rpm",
"@platform-python-pip-0__9.0.3-20.el8.x86_64//rpm",
"@platform-python-setuptools-0__39.2.0-6.el8.x86_64//rpm",
"@policycoreutils-0__2.9-16.el8.x86_64//rpm",
"@policycoreutils-python-utils-0__2.9-16.el8.x86_64//rpm",
"@polkit-0__0.115-12.el8.x86_64//rpm",
"@polkit-libs-0__0.115-12.el8.x86_64//rpm",
"@polkit-pkla-compat-0__0.1-12.el8.x86_64//rpm",
"@popt-0__1.18-1.el8.x86_64//rpm",
"@procps-ng-0__3.3.15-6.el8.x86_64//rpm",
"@python3-audit-0__3.0-0.17.20191104git1c2f876.el8.x86_64//rpm",
"@python3-libs-0__3.6.8-42.el8.x86_64//rpm",
"@python3-libselinux-0__2.9-5.el8.x86_64//rpm",
"@python3-libsemanage-0__2.9-6.el8.x86_64//rpm",
"@python3-pip-0__9.0.3-20.el8.x86_64//rpm",
"@python3-pip-wheel-0__9.0.3-20.el8.x86_64//rpm",
"@python3-policycoreutils-0__2.9-16.el8.x86_64//rpm",
"@python3-setools-0__4.3.0-2.el8.x86_64//rpm",
"@python3-setuptools-0__39.2.0-6.el8.x86_64//rpm",
"@python3-setuptools-wheel-0__39.2.0-6.el8.x86_64//rpm",
"@python36-0__3.6.8-38.module_el8.5.0__plus__895__plus__a459eca8.x86_64//rpm",
"@qemu-img-15__5.2.0-16.el8s.x86_64//rpm",
"@qemu-kvm-common-15__5.2.0-16.el8s.x86_64//rpm",
"@qemu-kvm-core-15__5.2.0-16.el8s.x86_64//rpm",
Expand Down Expand Up @@ -774,8 +736,6 @@ rpmtree(
"/var/run": "../run",
"/usr/sbin/iptables": "/usr/sbin/iptables-legacy",
"/usr/bin/nc": "/usr/bin/ncat",
"/usr/bin/python": "/usr/bin/python3.6",
"/usr/bin/python3": "/usr/bin/python3.6",
},
visibility = ["//visibility:public"],
)
Expand Down

0 comments on commit 8e160f1

Please sign in to comment.