diff --git a/dom0/core-modules/000QubesVm.py b/core-modules/000QubesVm.py similarity index 100% rename from dom0/core-modules/000QubesVm.py rename to core-modules/000QubesVm.py diff --git a/dom0/core-modules/003QubesTemplateVm.py b/core-modules/003QubesTemplateVm.py similarity index 100% rename from dom0/core-modules/003QubesTemplateVm.py rename to core-modules/003QubesTemplateVm.py diff --git a/dom0/core-modules/005QubesNetVm.py b/core-modules/005QubesNetVm.py similarity index 100% rename from dom0/core-modules/005QubesNetVm.py rename to core-modules/005QubesNetVm.py diff --git a/dom0/core-modules/006QubesDom0NetVm.py b/core-modules/006QubesDom0NetVm.py similarity index 100% rename from dom0/core-modules/006QubesDom0NetVm.py rename to core-modules/006QubesDom0NetVm.py diff --git a/dom0/core-modules/006QubesProxyVm.py b/core-modules/006QubesProxyVm.py similarity index 100% rename from dom0/core-modules/006QubesProxyVm.py rename to core-modules/006QubesProxyVm.py diff --git a/dom0/core-modules/01QubesAppVm.py b/core-modules/01QubesAppVm.py similarity index 100% rename from dom0/core-modules/01QubesAppVm.py rename to core-modules/01QubesAppVm.py diff --git a/dom0/core-modules/01QubesDisposableVm.py b/core-modules/01QubesDisposableVm.py similarity index 100% rename from dom0/core-modules/01QubesDisposableVm.py rename to core-modules/01QubesDisposableVm.py diff --git a/dom0/core-modules/01QubesHVm.py b/core-modules/01QubesHVm.py similarity index 100% rename from dom0/core-modules/01QubesHVm.py rename to core-modules/01QubesHVm.py diff --git a/dom0/core-modules/README.txt b/core-modules/README.txt similarity index 100% rename from dom0/core-modules/README.txt rename to core-modules/README.txt diff --git a/dom0/core-modules/__init__.py b/core-modules/__init__.py similarity index 100% rename from dom0/core-modules/__init__.py rename to core-modules/__init__.py diff --git a/dom0/core/.gitignore b/core/.gitignore similarity index 100% rename from dom0/core/.gitignore rename to core/.gitignore diff --git a/dom0/core/__init__.py b/core/__init__.py similarity index 100% rename from dom0/core/__init__.py rename to core/__init__.py diff --git a/dom0/core/guihelpers.py b/core/guihelpers.py similarity index 100% rename from dom0/core/guihelpers.py rename to core/guihelpers.py diff --git a/dom0/core/qubes.py b/core/qubes.py similarity index 100% rename from dom0/core/qubes.py rename to core/qubes.py diff --git a/dom0/core/qubesutils.py b/core/qubesutils.py similarity index 100% rename from dom0/core/qubesutils.py rename to core/qubesutils.py diff --git a/dom0/dispvm/.gitignore b/dispvm/.gitignore similarity index 100% rename from dom0/dispvm/.gitignore rename to dispvm/.gitignore diff --git a/dom0/dispvm/Makefile b/dispvm/Makefile similarity index 100% rename from dom0/dispvm/Makefile rename to dispvm/Makefile diff --git a/dom0/dispvm/block.qubes b/dispvm/block.qubes similarity index 100% rename from dom0/dispvm/block.qubes rename to dispvm/block.qubes diff --git a/dom0/dispvm/qfile-daemon-dvm b/dispvm/qfile-daemon-dvm similarity index 100% rename from dom0/dispvm/qfile-daemon-dvm rename to dispvm/qfile-daemon-dvm diff --git a/dom0/dispvm/qubes-prepare-saved-domain.sh b/dispvm/qubes-prepare-saved-domain.sh similarity index 100% rename from dom0/dispvm/qubes-prepare-saved-domain.sh rename to dispvm/qubes-prepare-saved-domain.sh diff --git a/dom0/dispvm/qubes-restore.c b/dispvm/qubes-restore.c similarity index 100% rename from dom0/dispvm/qubes-restore.c rename to dispvm/qubes-restore.c diff --git a/dom0/dispvm/qubes-update-dispvm-savefile-with-progress.sh b/dispvm/qubes-update-dispvm-savefile-with-progress.sh similarity index 100% rename from dom0/dispvm/qubes-update-dispvm-savefile-with-progress.sh rename to dispvm/qubes-update-dispvm-savefile-with-progress.sh diff --git a/dom0/dispvm/xenstore-watch.c b/dispvm/xenstore-watch.c similarity index 100% rename from dom0/dispvm/xenstore-watch.c rename to dispvm/xenstore-watch.c diff --git a/dom0/linux/aux-tools/.gitignore b/linux/aux-tools/.gitignore similarity index 100% rename from dom0/linux/aux-tools/.gitignore rename to linux/aux-tools/.gitignore diff --git a/dom0/linux/aux-tools/block-cleaner-daemon.py b/linux/aux-tools/block-cleaner-daemon.py similarity index 100% rename from dom0/linux/aux-tools/block-cleaner-daemon.py rename to linux/aux-tools/block-cleaner-daemon.py diff --git a/dom0/linux/aux-tools/cleanup-dispvms b/linux/aux-tools/cleanup-dispvms similarity index 100% rename from dom0/linux/aux-tools/cleanup-dispvms rename to linux/aux-tools/cleanup-dispvms diff --git a/dom0/linux/aux-tools/fix-dir-perms.sh b/linux/aux-tools/fix-dir-perms.sh similarity index 100% rename from dom0/linux/aux-tools/fix-dir-perms.sh rename to linux/aux-tools/fix-dir-perms.sh diff --git a/dom0/linux/aux-tools/prepare-volatile-img.sh b/linux/aux-tools/prepare-volatile-img.sh similarity index 100% rename from dom0/linux/aux-tools/prepare-volatile-img.sh rename to linux/aux-tools/prepare-volatile-img.sh diff --git a/dom0/linux/aux-tools/startup-dvm.sh b/linux/aux-tools/startup-dvm.sh similarity index 100% rename from dom0/linux/aux-tools/startup-dvm.sh rename to linux/aux-tools/startup-dvm.sh diff --git a/dom0/linux/aux-tools/startup-misc.sh b/linux/aux-tools/startup-misc.sh similarity index 100% rename from dom0/linux/aux-tools/startup-misc.sh rename to linux/aux-tools/startup-misc.sh diff --git a/dom0/linux/aux-tools/unbind-pci-device.sh b/linux/aux-tools/unbind-pci-device.sh similarity index 100% rename from dom0/linux/aux-tools/unbind-pci-device.sh rename to linux/aux-tools/unbind-pci-device.sh diff --git a/dom0/linux/aux-tools/vusb-ctl.py b/linux/aux-tools/vusb-ctl.py similarity index 100% rename from dom0/linux/aux-tools/vusb-ctl.py rename to linux/aux-tools/vusb-ctl.py diff --git a/dom0/linux/aux-tools/xl-qvm-usb-attach.py b/linux/aux-tools/xl-qvm-usb-attach.py similarity index 100% rename from dom0/linux/aux-tools/xl-qvm-usb-attach.py rename to linux/aux-tools/xl-qvm-usb-attach.py diff --git a/dom0/linux/aux-tools/xl-qvm-usb-detach.py b/linux/aux-tools/xl-qvm-usb-detach.py similarity index 100% rename from dom0/linux/aux-tools/xl-qvm-usb-detach.py rename to linux/aux-tools/xl-qvm-usb-detach.py diff --git a/dom0/linux/system-config/block-snapshot b/linux/system-config/block-snapshot similarity index 100% rename from dom0/linux/system-config/block-snapshot rename to linux/system-config/block-snapshot diff --git a/dom0/linux/system-config/qubes-guid.desktop b/linux/system-config/qubes-guid.desktop similarity index 100% rename from dom0/linux/system-config/qubes-guid.desktop rename to linux/system-config/qubes-guid.desktop diff --git a/dom0/linux/system-config/vif-route-qubes b/linux/system-config/vif-route-qubes similarity index 100% rename from dom0/linux/system-config/vif-route-qubes rename to linux/system-config/vif-route-qubes diff --git a/dom0/linux/systemd/qubes-block-cleaner.service b/linux/systemd/qubes-block-cleaner.service similarity index 100% rename from dom0/linux/systemd/qubes-block-cleaner.service rename to linux/systemd/qubes-block-cleaner.service diff --git a/dom0/linux/systemd/qubes-core.service b/linux/systemd/qubes-core.service similarity index 100% rename from dom0/linux/systemd/qubes-core.service rename to linux/systemd/qubes-core.service diff --git a/dom0/linux/systemd/qubes-meminfo-writer.service b/linux/systemd/qubes-meminfo-writer.service similarity index 100% rename from dom0/linux/systemd/qubes-meminfo-writer.service rename to linux/systemd/qubes-meminfo-writer.service diff --git a/dom0/linux/systemd/qubes-netvm.service b/linux/systemd/qubes-netvm.service similarity index 100% rename from dom0/linux/systemd/qubes-netvm.service rename to linux/systemd/qubes-netvm.service diff --git a/dom0/linux/systemd/qubes-qmemman.service b/linux/systemd/qubes-qmemman.service similarity index 100% rename from dom0/linux/systemd/qubes-qmemman.service rename to linux/systemd/qubes-qmemman.service diff --git a/dom0/linux/systemd/qubes-setupdvm.service b/linux/systemd/qubes-setupdvm.service similarity index 100% rename from dom0/linux/systemd/qubes-setupdvm.service rename to linux/systemd/qubes-setupdvm.service diff --git a/dom0/qmemman/.gitignore b/qmemman/.gitignore similarity index 100% rename from dom0/qmemman/.gitignore rename to qmemman/.gitignore diff --git a/dom0/qmemman/Makefile b/qmemman/Makefile similarity index 100% rename from dom0/qmemman/Makefile rename to qmemman/Makefile diff --git a/dom0/qmemman/meminfo-writer.c b/qmemman/meminfo-writer.c similarity index 100% rename from dom0/qmemman/meminfo-writer.c rename to qmemman/meminfo-writer.c diff --git a/dom0/qmemman/qmemman.conf b/qmemman/qmemman.conf similarity index 100% rename from dom0/qmemman/qmemman.conf rename to qmemman/qmemman.conf diff --git a/dom0/qmemman/qmemman.py b/qmemman/qmemman.py similarity index 100% rename from dom0/qmemman/qmemman.py rename to qmemman/qmemman.py diff --git a/dom0/qmemman/qmemman_algo.py b/qmemman/qmemman_algo.py similarity index 100% rename from dom0/qmemman/qmemman_algo.py rename to qmemman/qmemman_algo.py diff --git a/dom0/qmemman/qmemman_client.py b/qmemman/qmemman_client.py similarity index 100% rename from dom0/qmemman/qmemman_client.py rename to qmemman/qmemman_client.py diff --git a/dom0/qmemman/qmemman_server.py b/qmemman/qmemman_server.py similarity index 100% rename from dom0/qmemman/qmemman_server.py rename to qmemman/qmemman_server.py diff --git a/dom0/qmemman/server.py b/qmemman/server.py similarity index 100% rename from dom0/qmemman/server.py rename to qmemman/server.py diff --git a/dom0/qubes-rpc-policy/qubes.Filecopy.policy b/qubes-rpc-policy/qubes.Filecopy.policy similarity index 100% rename from dom0/qubes-rpc-policy/qubes.Filecopy.policy rename to qubes-rpc-policy/qubes.Filecopy.policy diff --git a/dom0/qubes-rpc-policy/qubes.NotifyUpdates.policy b/qubes-rpc-policy/qubes.NotifyUpdates.policy similarity index 100% rename from dom0/qubes-rpc-policy/qubes.NotifyUpdates.policy rename to qubes-rpc-policy/qubes.NotifyUpdates.policy diff --git a/dom0/qubes-rpc-policy/qubes.OpenInVM.policy b/qubes-rpc-policy/qubes.OpenInVM.policy similarity index 100% rename from dom0/qubes-rpc-policy/qubes.OpenInVM.policy rename to qubes-rpc-policy/qubes.OpenInVM.policy diff --git a/dom0/qubes-rpc-policy/qubes.VMShell.policy b/qubes-rpc-policy/qubes.VMShell.policy similarity index 100% rename from dom0/qubes-rpc-policy/qubes.VMShell.policy rename to qubes-rpc-policy/qubes.VMShell.policy diff --git a/dom0/qubes-rpc/.gitignore b/qubes-rpc/.gitignore similarity index 100% rename from dom0/qubes-rpc/.gitignore rename to qubes-rpc/.gitignore diff --git a/dom0/qubes-rpc/qubes-notify-updates b/qubes-rpc/qubes-notify-updates similarity index 100% rename from dom0/qubes-rpc/qubes-notify-updates rename to qubes-rpc/qubes-notify-updates diff --git a/dom0/qubes-rpc/qubes.NotifyUpdates b/qubes-rpc/qubes.NotifyUpdates similarity index 100% rename from dom0/qubes-rpc/qubes.NotifyUpdates rename to qubes-rpc/qubes.NotifyUpdates diff --git a/dom0/qvm-tools/qubes-dom0-network-via-netvm b/qvm-tools/qubes-dom0-network-via-netvm similarity index 100% rename from dom0/qvm-tools/qubes-dom0-network-via-netvm rename to qvm-tools/qubes-dom0-network-via-netvm diff --git a/dom0/qvm-tools/qubes-hcl-report b/qvm-tools/qubes-hcl-report similarity index 100% rename from dom0/qvm-tools/qubes-hcl-report rename to qvm-tools/qubes-hcl-report diff --git a/dom0/qvm-tools/qubes-prefs b/qvm-tools/qubes-prefs similarity index 100% rename from dom0/qvm-tools/qubes-prefs rename to qvm-tools/qubes-prefs diff --git a/dom0/qvm-tools/qvm-add-appvm b/qvm-tools/qvm-add-appvm similarity index 100% rename from dom0/qvm-tools/qvm-add-appvm rename to qvm-tools/qvm-add-appvm diff --git a/dom0/qvm-tools/qvm-add-template b/qvm-tools/qvm-add-template similarity index 100% rename from dom0/qvm-tools/qvm-add-template rename to qvm-tools/qvm-add-template diff --git a/dom0/qvm-tools/qvm-backup b/qvm-tools/qvm-backup similarity index 100% rename from dom0/qvm-tools/qvm-backup rename to qvm-tools/qvm-backup diff --git a/dom0/qvm-tools/qvm-backup-restore b/qvm-tools/qvm-backup-restore similarity index 100% rename from dom0/qvm-tools/qvm-backup-restore rename to qvm-tools/qvm-backup-restore diff --git a/dom0/qvm-tools/qvm-block b/qvm-tools/qvm-block similarity index 100% rename from dom0/qvm-tools/qvm-block rename to qvm-tools/qvm-block diff --git a/dom0/qvm-tools/qvm-clone b/qvm-tools/qvm-clone similarity index 100% rename from dom0/qvm-tools/qvm-clone rename to qvm-tools/qvm-clone diff --git a/dom0/qvm-tools/qvm-create b/qvm-tools/qvm-create similarity index 100% rename from dom0/qvm-tools/qvm-create rename to qvm-tools/qvm-create diff --git a/dom0/qvm-tools/qvm-create-default-dvm b/qvm-tools/qvm-create-default-dvm similarity index 100% rename from dom0/qvm-tools/qvm-create-default-dvm rename to qvm-tools/qvm-create-default-dvm diff --git a/dom0/qvm-tools/qvm-firewall b/qvm-tools/qvm-firewall similarity index 100% rename from dom0/qvm-tools/qvm-firewall rename to qvm-tools/qvm-firewall diff --git a/dom0/qvm-tools/qvm-grow-private b/qvm-tools/qvm-grow-private similarity index 100% rename from dom0/qvm-tools/qvm-grow-private rename to qvm-tools/qvm-grow-private diff --git a/dom0/qvm-tools/qvm-init-storage b/qvm-tools/qvm-init-storage similarity index 100% rename from dom0/qvm-tools/qvm-init-storage rename to qvm-tools/qvm-init-storage diff --git a/dom0/qvm-tools/qvm-kill b/qvm-tools/qvm-kill similarity index 100% rename from dom0/qvm-tools/qvm-kill rename to qvm-tools/qvm-kill diff --git a/dom0/qvm-tools/qvm-ls b/qvm-tools/qvm-ls similarity index 100% rename from dom0/qvm-tools/qvm-ls rename to qvm-tools/qvm-ls diff --git a/dom0/qvm-tools/qvm-pci b/qvm-tools/qvm-pci similarity index 100% rename from dom0/qvm-tools/qvm-pci rename to qvm-tools/qvm-pci diff --git a/dom0/qvm-tools/qvm-prefs b/qvm-tools/qvm-prefs similarity index 100% rename from dom0/qvm-tools/qvm-prefs rename to qvm-tools/qvm-prefs diff --git a/dom0/qvm-tools/qvm-remove b/qvm-tools/qvm-remove similarity index 100% rename from dom0/qvm-tools/qvm-remove rename to qvm-tools/qvm-remove diff --git a/dom0/qvm-tools/qvm-revert-template-changes b/qvm-tools/qvm-revert-template-changes similarity index 100% rename from dom0/qvm-tools/qvm-revert-template-changes rename to qvm-tools/qvm-revert-template-changes diff --git a/dom0/qvm-tools/qvm-run b/qvm-tools/qvm-run similarity index 100% rename from dom0/qvm-tools/qvm-run rename to qvm-tools/qvm-run diff --git a/dom0/qvm-tools/qvm-service b/qvm-tools/qvm-service similarity index 100% rename from dom0/qvm-tools/qvm-service rename to qvm-tools/qvm-service diff --git a/dom0/qvm-tools/qvm-shutdown b/qvm-tools/qvm-shutdown similarity index 100% rename from dom0/qvm-tools/qvm-shutdown rename to qvm-tools/qvm-shutdown diff --git a/dom0/qvm-tools/qvm-start b/qvm-tools/qvm-start similarity index 100% rename from dom0/qvm-tools/qvm-start rename to qvm-tools/qvm-start diff --git a/dom0/qvm-tools/qvm-sync-clock b/qvm-tools/qvm-sync-clock similarity index 100% rename from dom0/qvm-tools/qvm-sync-clock rename to qvm-tools/qvm-sync-clock diff --git a/dom0/qvm-tools/qvm-template-commit b/qvm-tools/qvm-template-commit similarity index 100% rename from dom0/qvm-tools/qvm-template-commit rename to qvm-tools/qvm-template-commit diff --git a/dom0/qvm-tools/qvm-usb b/qvm-tools/qvm-usb similarity index 100% rename from dom0/qvm-tools/qvm-usb rename to qvm-tools/qvm-usb diff --git a/rpm_spec/core-dom0.spec b/rpm_spec/core-dom0.spec index 30de477b..fe8275ff 100644 --- a/rpm_spec/core-dom0.spec +++ b/rpm_spec/core-dom0.spec @@ -76,16 +76,14 @@ ln -sf . %{name}-%{version} %setup -T -D %build -python -m compileall dom0/core dom0/core-modules dom0/qmemman -python -O -m compileall dom0/core dom/core-modules dom0/qmemman -for dir in dom0/dispvm dom0/qmemman; do +python -m compileall core core-modules qmemman +python -O -m compileall core dom/core-modules qmemman +for dir in dispvm qmemman; do (cd $dir; make) done %install -cd dom0 - mkdir -p $RPM_BUILD_ROOT/usr/lib/systemd/system cp linux/systemd/qubes-block-cleaner.service $RPM_BUILD_ROOT%{_unitdir} cp linux/systemd/qubes-core.service $RPM_BUILD_ROOT%{_unitdir} diff --git a/dom0/tests/block-001-list-attach-use-detach b/tests/block-001-list-attach-use-detach similarity index 100% rename from dom0/tests/block-001-list-attach-use-detach rename to tests/block-001-list-attach-use-detach diff --git a/dom0/tests/pvusb-001-mouse-kbd-attached b/tests/pvusb-001-mouse-kbd-attached similarity index 100% rename from dom0/tests/pvusb-001-mouse-kbd-attached rename to tests/pvusb-001-mouse-kbd-attached diff --git a/dom0/tests/pvusb-002-mouse-kbd-usbstick-wlan-attached b/tests/pvusb-002-mouse-kbd-usbstick-wlan-attached similarity index 100% rename from dom0/tests/pvusb-002-mouse-kbd-usbstick-wlan-attached rename to tests/pvusb-002-mouse-kbd-usbstick-wlan-attached diff --git a/dom0/tests/pvusb-003-list-attach-use-detach b/tests/pvusb-003-list-attach-use-detach similarity index 100% rename from dom0/tests/pvusb-003-list-attach-use-detach rename to tests/pvusb-003-list-attach-use-detach diff --git a/dom0/xen-vm-config/vm-template-hvm.conf b/xen-vm-config/vm-template-hvm.conf similarity index 100% rename from dom0/xen-vm-config/vm-template-hvm.conf rename to xen-vm-config/vm-template-hvm.conf diff --git a/dom0/xen-vm-config/vm-template.conf b/xen-vm-config/vm-template.conf similarity index 100% rename from dom0/xen-vm-config/vm-template.conf rename to xen-vm-config/vm-template.conf