Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

Commit

Permalink
Merge pull request #192 from nitkon/master
Browse files Browse the repository at this point in the history
runtime: Skip qemu-lite dependency for non-amd64 packaging
  • Loading branch information
jodh-intel authored Sep 27, 2018
2 parents 6613fc5 + 7fa02b2 commit 01b68b1
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion obs-packaging/runtime/debian.control-template
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Package: kata-runtime
Architecture: @deb_arch@
Depends: kata-containers-image (>= @kata_osbuilder_version@), kata-linux-container (>= @linux_container_version@),
kata-proxy (>= @kata_proxy_version@), kata-shim (>= @kata_shim_version@),
kata-ksm-throttler(>= @ksm_throttler_version@), qemu-lite(>= @qemu_lite_version@),
kata-ksm-throttler(>= @ksm_throttler_version@), qemu-lite(>= @qemu_lite_version@) [amd64],
qemu-vanilla(>= @qemu_vanilla_version@)
Description:
An Open Containers Initiative (OCI) "runtime" that launches an Intel VT-x secured Kata Containers hypervisor, rather than a standard Linux container.
2 changes: 1 addition & 1 deletion obs-packaging/runtime/kata-runtime.dsc-template
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Package: kata-runtime
Architecture: @deb_arch@
Depends: kata-containers-image (>= @kata_osbuilder_version@), kata-linux-container (>= @linux_container_version@),
kata-proxy (>= @kata_proxy_version@), kata-shim (>= @kata_shim_version@),
kata-ksm-throttler(>= @ksm_throttler_version@), qemu-lite(>= @qemu_lite_version@),
kata-ksm-throttler(>= @ksm_throttler_version@), qemu-lite(>= @qemu_lite_version@) [amd64],
qemu-vanilla(>= @qemu_vanilla_version@)
Description:
An Open Containers Initiative (OCI) "runtime" that launches an Intel VT-x secured Kata Containers hypervisor, rather than a standard Linux container.
4 changes: 3 additions & 1 deletion obs-packaging/runtime/kata-runtime.spec-template
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,10 @@ Requires: kata-linux-container >= @linux_container_version@
Requires: kata-proxy >= @kata_proxy_version@
Requires: kata-shim >= @kata_shim_version@
Requires: kata-ksm-throttler >= @ksm_throttler_version@
Requires: qemu-lite >= @qemu_lite_version@
Requires: qemu-vanilla >= @qemu_vanilla_version@
%ifarch x86_64
Requires: qemu-lite >= @qemu_lite_version@
%endif

# Patches
@RPM_PATCH_LIST@
Expand Down

0 comments on commit 01b68b1

Please sign in to comment.