From dffd7e045784c495bafc8fb8c42eb029f9ecc23a Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Thu, 7 Mar 2013 05:09:13 +0100 Subject: [PATCH] remove qubes-core-libs and qrexec leftovers They are now in separate repository. --- Makefile | 48 ++++----------- rpm_spec/core-libs.spec | 84 --------------------------- rpm_spec/core-vm.spec | 16 +---- version_vm => version | 0 vm-init.d/qubes_core | 2 - vm-systemd/qubes-qrexec-agent.service | 10 ---- 6 files changed, 13 insertions(+), 147 deletions(-) delete mode 100644 rpm_spec/core-libs.spec rename version_vm => version (100%) delete mode 100644 vm-systemd/qubes-qrexec-agent.service diff --git a/Makefile b/Makefile index 4d75759..272bc43 100644 --- a/Makefile +++ b/Makefile @@ -1,87 +1,59 @@ RPMS_DIR=rpm/ -VERSION_DOM0 := $(shell cat version_dom0) -VERSION_VAIO_FIXES := $(shell cat version_vaio_fixes) -VERSION_VM := $(shell cat version_vm) -VERSION_LIBS := $(shell cat version_libs) +VERSION := $(shell cat version) DIST_DOM0 ?= fc18 help: @echo "make rpms -- generate binary rpm packages" @echo "make rpms-vm -- generate binary rpm packages for VM" - @echo "make rpms-dom0 -- generate binary rpm packages for Dom0" @echo "make update-repo-current -- copy newly generated rpms to qubes yum repo" @echo "make update-repo-current-testing -- same, but to -current-testing repo" @echo "make update-repo-unstable -- same, but to -testing repo" @echo "make update-repo-installer -- copy dom0 rpms to installer repo" @echo "make clean -- cleanup" -rpms: rpms-vm rpms-dom0 +rpms: rpms-vm -rpms-libs: - rpmbuild --define "_rpmdir $(RPMS_DIR)" -bb rpm_spec/core-libs.spec - rpm --addsign $(RPMS_DIR)/x86_64/qubes-core-libs-$(VERSION_LIBS)*.rpm - -rpms-vm: rpms-libs +rpms-vm: rpmbuild --define "_rpmdir $(RPMS_DIR)" -bb rpm_spec/core-vm.spec rpmbuild --define "_rpmdir $(RPMS_DIR)" -bb rpm_spec/core-vm-kernel-placeholder.spec rpm --addsign \ - $(RPMS_DIR)/x86_64/qubes-core-vm-*$(VERSION_VM)*.rpm \ + $(RPMS_DIR)/x86_64/qubes-core-vm-*$(VERSION)*.rpm \ $(RPMS_DIR)/x86_64/qubes-core-vm-kernel-placeholder-*.rpm -rpms-dom0: rpms-libs rpms-vaio-fixes - rpmbuild --define "_rpmdir $(RPMS_DIR)" -bb rpm_spec/core-dom0.spec - rpm --addsign \ - $(RPMS_DIR)/x86_64/qubes-core-dom0-$(VERSION_DOM0)*.rpm - -rpms-vaio-fixes: - rpmbuild --define "_rpmdir $(RPMS_DIR)" -bb rpm_spec/core-dom0-vaio-fixes.spec - rpm --addsign $(RPMS_DIR)/x86_64/qubes-core-dom0-vaio-fixes-$(VERSION_VAIO_FIXES)*.rpm +rpms-dom0: + @true update-repo-current: - ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-$(VERSION_DOM0)*$(DIST_DOM0)*.rpm ../yum/current-release/current/dom0/rpm/ - ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-vaio-fixes-$(VERSION_VAIO_FIXES)*$(DIST_DOM0)*.rpm ../yum/current-release/current/dom0/rpm/ - ln -f $(RPMS_DIR)/x86_64/qubes-core-libs-$(VERSION_LIBS)*$(DIST_DOM0)*.rpm ../yum/current-release/current/dom0/rpm/ for vmrepo in ../yum/current-release/current/vm/* ; do \ dist=$$(basename $$vmrepo) ;\ - ln -f $(RPMS_DIR)/x86_64/qubes-core-vm-*$(VERSION_VM)*$$dist*.rpm $$vmrepo/rpm/ ;\ + ln -f $(RPMS_DIR)/x86_64/qubes-core-vm-*$(VERSION)*$$dist*.rpm $$vmrepo/rpm/ ;\ ln -f $(RPMS_DIR)/x86_64/qubes-core-vm-kernel-placeholder-*$$dist*.rpm $$vmrepo/rpm/ ;\ ln -f $(RPMS_DIR)/x86_64/qubes-core-libs-$(VERSION_LIBS)*$$dist*.rpm $$vmrepo/rpm/;\ done update-repo-current-testing: - ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-$(VERSION_DOM0)*$(DIST_DOM0)*.rpm ../yum/current-release/current-testing/dom0/rpm/ - ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-vaio-fixes-$(VERSION_VAIO_FIXES)*$(DIST_DOM0)*.rpm ../yum/current-release/current-testing/dom0/rpm/ - ln -f $(RPMS_DIR)/x86_64/qubes-core-libs-$(VERSION_LIBS)*$(DIST_DOM0)*.rpm ../yum/current-release/current-testing/dom0/rpm/ for vmrepo in ../yum/current-release/current-testing/vm/* ; do \ dist=$$(basename $$vmrepo) ;\ - ln -f $(RPMS_DIR)/x86_64/qubes-core-vm-*$(VERSION_VM)*$$dist*.rpm $$vmrepo/rpm/ ;\ + ln -f $(RPMS_DIR)/x86_64/qubes-core-vm-*$(VERSION)*$$dist*.rpm $$vmrepo/rpm/ ;\ ln -f $(RPMS_DIR)/x86_64/qubes-core-vm-kernel-placeholder-*$$dist*.rpm $$vmrepo/rpm/ ;\ ln -f $(RPMS_DIR)/x86_64/qubes-core-libs-$(VERSION_LIBS)*$$dist*.rpm $$vmrepo/rpm/;\ done update-repo-unstable: - ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-$(VERSION_DOM0)*$(DIST_DOM0)*.rpm ../yum/current-release/unstable/dom0/rpm/ - ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-vaio-fixes-$(VERSION_VAIO_FIXES)*$(DIST_DOM0)*.rpm ../yum/current-release/unstable/dom0/rpm/ - ln -f $(RPMS_DIR)/x86_64/qubes-core-libs-$(VERSION_LIBS)*$(DIST_DOM0)*.rpm ../yum/current-release/current-testing/dom0/rpm/ for vmrepo in ../yum/current-release/unstable/vm/* ; do \ dist=$$(basename $$vmrepo) ;\ - ln -f $(RPMS_DIR)/x86_64/qubes-core-vm-*$(VERSION_VM)*$$dist*.rpm $$vmrepo/rpm/ ;\ + ln -f $(RPMS_DIR)/x86_64/qubes-core-vm-*$(VERSION)*$$dist*.rpm $$vmrepo/rpm/ ;\ ln -f $(RPMS_DIR)/x86_64/qubes-core-vm-kernel-placeholder-*$$dist*.rpm $$vmrepo/rpm/ ;\ ln -f $(RPMS_DIR)/x86_64/qubes-core-libs-$(VERSION_LIBS)*$$dist*.rpm $$vmrepo/rpm/;\ done -update-repo-installer: - ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-*$(VERSION_DOM0)*$(DIST_DOM0)*.rpm ../installer/yum/qubes-dom0/rpm/ - ln -f $(RPMS_DIR)/x86_64/qubes-core-libs-$(VERSION_LIBS)*fc18*.rpm ../installer/yum/qubes-dom0/rpm/ - update-repo-template: for vmrepo in ../template-builder/yum_repo_qubes/* ; do \ dist=$$(basename $$vmrepo) ;\ - ln -f $(RPMS_DIR)/x86_64/qubes-core-vm-*$(VERSION_VM)*$$dist*.rpm $$vmrepo/rpm/ ;\ + ln -f $(RPMS_DIR)/x86_64/qubes-core-vm-*$(VERSION)*$$dist*.rpm $$vmrepo/rpm/ ;\ ln -f $(RPMS_DIR)/x86_64/qubes-core-vm-kernel-placeholder-*$$dist*.rpm $$vmrepo/rpm/ ;\ - ln -f $(RPMS_DIR)/x86_64/qubes-core-libs-$(VERSION_LIBS)*$$dist*.rpm $$vmrepo/rpm/;\ done clean: diff --git a/rpm_spec/core-libs.spec b/rpm_spec/core-libs.spec deleted file mode 100644 index 00c3582..0000000 --- a/rpm_spec/core-libs.spec +++ /dev/null @@ -1,84 +0,0 @@ -# -# The Qubes OS Project, http://www.qubes-os.org -# -# Copyright (C) 2010 Joanna Rutkowska -# Copyright (C) 2010 Rafal Wojtczuk -# Copyright (C) 2012 Marek Marczykowski -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# - -%{!?version: %define version %(cat version_libs)} - -Name: qubes-core-libs -Version: %{version} -Release: 1%{dist} - -Summary: Qubes core libraries -License: GPL v2 only -Group: Development/Sources -Group: Qubes -Vendor: Invisible Things Lab -URL: http://www.qubes-os.org -Obsoletes: qubes-core-appvm-libs -Obsoletes: qubes-core-vm-libs -BuildRequires: xen-devel - -%define _builddir %(pwd) - -%description -The Qubes core libraries for installation inside a Qubes Dom0 and VM. - -%prep -# we operate on the current directory, so no need to unpack anything -# symlink is to generate useful debuginfo packages -rm -f %{name}-%{version} -ln -sf . %{name}-%{version} -%setup -T -D - -%build -(cd u2mfn; make) -(cd vchan; make -f Makefile.linux) - -%install -install -D -m 0644 vchan/libvchan.h $RPM_BUILD_ROOT/usr/include/libvchan.h -install -D -m 0644 u2mfn/u2mfnlib.h $RPM_BUILD_ROOT/usr/include/u2mfnlib.h -install -D -m 0644 u2mfn/u2mfn-kernel.h $RPM_BUILD_ROOT/usr/include/u2mfn-kernel.h - -install -D vchan/libvchan.so $RPM_BUILD_ROOT/%{_libdir}/libvchan.so -install -D u2mfn/libu2mfn.so $RPM_BUILD_ROOT/%{_libdir}/libu2mfn.so - -%clean -rm -rf $RPM_BUILD_ROOT -rm -f %{name}-%{version} - -%files -%{_libdir}/libvchan.so -%{_libdir}/libu2mfn.so - -%package devel -Summary: Include files for qubes core libraries -License: GPL v2 only -Group: Development/Sources -Obsoletes: qubes-core-appvm-devel -Obsoletes: qubes-core-vm-devel - -%description devel - -%files devel -/usr/include/libvchan.h -/usr/include/u2mfnlib.h -/usr/include/u2mfn-kernel.h diff --git a/rpm_spec/core-vm.spec b/rpm_spec/core-vm.spec index 29b58c8..0f2b411 100644 --- a/rpm_spec/core-vm.spec +++ b/rpm_spec/core-vm.spec @@ -20,7 +20,7 @@ # # -%{!?version: %define version %(cat version_vm)} +%{!?version: %define version %(cat version)} Name: qubes-core-vm Version: %{version} @@ -71,8 +71,6 @@ ln -sf . %{name}-%{version} %setup -T -D %build -(cd vchan; make -f Makefile.linux) -(cd qrexec; make) for dir in qubes_rpc misc; do (cd $dir; make) done @@ -190,10 +188,6 @@ install -m 0644 qubes_rpc/*-gnome.desktop $RPM_BUILD_ROOT/usr/share/file-manager install -D misc/nautilus-actions.conf $RPM_BUILD_ROOT/etc/xdg/nautilus-actions/nautilus-actions.conf -install qrexec/qrexec_agent $RPM_BUILD_ROOT/usr/lib/qubes -install qrexec/qrexec_client_vm $RPM_BUILD_ROOT/usr/lib/qubes -install qrexec/qubes_rpc_multiplexer $RPM_BUILD_ROOT/usr/lib/qubes - install misc/meminfo-writer $RPM_BUILD_ROOT/usr/lib/qubes install -d $RPM_BUILD_ROOT/mnt/removable install -d $RPM_BUILD_ROOT/var/lib/qubes/dom0-updates @@ -440,12 +434,9 @@ rm -f %{name}-%{version} /usr/lib/qubes/qfile-agent %attr(4755,root,root) /usr/lib/qubes/qfile-unpacker /usr/lib/qubes/qopen-in-vm -/usr/lib/qubes/qrexec_agent -/usr/lib/qubes/qrexec_client_vm /usr/lib/qubes/qrun-in-vm /usr/lib/qubes/qubes_download_dom0_updates.sh /usr/lib/qubes/qubes_fix_nm_conf.sh -/usr/lib/qubes/qubes_rpc_multiplexer /usr/lib/qubes/qubes_setup_dnat_to_ns /usr/lib/qubes/qubes_trigger_sync_appmenus.sh /usr/lib/qubes/qvm-copy-to-vm.gnome @@ -552,7 +543,6 @@ The Qubes core startup configuration for SystemD init. %defattr(-,root,root,-) /lib/systemd/system/qubes-dvm.service /lib/systemd/system/qubes-meminfo-writer.service -/lib/systemd/system/qubes-qrexec-agent.service /lib/systemd/system/qubes-misc-post.service /lib/systemd/system/qubes-firewall.service /lib/systemd/system/qubes-netwatcher.service @@ -577,7 +567,7 @@ The Qubes core startup configuration for SystemD init. %post systemd -for srv in qubes-dvm qubes-meminfo-writer qubes-qrexec-agent qubes-sysinit qubes-misc-post qubes-netwatcher qubes-network qubes-firewall qubes-yum-proxy; do +for srv in qubes-dvm qubes-meminfo-writer qubes-sysinit qubes-misc-post qubes-netwatcher qubes-network qubes-firewall qubes-yum-proxy; do /bin/systemctl enable $srv.service 2> /dev/null done @@ -650,6 +640,6 @@ if [ "$1" != 0 ] ; then exit 0 fi -for srv in qubes-dvm qubes-meminfo-writer qubes-qrexec-agent qubes-sysinit qubes-misc-post qubes-netwatcher qubes-network; do +for srv in qubes-dvm qubes-meminfo-writer qubes-sysinit qubes-misc-post qubes-netwatcher qubes-network; do /bin/systemctl disable $srv.service do diff --git a/version_vm b/version similarity index 100% rename from version_vm rename to version diff --git a/vm-init.d/qubes_core b/vm-init.d/qubes_core index d5760fc..3896736 100755 --- a/vm-init.d/qubes_core +++ b/vm-init.d/qubes_core @@ -79,8 +79,6 @@ start() fi mount /home - /usr/lib/qubes/qrexec_agent 2>/var/log/qubes/qrexec_agent.log & - [ -x /rw/config/rc.local ] && /rw/config/rc.local success diff --git a/vm-systemd/qubes-qrexec-agent.service b/vm-systemd/qubes-qrexec-agent.service deleted file mode 100644 index 759e4b4..0000000 --- a/vm-systemd/qubes-qrexec-agent.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Qubes remote exec agent -After=qubes-dvm.service - -[Service] -ExecStart=/usr/lib/qubes/qrexec_agent -StandardOutput=syslog - -[Install] -WantedBy=multi-user.target