diff --git a/obs-packaging/gen_versions_txt.sh b/obs-packaging/gen_versions_txt.sh
index 2f22dbb554..f4f9bda215 100755
--- a/obs-packaging/gen_versions_txt.sh
+++ b/obs-packaging/gen_versions_txt.sh
@@ -42,10 +42,6 @@ gen_version_file() {
kata_agent_hash=$(get_kata_hash "agent" "${ref}")
kata_ksm_throttler_hash=$(get_kata_hash "ksm-throttler" "${ref}")
- qemu_lite_branch=$(get_from_kata_deps "assets.hypervisor.qemu-lite.branch" "${kata_version}")
- qemu_lite_version=$(curl -s -L "https://raw.githubusercontent.com/${project}/qemu/${qemu_lite_branch}/VERSION")
- qemu_lite_hash=$(git ls-remote https://github.com/${project}/qemu.git | grep "refs/heads/${qemu_lite_branch}" | awk '{print $1}')
-
qemu_vanilla_branch=$(get_from_kata_deps "assets.hypervisor.qemu.version" "${kata_version}")
# Check if qemu.version can be used to get the version and hash, otherwise use qemu.tag
qemu_vanilla_ref="refs/heads/${qemu_vanilla_branch}"
@@ -90,9 +86,6 @@ kata_ksm_throttler_hash=${kata_ksm_throttler_hash}
# Dependencies
kata_osbuilder_version=${kata_version}
-qemu_lite_version=${qemu_lite_version}
-qemu_lite_hash=${qemu_lite_hash}
-
qemu_vanilla_version=${qemu_vanilla_version}
qemu_vanilla_hash=${qemu_vanilla_hash}
diff --git a/obs-packaging/qemu-lite/_service-template b/obs-packaging/qemu-lite/_service-template
deleted file mode 100644
index 4010fe020e..0000000000
--- a/obs-packaging/qemu-lite/_service-template
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
- git
- https://github.com/kata-containers/qemu.git
- .git
- qemu-lite
- @VERSION@+git.%h
- qemu-lite-@VERSION@
-
-
- *.tar*
- gz
-
-
diff --git a/obs-packaging/qemu-lite/debian.compat b/obs-packaging/qemu-lite/debian.compat
deleted file mode 100644
index ec635144f6..0000000000
--- a/obs-packaging/qemu-lite/debian.compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/obs-packaging/qemu-lite/debian.control-template b/obs-packaging/qemu-lite/debian.control-template
deleted file mode 100644
index a48063fbfd..0000000000
--- a/obs-packaging/qemu-lite/debian.control-template
+++ /dev/null
@@ -1,14 +0,0 @@
-Source: qemu-lite
-Section: devel
-Priority: optional
-Maintainer: Kata containers team
-Build-Depends: debhelper (>= 9), cpio, libelf-dev, rsync, libdw-dev, pkg-config, flex, bison, libaudit-dev, bc, python-dev, gawk, autoconf, automake, libtool, libltdl-dev, libglib2.0-dev, libglib2.0-0, libcap-dev, libcap-ng-dev, libattr1-dev, m4, libnuma-dev, zlib1g-dev, libpixman-1-0, libpixman-1-dev
-Standards-Version: 3.9.6
-Homepage: https://katacontainers.io
-
-Package: qemu-lite
-Architecture: @deb_arch@
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends},
-Description: linux kernel optimised for container-like workloads.
- Linux kernel optimised for container-like workloads
-
diff --git a/obs-packaging/qemu-lite/debian.rules-template b/obs-packaging/qemu-lite/debian.rules-template
deleted file mode 100644
index d54174e0bf..0000000000
--- a/obs-packaging/qemu-lite/debian.rules-template
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/make -f
-include /usr/share/dpkg/default.mk
-export LANG=C
-%:
- dh $@
-
-override_dh_auto_configure:
- chmod a+x "../SOURCES/configure-hypervisor.sh"
- eval "../SOURCES/configure-hypervisor.sh" "qemu-lite" | xargs ./configure --prefix=/usr
-
-override_dh_auto_build:
- make
-
-override_dh_auto_install:
- dh_auto_install
- for file in $(CURDIR)/debian/qemu-lite/usr/bin/* ; do \
- dir=$$(dirname $$file) ;\
- bin=$$(basename $$file) ;\
- new=$$(echo $$bin | sed -e 's/qemu-/qemu-lite-/g' -e 's/ivshmem-/ivshmem-lite-/g' -e 's/virtfs-/virtfs-lite-/g') ;\
- mv $$file "$$dir"/"$$new" ; \
- done
-
-override_dh_auto_test:
- echo "Skip auto test"
-
-override_dh_auto_clean:
- echo "Skip auto clean"
-
diff --git a/obs-packaging/qemu-lite/patches/0001-memfd-fix-configure-test.patch b/obs-packaging/qemu-lite/patches/0001-memfd-fix-configure-test.patch
deleted file mode 100644
index b1f354ac1c..0000000000
--- a/obs-packaging/qemu-lite/patches/0001-memfd-fix-configure-test.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 Mon Sep 17 00:00:00 2001
-From: Paolo Bonzini
-Date: Tue, 28 Nov 2017 11:51:27 +0100
-Subject: [PATCH] memfd: fix configure test
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-Recent glibc added memfd_create in sys/mman.h. This conflicts with
-the definition in util/memfd.c:
-
- /builddir/build/BUILD/qemu-2.11.0-rc1/util/memfd.c:40:12: error: static declaration of memfd_create follows non-static declaration
-
-Fix the configure test, and remove the sys/memfd.h inclusion since the
-file actually does not exist---it is a typo in the memfd_create(2) man
-page.
-
-Cc: Marc-André Lureau
-Signed-off-by: Paolo Bonzini
----
- configure | 2 +-
- util/memfd.c | 4 +---
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/configure b/configure
-index 9c8aa5a..99ccc17 100755
---- a/configure
-+++ b/configure
-@@ -3923,7 +3923,7 @@ fi
- # check if memfd is supported
- memfd=no
- cat > $TMPC << EOF
--#include
-+#include
-
- int main(void)
- {
-diff --git a/util/memfd.c b/util/memfd.c
-index 4571d1a..412e94a 100644
---- a/util/memfd.c
-+++ b/util/memfd.c
-@@ -31,9 +31,7 @@
-
- #include "qemu/memfd.h"
-
--#ifdef CONFIG_MEMFD
--#include
--#elif defined CONFIG_LINUX
-+#if defined CONFIG_LINUX && !defined CONFIG_MEMFD
- #include
- #include
-
---
-1.8.3.1
-
diff --git a/obs-packaging/qemu-lite/qemu-lite-rpmlintrc b/obs-packaging/qemu-lite/qemu-lite-rpmlintrc
deleted file mode 100644
index 9c3c26fb58..0000000000
--- a/obs-packaging/qemu-lite/qemu-lite-rpmlintrc
+++ /dev/null
@@ -1 +0,0 @@
-setBadness('arch-dependent-file-in-usr-share', 0)
\ No newline at end of file
diff --git a/obs-packaging/qemu-lite/qemu-lite.dsc-template b/obs-packaging/qemu-lite/qemu-lite.dsc-template
deleted file mode 100644
index 630cda1654..0000000000
--- a/obs-packaging/qemu-lite/qemu-lite.dsc-template
+++ /dev/null
@@ -1,16 +0,0 @@
-Format: 3.0 (quilt)
-Source: qemu-lite
-Version: @VERSION@+git.@QEMU_LITE_HASH@-@RELEASE@
-Section: devel
-Priority: optional
-Maintainer: Kata containers team
-Build-Depends: debhelper (>= 9), cpio, libelf-dev, rsync, libdw-dev, pkg-config, flex, bison, libaudit-dev, bc, python-dev, gawk, autoconf, automake, libtool, libltdl-dev, libglib2.0-dev, libglib2.0-0, libcap-dev, libcap-ng-dev, libattr1-dev, m4, libnuma-dev, zlib1g-dev, libpixman-1-0, libpixman-1-dev, librbd-dev
-Standards-Version: 3.9.6
-Homepage: https://katacontainers.io
-Debtransform-Tar: qemu-lite-@VERSION@+git.@QEMU_LITE_HASH@.tar.gz
-
-Package: qemu-lite
-Architecture: @deb_arch@
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends},
-Description: QEMU is a generic and open source machine & userspace emulator and
-virtualizer.
diff --git a/obs-packaging/qemu-lite/qemu-lite.spec-template b/obs-packaging/qemu-lite/qemu-lite.spec-template
deleted file mode 100644
index b79c88d4e0..0000000000
--- a/obs-packaging/qemu-lite/qemu-lite.spec-template
+++ /dev/null
@@ -1,211 +0,0 @@
-%global qemu_lite_hash @QEMU_LITE_HASH@
-Name: qemu-lite
-Version: @VERSION@+git.%{qemu_lite_hash}
-Release: @RELEASE@
-Source0: %{name}-%{version}.tar.gz
-Source1: qemu-lite-rpmlintrc
-Source2: configure-hypervisor.sh
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
-
-Summary : OpenBIOS development utilities
-Group : Development/Tools
-License : BSD-2-Clause BSD-3-Clause GPL-2.0 GPL-2.0+ LGPL-2.0+ LGPL-2.1
-
-Requires: qemu-lite-bin
-Requires: qemu-lite-data
-BuildRequires : automake
-BuildRequires : bison
-BuildRequires : flex
-BuildRequires : gcc-c++
-BuildRequires : glib2-devel
-BuildRequires : libattr-devel
-BuildRequires : libcap-devel
-BuildRequires : libcap-ng-devel
-BuildRequires : libtool
-BuildRequires : libtool-ltdl-devel
-BuildRequires : libtool
-BuildRequires : m4
-BuildRequires : findutils
-
-%if 0%{?centos_version}
-BuildRequires : librbd1-devel
-%else
-
-%if ! 0%{?rhel_version}
-BuildRequires : librbd-devel
-%endif
-
-%endif
-
-%if 0%{?suse_version}
-BuildRequires : libnuma-devel
-%else
-BuildRequires : numactl-devel
-%endif
-BuildRequires : python
-BuildRequires : python-devel
-BuildRequires : zlib-devel
-BuildRequires : pkgconfig(pixman-1)
-
-# Patches
-@RPM_PATCH_LIST@
-
-%description
-===========
-QEMU is a generic and open source machine & userspace emulator and
-virtualizer.
-
-%package bin
-Summary: bin components for the qemu-lite package.
-Group: Binaries
-Requires: qemu-lite-data
-
-%description bin
-bin components for the qemu-lite package.
-
-
-%package data
-Summary: data components for the qemu-lite package.
-Group: Data
-
-%description data
-data components for the qemu-lite package.
-
-%global debug_package %{nil}
-
-%prep
-chmod +x %{_sourcedir}/configure-hypervisor.sh
-
-%setup -q
-# Patches
-@RPM_APPLY_PATCHES@
-
-%build
-export LANG=C
-
-# RHEL in OBS does not provide librados.
-# Remove it: See https://github.com/kata-containers/packaging/issues/36
-"%{_sourcedir}/configure-hypervisor.sh" "qemu-lite" \
-%if 0%{?rhel_version}
- | sed -e 's/--enable-rbd//g' \
-%endif
- | xargs ./configure --prefix=/usr
-
-make V=1 %{?_smp_mflags}
-
-%install
-rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
-## make_install_append content
-for file in %{buildroot}/usr/bin/*
-do
- dir=$(dirname "$file")
- bin=$(basename "$file")
- new=$(echo "$bin"|sed -e 's/qemu-/qemu-lite-/g' -e 's/ivshmem-/ivshmem-lite-/g' -e 's/virtfs-/virtfs-lite-/g')
- mv "$file" "$dir/$new"
-done
-## make_install_append end
-
-%files
-%defattr(-,root,root,-)
-
-%files bin
-%defattr(-,root,root,-)
-/usr/bin/qemu-lite-ga
-/usr/bin/qemu-lite-pr-helper
-/usr/bin/qemu-lite-system-x86_64
-/usr/bin/virtfs-lite-proxy-helper
-%dir /usr/libexec
-%dir /usr/libexec/qemu-lite
-/usr/libexec/qemu-lite/qemu-bridge-helper
-
-%files data
-%defattr(-,root,root,-)
-%dir /usr/share/qemu-lite
-%dir /usr/share/qemu-lite/qemu
-%dir /usr/share/qemu-lite/qemu/keymaps
-/usr/share/qemu-lite/qemu/QEMU,cgthree.bin
-/usr/share/qemu-lite/qemu/QEMU,tcx.bin
-/usr/share/qemu-lite/qemu/acpi-dsdt.aml
-/usr/share/qemu-lite/qemu/bamboo.dtb
-/usr/share/qemu-lite/qemu/bios-256k.bin
-/usr/share/qemu-lite/qemu/bios.bin
-/usr/share/qemu-lite/qemu/efi-e1000.rom
-/usr/share/qemu-lite/qemu/efi-e1000e.rom
-/usr/share/qemu-lite/qemu/efi-eepro100.rom
-/usr/share/qemu-lite/qemu/efi-ne2k_pci.rom
-/usr/share/qemu-lite/qemu/efi-pcnet.rom
-/usr/share/qemu-lite/qemu/efi-rtl8139.rom
-/usr/share/qemu-lite/qemu/efi-virtio.rom
-/usr/share/qemu-lite/qemu/efi-vmxnet3.rom
-/usr/share/qemu-lite/qemu/keymaps/ar
-/usr/share/qemu-lite/qemu/keymaps/bepo
-/usr/share/qemu-lite/qemu/keymaps/common
-/usr/share/qemu-lite/qemu/keymaps/cz
-/usr/share/qemu-lite/qemu/keymaps/da
-/usr/share/qemu-lite/qemu/keymaps/de
-/usr/share/qemu-lite/qemu/keymaps/de-ch
-/usr/share/qemu-lite/qemu/keymaps/en-gb
-/usr/share/qemu-lite/qemu/keymaps/en-us
-/usr/share/qemu-lite/qemu/keymaps/es
-/usr/share/qemu-lite/qemu/keymaps/et
-/usr/share/qemu-lite/qemu/keymaps/fi
-/usr/share/qemu-lite/qemu/keymaps/fo
-/usr/share/qemu-lite/qemu/keymaps/fr
-/usr/share/qemu-lite/qemu/keymaps/fr-be
-/usr/share/qemu-lite/qemu/keymaps/fr-ca
-/usr/share/qemu-lite/qemu/keymaps/fr-ch
-/usr/share/qemu-lite/qemu/keymaps/hr
-/usr/share/qemu-lite/qemu/keymaps/hu
-/usr/share/qemu-lite/qemu/keymaps/is
-/usr/share/qemu-lite/qemu/keymaps/it
-/usr/share/qemu-lite/qemu/keymaps/ja
-/usr/share/qemu-lite/qemu/keymaps/lt
-/usr/share/qemu-lite/qemu/keymaps/lv
-/usr/share/qemu-lite/qemu/keymaps/mk
-/usr/share/qemu-lite/qemu/keymaps/modifiers
-/usr/share/qemu-lite/qemu/keymaps/nl
-/usr/share/qemu-lite/qemu/keymaps/nl-be
-/usr/share/qemu-lite/qemu/keymaps/no
-/usr/share/qemu-lite/qemu/keymaps/pl
-/usr/share/qemu-lite/qemu/keymaps/pt
-/usr/share/qemu-lite/qemu/keymaps/pt-br
-/usr/share/qemu-lite/qemu/keymaps/ru
-/usr/share/qemu-lite/qemu/keymaps/sl
-/usr/share/qemu-lite/qemu/keymaps/sv
-/usr/share/qemu-lite/qemu/keymaps/th
-/usr/share/qemu-lite/qemu/keymaps/tr
-/usr/share/qemu-lite/qemu/kvmvapic.bin
-/usr/share/qemu-lite/qemu/linuxboot.bin
-/usr/share/qemu-lite/qemu/linuxboot_dma.bin
-/usr/share/qemu-lite/qemu/multiboot.bin
-/usr/share/qemu-lite/qemu/openbios-ppc
-/usr/share/qemu-lite/qemu/openbios-sparc32
-/usr/share/qemu-lite/qemu/openbios-sparc64
-/usr/share/qemu-lite/qemu/palcode-clipper
-/usr/share/qemu-lite/qemu/petalogix-ml605.dtb
-/usr/share/qemu-lite/qemu/petalogix-s3adsp1800.dtb
-/usr/share/qemu-lite/qemu/ppc_rom.bin
-/usr/share/qemu-lite/qemu/pxe-e1000.rom
-/usr/share/qemu-lite/qemu/pxe-eepro100.rom
-/usr/share/qemu-lite/qemu/pxe-ne2k_pci.rom
-/usr/share/qemu-lite/qemu/pxe-pcnet.rom
-/usr/share/qemu-lite/qemu/pxe-rtl8139.rom
-/usr/share/qemu-lite/qemu/pxe-virtio.rom
-/usr/share/qemu-lite/qemu/qemu-icon.bmp
-/usr/share/qemu-lite/qemu/qemu_logo_no_text.svg
-/usr/share/qemu-lite/qemu/s390-ccw.img
-/usr/share/qemu-lite/qemu/sgabios.bin
-/usr/share/qemu-lite/qemu/slof.bin
-/usr/share/qemu-lite/qemu/spapr-rtas.bin
-/usr/share/qemu-lite/qemu/trace-events-all
-/usr/share/qemu-lite/qemu/u-boot.e500
-/usr/share/qemu-lite/qemu/vgabios-cirrus.bin
-/usr/share/qemu-lite/qemu/vgabios-qxl.bin
-/usr/share/qemu-lite/qemu/vgabios-stdvga.bin
-/usr/share/qemu-lite/qemu/vgabios-virtio.bin
-/usr/share/qemu-lite/qemu/vgabios-vmware.bin
-/usr/share/qemu-lite/qemu/vgabios.bin
-/usr/share/qemu-lite/qemu/qemu_vga.ndrv
-/usr/share/qemu-lite/qemu/s390-netboot.img
-/usr/share/qemu-lite/qemu/skiboot.lid
diff --git a/obs-packaging/qemu-lite/update.sh b/obs-packaging/qemu-lite/update.sh
deleted file mode 100755
index 8e20dfa273..0000000000
--- a/obs-packaging/qemu-lite/update.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2018 Intel Corporation
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-
-# Automation script to create specs to build kata containers kernel
-[ -z "${DEBUG}" ] || set -o xtrace
-
-set -o errexit
-set -o nounset
-set -o pipefail
-
-source ../versions.txt
-source ../scripts/pkglib.sh
-
-SCRIPT_NAME=$0
-SCRIPT_DIR=$(dirname $0)
-PKG_NAME="qemu-lite"
-VERSION=$qemu_lite_version
-
-GENERATED_FILES=(qemu-lite.dsc qemu-lite.spec debian.rules _service debian.control)
-STATIC_FILES=(debian.compat "${SCRIPT_DIR}/../../scripts/configure-hypervisor.sh" qemu-lite-rpmlintrc)
-
-# Parse arguments
-cli "$@"
-
-[ "$VERBOSE" == "true" ] && set -x
-PROJECT_REPO=${PROJECT_REPO:-home:${OBS_PROJECT}:${OBS_SUBPROJECT}/qemu-lite}
-RELEASE=$(get_obs_pkg_release "${PROJECT_REPO}")
-((RELEASE++))
-
-set_versions "${qemu_lite_hash}"
-
-replace_list=(
- "VERSION=$VERSION"
- "RELEASE=$RELEASE"
- "QEMU_LITE_HASH=${qemu_lite_hash:0:${short_commit_length}}"
-)
-verify
-echo "Verify succeed."
-get_git_info
-changelog_update $VERSION
-generate_files "$SCRIPT_DIR" "${replace_list[@]}"
-build_pkg "${PROJECT_REPO}"
diff --git a/obs-packaging/runtime/debian.control-template b/obs-packaging/runtime/debian.control-template
index 5635fc5a4d..20f85f7230 100644
--- a/obs-packaging/runtime/debian.control-template
+++ b/obs-packaging/runtime/debian.control-template
@@ -14,7 +14,6 @@ Depends: kata-containers-image (= @kata_osbuilder_version_release@),
kata-proxy (= @kata_proxy_version_release@),
kata-shim (= @kata_shim_version_release@),
kata-ksm-throttler(= @ksm_throttler_version_release@),
- qemu-lite(= @qemu_lite_version_release@) [amd64],
qemu-vanilla(= @qemu_vanilla_version_release@)
Description:
An Open Containers Initiative (OCI) "runtime" that launches an Intel VT-x
diff --git a/obs-packaging/runtime/kata-runtime.dsc-template b/obs-packaging/runtime/kata-runtime.dsc-template
index 615758cffc..7ca909c4ef 100644
--- a/obs-packaging/runtime/kata-runtime.dsc-template
+++ b/obs-packaging/runtime/kata-runtime.dsc-template
@@ -19,7 +19,6 @@ Depends: kata-containers-image (= @kata_osbuilder_version_release@),
kata-proxy (= @kata_proxy_version_release@),
kata-shim (= @kata_shim_version_release@),
kata-ksm-throttler(= @ksm_throttler_version_release@),
- qemu-lite(= @qemu_lite_version_release@) [amd64],
qemu-vanilla(= @qemu_vanilla_version_release@)
Description:
An Open Containers Initiative (OCI) "runtime" that launches an Intel VT-x
diff --git a/obs-packaging/runtime/kata-runtime.spec-template b/obs-packaging/runtime/kata-runtime.spec-template
index 62275e93cd..4118024ab0 100644
--- a/obs-packaging/runtime/kata-runtime.spec-template
+++ b/obs-packaging/runtime/kata-runtime.spec-template
@@ -24,17 +24,12 @@ License : Apache-2.0
BuildRequires: git
-%{!?el7 || !?suse_version:Requires: qemu-lite = @qemu_lite_obs_fedora_version@ }
-
Requires: kata-containers-image = @kata_osbuilder_version@
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-vanilla = @qemu_vanilla_version@
-%ifarch x86_64
-Requires: qemu-lite = @qemu_lite_version@
-%endif
# Patches
@RPM_PATCH_LIST@
diff --git a/obs-packaging/runtime/update.sh b/obs-packaging/runtime/update.sh
index 51987cc541..9c319578ca 100755
--- a/obs-packaging/runtime/update.sh
+++ b/obs-packaging/runtime/update.sh
@@ -127,18 +127,6 @@ KATA_QEMU_VANILLA_REQUIRED_VERSION["deb"]=${pkgVersions[0]}
KATA_QEMU_VANILLA_REQUIRED_VERSION["rpm"]=${pkgVersions[1]}
info "qemu-vanilla ${KATA_QEMU_VANILLA_REQUIRED_VERSION[@]}"
-if [ "$arch" == "x86_64" ]; then
- declare -A KATA_QEMU_LITE_REQUIRED_VERSION
- pkgVersions=($(pkg_required_ver "qemu_lite"))
- KATA_QEMU_LITE_REQUIRED_VERSION["deb"]=${pkgVersions[0]}
- KATA_QEMU_LITE_REQUIRED_VERSION["rpm"]=${pkgVersions[1]}
- info "qemu-lite ${KATA_QEMU_LITE_REQUIRED_VERSION[@]}"
- replace_list+=( \
- "qemu_lite_version=${KATA_QEMU_LITE_REQUIRED_VERSION["rpm"]}" \
- "qemu_lite_version_release=${KATA_QEMU_LITE_REQUIRED_VERSION["deb"]}" \
- )
-fi
-
PROJECT_REPO=${PROJECT_REPO:-home:${OBS_PROJECT}:${OBS_SUBPROJECT}/runtime}
RELEASE=$(get_obs_pkg_release "${PROJECT_REPO}")
((RELEASE++))
diff --git a/obs-packaging/scripts/obs-pkgs.sh b/obs-packaging/scripts/obs-pkgs.sh
index 680d9d9eef..13331e62b7 100755
--- a/obs-packaging/scripts/obs-pkgs.sh
+++ b/obs-packaging/scripts/obs-pkgs.sh
@@ -11,8 +11,6 @@
typeset -a OBS_PKGS_PROJECTS
-[ "$(uname -m)" = "x86_64" ] && OBS_PKGS_PROJECTS+=(qemu-lite)
-
OBS_PKGS_PROJECTS+=(
qemu-vanilla
linux-container
diff --git a/release/kata-deploy-binaries.sh b/release/kata-deploy-binaries.sh
index 9546a48e58..1a584b533d 100755
--- a/release/kata-deploy-binaries.sh
+++ b/release/kata-deploy-binaries.sh
@@ -110,7 +110,7 @@ install_image() {
ln -sf "${initrd}" kata-containers-initrd.img
popd >>/dev/null
pushd ${destdir}
- tar -czvf ../kata-image.tar.gz *
+ tar -czvf ../kata-static-image.tar.gz *
popd
}
@@ -124,7 +124,7 @@ install_kernel() {
DESTDIR="${destdir}" PREFIX="${prefix}" ./kernel/build-kernel.sh install
popd
pushd ${destdir}
- tar -czvf ../kata-kernel.tar.gz *
+ tar -czvf ../kata-static-kernel.tar.gz *
popd
}
@@ -138,7 +138,7 @@ install_experimental_kernel() {
DESTDIR="${destdir}" PREFIX="${prefix}" ./kernel/build-kernel.sh -e install
popd
pushd ${destdir}
- tar -czvf ../kata-kernel-experimental.tar.gz *
+ tar -czvf ../kata-static-experimental-kernel.tar.gz *
popd
}
@@ -163,7 +163,7 @@ install_firecracker() {
sudo install -D --owner root --group root --mode 0744 firecracker/firecracker-static "${destdir}/opt/kata/bin/firecracker"
sudo install -D --owner root --group root --mode 0744 firecracker/jailer-static "${destdir}/opt/kata/bin/jailer"
pushd ${destdir}
- tar -czvf ../kata-firecracker-static.tar.gz *
+ tar -czvf ../kata-static-firecracker.tar.gz *
popd
}
@@ -231,15 +231,15 @@ EOT
popd
pushd ${destdir}
- tar -czvf ../kata-components.tar.gz *
+ tar -czvf ../kata-static-kata-components.tar.gz *
popd
}
untar_qemu_binaries() {
info "Install static qemu"
- tar xf kata-qemu-static.tar.gz -C "${destdir}"
+ tar xf kata-static-qemu.tar.gz -C "${destdir}"
info "Install static qemu-virtiofs"
- tar xf kata-qemu-virtiofs-static.tar.gz -C "${destdir}"
+ tar xf kata-static-qemu-virtiofsd.tar.gz -C "${destdir}"
}
main() {
diff --git a/scripts/README.md b/scripts/README.md
index dd91f88ce3..0444b53bf3 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -13,5 +13,5 @@ areas including performance, memory footprint and security.
Example usage:
```
- $ configure-hypervisor.sh qemu-lite
-```
\ No newline at end of file
+ $ configure-hypervisor.sh qemu
+```
diff --git a/scripts/configure-hypervisor.sh b/scripts/configure-hypervisor.sh
index 5bf834a1a5..50f3c4e414 100755
--- a/scripts/configure-hypervisor.sh
+++ b/scripts/configure-hypervisor.sh
@@ -77,7 +77,7 @@ Options:
Example:
- $ $script_name qemu-lite
+ $ $script_name qemu
EOT
}
diff --git a/static-build/qemu-virtiofs/Dockerfile b/static-build/qemu-virtiofs/Dockerfile
index f3b9aee3ef..828cf2de53 100644
--- a/static-build/qemu-virtiofs/Dockerfile
+++ b/static-build/qemu-virtiofs/Dockerfile
@@ -3,6 +3,7 @@ from ubuntu:18.04
ARG QEMU_VIRTIOFS_REPO
# commit/tag/branch
ARG QEMU_VIRTIOFS_TAG
+ARG QEMU_TARBALL
ARG PREFIX
WORKDIR /root/qemu-virtiofs
@@ -49,4 +50,4 @@ RUN make -j$(nproc) virtiofsd
RUN make install DESTDIR=/tmp/qemu-virtiofs-static
RUN mv /tmp/qemu-virtiofs-static/"${PREFIX}"/bin/qemu-system-x86_64 /tmp/qemu-virtiofs-static/"${PREFIX}"/bin/qemu-virtiofs-system-x86_64
RUN chmod +x virtiofsd && mv virtiofsd /tmp/qemu-virtiofs-static/opt/kata/bin/
-RUN cd /tmp/qemu-virtiofs-static && tar -czvf kata-qemu-static.tar.gz *
+RUN cd /tmp/qemu-virtiofs-static && tar -czvf "${QEMU_TARBALL}" *
diff --git a/static-build/qemu-virtiofs/build-static-qemu-virtiofs.sh b/static-build/qemu-virtiofs/build-static-qemu-virtiofs.sh
index e1a21b0903..c8765cf0bf 100755
--- a/static-build/qemu-virtiofs/build-static-qemu-virtiofs.sh
+++ b/static-build/qemu-virtiofs/build-static-qemu-virtiofs.sh
@@ -17,9 +17,8 @@ packaging_dir="${script_dir}/../.."
qemu_virtiofs_repo=$(get_from_kata_deps "assets.hypervisor.qemu-experimental.url")
# This tag will be supported on the runtime versions.yaml
qemu_virtiofs_tag=$(get_from_kata_deps "assets.hypervisor.qemu-experimental.tag")
-qemu_tar="kata-qemu-static.tar.gz"
-qemu_virtiofs_tar="kata-qemu-virtiofs-static.tar.gz"
-qemu_tmp_tar="kata-qemu-virtiofs-static-tmp.tar.gz"
+qemu_virtiofs_tar="kata-static-qemu-virtiofsd.tar.gz"
+qemu_tmp_tar="kata-static-qemu-virtiofsd-tmp.tar.gz"
info "Build ${qemu_virtiofs_repo} tag: ${qemu_virtiofs_tag}"
@@ -33,6 +32,7 @@ sudo docker build \
--build-arg https_proxy="${https_proxy}" \
--build-arg QEMU_VIRTIOFS_REPO="${qemu_virtiofs_repo}" \
--build-arg QEMU_VIRTIOFS_TAG="${qemu_virtiofs_tag}" \
+ --build-arg QEMU_TARBALL="${qemu_virtiofs_tar}" \
--build-arg PREFIX="${prefix}" \
"${packaging_dir}" \
-f "${script_dir}/Dockerfile" \
@@ -41,10 +41,10 @@ sudo docker build \
sudo docker run \
-i \
-v "${PWD}":/share qemu-virtiofs-static \
- mv "/tmp/qemu-virtiofs-static/${qemu_tar}" /share/
+ mv "/tmp/qemu-virtiofs-static/${qemu_virtiofs_tar}" /share/
-sudo chown ${USER}:${USER} "${PWD}/${qemu_tar}"
+sudo chown ${USER}:${USER} "${PWD}/${qemu_virtiofs_tar}"
# Remove blacklisted binaries
-gzip -d < "${qemu_tar}" | tar --delete --wildcards -f - ${qemu_black_list[*]} | gzip > "${qemu_tmp_tar}"
+gzip -d < "${qemu_virtiofs_tar}" | tar --delete --wildcards -f - ${qemu_black_list[*]} | gzip > "${qemu_tmp_tar}"
mv -f "${qemu_tmp_tar}" "${qemu_virtiofs_tar}"
diff --git a/static-build/qemu/Dockerfile b/static-build/qemu/Dockerfile
index 3d79f853d0..2b127b6fda 100644
--- a/static-build/qemu/Dockerfile
+++ b/static-build/qemu/Dockerfile
@@ -3,6 +3,7 @@ from ubuntu:18.04
ARG QEMU_REPO
# commit/tag/branch
ARG QEMU_VERSION
+ARG QEMU_TARBALL
ARG PREFIX
WORKDIR /root/qemu
@@ -54,4 +55,4 @@ RUN PREFIX="${PREFIX}" /root/configure-hypervisor.sh -s kata-qemu | xargs ./conf
RUN make -j$(nproc)
RUN make install DESTDIR=/tmp/qemu-static
-RUN cd /tmp/qemu-static && tar -czvf kata-qemu-static.tar.gz *
+RUN cd /tmp/qemu-static && tar -czvf "${QEMU_TARBALL}" *
diff --git a/static-build/qemu/build-static-qemu.sh b/static-build/qemu/build-static-qemu.sh
index 7e46c837ec..7939889564 100755
--- a/static-build/qemu/build-static-qemu.sh
+++ b/static-build/qemu/build-static-qemu.sh
@@ -14,8 +14,8 @@ source "${script_dir}/../../scripts/lib.sh"
source "${script_dir}/../qemu.blacklist"
packaging_dir="${script_dir}/../.."
-qemu_tar="kata-qemu-static.tar.gz"
-qemu_tmp_tar="kata-qemu-static-tmp.tar.gz"
+qemu_tar="kata-static-qemu.tar.gz"
+qemu_tmp_tar="kata-static-qemu-tmp.tar.gz"
qemu_repo="${qemu_repo:-}"
qemu_version="${qemu_version:-}"
@@ -46,6 +46,7 @@ sudo docker build \
--build-arg https_proxy="${https_proxy}" \
--build-arg QEMU_REPO="${qemu_repo}" \
--build-arg QEMU_VERSION="${qemu_version}" \
+ --build-arg QEMU_TARBALL="${qemu_tar}" \
--build-arg PREFIX="${prefix}" \
"${packaging_dir}" \
-f "${script_dir}/Dockerfile" \