diff --git a/Makefile b/Makefile index b9c7706..a17f45b 100644 --- a/Makefile +++ b/Makefile @@ -54,7 +54,7 @@ help: .PHONY: rpms rpms_anaconda rpms_firstboot rpms_logos rpms_release rpms_revisor \ update-repo update-repo-testing clean -rpms: rpms_anaconda rpms_firstboot rpms_logos rpms_release rpms_revisor rpms_misc +rpms: rpms_anaconda rpms_firstboot rpms_logos rpms_release rpms_revisor rpm --addsign `ls -d rpm/x86_64/*.rpm rpm/i686/*.rpm rpm/noarch/*.rpm 2>/dev/null` rpm/SOURCES/anaconda-$(ANACONDA_VERSION).tar.bz2: anaconda anaconda/anaconda.spec @@ -84,13 +84,9 @@ rpms_release: rpm/SOURCES/qubes-release-$(QBSRELEASE_VERSION).tar.bz2 rpms_revisor: revisor/revisor-$(REVISOR_VERSION).tar.gz revisor/revisor.spec rpmbuild --define "_rpmdir rpm/" --define "_sourcedir $(TOP)/revisor" -bb revisor/revisor.spec -rpms_misc: - rpmbuild $(RPMBUILD_DEFINES) -bb misc/kernel-qubes-dom0-virtual.spec - RPMS = rpm/noarch/qubes-logos-$(QBSLOGOS_VERSION)-*.rpm \ rpm/noarch/qubes-release-$(QBSRELEASE_VERSION)-*.rpm \ rpm/noarch/revisor*-$(REVISOR_VERSION)-*.rpm \ - rpm/noarch/kernel-qubes-dom0-virtual-1.0-*.rpm \ rpm/x86_64/anaconda-$(ANACONDA_VERSION)-*.rpm \ rpm/x86_64/firstboot-$(FIRSTBOOT_VERSION)-*.rpm diff --git a/conf/comps-qubes.xml b/conf/comps-qubes.xml index 0ce963e..f7ba76a 100644 --- a/conf/comps-qubes.xml +++ b/conf/comps-qubes.xml @@ -94,7 +94,7 @@ Qubes Environment true - kernel-qubes-dom0-virtual + kernel-qubes-dom0 qubes-core-dom0 qubes-gui-dom0 qubes-logos diff --git a/misc/kernel-qubes-dom0-virtual.spec b/misc/kernel-qubes-dom0-virtual.spec deleted file mode 100644 index 1e4440d..0000000 --- a/misc/kernel-qubes-dom0-virtual.spec +++ /dev/null @@ -1,31 +0,0 @@ -Name: kernel-qubes-dom0-virtual -Version: 1.0 -Release: 1%{?dist} -Summary: Virtual package to install Qubes kernels set -BuildArch: noarch - -Group: System -License: GPL -URL: http://www.qubes-os.org/ - -Requires: kernel-qubes-dom0-pvops -Requires: kernel-qubes-dom0-xenlinux - -%description -Package to workaround revisor limitation - packages must be specified by its -name, not provides. - -%prep - - -%build - - -%install - - -%files - - -%changelog -