Commit Graph

914 Commits

Author SHA1 Message Date
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
Cole Robinson
7a925b3802 spec: More RHEL merging
* Add tools_only path to only build qemu-img and qemu-guest-agent
* Add a -tests subpackage
* Install tracetool, simpletrace, dump-guest-memory
* Add vhost modprobe file
* Sync qemu-guest-agent file lists
* Use udevrulesdir from systemd
* Add more seabios and seavgabios roms
* More use of %{name} to make paths more generic
* Group all fedora specific %install content at the end
* Drop the rpath stripping, in my testing it's not needed anymore
* Drop the s390x iotests skippage from last year

Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-06-23 11:50:54 -04:00
Cole Robinson
443b083edd spec: Remove qemu-sanity-check and -help smoke test
These have been moved to fedora CI jobs

Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-06-22 14:55:56 -04:00
Cole Robinson
ec76e0bb54 tests: Add qemu-sanity-check fedora CI job
We use `fmf` and `tmt` test config to run qemu-sanity-check,
similar to how its done in the spec file at the moment.

Add gating.yml that requires these tests to pass before updates
can be pushed

Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-06-22 11:46:52 -04:00
Cole Robinson
ec4dab0a93 spec: Add --enable-fuse and --enable-sdl-image
Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-06-16 19:30:28 -04:00
Cole Robinson
7e8e4ff4c0 spec: Manually specify every --enable-XXX flag we use
This moves the %build section to be closer to RHEL qemu-kvm content.
It's a bit tedious but it ensures we enable every feature we actually
think we are enabling :)

Add some macros to facilitate sharing this layout with the RHEL spec

The only functional change is now we use gcrypt instead of nettle.
I'm not sure if that was intentional before, but gcrypt is requested
on RHEL so I'm guessing that's what we want for Fedora too

Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-06-16 19:30:28 -04:00
Cole Robinson
6c55704061 spec: Move BuildRequires closer to RHEL formatting
This should not be any functional change, just some BuildRequires
movement and macro tweaking with the goal of sharing the first block
of deps with the RHEL/centos qemu-kvm spec

Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-06-16 19:30:28 -04:00
Cole Robinson
09badc27ce Move qemu-storage-daemon to qemu-img subpackage
This matches what RHEL is doing

Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-06-16 19:30:28 -04:00
Richard W.M. Jones
1081205b84 Fix mismatched pushd/popd on ppc64le and s390x
Executing(%check): /bin/sh -e /var/tmp/rpm-tmp.HyvLyX
+ umask 022
+ cd /builddir/build/BUILD
+ cd qemu-6.0.0
+ b=./x86_64-softmmu/qemu-system-x86_64
+ '[' -x ./x86_64-softmmu/qemu-system-x86_64 ']'
+ popd
/var/tmp/rpm-tmp.HyvLyX: line 46: popd: directory stack empty
error: Bad exit status from /var/tmp/rpm-tmp.HyvLyX (%check)
2021-06-09 13:54:38 +01:00
Cole Robinson
658feedf3f Temporarily disable test suite on s390x and ppc64le
These seem like host related errors, let's wait a bit and see if
they are fixed for us

Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-06-08 08:28:40 -04:00
Cole Robinson
5c8060d1bd qemu-6.0.0-5
Rebuild for xen 4.15
2021-06-07 20:13:48 -04:00
Cole Robinson
9348aa0ea4 Split out qemu-docs subpackage
Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-06-01 10:05:00 -04:00
Cole Robinson
1ba19df591 Split out qemu-device-display-vhost-user-gpu
This drops virglrenderer as a dep of qemu-common, which reduces
dep footprint of -core packages

Signed-off-by: Cole Robinson <crobinso@redhat.com>
2021-06-01 10:05:00 -04:00