github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-05-01 21:24:36 +00:00
Code Issues Projects Releases Wiki Activity

qemu: update build dependencies to support QEMU 5

Browse Source 
Add the following packages as build dependencies to build QEMU
5 in OBS and launchpad (snap)

* libselinux1
* libffi
* libmount
* libblkid
* python3

fixes #1075

Signed-off-by: Julio Montes <julio.montes@intel.com>
This commit is contained in:
Julio Montes 2020-06-12 15:56:51 -05:00
parent c422d061cb
commit f5b71d3455
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/packaging/obs-packaging/qemu-vanilla/debian.control-template
View File

@ -2,7 +2,7 @@ Source: qemu-vanilla
Section: devel Section: devel
Priority: optional Priority: optional
Maintainer: Kata containers team <https://github.com/kata-containers/> 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 Build-Depends: debhelper (>= 9), cpio, libelf-dev, rsync, libdw-dev, pkg-config, flex, bison, libaudit-dev, bc, python3-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, libselinux1-dev, libffi-dev, libmount-dev, libblkid-dev
Standards-Version: 3.9.6 Standards-Version: 3.9.6
Homepage: https://katacontainers.io Homepage: https://katacontainers.io
@ -11,4 +11,3 @@ Architecture: @deb_arch@
Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends},
Description: linux kernel optimised for container-like workloads. Description: linux kernel optimised for container-like workloads.
Linux kernel optimised for container-like workloads Linux kernel optimised for container-like workloads

2
tools/packaging/obs-packaging/qemu-vanilla/qemu-vanilla.dsc-template
View File

@ -4,7 +4,7 @@ Version: @VERSION@+git.@QEMU_VANILLA_HASH@-@RELEASE@
Section: devel Section: devel
Priority: optional Priority: optional
Maintainer: Kata containers team <https://github.com/kata-containers/> 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 Build-Depends: debhelper (>= 9), cpio, libelf-dev, rsync, libdw-dev, pkg-config, flex, bison, libaudit-dev, bc, python3-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, libselinux1-dev, libffi-dev, libmount-dev, libblkid-dev
Standards-Version: 3.9.6 Standards-Version: 3.9.6
Homepage: https://katacontainers.io Homepage: https://katacontainers.io
Debtransform-Tar: qemu-vanilla-@VERSION@+git.@QEMU_VANILLA_HASH@.tar.gz Debtransform-Tar: qemu-vanilla-@VERSION@+git.@QEMU_VANILLA_HASH@.tar.gz

11
tools/packaging/obs-packaging/qemu-vanilla/qemu-vanilla.spec-template
View File

@ -30,12 +30,18 @@ BuildRequires : findutils
%if 0%{?centos_version} %if 0%{?centos_version}
BuildRequires : librbd1-devel BuildRequires : librbd1-devel
BuildRequires : libmount
%else %else
%if ! 0%{?rhel_version} %if ! 0%{?rhel_version}
BuildRequires : librbd-devel BuildRequires : librbd-devel
%endif %endif
BuildRequires : libselinux-devel
BuildRequires : libffi-devel
BuildRequires : libmount-devel
BuildRequires : libblkid-devel
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
@ -44,13 +50,8 @@ BuildRequires : libnuma-devel
BuildRequires : numactl-devel BuildRequires : numactl-devel
%endif %endif
%if 0%{?centos} < 8
BuildRequires : python
BuildRequires : python-devel
%else
BuildRequires : python3 BuildRequires : python3
BuildRequires : python3-devel BuildRequires : python3-devel
%endif
BuildRequires : zlib-devel BuildRequires : zlib-devel
BuildRequires : pkgconfig(pixman-1) BuildRequires : pkgconfig(pixman-1)
BuildRequires : libpmem-devel BuildRequires : libpmem-devel

4
tools/packaging/snap/snapcraft.yaml
View File

@ -338,6 +338,10 @@ parts:
- curl - curl
- libcapstone-dev - libcapstone-dev
- bc - bc
- libblkid-dev
- libffi-dev
- libmount-dev
- libselinux1-dev
override-build: | override-build: |
kata_version=$(cat ${SNAPCRAFT_STAGE}/kata_version) kata_version=$(cat ${SNAPCRAFT_STAGE}/kata_version)
yq=$(realpath ../../yq/build/yq) yq=$(realpath ../../yq/build/yq)