diff --git a/Makefile b/Makefile index b91e0e5..a17f45b 100644 --- a/Makefile +++ b/Makefile @@ -98,6 +98,7 @@ iso: cp rpm_verify /usr/local/bin/ ln -sf `pwd` /tmp/qubes-installer 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 clean: diff --git a/conf/comps-qubes.xml b/conf/comps-qubes.xml index 765f0fe..38c2e2f 100644 --- a/conf/comps-qubes.xml +++ b/conf/comps-qubes.xml @@ -101,6 +101,7 @@ qubes-manager qubes-template-fedora-15-x64 qubes-gpg-split-dom0 + qubes-core-dom0-pvdrivers-win7 diff --git a/qubes-release/qubes-pro-dom0.repo b/qubes-release/qubes-pro-dom0.repo new file mode 100644 index 0000000..b275209 --- /dev/null +++ b/qubes-release/qubes-pro-dom0.repo @@ -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 + diff --git a/qubes-release/qubes-release.spec b/qubes-release/qubes-release.spec index 12c0f4a..62609bc 100644 --- a/qubes-release/qubes-release.spec +++ b/qubes-release/qubes-release.spec @@ -75,7 +75,9 @@ EOF # On Mar 31, 2012, the Qubes signing key has changed # The new key is brought by this RPM, but we also # 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 @@ -93,6 +95,7 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) /etc/yum.repos.d/fedora.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-pro-dom0.repo %config(noreplace) %attr(0644,root,root) /etc/issue %config(noreplace) %attr(0644,root,root) /etc/issue.net %config %attr(0644,root,root) /etc/rpm/macros.dist