From 019c81e8ecce9b24e2504ec23c1fa48111de6e27 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Fri, 22 Jun 2012 21:12:57 +0200 Subject: [PATCH 1/3] appmenus: choose whitelists basing on distribution version --- .../netvm-whitelisted-appmenus.list | 0 .../vm-whitelisted-appmenus.list | 0 .../whitelisted-appmenus.list | 0 .../convert_app2template.sh => convert_app2template.sh | 0 create_apps_templates.sh | 2 +- qubeize_image | 10 +++++++++- 6 files changed, 10 insertions(+), 2 deletions(-) rename {appmenus => appmenus_generic}/netvm-whitelisted-appmenus.list (100%) rename {appmenus => appmenus_generic}/vm-whitelisted-appmenus.list (100%) rename {appmenus => appmenus_generic}/whitelisted-appmenus.list (100%) rename appmenus/convert_app2template.sh => convert_app2template.sh (100%) diff --git a/appmenus/netvm-whitelisted-appmenus.list b/appmenus_generic/netvm-whitelisted-appmenus.list similarity index 100% rename from appmenus/netvm-whitelisted-appmenus.list rename to appmenus_generic/netvm-whitelisted-appmenus.list diff --git a/appmenus/vm-whitelisted-appmenus.list b/appmenus_generic/vm-whitelisted-appmenus.list similarity index 100% rename from appmenus/vm-whitelisted-appmenus.list rename to appmenus_generic/vm-whitelisted-appmenus.list diff --git a/appmenus/whitelisted-appmenus.list b/appmenus_generic/whitelisted-appmenus.list similarity index 100% rename from appmenus/whitelisted-appmenus.list rename to appmenus_generic/whitelisted-appmenus.list diff --git a/appmenus/convert_app2template.sh b/convert_app2template.sh similarity index 100% rename from appmenus/convert_app2template.sh rename to convert_app2template.sh diff --git a/create_apps_templates.sh b/create_apps_templates.sh index 732f450..c669c57 100755 --- a/create_apps_templates.sh +++ b/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 \; diff --git a/qubeize_image b/qubeize_image index 41a1c49..56c5b77 100755 --- a/qubeize_image +++ b/qubeize_image @@ -48,9 +48,17 @@ 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 From 00e306764149cdcc9e5873d839d6a2fa541cc00b Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Fri, 22 Jun 2012 21:16:41 +0200 Subject: [PATCH 2/3] appmenus: whitelists for fc17 --- appmenus_fc17/netvm-whitelisted-appmenus.list | 1 + appmenus_fc17/vm-whitelisted-appmenus.list | 5 +++++ appmenus_fc17/whitelisted-appmenus.list | 6 ++++++ 3 files changed, 12 insertions(+) create mode 100644 appmenus_fc17/netvm-whitelisted-appmenus.list create mode 100644 appmenus_fc17/vm-whitelisted-appmenus.list create mode 100644 appmenus_fc17/whitelisted-appmenus.list diff --git a/appmenus_fc17/netvm-whitelisted-appmenus.list b/appmenus_fc17/netvm-whitelisted-appmenus.list new file mode 100644 index 0000000..4b744f7 --- /dev/null +++ b/appmenus_fc17/netvm-whitelisted-appmenus.list @@ -0,0 +1 @@ +gnome-terminal.desktop diff --git a/appmenus_fc17/vm-whitelisted-appmenus.list b/appmenus_fc17/vm-whitelisted-appmenus.list new file mode 100644 index 0000000..8db3e1e --- /dev/null +++ b/appmenus_fc17/vm-whitelisted-appmenus.list @@ -0,0 +1,5 @@ +gnome-terminal.desktop +nautilus.desktop +firefox.desktop +mozilla-thunderbird.desktop +libreoffice-startcenter.desktop diff --git a/appmenus_fc17/whitelisted-appmenus.list b/appmenus_fc17/whitelisted-appmenus.list new file mode 100644 index 0000000..23268c8 --- /dev/null +++ b/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 From b3298c852d77a5947f4d3c0038fe13dce91e617f Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Mon, 25 Jun 2012 13:15:15 +0200 Subject: [PATCH 3/3] Use yum to install qubes-specific rpms This will allow to automatically install its requires. --- create_symlinks_in_rpms_to_install_dir.sh | 20 ++++++++++---------- qubeize_image | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/create_symlinks_in_rpms_to_install_dir.sh b/create_symlinks_in_rpms_to_install_dir.sh index e85c7d7..bd05e8c 100755 --- a/create_symlinks_in_rpms_to_install_dir.sh +++ b/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 diff --git a/qubeize_image b/qubeize_image index 56c5b77..5789e8c 100755 --- a/qubeize_image +++ b/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 "--> Copying the Apps Menu shortcuts..."