From 121a8054c995c3aa46c639e5e23a0920d53fecbc Mon Sep 17 00:00:00 2001 From: Joanna Rutkowska Date: Fri, 2 Nov 2012 14:27:01 +0100 Subject: [PATCH 1/6] version 2.1.1 --- version_vm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version_vm b/version_vm index c8a481c..3e3c2f1 100644 --- a/version_vm +++ b/version_vm @@ -1 +1 @@ -1.7.46 +2.1.1 From aa1babada1b53355d5b6d4266f8039d8d0c926a2 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Sat, 3 Nov 2012 01:57:36 +0100 Subject: [PATCH 2/6] vm: setup device permission to allow non-root vchan servers This will allow to start pulseaudio as normal user and get rid of preloaded library. --- vm-init.d/qubes_core | 2 ++ vm-systemd/qubes-sysinit.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/vm-init.d/qubes_core b/vm-init.d/qubes_core index c5fe5d2..4830587 100755 --- a/vm-init.d/qubes_core +++ b/vm-init.d/qubes_core @@ -17,6 +17,8 @@ start() # Set permissions to /proc/xen/xenbus, so normal user can use xenstore-read chmod 666 /proc/xen/xenbus + # Set permissions to files needed to listen at vchan + chmod 666 /proc/u2mfn /dev/xen/evtchn mkdir -p /var/run/xen-hotplug diff --git a/vm-systemd/qubes-sysinit.sh b/vm-systemd/qubes-sysinit.sh index b054407..f0b098a 100755 --- a/vm-systemd/qubes-sysinit.sh +++ b/vm-systemd/qubes-sysinit.sh @@ -25,6 +25,8 @@ mkdir -p /var/run/xen-hotplug # Set permissions to /proc/xen/xenbus, so normal user can use xenstore-read chmod 666 /proc/xen/xenbus +# Set permissions to files needed to listen at vchan +chmod 666 /proc/u2mfn /dev/xen/evtchn # Set default services depending on VM type TYPE=`$XS_READ qubes_vm_type 2> /dev/null` From e432f0e55c8669fac9dec5219cb6dc5ee259f1f3 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Sat, 3 Nov 2012 02:07:34 +0100 Subject: [PATCH 3/6] vm/spec: fix NotShowIn entries in autostart desktop files --- rpm_spec/core-vm.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpm_spec/core-vm.spec b/rpm_spec/core-vm.spec index 763e6b1..64884ea 100644 --- a/rpm_spec/core-vm.spec +++ b/rpm_spec/core-vm.spec @@ -212,7 +212,7 @@ remove_ShowIn () { for F in abrt-applet deja-dup-monitor imsettings-start krb5-auth-dialog pulseaudio restorecond sealertauto gnome-power-manager gnome-sound-applet gnome-screensaver orca-autostart; do if [ -e /etc/xdg/autostart/$F.desktop ]; then remove_ShowIn $F - echo 'NotShowIn=QUBES' >> /etc/xdg/autostart/$F.desktop + echo 'NotShowIn=QUBES;' >> /etc/xdg/autostart/$F.desktop fi done @@ -220,7 +220,7 @@ done for F in gcm-apply ; do if [ -e /etc/xdg/autostart/$F.desktop ]; then remove_ShowIn $F - echo 'NotShowIn=DisposableVM' >> /etc/xdg/autostart/$F.desktop + echo 'NotShowIn=DisposableVM;' >> /etc/xdg/autostart/$F.desktop fi done From 601f8d8ec6f4a413ce21f3a031daed48438df7a6 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Wed, 7 Nov 2012 17:58:08 +0100 Subject: [PATCH 4/6] makefile: split rpms into rpms-vm and rpms-dom0 (#665) --- Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 4717ce0..0ae46dd 100644 --- a/Makefile +++ b/Makefile @@ -12,15 +12,20 @@ help: @echo "make update-repo-installer -- copy dom0 rpms to installer repo" @echo "make clean -- cleanup" -rpms: +rpms: rpms-vm rpms-dom0 + +rpms-vm: rpmbuild --define "_rpmdir $(RPMS_DIR)" -bb rpm_spec/core-vm.spec rpmbuild --define "_rpmdir $(RPMS_DIR)" -bb rpm_spec/core-vm-kernel-placeholder.spec - rpmbuild --define "_rpmdir $(RPMS_DIR)" -bb rpm_spec/core-dom0.spec rpm --addsign \ - $(RPMS_DIR)/x86_64/qubes-core-dom0-$(VERSION_DOM0)*.rpm \ $(RPMS_DIR)/x86_64/qubes-core-vm-*$(VERSION_VM)*.rpm \ $(RPMS_DIR)/x86_64/qubes-core-vm-kernel-placeholder-*.rpm +rpms-dom0: + rpmbuild --define "_rpmdir $(RPMS_DIR)" -bb rpm_spec/core-dom0.spec + rpm --addsign \ + $(RPMS_DIR)/x86_64/qubes-core-dom0-$(VERSION_DOM0)*.rpm + rpms-vaio-fixes: rpmbuild --define "_rpmdir $(RPMS_DIR)" -bb rpm_spec/core-dom0-vaio-fixes.spec rpm --addsign $(RPMS_DIR)/x86_64/qubes-core-dom0-vaio-fixes-$(VERSION_VAIO_FIXES)*.rpm From 4b62e2d29fc786770b2501de7f80d1d6bb2ad6ff Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Wed, 7 Nov 2012 18:14:26 +0100 Subject: [PATCH 5/6] Add build-deps file (#666) --- build-deps-core.list | 1 + 1 file changed, 1 insertion(+) create mode 100644 build-deps-core.list diff --git a/build-deps-core.list b/build-deps-core.list new file mode 100644 index 0000000..55e7836 --- /dev/null +++ b/build-deps-core.list @@ -0,0 +1 @@ +xen-devel-*DIST* From 98866cc62e667173fa5fe8abcae603fae55b7a5f Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Wed, 7 Nov 2012 18:19:07 +0100 Subject: [PATCH 6/6] Rename build-deps file (#666) --- build-deps-core.list => build-deps.list | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename build-deps-core.list => build-deps.list (100%) diff --git a/build-deps-core.list b/build-deps.list similarity index 100% rename from build-deps-core.list rename to build-deps.list