From: Marcin Krol Date: Fri, 6 Feb 2015 16:34:47 +0000 (+0000) Subject: - killed systemd stuff X-Git-Url: https://git.tld-linux.org/?p=packages%2Fqemu.git;a=commitdiff_plain;h=9ac7ce16004702ee94c5c6afba65fa0353adfafa - killed systemd stuff --- diff --git a/99-qemu-guest-agent.rules b/99-qemu-guest-agent.rules deleted file mode 100644 index 8a290ab..0000000 --- a/99-qemu-guest-agent.rules +++ /dev/null @@ -1,2 +0,0 @@ -SUBSYSTEM=="virtio-ports", ATTR{name}=="org.qemu.guest_agent.0", \ - TAG+="systemd" ENV{SYSTEMD_WANTS}="qemu-guest-agent.service" diff --git a/ksm.service b/ksm.service deleted file mode 100644 index dbffa6e..0000000 --- a/ksm.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Kernel Samepage Merging -ConditionPathExists=/sys/kernel/mm/ksm - -[Service] -Type=oneshot -RemainAfterExit=yes -EnvironmentFile=-/etc/sysconfig/ksm -ExecStart=/usr/sbin/ksmctl start -ExecStop=/usr/sbin/ksmctl stop - -[Install] -WantedBy=multi-user.target diff --git a/ksmtuned.service b/ksmtuned.service deleted file mode 100644 index 39febcc..0000000 --- a/ksmtuned.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Kernel Samepage Merging (KSM) Tuning Daemon -After=ksm.service -Requires=ksm.service - -[Service] -ExecStart=/usr/sbin/ksmtuned -ExecReload=/bin/kill -USR1 $MAINPID -Type=forking - -[Install] -WantedBy=multi-user.target diff --git a/qemu-guest-agent.service b/qemu-guest-agent.service deleted file mode 100644 index 51cd7b3..0000000 --- a/qemu-guest-agent.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=QEMU Guest Agent -BindTo=dev-virtio\x2dports-org.qemu.guest_agent.0.device -After=dev-virtio\x2dports-org.qemu.guest_agent.0.device - -[Service] -ExecStart=-/usr/bin/qemu-ga -Restart=always -RestartSec=0 - -[Install] diff --git a/qemu.spec b/qemu.spec index 93c0339..de1ebf4 100644 --- a/qemu.spec +++ b/qemu.spec @@ -33,7 +33,7 @@ Summary: QEMU CPU Emulator Summary(pl.UTF-8): QEMU - emulator procesora Name: qemu Version: 2.2.0 -Release: 1 +Release: 2 License: GPL v2+ Group: Applications/Emulators Source0: http://wiki.qemu-project.org/download/%{name}-%{version}.tar.bz2 @@ -44,14 +44,10 @@ Source3: kvm-modules-load.conf # Creates /dev/kvm Source4: 80-kvm.rules # KSM control scripts -Source5: ksm.service Source6: ksm.sysconfig Source7: ksmctl.c -Source8: ksmtuned.service Source9: ksmtuned Source10: ksmtuned.conf -Source11: %{name}-guest-agent.service -Source12: 99-%{name}-guest-agent.rules Patch0: %{name}-cflags.patch Patch1: vgabios-widescreens.patch Patch2: %{name}-whitelist.patch @@ -205,7 +201,6 @@ aby działał na kolejnych procesorach. QEMU ma dwa tryby pracy: Summary: QEMU common files needed by all QEMU targets Summary(pl.UTF-8): Wspólne pliki QEMU wymagane przez wszystkie środowiska QEMU Group: Development/Tools -Requires(post,preun,postun): systemd-units >= 38 Requires(postun): /usr/sbin/groupdel Requires(postun): /usr/sbin/userdel Requires(pre): /bin/id @@ -215,7 +210,6 @@ Requires(pre): /usr/sbin/useradd Requires: glib2 >= 1:2.12 %{?with_libnfs:Requires: libnfs >= 1.9.3} Requires: libssh2 >= 1.2.8 -Requires: systemd-units >= 38 Provides: group(qemu) Provides: user(qemu) Obsoletes: qemu-kvm-common @@ -254,8 +248,6 @@ Summary: QEMU user mode emulation of qemu targets Summary(pl.UTF-8): QEMU - emulacja trybu użytkownika środowisk qemu Group: Development/Tools Requires: %{name}-common = %{version}-%{release} -Requires(post,postun): systemd-units >= 38 -Requires: systemd-units >= 38 Obsoletes: qemu-kvm-user %description user @@ -630,9 +622,7 @@ Ten pakiet zawiera emulator systemu z procesorem Xtensa. Summary: QEMU guest agent Summary(pl.UTF-8): Agent gościa QEMU Group: Daemons -Requires(post,preun,postun): systemd-units >= 38 Requires: glib2 >= 1:2.12 -Requires: systemd-units >= 38 Obsoletes: qemu-kvm-guest-agent %description guest-agent @@ -798,7 +788,7 @@ ln -s ../error.h qapi/error.h %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{systemdunitdir},/usr/lib/binfmt.d} \ +install -d $RPM_BUILD_ROOT/usr/lib/binfmt.d \ $RPM_BUILD_ROOT/etc/{sysconfig,udev/rules.d,modules-load.d} \ $RPM_BUILD_ROOT{%{_sysconfdir}/sasl,%{_sbindir}} @@ -820,19 +810,12 @@ install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/modules-load.d/kvm.conf install -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d %endif -install -p %{SOURCE5} $RPM_BUILD_ROOT%{systemdunitdir}/ksm.service install -p %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/ksm install -p ksmctl $RPM_BUILD_ROOT%{_sbindir} -install -p %{SOURCE8} $RPM_BUILD_ROOT%{systemdunitdir}/ksmtuned.service install -p %{SOURCE9} $RPM_BUILD_ROOT%{_sbindir}/ksmtuned install -p %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/ksmtuned.conf -# For the qemu-guest-agent subpackage install the systemd -# service and udev rules. -install -p %{SOURCE11} $RPM_BUILD_ROOT%{systemdunitdir} -install -p %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d - for i in dummy \ %ifnarch %{ix86} %{x8664} qemu-i386 \ @@ -888,40 +871,14 @@ rm -rf $RPM_BUILD_ROOT %groupadd -g 276 qemu %useradd -u 276 -g qemu -G kvm -c "QEMU User" qemu -%post common -%systemd_post ksm.service -%systemd_post ksmtuned.service - -%preun common -%systemd_preun ksm.service -%systemd_preun ksmtuned.service - %postun common if [ "$1" = "0" ]; then %userremove qemu %groupremove qemu %groupremove kvm fi -%systemd_reload %triggerpostun common -- qemu-common < 1.6.1-4 -%systemd_trigger ksm.service -%systemd_trigger ksmtuned.service - -%post user -%systemd_service_restart systemd-binfmt.service - -%postun user -%systemd_service_restart systemd-binfmt.service - -%post guest-agent -%systemd_reload - -%preun guest-agent -%systemd_preun qemu-guest-agent.service - -%postun guest-agent -%systemd_reload %files %defattr(644,root,root,755) @@ -934,8 +891,6 @@ fi %config(noreplace) %verify(not md5 mtime size) /etc/ksmtuned.conf %config(noreplace) %verify(not md5 mtime size) /etc/sasl/qemu.conf %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/ksm -%{systemdunitdir}/ksm.service -%{systemdunitdir}/ksmtuned.service %dir %{_sysconfdir}/qemu %attr(755,root,root) %{_bindir}/virtfs-proxy-helper %attr(755,root,root) %{_bindir}/qemu-nbd @@ -1124,8 +1079,6 @@ fi %files guest-agent %defattr(644,root,root,755) -%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/99-qemu-guest-agent.rules -%{systemdunitdir}/qemu-guest-agent.service %attr(755,root,root) %{_bindir}/qemu-ga %files module-block-curl