Commit Graph

422 Commits

Author SHA1 Message Date
Joanna Rutkowska
4130c15db7 Merge branch 'master' of git://git.qubes-os.org/marmarek/template-builder 2013-01-29 13:20:14 +01:00
Marek Marczykowski
6be747cf6a appmenus: preserve file header 2013-01-23 15:59:08 +01:00
Marek Marczykowski
fe2f66dfc7 spec: ensure right install order
Execute %post after installation of tar and qubes-core-dom0
2013-01-23 01:29:54 +01:00
Joanna Rutkowska
e23a222e0d version 2.0.5 2013-01-10 20:53:00 +01:00
Marek Marczykowski
d3187888d5 appmenus: whitelist only some fields in desktop files (#694)
Use the same algorithm as qrexec version. Especially skip Display= field...
2012-12-19 03:26:16 +01:00
Joanna Rutkowska
b79aff95ac version 2.0.4 2012-12-10 16:51:17 +01:00
Marek Marczykowski
485e7d1e30 setup default console encoding to UTF-8 2012-11-20 19:52:21 +01:00
Marek Marczykowski
e25fed755a reduce verbosity based on $VERBOSE variable 2012-11-18 04:01:49 +01:00
Marek Marczykowski
1df5f9426a qubeize-image: unmount image even after failed build 2012-11-17 12:56:19 +01:00
Marek Marczykowski
bf43862f3b fedorize-image: clean yum cache before install
This is mostly required for template-builder-repo, in which packages can be
rebuild without version change (so rpm hash will be different). In case of image update (instead of fresh install) cache can contain outdated information.

This is especially needed before qubeize_image, which install packages from
this repo, but one package in fedorize_image (qubes-vm-kernel-placeholder) is
installed at this stage. In any case fedorize_images is always called just
before qubeize_image, so one yum clean is enough.
2012-11-17 12:56:19 +01:00
Joanna Rutkowska
836355d0ee version 2.0.3 2012-11-15 17:01:01 +01:00
Marek Marczykowski
b861bb9f37 fedorize_image: reduce verbosity
Now it prints (almost) only custom echos and yum messages. The later one gives
some (nicely formatted) progress of very time-consuming package download and
installation.
2012-11-14 16:50:28 +01:00
Marek Marczykowski
fdea5277cd qubeize_image: use yum repo for Qubes-specific rpms instead of symlinks
This would simplify changes in package list and (more important) make
template-builder independent of layout of other repos (eg location of version
file).
2012-11-14 16:12:18 +01:00
Bruce A Downs
408d00e8a4 template-builder: Added ltrace and strace to default template
* ltrace
* strace
* added to clean_images/packages.list
2012-11-06 21:49:08 +01:00
Joanna Rutkowska
3c45a87e87 Makefile: remove unecessary export 2012-11-06 13:33:19 +01:00
Joanna Rutkowska
d24b20d71f version 2.0.2 2012-11-06 10:43:59 +01:00
Joanna Rutkowska
fcf4b4b86f Fix automatic template versioning (#667) 2012-11-06 10:43:45 +01:00
Joanna Rutkowska
82742e6fd6 version 2.0.1 2012-11-05 15:45:31 +01:00
Joanna Rutkowska
bd73bf990a Automatic template versioning (#667)
Use version no of the following form:
    $(version)-$(timestamp)
2012-11-05 15:45:06 +01:00
Marek Marczykowski
d076d60d0d Fedora 18 initial support 2012-10-27 21:31:20 +02:00
Marek Marczykowski
f5a4c21df4 qubeize_image: fix symlink to xen packages
Xen rpms are currently marked with dist tag instead of "qubes".
2012-10-27 17:52:48 +02:00
Marek Marczykowski
4b4fdefe94 copy some /dev/ files required by fedora rpms
Some rpm %post scripts fails when /dev is empty. Especially lpstat crashes when
/dev/random is missing, which caused yum hang on some rpms installation.
2012-10-19 03:44:11 +02:00
Joanna Rutkowska
1a5fdddf01 version 1.4.18 2012-08-29 11:17:24 +02:00
Joanna Rutkowska
78d6360e78 version 1.4.17 2012-08-23 14:57:14 +02:00
Marek Marczykowski
f9132e0d8d fedorize_image: install kernel-placeholder package instead of real kernel (#645)
Some packages depends on kernel pkg, so must be installed in fedorize stage.
2012-07-24 03:51:13 +02:00
Marek Marczykowski
48df9b4ec2 exclude xorg-x11-drv-nouveau as it pulls kernel-drm-nouveau into deps 2012-07-23 23:42:57 +02:00
Joanna Rutkowska
5616f42896 version 1.4.16 2012-07-20 16:01:06 +02:00
Joanna Rutkowska
25843586c9 fedorize_image: also update *all* packages 2012-07-20 16:00:56 +02:00
Joanna Rutkowska
85c4154a62 version 1.4.15 2012-07-19 23:26:16 +02:00
Joanna Rutkowska
cad23b3b01 version 1.4.14 2012-07-18 22:31:43 +02:00
Joanna Rutkowska
5b6291d0cf Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/template-builder 2012-07-18 22:30:17 +02:00
Marek Marczykowski
a6ece886a4 install qvm-tools docs in VM 2012-07-18 12:40:53 +02:00
Marek Marczykowski
360b2e60cf qubeize_image: remove duplicated 3rd party soft installation 2012-07-18 11:49:05 +02:00
Marek Marczykowski
72f6fd4d40 Merge remote-tracking branch 'joanna/master' 2012-07-18 11:45:48 +02:00
Joanna Rutkowska
788cda67cf version 1.4.13 2012-07-16 19:38:03 +02:00
Joanna Rutkowska
014d49e824 Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/template-builder 2012-07-14 12:34:30 +02:00
Marek Marczykowski
7d55c9b24f remove dispvm files - now part of qubes-core-vm package 2012-07-12 14:32:12 +02:00
Marek Marczykowski
0b5bcbc0e9 dispvm-dotfiles update for FC17 2012-07-12 04:01:32 +02:00
Marek Marczykowski
7ed720ee82 cleanup_image: hide messages from rpmdb rebuild
If version mismatch, rpm --rebuilddb will complain about some files, but is
isn't critical, so just hide those messages. We still take care of exit code.
2012-06-26 03:38:10 +02:00
Joanna Rutkowska
306d390c15 .gitignore: added 'appmenus' 2012-06-25 23:41:43 +02:00
Joanna Rutkowska
7ed2e14786 version 1.4.12 2012-06-25 23:39:45 +02:00
Joanna Rutkowska
f61878cbf7 Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/template-builder
Conflicts:
	qubeize_image
2012-06-25 16:28:04 +02:00
Marek Marczykowski
b3298c852d Use yum to install qubes-specific rpms
This will allow to automatically install its requires.
2012-06-25 13:15:15 +02:00
Marek Marczykowski
00e3067641 appmenus: whitelists for fc17 2012-06-22 21:16:41 +02:00
Marek Marczykowski
019c81e8ec appmenus: choose whitelists basing on distribution version 2012-06-22 21:12:57 +02:00
Joanna Rutkowska
bdea9a6e2b Revert "qubize_image: also copy qubes-specific-appmenus to VM's app template dir"
This reverts commit 3f6889c345.
This has been done in core instead, see this commit:

http://git.qubes-os.org/?p=joanna/core.git;a=commit;h=ffa3d8732c7d0acba3cda2e855e47910b7d7d221

... which is a correct way of doing this, as the Template's apps.template direcotry gets recreated after each yum update/install in the VM.
2012-06-22 15:31:34 +02:00
Joanna Rutkowska
c00a361712 version 1.4.11 2012-06-21 15:56:00 +02:00
Joanna Rutkowska
3f6889c345 qubize_image: also copy qubes-specific-appmenus to VM's app template dir
E.g. Add/Remove Appmenus shortcut, etc.
2012-06-21 12:10:25 +02:00
Joanna Rutkowska
9850431b40 qubize_image: run 3rd party installer before appmenus extraction 2012-06-21 12:04:12 +02:00
Joanna Rutkowska
61e055c074 Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/template-builder
Conflicts:
	version_core
	version_gui
2012-06-21 11:55:14 +02:00