Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "rpm: do not build qubes-core-agent-sysvinit package"

Browse Source 
This reverts commit 408bccdd5c.
This commit is contained in:
Marek Marczykowski-Górecki 2020-09-17 02:47:51 +02:00
parent 27d4ecefed
commit 87135138ac
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -125,7 +125,7 @@ install-sysvinit: install-init
install -D vm-init.d/qubes-core.modules $(DESTDIR)/etc/sysconfig/modules/qubes-core.modules install -D vm-init.d/qubes-core.modules $(DESTDIR)/etc/sysconfig/modules/qubes-core.modules
install network/qubes-iptables $(DESTDIR)/etc/init.d/ install network/qubes-iptables $(DESTDIR)/etc/init.d/
install-rh: install-systemd install-systemd-dropins install-rh: install-systemd install-systemd-dropins install-sysvinit
install-doc: install-doc:
$(MAKE) -C doc install $(MAKE) -C doc install
@ -202,7 +202,7 @@ install-deb: install-common install-systemd install-systemd-dropins install-syst
mkdir -p $(DESTDIR)/etc/systemd/system/ mkdir -p $(DESTDIR)/etc/systemd/system/
install -m 0644 vm-systemd/haveged.service $(DESTDIR)/etc/systemd/system/ install -m 0644 vm-systemd/haveged.service $(DESTDIR)/etc/systemd/system/
install-corevm: install-rh install-common install-systemd install-systemd-dropins install-networking install-corevm: install-rh install-common install-systemd install-sysvinit install-systemd-dropins install-networking
install-netvm: install-systemd-networking-dropins install-networkmanager install-netvm: install-systemd-networking-dropins install-networkmanager

9
rpm_spec/core-agent.spec.in
View File

@ -20,8 +20,6 @@
# #
# #
%global with_sysvinit 0
%define qubes_services qubes-core qubes-core-netvm qubes-core-early qubes-firewall qubes-iptables qubes-updates-proxy qubes-updates-proxy-forwarder %define qubes_services qubes-core qubes-core-netvm qubes-core-early qubes-firewall qubes-iptables qubes-updates-proxy qubes-updates-proxy-forwarder
%define qubes_preset_file 75-qubes-vm.preset %define qubes_preset_file 75-qubes-vm.preset
@ -308,10 +306,6 @@ make -C qubes-rpc/kde DESTDIR=$RPM_BUILD_ROOT install
make -C qubes-rpc/nautilus DESTDIR=$RPM_BUILD_ROOT install make -C qubes-rpc/nautilus DESTDIR=$RPM_BUILD_ROOT install
make -C qubes-rpc/thunar DESTDIR=$RPM_BUILD_ROOT install make -C qubes-rpc/thunar DESTDIR=$RPM_BUILD_ROOT install
%if %with_sysvinit
install DESTDIR=$RPM_BUILD_ROOT install-sysvinit
%endif
make -C package-managers DESTDIR=$RPM_BUILD_ROOT install install-dnf make -C package-managers DESTDIR=$RPM_BUILD_ROOT install install-dnf
%if 0%{?rhel} == 7 %if 0%{?rhel} == 7
make -C package-managers DESTDIR=$RPM_BUILD_ROOT install-yum make -C package-managers DESTDIR=$RPM_BUILD_ROOT install-yum
@ -785,7 +779,6 @@ rm -f %{name}-%{version}
%config(noreplace) /etc/sudoers.d/qubes %config(noreplace) /etc/sudoers.d/qubes
%config(noreplace) /etc/pam.d/su.qubes %config(noreplace) /etc/pam.d/su.qubes
%if %with_sysvinit
%package sysvinit %package sysvinit
Summary: Qubes unit files for SysV init style or upstart Summary: Qubes unit files for SysV init style or upstart
License: GPL v2 only License: GPL v2 only
@ -852,8 +845,6 @@ if [ "$1" = 0 ] ; then
done done
fi fi
%endif
%package systemd %package systemd
Summary: Qubes unit files for SystemD init style Summary: Qubes unit files for SystemD init style
License: GPL v2 only License: GPL v2 only