From 2333bf24c0e39731d5170d6e92ac94d71d67631d Mon Sep 17 00:00:00 2001 From: Olivier Medoc Date: Fri, 8 Feb 2013 11:30:47 +0100 Subject: [PATCH] scripts_archlinux: install dev tools as dependencies to ease template cleanup --- scripts_archlinux/04_install_qubes.sh | 2 ++ scripts_archlinux/09_cleanup.sh | 3 --- scripts_archlinux/packages.list | 5 +---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/scripts_archlinux/04_install_qubes.sh b/scripts_archlinux/04_install_qubes.sh index cc97c16..6b02b5c 100755 --- a/scripts_archlinux/04_install_qubes.sh +++ b/scripts_archlinux/04_install_qubes.sh @@ -4,6 +4,8 @@ echo "Mounting archlinux install system into archlinux_dvd..." sudo mount root-image.fs archlinux_dvd echo $INSTALLDIR +echo "--> Installing yaourt make dependencies..." +sudo ./archlinux_dvd/usr/bin/arch-chroot $INSTALLDIR sh -c 'pacman -S --asdeps binutils yajl gcc make' echo "--> Installing yaourt..." sudo ./archlinux_dvd/usr/bin/arch-chroot $INSTALLDIR sh -c 'cd tmp && wget https://aur.archlinux.org/packages/pa/package-query/package-query.tar.gz && tar xzvf package-query.tar.gz && cd package-query && makepkg --asroot && pacman --noconfirm -U package-query-*.pkg.tar.xz' diff --git a/scripts_archlinux/09_cleanup.sh b/scripts_archlinux/09_cleanup.sh index 70744c0..208accb 100755 --- a/scripts_archlinux/09_cleanup.sh +++ b/scripts_archlinux/09_cleanup.sh @@ -8,9 +8,6 @@ echo "--> Starting cleanup actions" cleanuppkgs=`sudo ./archlinux_dvd/usr/bin/arch-chroot $INSTALLDIR pacman -Qdt | cut -d " " -f 1` sudo ./archlinux_dvd/usr/bin/arch-chroot $INSTALLDIR pacman --noconfirm -Rsc $cleanuppkgs -# Remove yaourt dependencies -sudo ./archlinux_dvd/usr/bin/arch-chroot $INSTALLDIR pacman --noconfirm -Rsc binutils yajl gcc make - # Clean pacman cache sudo ./archlinux_dvd/usr/bin/arch-chroot $INSTALLDIR pacman --noconfirm -Scc diff --git a/scripts_archlinux/packages.list b/scripts_archlinux/packages.list index 9920d0c..af28db7 100644 --- a/scripts_archlinux/packages.list +++ b/scripts_archlinux/packages.list @@ -12,7 +12,4 @@ ttf-dejavu ttf-freefont wget zsh -binutils -yajl -gcc -make +xfce4-terminal