diff --git a/comps-qubes-template.xml b/comps-qubes-template.xml index fb084e2..4ed9406 100644 --- a/comps-qubes-template.xml +++ b/comps-qubes-template.xml @@ -9,12 +9,12 @@ qubes-core-vm-systemd qubes-core-vm qubes-gui-vm - qubes-gpg-split xen-libs xen-qubes-vm-essentials - thunderbird-qubes qubes-doc-vm - qubes-pdf-converter + thunderbird-qubes + qubes-pdf-converter + qubes-gpg-split diff --git a/scripts_fedora/04_install_qubes.sh b/scripts_fedora/04_install_qubes.sh index f1a0c0b..2b033d6 100755 --- a/scripts_fedora/04_install_qubes.sh +++ b/scripts_fedora/04_install_qubes.sh @@ -6,7 +6,11 @@ trap "umount $PWD/mnt/proc" EXIT export YUM0=$PWD/yum_repo_qubes if [ "$TEMPLATE_FLAVOR" == "minimal" ]; then - YUM_OPTS="$YUM_OPTS --group_package_types=mandatory" + YUM_OPTS="$YUM_OPTS --setopt=group_package_types=mandatory" + rpmbuild -bb --define "_rpmdir $CACHEDIR" $SCRIPTSDIR/qubes-template-minimal-stub.spec || exit 1 + yum install -c $PWD/yum.conf $YUM_OPTS -y --installroot=$(pwd)/mnt $CACHEDIR/*/qubes-template-minimal-stub*rpm || exit 1 +else + YUM_OPTS="$YUM_OPTS --setopt=group_package_types=mandatory,default,optional" fi echo "--> Installing RPMs..." diff --git a/scripts_fedora/qubes-template-minimal-stub.spec b/scripts_fedora/qubes-template-minimal-stub.spec new file mode 100644 index 0000000..002455a --- /dev/null +++ b/scripts_fedora/qubes-template-minimal-stub.spec @@ -0,0 +1,44 @@ +Name: qubes-template-minimal-stub +Version: 1.0 +Release: 1%{?dist} +Summary: Placeholder package to minimize installed dependencies + +Group: Qubes +License: GPL +URL: http://www.qubes-os.org/ + +Provides: /usr/bin/mimeopen +Provides: nautilus-actions +Provides: gnome-packagekit-updater +Provides: ImageMagick +Provides: notification-daemon +Provides: tinyproxy +# Those versions needs to be updated to match target Fedora release, when introducing new one, use ifdefs on %fedora +Provides: NetworkManager = 0.9.9.0-38 +Provides: pulseaudio = 4.0 +Provides: /usr/bin/pulseaudio + +%description +Placeholder package, which provide ghost dependencies for qubes-core-vm to +minimize number of packages installed in the minimal template. Note that each +of those dependencies is required for some functionality, so without installing +some real package (minimal replacement?) some functionality will be missing. At least those: + - graphical updates + - be a target of qvm-open-in-vm + - be a DisposableVM template + - context menu "Send to VM" entry in nautilus + - graphical notifications + - sending application icons to dom0 (no fancy icons in dom0 menu) + - will not work as netvm + +%prep + + +%build + +%install + +%files + +%changelog +