rpm/qemu
SHA256
1
0
Fork 0
forked from pool/qemu
Code Pull Requests Activity

Accepting request 176540 from home:a_faerber:branches:Virtualization

Browse Source 
Fix ppc qemu-linux-user build by moving directories from qemu package to qemu-linux-user (still unclear to me what they are useful for though...)

OBS-URL: https://build.opensuse.org/request/show/176540
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=142
This commit is contained in:
Andreas Färber 2013-05-25 13:20:26 +00:00 committed by Git OBS Bridge
parent ac78263f90
commit cf7a60cdb5
6 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qemu-linux-user.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri May 24 19:57:35 UTC 2013 - afaerber@suse.de
- Fix ppc builds by packaging /emul/ia32-linux (previously in qemu)
and /usr/share/qemu/qemu-i386
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 24 16:28:50 UTC 2013 - afaerber@suse.de Fri May 24 16:28:50 UTC 2013 - afaerber@suse.de

7
qemu-linux-user.spec
View File

@ -224,5 +224,12 @@ rm -rf ${RPM_BUILD_ROOT}
%_bindir/qemu-x86_64 %_bindir/qemu-x86_64
%_bindir/qemu-*-binfmt %_bindir/qemu-*-binfmt
%_sbindir/qemu-binfmt-conf.sh %_sbindir/qemu-binfmt-conf.sh
%ifnarch %ix86 x86_64 ia64
%dir /emul/ia32-linux
%endif
%ifnarch %ix86 x86_64
%dir /usr/share/qemu
/usr/share/qemu/qemu-i386
%endif
%changelog %changelog

7
qemu-linux-user.spec.in
View File

@ -150,5 +150,12 @@ rm -rf ${RPM_BUILD_ROOT}
%_bindir/qemu-x86_64 %_bindir/qemu-x86_64
%_bindir/qemu-*-binfmt %_bindir/qemu-*-binfmt
%_sbindir/qemu-binfmt-conf.sh %_sbindir/qemu-binfmt-conf.sh
%ifnarch %ix86 x86_64 ia64
%dir /emul/ia32-linux
%endif
%ifnarch %ix86 x86_64
%dir /usr/share/qemu
/usr/share/qemu/qemu-i386
%endif
%changelog %changelog

5
qemu.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri May 24 19:57:35 UTC 2013 - afaerber@suse.de
- Move /emul/ia32-linux to qemu-linux-user
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 24 17:11:36 UTC 2013 - afaerber@suse.de Fri May 24 17:11:36 UTC 2013 - afaerber@suse.de

9
qemu.spec
View File

@ -239,12 +239,6 @@ make %{?_smp_mflags} V=1
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
rm -fr $RPM_BUILD_ROOT/%_datadir/doc rm -fr $RPM_BUILD_ROOT/%_datadir/doc
install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf
%ifnarch %ix86 x86_64
ln -sf ../../../emul/ia32-linux $RPM_BUILD_ROOT/usr/share/qemu/qemu-i386
%endif
%ifnarch ia64
mkdir -p $RPM_BUILD_ROOT/emul/ia32-linux
%endif
%if 0%{?suse_version} >= 1210 %if 0%{?suse_version} >= 1210
%find_lang %name %find_lang %name
%endif %endif
@ -274,9 +268,6 @@ rm -rf ${RPM_BUILD_ROOT}
%_bindir/qemu-system-* %_bindir/qemu-system-*
%doc %_mandir/man1/qemu.1.gz %doc %_mandir/man1/qemu.1.gz
%_datadir/%name %_datadir/%name
%ifnarch %ix86 x86_64 ia64
%dir /emul/ia32-linux
%endif
%dir %_sysconfdir/%name %dir %_sysconfdir/%name
%config %_sysconfdir/%name/target-x86_64.conf %config %_sysconfdir/%name/target-x86_64.conf

9
qemu.spec.in
View File

@ -165,12 +165,6 @@ make %{?_smp_mflags} V=1
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
rm -fr $RPM_BUILD_ROOT/%_datadir/doc rm -fr $RPM_BUILD_ROOT/%_datadir/doc
install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf
%ifnarch %ix86 x86_64
ln -sf ../../../emul/ia32-linux $RPM_BUILD_ROOT/usr/share/qemu/qemu-i386
%endif
%ifnarch ia64
mkdir -p $RPM_BUILD_ROOT/emul/ia32-linux
%endif
%if 0%{?suse_version} >= 1210 %if 0%{?suse_version} >= 1210
%find_lang %name %find_lang %name
%endif %endif
@ -200,9 +194,6 @@ rm -rf ${RPM_BUILD_ROOT}
%_bindir/qemu-system-* %_bindir/qemu-system-*
%doc %_mandir/man1/qemu.1.gz %doc %_mandir/man1/qemu.1.gz
%_datadir/%name %_datadir/%name
%ifnarch %ix86 x86_64 ia64
%dir /emul/ia32-linux
%endif
%dir %_sysconfdir/%name %dir %_sysconfdir/%name
%config %_sysconfdir/%name/target-x86_64.conf %config %_sysconfdir/%name/target-x86_64.conf