Commit Graph

54 Commits

Author SHA1 Message Date
Marek Marczykowski-Górecki
8c6fe7ed90
Merge remote-tracking branch 'origin/master' into core3-devel-mm 2016-04-11 13:03:12 +02:00
Wojtek Porczyk
5eaf03c4a2 HVM part 1 2016-03-21 11:44:46 +01:00
Patrick Schleizer
2a46ebb205
fixed wrong target filename 2016-03-14 22:47:46 +01:00
Patrick Schleizer
e33b958bdd
implemented dom0 qubes.GetRandomizedTime
Required for fixing 'sys-whonix doesn't connect to Tor after system suspend'.

https://github.com/QubesOS/qubes-issues/issues/1764
2016-03-13 01:15:46 +00:00
Wojtek Porczyk
9eafa57539 Merge remote-tracking branch 'marmarek/master' into core3-devel
The following list is bollocks. There were many, many more.

Conflicts:
    core-modules/003QubesTemplateVm.py
    core-modules/005QubesNetVm.py
    core/qubes.py
    core/storage/__init__.py
    core/storage/xen.py
    doc/qvm-tools/qvm-pci.rst
    doc/qvm-tools/qvm-prefs.rst
    qubes/tools/qmemmand.py
    qvm-tools/qvm-create
    qvm-tools/qvm-prefs
    qvm-tools/qvm-start
    tests/__init__.py
    vm-config/xen-vm-template-hvm.xml

This commit took 2 days (26-27.01.2016) and put our friendship to test.
    --Wojtek and Marek
2016-03-03 01:13:51 +01:00
Wojtek Porczyk
c538d536c8 core3: move qmemman
This is part of fixing qvm-start.

qmemman was moved with minimal touching, mainly module names.

Moved function parsing human-readable sizes from core2. This function is
wrong, because it treats k/M/G as 1024-based, but leave it for now.
2015-10-05 12:46:14 +02:00
Wojtek Porczyk
6f4951d08a install python package with setuptools 2015-10-05 12:46:14 +02:00
Wojtek Porczyk
5f92afc013 rpm: install RelaxNG specfiles 2015-06-29 17:39:26 +02:00
Wojtek Porczyk
7e12d0485d add core3 to Makefiles and spec 2015-06-29 17:39:26 +02:00
Marek Marczykowski-Górecki
64755b2d98 dispvm: do not treat DispVMs as Xen-specific
Theoretically it should work (with some minor modifications) on any
hypervisor.
2015-03-30 05:30:52 +02:00
Marek Marczykowski-Górecki
4bd14f5011 windows: installer 2014-11-19 12:50:30 +01:00
Marek Marczykowski-Górecki
ec37a4e681 Rename vm-configs directory to be more generic 2014-11-19 12:50:27 +01:00
Marek Marczykowski-Górecki
675a164e7d makefile/windows: use c:\qubes as default data dir 2014-11-19 12:50:26 +01:00
Marek Marczykowski-Górecki
aad945e01b makefile: install only relevant stuff according to OS/VMM 2014-11-19 12:50:25 +01:00
Marek Marczykowski-Górecki
72e415a807 move qubes-notify-* to libexec 2014-11-19 12:50:25 +01:00
Marek Marczykowski-Górecki
0009805041 rpm+makefile: move build/install code to Makefile files
This makes build "scripts" not tied to Fedora-specific files. Especially
ease porting to other platforms.
2014-11-19 12:50:24 +01:00
Marek Marczykowski
340b62d4d4 Update make clean target 2013-03-20 16:40:01 +01:00
Marek Marczykowski
b72fdb35ee Remove support for old builder API 2013-03-19 19:02:15 +01:00
Marek Marczykowski
9db68897c7 Remove other Linux-specific stuff
Move remaining files to linux/ subdirectory.
2013-03-16 19:54:22 +01:00
Marek Marczykowski
d9358a91aa Move manpages here from separate repo 2013-03-12 17:02:26 +01:00
Marek Marczykowski
ad2bdf0634 Rename 'version_dom0' -> 'version'
This repository contains only dom0 files now.
2013-03-12 16:50:14 +01:00
Marek Marczykowski
0e8037deee remove VM files 2013-03-07 05:07:42 +01:00
Marek Marczykowski
f4c37be03a remove qubes-core-libs files - moved to separate repository 2013-03-07 02:54:55 +01:00
Joanna Rutkowska
ef972bcbc7 Makefile: use fc18 as default value for DIST_DOM0 2013-02-28 13:43:32 +00:00
Marek Marczykowski
acbdccbd61 makefile: support dom0 different than fc13 2013-01-25 03:07:16 +01:00
Marek Marczykowski
dba9193801 makefile: update-repo-template target 2012-11-14 15:53:42 +01:00
Marek Marczykowski
629038e76d spec: extract core libs from qubes-core-vm
This libs are required by both dom0 and VM so it's better to have it
separately. Previously in VM it was separate package, but dom0 have them
embedded in qubes-core-dom0, but qubes-core-vm-libs package was used to build
qubes-gui-dom0. Now we do not build all packages for all distros (especially do
not build core-vm package for dom0 distro, so gui-dom0 build fails), so make it
explicit which package is needed by which system.
2012-11-14 13:12:51 +01:00
Marek Marczykowski
bd1e7620d2 makefile: generic rpms-dom0 and rpms-vm targets 2012-11-14 01:41:21 +01:00
Marek Marczykowski
c777f3d30d makefile: split rpms into rpms-vm and rpms-dom0 (#665) 2012-11-07 18:05:17 +01:00
Marek Marczykowski
b691f57bbf vm: kernel-placeholder package to inhibit real kernel pkg in VM (#645)
Some packages depends on kernel (ex fuse, pulseaudio), but kernel in VM is
managed by dom0. Any hack like exlude or so on will break some things, so
install empty placeholder package to fulfill dependencies.
2012-07-23 23:17:50 +02:00
Marek Marczykowski
56b7442646 makefile: fix clean target 2012-07-07 02:45:56 +02:00
Marek Marczykowski
7ed4cab214 Makefile: network doesn't require clean 2012-01-15 17:36:35 +01:00
Marek Marczykowski
adc0b6eff5 vm(+dom0): major rearrage VM files in repo; merge core-*vm packages 2012-01-06 21:31:12 +01:00
Joanna Rutkowska
d566da8dbb Makefile: do not run update_repo.sh for update-repo-installer 2011-11-05 11:05:49 +01:00
Joanna Rutkowska
74550bf949 Makefile: don't autoupdate yum repo after copying rpms there 2011-06-30 20:47:48 +02:00
Joanna Rutkowska
3154ce2e90 Makefile: automaically copy rpms to _all_ vm repos 2011-06-24 23:00:40 +02:00
Marek Marczykowski
986f4a888c Merge branch 'r1-beta1-fixes'
Conflicts:
	dom0/qvm-core/qubes.py
	version_dom0
	version_vm
2011-05-24 00:20:39 +02:00
Timo Juhani Lindfors
6e19780551 Ensure 'make clean' descends to u2mfn/ 2011-05-13 14:16:10 +02:00
Joanna Rutkowska
8c218c38a7 core-dom0-vaio-fixes is now a separate package
Also fixes to postun scripts to properly handle updates
2011-05-10 11:14:41 +02:00
Joanna Rutkowska
b77d2193f4 Makefile: update-repo-current-testing target 2011-05-09 18:40:51 +02:00
Joanna Rutkowska
ae3d194f13 Makefile: update-repo-installer 2011-04-06 15:35:30 +02:00
Joanna Rutkowska
43dfc30b4a Makefile: only copy fc13 packages to Dom0 repo 2011-04-06 14:15:24 +02:00
Joanna Rutkowska
8a20a0ffdc Update Makefile to handle split VM repos 2011-04-06 14:00:06 +02:00
Joanna Rutkowska
bbec676076 Fix rpm signing in Makefile 2011-04-04 11:27:51 +02:00
Joanna Rutkowska
6e747e98cb Makefile improvements for repo management
* Sign only current version of the rpms generated
 * repo-update-{current,unstable} targets for new yum repo
2011-04-04 10:57:21 +02:00
Rafal Wojtczuk
488eda21d9 Merge branch 'blockless' into spring-merge
Conflicts:
	appvm/Makefile
	appvm/qubes_core
	netvm/qubes_core
	rpm_spec/core-appvm.spec
	rpm_spec/core-netvm.spec
2011-03-21 13:54:35 +01:00
Marek Marczykowski
c7a832a279 NetVM, AppVM, ProxyVM from single template - VM side
Modify VM packages to:
- do not conflicts
- starts services if its VM type need it

Added core-proxyvm (firewall) and core-commonvm (common parts) packages.
2011-03-11 01:38:04 +01:00
Rafal Wojtczuk
f263aa6b7c Moved vchan and u2mfn code to core. 2011-03-08 12:24:47 +01:00
Rafal Wojtczuk
0d12aeec88 added "make -C qrexec clean" 2011-03-07 16:13:15 +01:00
Joanna Rutkowska
70f8a7401c Make 'make clean' clean all the object files 2010-09-15 15:36:04 +02:00