import CS virt-what-1.25-4.el8

This commit is contained in:
eabdullin 2023-09-27 14:19:00 +00:00
parent 3155c667bb
commit 8b6990d89f
8 changed files with 1565 additions and 8 deletions

View File

@ -23,5 +23,5 @@ index d090898e5..170bc24ab 100644
fi fi
-- --
2.31.1 2.39.1

View File

@ -79,5 +79,5 @@ index 170bc24ab..c6e4a1e00 100644
# example /proc/cpuinfo line indicating 'not baremetal' # example /proc/cpuinfo line indicating 'not baremetal'
-- --
2.31.1 2.39.1

View File

@ -32,5 +32,5 @@ similarity index 100%
rename from tests/podman/1/environ rename from tests/podman/1/environ
rename to tests/podman/proc/1/environ rename to tests/podman/proc/1/environ
-- --
2.31.1 2.39.1

View File

@ -884,5 +884,5 @@ index 2c346bded..9dbc079f9 100644
Status: contributed by Jordan Webb Status: contributed by Jordan Webb
-- --
2.31.1 2.39.1

View File

@ -367,5 +367,5 @@ index 102e23f67..fbf8c54c5 100644
# The test for KVM above failed, so now we know we're # The test for KVM above failed, so now we know we're
# not using KVM acceleration. # not using KVM acceleration.
-- --
2.31.1 2.39.1

File diff suppressed because it is too large Load Diff

View File

@ -8,7 +8,7 @@ set -e
# ./copy-patches.sh # ./copy-patches.sh
project=virt-what project=virt-what
rhel_version=8.8 rhel_version=8.9
# Check we're in the right directory. # Check we're in the right directory.
if [ ! -f $project.spec ]; then if [ ! -f $project.spec ]; then

View File

@ -1,6 +1,6 @@
Name: virt-what Name: virt-what
Version: 1.25 Version: 1.25
Release: 3%{?dist} Release: 4%{?dist}
Summary: Detect if we are running in a virtual machine Summary: Detect if we are running in a virtual machine
License: GPLv2+ License: GPLv2+
@ -11,7 +11,7 @@ Source0: http://people.redhat.com/~rjones/virt-what/files/%{name}-%{versi
Source1: copy-patches.sh Source1: copy-patches.sh
# Patches are maintained in the following repository: # Patches are maintained in the following repository:
# http://git.annexia.org/?p=virt-what.git;a=shortlog;h=refs/heads/rhel-8.8 # http://git.annexia.org/?p=virt-what.git;a=shortlog;h=refs/heads/rhel-8.9
# Patches. # Patches.
Patch0001: 0001-Rearrange-lxc-test-to-avoid-use-of-cat.patch Patch0001: 0001-Rearrange-lxc-test-to-avoid-use-of-cat.patch
@ -19,6 +19,7 @@ Patch0002: 0002-Move-docker-and-podman-tests-up-add-comments.patch
Patch0003: 0003-podman-Fix-location-of-test-file-proc-1-environ.patch Patch0003: 0003-podman-Fix-location-of-test-file-proc-1-environ.patch
Patch0004: 0004-Detect-OCI-containers.patch Patch0004: 0004-Detect-OCI-containers.patch
Patch0005: 0005-Add-support-for-Alibaba-cloud-on-aarch64.patch Patch0005: 0005-Add-support-for-Alibaba-cloud-on-aarch64.patch
Patch0006: 0006-Add-support-for-CRI-O-containers.patch
BuildRequires: make BuildRequires: make
BuildRequires: git BuildRequires: git
@ -125,6 +126,10 @@ fi
%changelog %changelog
* Wed Jun 28 2023 Richard W.M. Jones <rjones@redhat.com> - 1.25-4
- Add support for CRI-O containers
resolves: rhbz#2217407
* Mon Jan 30 2023 Richard W.M. Jones <rjones@redhat.com> - 1.25-3 * Mon Jan 30 2023 Richard W.M. Jones <rjones@redhat.com> - 1.25-3
- Add support for Alibaba cloud on aarch64 - Add support for Alibaba cloud on aarch64
resolves: rhbz#2165518 resolves: rhbz#2165518