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

Conflicts:
	qubeize_image

appmenus_fc17/vm-whitelisted-appmenus.list

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

appmenus_fc17/whitelisted-appmenus.list

@@ -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

appmenus_generic/netvm-whitelisted-appmenus.list

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

create_apps_templates.sh

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

create_symlinks_in_rpms_to_install_dir.sh

@@ -9,29 +9,29 @@ rm -fr rpms_to_install/*
 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
+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.rpm
 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
-    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
 
 # 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
+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
-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
+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.rpm
+ln -s $SRC_ROOT/xen/rpm/x86_64/xen-qubes-vm-essentials-$VERSION_XEN.rpm xen-qubes-vm-essentials.rpm
 
 # Install also addons
 # 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
+ln -s $SRC_ROOT/addons/rpm/x86_64/thunderbird-qubes-$VERSION_TB.rpm thunderbird-qubes.rpm
 # 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
+ln -s $SRC_ROOT/addons/rpm/x86_64/qubes-gpg-split-$VERSION_GPG.rpm qubes-gpg-split.rpm
 
 popd

qubeize_image

@@ -39,7 +39,7 @@ mount -o loop $IMG mnt || exit 1
 mount -t proc proc mnt/proc
 
 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"
 ./add_3rd_party_software.sh
@@ -50,9 +50,20 @@ APPSTEMPL=qubeized_images/$NAME-apps.templates
 mkdir -p $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
 
+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..."
 cp dispvm-dotfiles.tbz mnt/etc/