Commit Graph

1076 Commits

Author SHA1 Message Date
Richard W.M. Jones
c1a37784f9 Fix -cpu max (RHBZ#1999700) 2021-08-31 18:59:35 +01:00
Richard W.M. Jones
9eb1916f15 Disable gcrypt (for real this time).
This will use gnutls's internal implementation as the
default crypto engine:

  Crypto
    TLS priority                 : "@QEMU,SYSTEM"
    GNUTLS support               : YES
    GNUTLS crypto                : YES
    libgcrypt                    : NO
    nettle                       : NO
    crypto afalg                 : NO
    rng-none                     : NO
    Linux keyring                : YES

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1998452
2021-08-27 13:19:13 +01:00
Richard W.M. Jones
1ba242c778 Revert "Disable gcrypt" which seems to disable gnutls (RHBZ#1998452)
This reverts commit a06059bd4d.
2021-08-27 10:23:34 +01:00
Richard W.M. Jones
96944e0b05 Fix dependency pci_gl -> pci-gl and vga_gl -> vga-gl (RHBZ#1997855) 2021-08-26 08:10:11 +01:00
Eduardo Lima (Etrunko)
050829c2b7 qemu-6.1.0 2021-08-24 21:21:19 -03:00
Eduardo Lima (Etrunko)
79f4b0ef32 qemu-6.1.0-rc4
Signed-off-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
2021-08-18 15:15:26 -03:00
Eduardo Lima (Etrunko)
a06059bd4d Disable gcrypt
Use gnutls as the default crypto backend to match latest upstream defaults

Signed-off-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
2021-08-12 13:53:38 -03:00
Eduardo Lima (Etrunko)
7403595754 Update sources with latest tarball
Signed-off-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
2021-08-12 12:43:32 -03:00
Eduardo Lima (Etrunko)
bf8d867e21 qemu-6.1.0-rc3
- Static build works again.
- Remove --enable-block-drv-whitelist-in-tools option causing iotests
  049 134 158 to fail.

Signed-off-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
2021-08-12 12:32:20 -03:00
Eduardo Lima (Etrunko)
51980a6acd Some workarounds for build failures on rc2
- Temporarily disable static build

FAILED: qemu-aarch64
gcc  -o qemu-aarch64 ... -Wl,--start-group libqemuutil.a libhwcore.fa libqom.fa /usr/lib64/libz.a -lrt -lutil -pthread -lgnutls -ltspi -lgmp -lunistring -lnettle -lhogweed -ltasn1 -lidn2 -lp11-kit -lm -lgthread-2.0 -lglib-2.0 -lpcre -Wl,--end-group
/usr/bin/ld: cannot find -lgnutls
/usr/bin/ld: cannot find -ltspi
/usr/bin/ld: cannot find -lgmp
/usr/bin/ld: cannot find -lunistring
/usr/bin/ld: cannot find -lnettle
/usr/bin/ld: cannot find -lhogweed
/usr/bin/ld: cannot find -ltasn1
/usr/bin/ld: cannot find -lidn2
/usr/bin/ld: cannot find -lp11-kit
collect2: error: ld returned 1 exit status

- Temporarily disable make check, qemu-iotests failing

Failures: 049 134 158
Failed 3 of 119 iotests
2021-08-10 03:47:37 -03:00
Eduardo Lima (Etrunko)
b048de05e7 qemu-6.1.0-rc2
Signed-off-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
2021-08-10 03:30:06 -03:00
Cole Robinson
6bb4bb52c7 qemu-6.0.0-12.fc35
Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-07-29 07:34:46 -04:00
Cole Robinson
f744b8b952 spec: quote %{firmwaredirs} for consistency
Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-07-28 20:07:57 -04:00
Cole Robinson
f806e664d9 spec: Use --enable-lto if _lto_cflags is not empty
Not sure if this is strictly required, but it seems like
the right thing to do

Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-07-28 19:23:02 -04:00
Cole Robinson
38b1a6c732 spec: Update LTO comment
Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-07-28 19:10:59 -04:00
Cole Robinson
b7cbd7e5e1 spec: Open code %set_build_flags
There should be no functional difference here, but it's not
obvious at a glance how qemu handles globally defined CFLAGS + LDFLAGS
with --extra-cflags and --extra-ldflags.

Reproduce the desired behavior with explicit configure options and
RPM variables

Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-07-25 16:22:33 -04:00
Cole Robinson
e3c05f4d3e spec: Use %make_build for 'check' too
So we get smp_flags

Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-07-25 12:05:06 -04:00
Cole Robinson
1ac11e4877 spec: Explicitly don't build with c++
This is the historical intended behavior in the buildroot, but for
local builds, or with clang, qemu would detect a c++ compiler on the
host. So explicitly make the check fail by passing /bin/false

Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-07-25 09:38:55 -04:00
Cole Robinson
2dc6f7395e spec: Drop explicit --build-id
clang + gcc have done this for us for years

Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-07-25 09:38:55 -04:00
Cole Robinson
0edf0fe9c8 spec: Drop python3 shebang fixup for tests rpm
* python -> python3 isn't required anymore for qemu.git
* env -> /usr/bin is handled by rpm brp-mangle-shebangs

Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-07-25 09:38:55 -04:00
Richard W.M. Jones
e5d06dbc16 Actually fix previous commit
See discussion in:
https://bugzilla.redhat.com/show_bug.cgi?id=1985369
2021-07-23 15:27:16 +01:00
Richard W.M. Jones
2825584364 Fix dependencies of qemu metapackage
Commit 7a925b3802 ("spec: More RHEL merging") placed the %description
section right up against the list of Requires.  This resulted in RPM
silently ignoring the Requires and adding them to the description
instead.  As a result the qemu metapackage was totally broken.

Fixes: commit 7a925b3802
2021-07-23 15:03:34 +01:00
Fedora Release Engineering
6af1856936 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-23 10:38:07 +00:00
Cole Robinson
d6b4a46932 qemu-6.0.0-10.fc35
Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-07-18 17:44:08 -04:00
Cole Robinson
ba7d6c0e41 spec: Split out qemu-tools subpackage
Main reason is to reduce the library dependency footprint of
-core packages

Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-07-15 11:37:32 -04:00
Cole Robinson
7ae7935089 spec: Split out qemu-pr-helper subpackage
Main reason is to reduce the library dependency footprint of
-core package

Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-07-15 11:37:24 -04:00
Cole Robinson
e1bf97d468 Rename gating.yml -> gating.yaml
Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-07-15 11:22:56 -04:00
Cole Robinson
51821d35c5 spec: s/datarootdir/datadir/
The latter is the more common one

Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-07-07 19:07:37 -04:00
Cole Robinson
180e0d8daf qemu-6.0.0-9.fc35
Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-07-07 16:37:33 -04:00
Cole Robinson
e0cb84627a spec: Use --firmwarepath to drop rom symlinking
Access ipxe, seabios, seavgabios, and sgabios roms directly
in their /usr/share directories.

Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-07-07 16:35:01 -04:00
Cole Robinson
f1ea3b69f7 gating: copy verbatim from cockpit where gating is working
Not sure why rawhide gating is not triggering in bodhi...

Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-07-06 15:35:37 -04:00
Cole Robinson
d13afbee6a spec: BuildRequires: clang if toolchain == clang
Let's us experiment easier with clang usage in koji

Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-07-02 19:05:54 -04:00
Cole Robinson
b013f94648 spec: Drop use of %dnl macro
It's not available on centos8

Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-07-02 18:08:34 -04:00
Cole Robinson
d5c2bbe293 spec: use %set_build_flags
Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-07-02 16:03:07 -04:00
Cole Robinson
05fedb21f6 spec: use make_install macro
make_install is: /usr/bin/make install DESTDIR=%{buildroot} INSTALL="/usr/bin/install -p"

Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-07-02 15:32:53 -04:00
Cole Robinson
0ae9d20128 spec: Drop make install sharedir and datadir usage
qemu doesn't use sharedir. datadir is set at configure time

Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-07-02 15:32:09 -04:00
Cole Robinson
183fcd911e spec: Use %make_build macro
make_build is: make -O -jXX V=1 VERBOSE=1

So it covers all our make option usage

Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-07-02 15:20:16 -04:00
Cole Robinson
e6c8eaee02 spec: Remove buildldflags
VL_LDFLAGS has not been present in qemu.git since 2008!

Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-07-02 15:16:41 -04:00
Cole Robinson
d4c8ff71ce spec: SDL2_image isn't available on epel/rhel
Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-07-02 15:07:14 -04:00
Cole Robinson
f4c1719ae1 spec: Re-disable tests for power64, still intermittently hanging
Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-06-30 18:53:18 -04:00
Cole Robinson
73149263f3 spec: Use --enable-capstone even if capstone-devel not available
In that case (like building on EPEL), use the internal qemu copy,
like RHEL qemu-kvm does.

Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-06-30 16:19:08 -04:00
Cole Robinson
b2595a5449 qemu-6.0.0-8.fc35
Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-06-30 10:49:14 -04:00
Cole Robinson
d636452cba spec: Drop test skippage on power64, it's working again
Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-06-30 10:49:14 -04:00
Cole Robinson
4a2d9a4c52 spec: Temporarily disable conflict between binfmt subpackages
Fedora CI can't handle subpackages with Conflicts. There's ongoing
work to make it happen:

https://pagure.io/fedora-ci/general/issue/184

Once that lands we can re-enable these conflicts.

Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-06-30 10:49:14 -04:00
Cole Robinson
f54ac0f7d7 spec: Drop some outdates obsoletes
This are from 2017 and earlier, I don't think we need them anymore

Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-06-30 10:37:15 -04:00
Cole Robinson
833342c627 gating: Attempt to fix rawhide gating
Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-06-30 10:35:57 -04:00
Cole Robinson
ad860648fa Tweak minimum meson_version to match fedora versioning
This was copied from RHEL, but it's too restrictive

Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-06-23 12:05:37 -04:00
Cole Robinson
91b70a682d qemu-6.0.0-7.fc35
Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-06-23 11:53:52 -04:00
Cole Robinson
4abd8de197 spec: Merge arch specific kvm.conf files from RHEL
Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-06-23 11:50:58 -04:00
Cole Robinson
566be371a3 spec: Drop pathfix.py usage
There's only one remaining ambiguous python shebang in qemu.git, and
it's not for anything we care about.

Also redhat-rpm-config brp-mangle-shebangs added in 2018 will do
/usr/bin/env python3 -> /usr/bin/python3 automatically for us

Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-06-23 11:50:58 -04:00