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:
	qubeize_image
This commit is contained in:
Joanna Rutkowska 2012-06-25 16:28:04 +02:00
commit f61878cbf7
10 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
appmenus/netvm-whitelisted-appmenus.list → appmenus_fc17/netvm-whitelisted-appmenus.list
View File

5
appmenus_fc17/vm-whitelisted-appmenus.list Normal file
View File

@ -0,0 +1,5 @@
gnome-terminal.desktop
nautilus.desktop
firefox.desktop
mozilla-thunderbird.desktop
libreoffice-startcenter.desktop

6
appmenus_fc17/whitelisted-appmenus.list Normal file
View File

@ -0,0 +1,6 @@
gnome-terminal.desktop
gpk-application.desktop
gpk-prefs.desktop
gpk-update-viewer.desktop
system-config-date.desktop
system-config-printer.desktop

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

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

0
appmenus/vm-whitelisted-appmenus.list → appmenus_generic/vm-whitelisted-appmenus.list
View File

0
appmenus/whitelisted-appmenus.list → appmenus_generic/whitelisted-appmenus.list
View File

0
appmenus/convert_app2template.sh → convert_app2template.sh
View File

2
create_apps_templates.sh
View File

@ -9,4 +9,4 @@ fi
rm -f $APPSTMPL/* rm -f $APPSTMPL/*
mkdir -p $APPSTMPL mkdir -p $APPSTMPL
find $APPSORIG -name "*.desktop" -exec appmenus/convert_app2template.sh {} $APPSTMPL \; find $APPSORIG -name "*.desktop" -exec ./convert_app2template.sh {} $APPSTMPL \;

20
create_symlinks_in_rpms_to_install_dir.sh
View File

@ -9,29 +9,29 @@ rm -fr rpms_to_install/*
pushd rpms_to_install pushd rpms_to_install
# FIXME: rel hardcoded # FIXME: rel hardcoded
VERSION_CORE=$(cat $SRC_ROOT/core/version_vm)-1.$DIST.x86_64 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-$VERSION_CORE.rpm qubes-core-vm.rpm
ln -s $SRC_ROOT/core/rpm/x86_64/qubes-core-vm-libs-$VERSION_CORE.rpm qubes-core-vm-libs ln -s $SRC_ROOT/core/rpm/x86_64/qubes-core-vm-libs-$VERSION_CORE.rpm qubes-core-vm-libs.rpm
if [ "${DIST/fc/}" -ge 15 ]; then if [ "${DIST/fc/}" -ge 15 ]; then
ln -s $SRC_ROOT/core/rpm/x86_64/qubes-core-vm-systemd-$VERSION_CORE.rpm qubes-core-vm-init ln -s $SRC_ROOT/core/rpm/x86_64/qubes-core-vm-systemd-$VERSION_CORE.rpm qubes-core-vm-init.rpm
else else
ln -s $SRC_ROOT/core/rpm/x86_64/qubes-core-vm-sysvinit-$VERSION_CORE.rpm qubes-core-vm-init ln -s $SRC_ROOT/core/rpm/x86_64/qubes-core-vm-sysvinit-$VERSION_CORE.rpm qubes-core-vm-init.rpm
fi fi
# FIXME: rel hardcoded # FIXME: rel hardcoded
VERSION_GUI=$(cat $SRC_ROOT/gui/version)-1.$DIST.x86_64 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 ln -s $SRC_ROOT/gui/rpm/x86_64/qubes-gui-vm-$VERSION_GUI.rpm qubes-gui-vm.rpm
VERSION_XEN=$(cat $SRC_ROOT/xen/version)-$(cat $SRC_ROOT/xen/rel).qubes.x86_64 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-libs-$VERSION_XEN.rpm xen-libs.rpm
ln -s $SRC_ROOT/xen/rpm/x86_64/xen-licenses-$VERSION_XEN.rpm xen-licenses ln -s $SRC_ROOT/xen/rpm/x86_64/xen-licenses-$VERSION_XEN.rpm xen-licenses.rpm
ln -s $SRC_ROOT/xen/rpm/x86_64/xen-qubes-vm-essentials-$VERSION_XEN.rpm xen-qubes-vm-essentials ln -s $SRC_ROOT/xen/rpm/x86_64/xen-qubes-vm-essentials-$VERSION_XEN.rpm xen-qubes-vm-essentials.rpm
# Install also addons # Install also addons
# FIXME: rel hardcoded # FIXME: rel hardcoded
VERSION_TB=$(cat $SRC_ROOT/addons/thunderbird-qubes/version)-1.$DIST.x86_64 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 ln -s $SRC_ROOT/addons/rpm/x86_64/thunderbird-qubes-$VERSION_TB.rpm thunderbird-qubes.rpm
# FIXME: rel hardcoded # FIXME: rel hardcoded
VERSION_GPG=$(cat $SRC_ROOT/addons/gpg-split/version)-1.$DIST.x86_64 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 ln -s $SRC_ROOT/addons/rpm/x86_64/qubes-gpg-split-$VERSION_GPG.rpm qubes-gpg-split.rpm
popd popd

15
qubeize_image
View File

@ -39,7 +39,7 @@ mount -o loop $IMG mnt || exit 1
mount -t proc proc mnt/proc mount -t proc proc mnt/proc
echo "--> Installing RPMs..." echo "--> Installing RPMs..."
rpm --force --root=$(pwd)/mnt -ihv rpms_to_install/* yum install -c $PWD/yum.conf $YUM_OPTS -y --installroot=$(pwd)/mnt rpms_to_install/*rpm
echo "--> Installing 3rd party apps" echo "--> Installing 3rd party apps"
./add_3rd_party_software.sh ./add_3rd_party_software.sh
@ -50,9 +50,20 @@ APPSTEMPL=qubeized_images/$NAME-apps.templates
mkdir -p $APPSORIG mkdir -p $APPSORIG
cp -r $(pwd)/mnt/usr/share/applications/* $APPSORIG cp -r $(pwd)/mnt/usr/share/applications/* $APPSORIG
echo "--> Createing the Apps Menu templates..." echo "--> Creating the Apps Menu templates..."
./create_apps_templates.sh $APPSORIG $APPSTEMPL ./create_apps_templates.sh $APPSORIG $APPSTEMPL
echo "--> Choosing appmenus whitelists..."
rm -f appmenus
if [ -d "appmenus_$DIST" ]; then
ln -s "appmenus_$DIST" appmenus
else
ln -s "appmenus_generic" appmenus
fi
echo "--> Installing 3rd party apps"
./add_3rd_party_software.sh
echo "--> Copying DispVM dotfiles dir..." echo "--> Copying DispVM dotfiles dir..."
cp dispvm-dotfiles.tbz mnt/etc/ cp dispvm-dotfiles.tbz mnt/etc/