Skip to content

Commit

Permalink
rpm: Minor style adjustment to script
Browse files Browse the repository at this point in the history
Keep things nice and consistent.

Signed-off-by: Andrea Bolognani <[email protected]>
  • Loading branch information
andreabolognani committed Oct 27, 2022
1 parent 85fc5d9 commit 6510966
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions hack/rpm-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,6 @@ centos_extra="
libcurl-minimal
"

# get latest repo data from repo.yaml
bazel run \
--config=${ARCHITECTURE} \
//:bazeldnf -- fetch \
${bazeldnf_repos}

# create a rpmtree for our test image with misc. tools.
testimage_base="
device-mapper
Expand All @@ -52,9 +46,9 @@ testimage_base="
nmap-ncat
procps-ng
qemu-img-${QEMU_VERSION}
tar
util-linux
which
tar
"

# create a rpmtree for libvirt-devel. libvirt-devel is needed for compilation and unit-testing.
Expand All @@ -77,12 +71,13 @@ sandbox_base="
python36
sssd-client
"

# create a rpmtree for virt-launcher and virt-handler. This is the OS for our node-components.
launcherbase_base="
libvirt-client-${LIBVIRT_VERSION}
libvirt-daemon-driver-qemu-${LIBVIRT_VERSION}
qemu-kvm-core-${QEMU_VERSION}
passt-${PASST_VERSION}
qemu-kvm-core-${QEMU_VERSION}
"
launcherbase_x86_64="
edk2-ovmf-${EDK2_VERSION}
Expand All @@ -108,7 +103,6 @@ launcherbase_extra="
handler_base="
qemu-img-${QEMU_VERSION}
"

handlerbase_extra="
findutils
iproute
Expand Down Expand Up @@ -138,6 +132,12 @@ exportserver_base="
tar
"

# get latest repo data from repo.yaml
bazel run \
--config=${ARCHITECTURE} \
//:bazeldnf -- fetch \
${bazeldnf_repos}

if [ -z "${SINGLE_ARCH}" ] || [ "${SINGLE_ARCH}" == "x86_64" ]; then

bazel run \
Expand Down

0 comments on commit 6510966

Please sign in to comment.