Compare commits

...

20 Commits

Author SHA1 Message Date
54aac64d4b rebuilt with libmultipath-tools 0.8.8 [release 6.2.0-2mamba;Mon Jan 03 2022] 2024-01-05 17:00:34 +01:00
bff8a5de22 automatic version update by autodist [release 6.2.0-1mamba;Sat Jan 01 2022] 2024-01-05 17:00:34 +01:00
e043bb1aab automatic version update by autodist [release 6.1.0-1mamba;Sun Sep 05 2021] 2024-01-05 17:00:33 +01:00
c55ad672dc automatic version update by autodist [release 6.0.0-1mamba;Tue May 04 2021] 2024-01-05 17:00:33 +01:00
21b22385e0 update to 5.2.0 [release 5.2.0-1mamba;Mon May 03 2021] 2024-01-05 17:00:33 +01:00
3b98c8470f rebuilt with libbrltty 6.1 [release 5.1.0-2mamba;Fri Oct 09 2020] 2024-01-05 17:00:33 +01:00
89884dbc13 automatic version update by autodist [release 5.1.0-1mamba;Thu Aug 13 2020] 2024-01-05 17:00:32 +01:00
0db3cf4300 automatic version update by autodist [release 5.0.0-1mamba;Mon May 04 2020] 2024-01-05 17:00:32 +01:00
269bd7b347 rebuilt with debug package [release 4.2.0-2mamba;Wed Mar 04 2020] 2024-01-05 17:00:32 +01:00
0f67a37710 update to 4.2.0 [release 4.2.0-1mamba;Tue Jan 28 2020] 2024-01-05 17:00:32 +01:00
4008da7de3 automatic version update by autodist [release 4.0.0-1mamba;Wed Apr 24 2019] 2024-01-05 17:00:32 +01:00
e3a8ad4faf update to 3.1.0 [release 3.1.0-1mamba;Mon Feb 11 2019] 2024-01-05 17:00:32 +01:00
af367825ea automatic version update by autodist [release 3.0.0-1mamba;Sun Sep 09 2018] 2024-01-05 17:00:31 +01:00
6942294e48 automatic version update by autodist [release 2.11.1-1mamba;Fri Feb 16 2018] 2024-01-05 17:00:31 +01:00
01b796527d automatic version update by autodist [release 2.11.0-1mamba;Sat Jan 06 2018] 2024-01-05 17:00:31 +01:00
6fbf21ac45 automatic version update by autodist [release 2.10.1-1mamba;Sun Oct 08 2017] 2024-01-05 17:00:31 +01:00
dbb2f56449 automatic version update by autodist [release 2.10.0-1mamba;Sat Sep 23 2017] 2024-01-05 17:00:31 +01:00
bcb9700192 automatic version update by autodist [release 2.8.0-1mamba;Fri Dec 23 2016] 2024-01-05 17:00:31 +01:00
0f901e5e65 rebuilt by autoport with build requirements: libxen-devel>=4.8.0-1mamba [release 2.7.0-2mamba;Sat Dec 10 2016] 2024-01-05 17:00:31 +01:00
243cf48af6 automatic version update by autodist [release 2.7.0-1mamba;Sat Sep 03 2016] 2024-01-05 17:00:30 +01:00
2 changed files with 169 additions and 112 deletions

View File

@ -0,0 +1,11 @@
--- qemu-5.2.0/tools/virtiofsd/passthrough_ll.c.orig 2021-05-03 22:19:36.266659588 +0200
+++ qemu-5.2.0/tools/virtiofsd/passthrough_ll.c 2021-05-03 22:25:22.351624454 +0200
@@ -793,7 +793,7 @@
{
int res;
-#if defined(CONFIG_STATX) && defined(STATX_MNT_ID)
+#if 0 && defined(CONFIG_STATX) && defined(STATX_MNT_ID)
if (lo->use_statx) {
struct statx statxbuf;

270
qemu.spec
View File

@ -1,13 +1,14 @@
Name: qemu
Version: 2.6.1
Release: 1mamba
Version: 6.2.0
Release: 2mamba
Summary: A generic and open source processor emulator
Group: Applications/Emulators
Vendor: openmamba
Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: http://qemu.org
Source: http://wiki.qemu.org/download/qemu-%{version}.tar.bz2
URL: https://www.qemu.org/
Source: https://download.qemu.org/qemu-%{version}.tar.xz
#Source: http://wiki.qemu.org/download/qemu-%{version}.tar.bz2
Source1: %{name}-initscript
Source2: qemu-guest-agent.service
Source3: 99-qemu-guest-agent.rules
@ -20,66 +21,69 @@ Patch3: %{name}-0.8.0-gcc4_ppc.patch
Patch4: %{name}-0.8.0-ldscript_ppc.patch
Patch5: qemu-1.4.1-texinfo-5.patch
Patch6: qemu-1.7.0-virtfs-ftbfs.patch
Patch7: qemu-5.2.0-STATX_MNT_ID-missing-workaround.patch
License: GPL, LGPL
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
BuildRequires: libSDL2-devel
BuildRequires: libX11-devel
BuildRequires: libaio-devel
BuildRequires: libalsa-devel
BuildRequires: libatk-devel
BuildRequires: libbluetooth-devel
BuildRequires: libbrltty-devel
BuildRequires: libbzip2-devel
BuildRequires: libcacard-devel
BuildRequires: libcairo-devel
BuildRequires: libcap-devel
BuildRequires: libcap-ng-devel
BuildRequires: libcares-devel
BuildRequires: libcurl-devel
BuildRequires: libfontconfig-devel
BuildRequires: libfreetype-devel
BuildRequires: libgcrypt-devel
BuildRequires: libepoxy-devel
BuildRequires: libfuse3-devel
BuildRequires: libgcc
BuildRequires: libgdk-pixbuf-devel
BuildRequires: libGL-devel
BuildRequires: libglib-devel
BuildRequires: libgnutls-devel
BuildRequires: libgpg-error-devel
BuildRequires: libgss-devel
BuildRequires: libgtk2-devel
BuildRequires: libidn-devel
BuildRequires: libgtk3-devel
BuildRequires: libjpeg-devel
BuildRequires: libncurses-devel
BuildRequires: libnspr-devel
BuildRequires: libnss-devel
BuildRequires: libopenldap-devel
BuildRequires: libopenssl-devel
BuildRequires: libpango-devel
BuildRequires: liblzo-devel
BuildRequires: libmesa-devel
BuildRequires: libmultipath-tools-devel
BuildRequires: libndctl-devel
BuildRequires: libnettle-devel
BuildRequires: libnfs-devel
BuildRequires: libnuma-devel
BuildRequires: libpam-devel
BuildRequires: libpixman-devel
BuildRequires: libpng-devel
BuildRequires: librtmp-devel
BuildRequires: libsasl-devel
%if "%{stage1}" != "1"
BuildRequires: libSDL-devel
%endif
BuildRequires: libssh2-devel
BuildRequires: libusbx-devel
BuildRequires: libuuid-devel
BuildRequires: libvte0-devel
BuildRequires: libX11-devel
BuildRequires: libpulseaudio-devel
BuildRequires: libsasl2-devel
BuildRequires: libsdl2_image-devel
BuildRequires: libseccomp-devel
BuildRequires: libsnappy-devel
BuildRequires: libspice-devel
BuildRequires: libssh-devel
BuildRequires: libstdc++6-devel
BuildRequires: libudev-devel
BuildRequires: libusb-devel
BuildRequires: libusbredir-devel
BuildRequires: libvte-devel
%ifarch x86_64 %{ix86}
BuildRequires: libxen-devel
BuildRequires: libXext-devel
%endif
BuildRequires: libxkbcommon-devel
BuildRequires: libz-devel
BuildRequires: libzstd-devel
## AUTOBUILDREQ-END
BuildRequires: libxen-devel >= 4.7
BuildRequires: libmultipath-tools-devel >= 0.8.8
BuildRequires: libadplug-devel >= 1.5.1
BuildRequires: libglib-static >= 2.34.1-2mamba
BuildRequires: libspice-devel
BuildRequires: spice-protocol-devel
BuildRequires: libusbredir-devel
BuildRequires: libcelt051-devel
BuildRequires: libnfs-devel
BuildRequires: libopenssl-static
BuildRequires: libbrltty-devel >= 6.1
#% if "%{_build_cpu}" != "ppc"
#BuildRequires: gcc34
#% endif
Conflicts: kvm
%systemd_requires
BuildRoot: %{_tmppath}/%{name}-%{version}-root
%description
QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation.
@ -120,25 +124,22 @@ Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release}
QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation.
This package contains static user mode emulators. In this mode, QEMU can launch Linux processes compiled for one CPU on another CPU.
%debug_package
%prep
%setup -q
#-D -T
#:<< ___EOF
#%if "%{_build_cpu}" == "ppc"
#%patch0 -p1
#%patch1
#%patch2
#%patch3
#%patch4 -p1
#%endif
#%patch5 -p1
#%patch6 -p1
%patch7 -p1
%build
#:<< ___EOF
# static build for usermode emulation targets only
# used by cross platform installation tools like makedist
./configure \
mkdir -p build-static
cd build-static
../configure \
--sysconfdir=%{_sysconfdir} \
--prefix=%{_prefix} \
--cc=%{_build}-gcc \
@ -147,26 +148,30 @@ This package contains static user mode emulators. In this mode, QEMU can launch
--static \
--disable-sdl \
--disable-curl \
--disable-bluez \
--disable-system \
--disable-strip \
--disable-libssh2 \
--disable-libnfs \
--disable-libxml2 \
--disable-gnutls \
--enable-linux-user
# --disable-bluez \
# --disable-libssh2 \
# --disable-smartcard-nss \
# --disable-usb-redir \
# --disable-vde \
#LIBSSH_LIBS="-lssh -lcrypto -ldl -lgss"
%make
mkdir static
find *-linux-user -name qemu-\* -exec mv {} static/ \;
make clean
cd ..
#___EOF
mkdir -p build-dynamic
cd build-dynamic
# dynamic build
./configure \
../configure \
--sysconfdir=%{_sysconfdir} \
--prefix=%{_prefix} \
--libdir=%{_libdir} \
@ -174,31 +179,32 @@ make clean
--cc=%{_build}-gcc \
--host-cc=%{_host}-gcc \
--cpu=%{_host_cpu} \
%if "%{_build_cpu}" == "ppc"
--disable-gcc-check \
#% else
# --cc=%{_target_platform}-gcc34 \
%endif
--audio-drv-list="alsa pa" \
--audio-drv-list="alsa,pa" \
--enable-spice \
--enable-usb-redir \
--enable-guest-agent
%make
%make LDFLAGS_NOPIE=""
%install
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
%makeinstall
%makeinstall -C build-dynamic
install -D -m 755 %{S:1} \
%{buildroot}%{_prefix}/lib/systemd/scripts/%{name}-binfmt
install -D -m 0644 %{S:5} \
%{buildroot}%{_unitdir}/qemu.service
#install -D -m 755 %{S:1} \
# %{buildroot}%{_prefix}/lib/systemd/scripts/%{name}-binfmt
#install -D -m 0644 %{S:5} \
# %{buildroot}%{_unitdir}/qemu.service
cd static
for f in *; do
# disable stripping static binaries by installing without -x
install -m644 $f %{buildroot}%{_bindir}/$f.static
install -d -m0755 %{buildroot}%{_binfmtdir}
scripts/qemu-binfmt-conf.sh --exportdir %{buildroot}%{_binfmtdir}/ \
--systemd ALL --qemu-path %{_bindir}
cd build-static
find *-linux-user -name qemu-\* | while read f; do
cp -L ${f} %{buildroot}%{_bindir}/`basename $f`.static
## (obsolete?) disable stripping static binaries by installing without -x
#install -m755 $f %{buildroot}%{_bindir}/$f.static
done
cd ..
@ -214,23 +220,9 @@ install -D -m0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/qemu-ga
%clean
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
%post
# new install
%systemd_post qemu
if [ $1 -gt 1 ]; then
systemctl --no-reload preset qemu >/dev/null 2>&1 || :
fi
:
%preun
# erase
%systemd_preun qemu
:
%postun
# upgrade
%systemd_postun_with_restart qemu.service
:
#%post
#% binfmt_apply
#:
%post guest-agent
%systemd_post qemu-guest-agent.service
@ -260,20 +252,29 @@ find /etc/rc[0-6].d/ -type l -xtype l -exec rm -f {} \;
%files -f %{name}.lang
%defattr(-,root,root)
%{_bindir}/%{name}*
%{_bindir}/elf2dmp
%exclude %{_bindir}/qemu-ga
%{_bindir}/ivshmem-client
%{_bindir}/ivshmem-server
#%{_bindir}/vscclient
#%{_bindir}/ivshmem-client
#%{_bindir}/ivshmem-server
%exclude %{_bindir}/%{name}*.static
%{_bindir}/virtfs-proxy-helper
%{_unitdir}/qemu.service
%{_prefix}/lib/systemd/scripts/%{name}-binfmt
%{_datadir}/applications/qemu.desktop
%{_datadir}/icons/hicolor/*/apps/qemu.png
%{_datadir}/icons/hicolor/*/apps/qemu.bmp
%{_datadir}/icons/hicolor/scalable/apps/qemu.svg
%{_libexecdir}/qemu-bridge-helper
#%{_libexecdir}/qemu-pr-helper
%{_libexecdir}/virtfs-proxy-helper
%{_libexecdir}/virtiofsd
%{_datadir}/%{name}
%{_binfmtdir}/*.conf
%{_includedir}/qemu-plugin.h
%{_docdir}/%{name}
%{_mandir}/man1/%{name}*
%{_mandir}/man1/qemu*.1*
%{_mandir}/man1/virtfs-proxy-helper.1*
%{_mandir}/man8/%{name}-nbd.8*
%{_mandir}/man1/virtiofsd.1*
%exclude %{_mandir}/man7/qemu-ga-ref.7*
%{_mandir}/man7/qemu-*.7*
%{_mandir}/man8/qemu-*.8*
%doc COPYING COPYING.LIB
%files guest-agent
@ -286,29 +287,74 @@ find /etc/rc[0-6].d/ -type l -xtype l -exec rm -f {} \;
%{_bindir}/%{name}-ga
%{_unitdir}/qemu-guest-agent.service
%{_udevrulesdir}/99-qemu-guest-agent.rules
%{_mandir}/man7/qemu-ga-ref.7*
%{_mandir}/man8/qemu-ga.8*
#% ifnarch x86_64
#%files -n libcacard
#%defattr(-,root,root)
#%{_libdir}/libcacard.so.*
#%files -n libcacard-devel
#%defattr(-,root,root)
#%dir %{_includedir}/cacard
#%{_includedir}/cacard/*.h
#%{_libdir}/libcacard.a
#%{_libdir}/libcacard.la
#%{_libdir}/libcacard.so
#%{_libdir}/pkgconfig/libcacard.pc
#%doc LICENSE README
##% endif
%files static
%defattr(-,root,root)
%attr(0755,root,root) %{_bindir}/%{name}*.static
%changelog
* Mon Jan 03 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 6.2.0-2mamba
- rebuilt with libmultipath-tools 0.8.8
* Sat Jan 01 2022 Automatic Build System <autodist@mambasoft.it> 6.2.0-1mamba
- automatic version update by autodist
* Sun Sep 05 2021 Automatic Build System <autodist@mambasoft.it> 6.1.0-1mamba
- automatic version update by autodist
* Tue May 04 2021 Automatic Build System <autodist@mambasoft.it> 6.0.0-1mamba
- automatic version update by autodist
* Mon May 03 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 5.2.0-1mamba
- update to 5.2.0
* Fri Oct 09 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 5.1.0-2mamba
- rebuilt with libbrltty 6.1
* Thu Aug 13 2020 Automatic Build System <autodist@mambasoft.it> 5.1.0-1mamba
- automatic version update by autodist
* Mon May 04 2020 Automatic Build System <autodist@mambasoft.it> 5.0.0-1mamba
- automatic version update by autodist
* Wed Mar 04 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 4.2.0-2mamba
- rebuilt with debug package
* Tue Jan 28 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 4.2.0-1mamba
- update to 4.2.0
* Wed Apr 24 2019 Automatic Build System <autodist@mambasoft.it> 4.0.0-1mamba
- automatic version update by autodist
* Mon Feb 11 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 3.1.0-1mamba
- update to 3.1.0
* Sun Sep 09 2018 Automatic Build System <autodist@mambasoft.it> 3.0.0-1mamba
- automatic version update by autodist
* Fri Feb 16 2018 Automatic Build System <autodist@mambasoft.it> 2.11.1-1mamba
- automatic version update by autodist
* Sat Jan 06 2018 Automatic Build System <autodist@mambasoft.it> 2.11.0-1mamba
- automatic version update by autodist
* Sun Oct 08 2017 Automatic Build System <autodist@mambasoft.it> 2.10.1-1mamba
- automatic version update by autodist
* Sat Sep 23 2017 Automatic Build System <autodist@mambasoft.it> 2.10.0-1mamba
- automatic version update by autodist
* Fri Dec 23 2016 Automatic Build System <autodist@mambasoft.it> 2.8.0-1mamba
- automatic version update by autodist
* Sat Dec 10 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 2.7.0-2mamba
- rebuilt by autoport with build requirements: libxen-devel>=4.8.0-1mamba
* Sat Sep 03 2016 Automatic Build System <autodist@mambasoft.it> 2.7.0-1mamba
- automatic version update by autodist
* Thu Aug 18 2016 Automatic Build System <autodist@mambasoft.it> 2.6.1-1mamba
- automatic version update by autodist