release: Remove all traces of qemu-lite from packaging

qemu-lite has long been deprecated.

Signed-off-by: Archana Shinde <archana.m.shinde@intel.com>

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}
 

obs-packaging/qemu-lite/_service-template

@@ -1,15 +0,0 @@
-<!--- XML Structure defined here: https://en.opensuse.org/openSUSE:Build_Service_Concept_SourceService -->
-<services>
- <service name="tar_scm">
-    <param name="scm">git</param>
-    <param name="url">https://github.com/kata-containers/qemu.git</param>
-    <param name="exclude">.git</param>
-    <param name="filename">qemu-lite</param>
-    <param name="versionformat">@VERSION@+git.%h</param>
-    <param name="revision">qemu-lite-@VERSION@</param>
- </service>
- <service name="recompress">
-    <param name="file">*.tar*</param>
-    <param name="compression">gz</param>
-  </service>
-</services>

obs-packaging/qemu-lite/debian.compat

@@ -1 +0,0 @@
-9

obs-packaging/qemu-lite/debian.control-template

@@ -1,14 +0,0 @@
-Source: qemu-lite
-Section: devel
-Priority: optional
-Maintainer: Kata containers team <https://github.com/kata-containers/>
-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
-

obs-packaging/qemu-lite/debian.rules-template

@@ -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"
-

obs-packaging/qemu-lite/patches/0001-memfd-fix-configure-test.patch

@@ -1,55 +0,0 @@
-From 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 Mon Sep 17 00:00:00 2001
-From: Paolo Bonzini <pbonzini@redhat.com>
-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 <marcandre.lureau@redhat.com>
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
----
- 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 <sys/memfd.h>
-+#include <sys/mman.h>
- 
- 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 <sys/memfd.h>
--#elif defined CONFIG_LINUX
-+#if defined CONFIG_LINUX && !defined CONFIG_MEMFD
- #include <sys/syscall.h>
- #include <asm/unistd.h>
- 
--- 
-1.8.3.1
-

obs-packaging/qemu-lite/qemu-lite-rpmlintrc

@@ -1 +0,0 @@
-setBadness('arch-dependent-file-in-usr-share', 0)

obs-packaging/qemu-lite/qemu-lite.dsc-template

@@ -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 <https://github.com/kata-containers/>
-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.

obs-packaging/qemu-lite/qemu-lite.spec-template

@@ -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

obs-packaging/qemu-lite/update.sh

@@ -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}"

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

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

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@

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++))

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

scripts/README.md

@@ -13,5 +13,5 @@ areas including performance, memory footprint and security.
 Example usage:
 
 ```
-  $ configure-hypervisor.sh qemu-lite
+  $ configure-hypervisor.sh qemu
-```
+```

scripts/configure-hypervisor.sh

@@ -77,7 +77,7 @@ Options:
 
 Example:
 
-	$ $script_name qemu-lite
+	$ $script_name qemu
 
 EOT
 }