QubesOS/qubes-linux-template-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of ssh://git.qubes-os.org/var/lib/qubes/git/joanna/template-builder

Browse Source 
Conflicts:
	appmenus/whitelisted-appmenus.list
This commit is contained in:
Marek Marczykowski 2011-07-11 20:43:10 +02:00
commit eb0fd31bf4
22 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
README
View File

@ -9,8 +9,11 @@ fedorize_image <image> <file-with-packets-lists>
NOTE: The fedorize_image script can be also used to update an image -- it
automatically assumes the update mode if the <image> already exists.
2) Update symlinks in rpms_to_install_XXX/ so that they point to the current version
of Qubes-specific rpms to install you want to use (e.g. qubes-gui-vm, etc).
2) Update symlinks in rpms_to_install/ using the create_symlinks_in_rpms_to_install_dir.sh script. The script
reads the core, gui, and xen packages versions from version_{core,gui,xen} files and creates appropriate symlinks
in rpms_to_install/ dir.
Verify that all symlinks are correct.
3) Now, you can "qubeize" the image. This must be done as root. E.g.:

10
appmenus/vm-whitelisted-appmenus.list
View File

@ -1,7 +1,6 @@
gnome-terminal.desktop
gnome-nautilus-home.desktop
dolphin.desktop
manage-print-jobs.desktop
mozilla-firefox.desktop
mozilla-thunderbird.desktop
openoffice.org-calc.desktop
@ -9,12 +8,3 @@ openoffice.org-draw.desktop
openoffice.org-impress.desktop
openoffice.org-math.desktop
openoffice.org-writer.desktop
fedora-keepassx.desktop
gedit.desktop
gnome-dictionary.desktop
gnome-gcalctool.desktop
gnote.desktop
vinagre.desktop
totem.desktop
planner.desktop
manage-print-jobs.desktop

1
clean_images/packages.list
View File

@ -24,3 +24,4 @@ perl-File-MimeInfo
gnome-terminal
yum-plugin-post-transaction-actions
--exclude=kdegames
yum-plugin-post-transaction-actions

17
create_symlinks_in_rpms_to_install_dir.sh Executable file
View File

@ -0,0 +1,17 @@
#!/bin/bash
rm -fr rpms_to_install/*
VERSION_CORE=$(cat version_core)
ln -s ../../core/rpm/x86_64/qubes-core-appvm-$VERSION_CORE.rpm rpms_to_install/qubes-core-appvm
ln -s ../../core/rpm/x86_64/qubes-core-appvm-libs-$VERSION_CORE.rpm rpms_to_install/qubes-core-appvm-libs
ln -s ../../core/rpm/x86_64/qubes-core-commonvm-$VERSION_CORE.rpm rpms_to_install/qubes-core-commonvm
ln -s ../../core/rpm/x86_64/qubes-core-netvm-$VERSION_CORE.rpm rpms_to_install/qubes-core-netvm
ln -s ../../core/rpm/x86_64/qubes-core-proxyvm-$VERSION_CORE.rpm rpms_to_install/qubes-core-proxyvm
VERSION_GUI=$(cat version_gui)
ln -s ../../gui/rpm/x86_64/qubes-gui-vm-$VERSION_GUI.rpm rpms_to_install/qubes-gui-vm
VERSION_XEN=$(cat version_xen)
ln -s ../../xen/rpm/x86_64/xen-libs-$VERSION_XEN.rpm rpms_to_install/xen-libs
ln -s ../../xen/rpm/x86_64/xen-licenses-$VERSION_XEN.rpm rpms_to_install/xen-licenses
ln -s ../../xen/rpm/x86_64/xen-qubes-vm-essentials-$VERSION_XEN.rpm rpms_to_install/xen-qubes-vm-essentials

1
rpms_to_install
View File

@ -1 +0,0 @@
rpms_to_install_x64

1
rpms_to_install/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
*

1
rpms_to_install_x64/kernel
View File

@ -1 +0,0 @@
../../kernel-dom0/rpm/x86_64/kernel-domU-2.6.34.1-13.xenlinux.qubes.x86_64.rpm

1
rpms_to_install_x64/qubes-core-appvm
View File

@ -1 +0,0 @@
../../core/rpm/x86_64/qubes-core-appvm-1.5.21-1.fc14.x86_64.rpm

1
rpms_to_install_x64/qubes-core-appvm-libs
View File

@ -1 +0,0 @@
../../core/rpm/x86_64/qubes-core-appvm-libs-1.5.21-1.fc14.x86_64.rpm

1
rpms_to_install_x64/qubes-core-commonvm
View File

@ -1 +0,0 @@
../../core/rpm/x86_64/qubes-core-commonvm-1.5.21-1.fc14.x86_64.rpm

1
rpms_to_install_x64/qubes-core-netvm
View File

@ -1 +0,0 @@
../../core/rpm/x86_64/qubes-core-netvm-1.5.21-1.fc14.x86_64.rpm

1
rpms_to_install_x64/qubes-core-proxyvm
View File

@ -1 +0,0 @@
../../core/rpm/x86_64/qubes-core-proxyvm-1.5.21-1.fc14.x86_64.rpm

1
rpms_to_install_x64/qubes-gui-vm
View File

@ -1 +0,0 @@
../../gui/rpm/x86_64/qubes-gui-vm-1.2.8-1.fc14.x86_64.rpm

1
rpms_to_install_x64/qubes-u2mfn-vm
View File

@ -1 +0,0 @@
../../gui/rpm/x86_64/qubes-u2mfn-vm-{kernel-2.6.34.1-13.xenlinux.qubes.x86_64}-1.1.1-1.x86_64.rpm

1
rpms_to_install_x64/xen-libs
View File

@ -1 +0,0 @@
../../xen/rpm/x86_64/xen-libs-3.4.3-6.qubes.x86_64.rpm

1
rpms_to_install_x64/xen-qubes-vm-essentials
View File

@ -1 +0,0 @@
../../xen/rpm/x86_64/xen-qubes-vm-essentials-3.4.3-6.qubes.x86_64.rpm

2
templates.spec
View File

@ -3,7 +3,7 @@
# This includes the VM's root image, patched with all qubes rpms, etc
#
%{!?version: %define version %(cat version_appvm)}
%{!?version: %define version %(cat version)}
Name: qubes-template-%{template_name}
Version: %{version}

1
version Normal file
View File

@ -0,0 +1 @@
1.3.2

1
version_appvm
View File

@ -1 +0,0 @@
1.2.10

1
version_core Normal file
View File

@ -0,0 +1 @@
1.6.6-1.fc14.x86_64

1
version_gui Normal file
View File

@ -0,0 +1 @@
1.3.1-2.fc14.x86_64

1
version_xen Normal file
View File

@ -0,0 +1 @@
4.1.0-4.qubes.x86_64