QubesOS/qubes-installer-qubes-os
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "virtual package to install multiple kernel versions"

Browse Source 
This reverts commit 166b6f5d4c.
This didn't work (break anaconda dependecy resolve).
This commit is contained in:
Marek Marczykowski 2012-07-09 13:46:03 +02:00
parent 166b6f5d4c
commit dfe853fb9d
3 changed files with 2 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -54,7 +54,7 @@ help:
.PHONY: rpms rpms_anaconda rpms_firstboot rpms_logos rpms_release rpms_revisor \ .PHONY: rpms rpms_anaconda rpms_firstboot rpms_logos rpms_release rpms_revisor \
update-repo update-repo-testing clean 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 --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 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 rpms_revisor: revisor/revisor-$(REVISOR_VERSION).tar.gz revisor/revisor.spec
rpmbuild --define "_rpmdir rpm/" --define "_sourcedir $(TOP)/revisor" -bb 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 \ RPMS = rpm/noarch/qubes-logos-$(QBSLOGOS_VERSION)-*.rpm \
rpm/noarch/qubes-release-$(QBSRELEASE_VERSION)-*.rpm \ rpm/noarch/qubes-release-$(QBSRELEASE_VERSION)-*.rpm \
rpm/noarch/revisor*-$(REVISOR_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/anaconda-$(ANACONDA_VERSION)-*.rpm \
rpm/x86_64/firstboot-$(FIRSTBOOT_VERSION)-*.rpm rpm/x86_64/firstboot-$(FIRSTBOOT_VERSION)-*.rpm

2
conf/comps-qubes.xml
View File

@ -94,7 +94,7 @@
<name>Qubes Environment</name> <name>Qubes Environment</name>
<default>true</default> <default>true</default>
<packagelist> <packagelist>
<packagereq type="mandatory">kernel-qubes-dom0-virtual</packagereq> <packagereq type="mandatory">kernel-qubes-dom0</packagereq>
<packagereq type="mandatory">qubes-core-dom0</packagereq> <packagereq type="mandatory">qubes-core-dom0</packagereq>
<packagereq type="mandatory">qubes-gui-dom0</packagereq> <packagereq type="mandatory">qubes-gui-dom0</packagereq>
<packagereq type="mandatory">qubes-logos</packagereq> <packagereq type="mandatory">qubes-logos</packagereq>

31
misc/kernel-qubes-dom0-virtual.spec
View File

@ -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