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

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

Browse Source 
Conflicts:
	version_core
	version_gui
This commit is contained in:
Joanna Rutkowska 2012-06-21 11:55:14 +02:00
commit 61e055c074
19 changed files with 103 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
3rd_party_software/adobe-release-x86_64-1.0-1.noarch.rpm Normal file
View File

Binary file not shown.

BIN
3rd_party_software/flash-player-properties
View File

Binary file not shown.

BIN
3rd_party_software/libflashplayer.so
View File

Binary file not shown.

8
add_3rd_party_software.sh
View File

@ -1,3 +1,7 @@
#!/bin/sh
cp 3rd_party_software/libflashplayer.so mnt/usr/lib64/mozilla/plugins/
cp 3rd_party_software/flash-player-properties mnt/usr/bin/
INSTALLDIR=$PWD/mnt
rpm -i --root=$INSTALLDIR 3rd_party_software/adobe-release-x86_64-*.noarch.rpm
rpm --import --root=$INSTALLDIR mnt/etc/pki/rpm-gpg/RPM-GPG-KEY-adobe-linux
yum install -c $PWD/yum.conf -y --installroot=$INSTALLDIR flash-plugin

1
appmenus/netvm-whitelisted-appmenus.list Normal file
View File

@ -0,0 +1 @@
gnome-terminal.desktop

BIN
base_rpms_fc17/fedora-release-17-1.noarch.rpm Normal file
View File

Binary file not shown.

BIN
base_rpms_fc17/filesystem-3-2.fc17.x86_64.rpm Normal file
View File

Binary file not shown.

BIN
base_rpms_fc17/setup-2.8.48-1.fc17.noarch.rpm Normal file
View File

Binary file not shown.

1
clean_images/packages.list
View File

@ -26,6 +26,7 @@ Terminal
--exclude=kdegames
--exclude=firstboot
yum-plugin-post-transaction-actions
tinyproxy
liblzma.so.0()(64bit)
git
createrepo

4
cleanup_image
View File

@ -17,13 +17,15 @@ fi
ls -als $IMG
mount -o loop $IMG mnt || exit 1
INSTALLDIR=`pwd`/mnt/
rm -f $INSTALLDIR/var/lib/rpm/__db.00* $INSTALLDIR/var/lib/rpm/.rpm.lock
yum -c $PWD/yum.conf clean packages --installroot=$INSTALLDIR
# Make sure that rpm database has right format (for rpm version in template, not host)
echo "--> Rebuilding rpm database..."
chroot `pwd`/mnt /bin/rpm --rebuilddb
dd if=/dev/zero of=mnt/fillme bs=1M || true
echo "--> Compacting image file..."
dd if=/dev/zero of=mnt/fillme bs=1M 2> /dev/null || true
sync
rm mnt/fillme
umount mnt

37
create_symlinks_in_rpms_to_install_dir.sh
View File

@ -6,25 +6,32 @@ SRC_ROOT=../..
: DIST=fc14
rm -fr rpms_to_install/*
VERSION_CORE=$(cat version_core | sed "s/%DIST%/$DIST/")
ln -s $SRC_ROOT/core/rpm/x86_64/qubes-core-vm-$VERSION_CORE.rpm rpms_to_install/qubes-core-vm
ln -s $SRC_ROOT/core/rpm/x86_64/qubes-core-vm-libs-$VERSION_CORE.rpm rpms_to_install/qubes-core-vm-libs
pushd rpms_to_install
# FIXME: rel hardcoded
VERSION_CORE=$(cat $SRC_ROOT/core/version_vm)-1.$DIST.x86_64
ln -s $SRC_ROOT/core/rpm/x86_64/qubes-core-vm-$VERSION_CORE.rpm qubes-core-vm
ln -s $SRC_ROOT/core/rpm/x86_64/qubes-core-vm-libs-$VERSION_CORE.rpm qubes-core-vm-libs
if [ "${DIST/fc/}" -ge 15 ]; then
ln -s $SRC_ROOT/core/rpm/x86_64/qubes-core-vm-systemd-$VERSION_CORE.rpm rpms_to_install/qubes-core-vm-init
ln -s $SRC_ROOT/core/rpm/x86_64/qubes-core-vm-systemd-$VERSION_CORE.rpm qubes-core-vm-init
else
ln -s $SRC_ROOT/core/rpm/x86_64/qubes-core-vm-sysvinit-$VERSION_CORE.rpm rpms_to_install/qubes-core-vm-init
ln -s $SRC_ROOT/core/rpm/x86_64/qubes-core-vm-sysvinit-$VERSION_CORE.rpm qubes-core-vm-init
fi
VERSION_GUI=$(cat version_gui | sed "s/%DIST%/$DIST/")
ln -s $SRC_ROOT/gui/rpm/x86_64/qubes-gui-vm-$VERSION_GUI.rpm rpms_to_install/qubes-gui-vm
# FIXME: rel hardcoded
VERSION_GUI=$(cat $SRC_ROOT/gui/version)-1.$DIST.x86_64
ln -s $SRC_ROOT/gui/rpm/x86_64/qubes-gui-vm-$VERSION_GUI.rpm qubes-gui-vm
VERSION_XEN=$(cat version_xen)
ln -s $SRC_ROOT/xen/rpm/x86_64/xen-libs-$VERSION_XEN.rpm rpms_to_install/xen-libs
ln -s $SRC_ROOT/xen/rpm/x86_64/xen-licenses-$VERSION_XEN.rpm rpms_to_install/xen-licenses
ln -s $SRC_ROOT/xen/rpm/x86_64/xen-qubes-vm-essentials-$VERSION_XEN.rpm rpms_to_install/xen-qubes-vm-essentials
VERSION_XEN=$(cat $SRC_ROOT/xen/version)-$(cat $SRC_ROOT/xen/rel).qubes.x86_64
ln -s $SRC_ROOT/xen/rpm/x86_64/xen-libs-$VERSION_XEN.rpm xen-libs
ln -s $SRC_ROOT/xen/rpm/x86_64/xen-licenses-$VERSION_XEN.rpm xen-licenses
ln -s $SRC_ROOT/xen/rpm/x86_64/xen-qubes-vm-essentials-$VERSION_XEN.rpm xen-qubes-vm-essentials
# Install also addons
VERSION_TB=$(cat version_addon_tb | sed "s/%DIST%/$DIST/")
ln -s $SRC_ROOT/addons/rpm/x86_64/thunderbird-qubes-$VERSION_TB.rpm rpms_to_install/thunderbird-qubes
VERSION_GPG=$(cat version_addon_gpg | sed "s/%DIST%/$DIST/")
ln -s $SRC_ROOT/addons/rpm/x86_64/qubes-gpg-split-$VERSION_GPG.rpm rpms_to_install/qubes-gpg-split
# FIXME: rel hardcoded
VERSION_TB=$(cat $SRC_ROOT/addons/thunderbird-qubes/version)-1.$DIST.x86_64
ln -s $SRC_ROOT/addons/rpm/x86_64/thunderbird-qubes-$VERSION_TB.rpm thunderbird-qubes
# FIXME: rel hardcoded
VERSION_GPG=$(cat $SRC_ROOT/addons/gpg-split/version)-1.$DIST.x86_64
ln -s $SRC_ROOT/addons/rpm/x86_64/qubes-gpg-split-$VERSION_GPG.rpm qubes-gpg-split
popd

29
keys_fc17/RPM-GPG-KEY-Fedora-17-primary Normal file
View File

@ -0,0 +1,29 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.11 (GNU/Linux)
mQINBE8MkeIBEADfn8QtElquxUAVvS8th7UnVmfkExw7jC7SVy7dGlXo5rgxqETM
AZorpDIvAtKX5VMr/lUfODB6sSymh0e6EdvYQfHrpImO05F7WBq2DhRW74j1DRNu
8vohKPTsSZTEZo/mrUBDAAGtGOXcrsQxx4J2Ur73+r18ODd+v6O33YevlFmwmFYT
uDcgdhxyxBdpJVES8MdxO349uP9bvrU+3KjpDDGHb/hMbY8az7lwLtBufRrAekhN
5Cg7+zm+I+wVGzgzSw0yrIh4hdVts4RKZIrl2N3VeZcCY4IrNZFd2Do6HhIwA7l/
/xpTEBTZ4BmnGP9iufUVa2h97/JmKy38rM88IovIcTSnYDG68k/NxUkC+dLriI4T
BNc9kJLVo821x77WYViNXHscF8ujlf73HilfCnhEtNwViGO7x41guQrdv5k79UDf
1CylSZ+76vKXziz6uNHzIagiViNOvYHOoEH8jDNnubqFTxYXUNks5l3/byllQ0XK
Oj9RarmjsMS3udRB6RCiEnzDbPge2S9gmdmY8MA3QeZ3aWoZJqygDQ0WNUOjPZ0E
80x+xbUyAK06/SCzs6bUx6GMXd5Iy5r3Gc+6LRt4WEG5r/vJEHPSj3qAoVqydsY0
GjASPIQmYduCdi7Inf0w+2n+nJGPcK1k432xHD0z0kp1Q/xcOH/Tul3bcQARAQAB
tCZGZWRvcmEgKDE3KSA8ZmVkb3JhQGZlZG9yYXByb2plY3Qub3JnPokCNgQTAQIA
IAUCTwyR4gIbDwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEFDpTJkayjRlKxAQ
AICtQT+j8Sum1J86yBwso1wuzK2sHOXbfC1LCdQw2u6QLfKSUsCnQ5AL+oCnS491
5fjrYksT2siclLhgZX7/yF76XuYHHhRTO65NaPSCxxhN6S9zbExUPRoxFL1ay0cH
p14WYI1/SGmKPcJmigV6n8+wGYl+zWlH9eiiFP/+JCxJ0ZvRg3mgT5zcPdIzTDOz
4rTE3WfH3qqxYhw2ttDPomBSdbgJw2N6bj46t8rljIDGdeKpFHYMVXpUp0gDkEoY
bAiQhvZaa2F6mGMfXRdr4Phs562+tF/Qy/JaK8uafYZPHTtC16NHf87DYceLzvci
W1KNBYGrEHm5NMguBlqP348FYMp+6hJDYMl38Qx3BK9bz6lW0G75tgaAZ+sxAFGs
/MUcjChkF9OcF7Y7W6hY3IQb/+FgB5eNpBqfmZZ76ywpS+D0sIqxzWoILtlXdHeN
eM4YiX0gvVQXwn9S89O5vWKxWYspywfgV/aXHk14O6k7oi8wInJOvgxZKEHUT4XU
K7DyogL45VV9iYoWYIym2L17VBnINE/Kwmc/81nYigE0tTOwaR+qMFBSRlkOA4+X
ZlIvb5Cft7CdC183FYLIM+B6xNSKE/OhavHZsRJrLZC1aAP8MNh8Cy7Jqrn1/Qjj
6sncrqaj/Yis4yAaINk4MrnbImN2MwzU70q0eR3kA6PY
=3+4G
-----END PGP PUBLIC KEY BLOCK-----

39
keys_fc17/qubes-release-1-signing-key.asc Normal file
View File

@ -0,0 +1,39 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
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
=f2Ro
-----END PGP PUBLIC KEY BLOCK-----

2
templates.spec
View File

@ -49,6 +49,7 @@ mkdir -p $RPM_BUILD_ROOT/%{dest_dir}/apps.templates
mkdir -p $RPM_BUILD_ROOT/%{dest_dir}/apps
cp -r qubeized_images/%{template_name}-apps.templates/* $RPM_BUILD_ROOT/%{dest_dir}/apps.templates
cp appmenus/whitelisted-appmenus.list appmenus/vm-whitelisted-appmenus.list $RPM_BUILD_ROOT/%{dest_dir}/
cp appmenus/netvm-whitelisted-appmenus.list $RPM_BUILD_ROOT/%{dest_dir}/
touch $RPM_BUILD_ROOT/%{dest_dir}/icon.png
%pre
@ -133,4 +134,5 @@ rm -rf $RPM_BUILD_ROOT
%attr (664,root,qubes) %{dest_dir}/apps.templates/*
%attr (664,root,qubes) %{dest_dir}/whitelisted-appmenus.list
%attr (664,root,qubes) %{dest_dir}/vm-whitelisted-appmenus.list
%attr (664,root,qubes) %{dest_dir}/netvm-whitelisted-appmenus.list
%{dest_dir}/icon.png

1
version_addon_gpg
View File

@ -1 +0,0 @@
1.0-1.%DIST%.x86_64

1
version_addon_tb
View File

@ -1 +0,0 @@
1.2.1-1.%DIST%.x86_64

1
version_core
View File

@ -1 +0,0 @@
1.7.8-1.%DIST%.x86_64

1
version_gui
View File

@ -1 +0,0 @@
1.4.5-1.%DIST%.x86_64

1
version_xen
View File

@ -1 +0,0 @@
4.1.1-7.qubes.x86_64