From f5d9341e6ad777ed3a9c91963e076ad4b9b84aa0 Mon Sep 17 00:00:00 2001 From: Jason Mehring Date: Tue, 14 Oct 2014 18:26:01 -0400 Subject: [PATCH] Moved Whonix submodules init and patches from qubes-builder here to keep everything in one place --- .../02_install_groups_packages_installed.sh | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/scripts_debian/custom_wheezy_whonix/02_install_groups_packages_installed.sh b/scripts_debian/custom_wheezy_whonix/02_install_groups_packages_installed.sh index c437d67..21c3f98 100755 --- a/scripts_debian/custom_wheezy_whonix/02_install_groups_packages_installed.sh +++ b/scripts_debian/custom_wheezy_whonix/02_install_groups_packages_installed.sh @@ -124,6 +124,34 @@ trap error EXIT if ! [ -f "$INSTALLDIR/tmp/.prepared_whonix" ]; then echo "-> Installing whonix system" + # -------------------------------------------------------------------------- + # Initialize Whonix submodules + # -------------------------------------------------------------------------- + pushd "$WHONIX_DIR" + { + git submodule update --init --recursive; + } + popd + + # -------------------------------------------------------------------------- + # Patch Whonix submodules + # -------------------------------------------------------------------------- + + # Patch anon-meta-packages to not depend on grub-pc + # XXX: Seems like the error disappears, but then whonix updates to original code? + pushd "$WHONIX_DIR/packages/anon-meta-packages/debian" + { + sed -i 's/ grub-pc,//g' control; + #git commit -am 'removed grub-pc depend'; + } + popd + + pushd "$WHONIX_DIR/build-steps.d" + { + sed -i 's/ check_for_uncommited_changes/ #check_for_uncommited_changes/g' 1200_create-debian-packages; + } + popd + # -------------------------------------------------------------------------- # Whonix system config dependancies # --------------------------------------------------------------------------