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

Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/installer into hvm

Browse Source
This commit is contained in:
Joanna Rutkowska 2012-04-19 18:12:11 +02:00
commit 6a201ed8e7
4 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -98,6 +98,7 @@ iso:
cp rpm_verify /usr/local/bin/ cp rpm_verify /usr/local/bin/
ln -sf `pwd` /tmp/qubes-installer ln -sf `pwd` /tmp/qubes-installer
revisor --cli --config=conf/qubes-install.conf --model=qubes-x86_64 --install-dvd revisor --cli --config=conf/qubes-install.conf --model=qubes-x86_64 --install-dvd
isohybrid build/ISO/qubes-x86_64/iso/*.iso
rpm_verify build/work/revisor-install/R?-*/qubes-x86_64/x86_64/os/Packages/*.rpm rpm_verify build/work/revisor-install/R?-*/qubes-x86_64/x86_64/os/Packages/*.rpm
clean: clean:

1
conf/comps-qubes.xml
View File

@ -101,6 +101,7 @@
<packagereq type="mandatory">qubes-manager</packagereq> <packagereq type="mandatory">qubes-manager</packagereq>
<packagereq type="mandatory">qubes-template-fedora-15-x64</packagereq> <packagereq type="mandatory">qubes-template-fedora-15-x64</packagereq>
<packagereq type="default">qubes-gpg-split-dom0</packagereq> <packagereq type="default">qubes-gpg-split-dom0</packagereq>
<packagereq type="default">qubes-core-dom0-pvdrivers-win7</packagereq>
</packagelist> </packagelist>
</group> </group>
</comps> </comps>

8
qubes-release/qubes-pro-dom0.repo Normal file
View File

@ -0,0 +1,8 @@
[qubes-pro-dom0-current]
name = Qubes Pro Dom0 Repository
baseurl = http://10.141.1.102/yum/dom0
enabled = 1
metadata_expire = 7d
gpgcheck = 1
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary

5
qubes-release/qubes-release.spec
View File

@ -75,7 +75,9 @@ EOF
# On Mar 31, 2012, the Qubes signing key has changed # On Mar 31, 2012, the Qubes signing key has changed
# The new key is brought by this RPM, but we also # The new key is brought by this RPM, but we also
# need to explicitly import it to RPM DB # need to explicitly import it to RPM DB
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary if [ $1 -gt 1 ]; then
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
fi
%clean %clean
@ -93,6 +95,7 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) /etc/yum.repos.d/fedora.repo %config(noreplace) /etc/yum.repos.d/fedora.repo
%config(noreplace) /etc/yum.repos.d/fedora-updates.repo %config(noreplace) /etc/yum.repos.d/fedora-updates.repo
%config(noreplace) /etc/yum.repos.d/qubes-r1-dom0.repo %config(noreplace) /etc/yum.repos.d/qubes-r1-dom0.repo
%config(noreplace) /etc/yum.repos.d/qubes-pro-dom0.repo
%config(noreplace) %attr(0644,root,root) /etc/issue %config(noreplace) %attr(0644,root,root) /etc/issue
%config(noreplace) %attr(0644,root,root) /etc/issue.net %config(noreplace) %attr(0644,root,root) /etc/issue.net
%config %attr(0644,root,root) /etc/rpm/macros.dist %config %attr(0644,root,root) /etc/rpm/macros.dist