Fix packaging: 'user' group, BACKEND_VMM var

- BACKEND_VMM may not be available as env variable (mock build), provide
it explicitly
- 'user' group may not exists at package build time, set it at package
installation
This commit is contained in:
Marek Marczykowski-Górecki 2018-05-01 17:34:52 +02:00
parent ce50704648
commit d25ecb4e40
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
4 changed files with 7 additions and 2 deletions

View File

@ -218,7 +218,7 @@ install-common: install-doc
misc/20_org.mate.NotificationDaemon.qubes.gschema.override \ misc/20_org.mate.NotificationDaemon.qubes.gschema.override \
misc/20_org.gnome.desktop.wm.preferences.qubes.gschema.override \ misc/20_org.gnome.desktop.wm.preferences.qubes.gschema.override \
$(DESTDIR)/usr/share/glib-2.0/schemas/ $(DESTDIR)/usr/share/glib-2.0/schemas/
install -g user -m 2775 -d $(DESTDIR)/var/lib/qubes/dom0-updates install -m 2775 -d $(DESTDIR)/var/lib/qubes/dom0-updates
install -D -m 0644 misc/qubes-master-key.asc $(DESTDIR)/usr/share/qubes/qubes-master-key.asc install -D -m 0644 misc/qubes-master-key.asc $(DESTDIR)/usr/share/qubes/qubes-master-key.asc
install misc/resize-rootfs $(DESTDIR)$(LIBDIR)/qubes/ install misc/resize-rootfs $(DESTDIR)$(LIBDIR)/qubes/

View File

@ -324,6 +324,8 @@ post_install() {
cp /etc/init/serial.conf /var/lib/qubes/serial.orig cp /etc/init/serial.conf /var/lib/qubes/serial.orig
fi fi
chgrp user /var/lib/qubes/dom0-updates
# Remove most of the udev scripts to speed up the VM boot time # Remove most of the udev scripts to speed up the VM boot time
# Just leave the xen* scripts, that are needed if this VM was # Just leave the xen* scripts, that are needed if this VM was
# ever used as a net backend (e.g. as a VPN domain in the future) # ever used as a net backend (e.g. as a VPN domain in the future)

View File

@ -145,6 +145,8 @@ case "${1}" in
fi fi
systemctl reenable haveged systemctl reenable haveged
chgrp user /var/lib/qubes/dom0-updates
debug "UPDATE..." debug "UPDATE..."
# disable some Upstart services # disable some Upstart services
for init in plymouth-shutdown \ for init in plymouth-shutdown \

View File

@ -267,7 +267,7 @@ Thunar support for Qubes VM tools
%build %build
for dir in qubes-rpc qrexec misc; do for dir in qubes-rpc qrexec misc; do
(cd $dir; make) make -C $dir BACKEND_VMM=@BACKEND_VMM@
done done
make -C doc manpages make -C doc manpages
@ -329,6 +329,7 @@ for F in plymouth-shutdown prefdm splash-manager start-ttys tty ; do
fi fi
done done
chgrp user /var/lib/qubes/dom0-updates
# Remove old firmware updates link # Remove old firmware updates link
if [ -L /lib/firmware/updates ]; then if [ -L /lib/firmware/updates ]; then