debian: use real apt repo for qubes packages installation

scripts_debian/04_install_qubes.sh

@@ -30,13 +30,38 @@ xen /proc/xen xenfs defaults 0 0
 EOF
 
 echo "--> Installing qubes packages"
-export CUSTOMREPO="$PWD/yum_repo_qubes/debian"
+export CUSTOMREPO="$PWD/yum_repo_qubes/$DIST/apt"
-mkdir -p $INSTALLDIR/tmp/qubesdebs
+
-find $CUSTOMREPO/apt -name '*.deb' -exec cp -t $INSTALLDIR/tmp/qubesdebs '{}' \;
+if ! [ -e $CACHEDIR/repo-secring.gpg ]; then
-chroot $INSTALLDIR /bin/sh -c 'dpkg -i /tmp/qubesdebs/*.deb'
+    mkdir -p $CACHEDIR
-rm -rf $INSTALLDIR/tmp/qubesdebs
+    gpg --gen-key --batch <<EOF
-# Install dependencies for qubes packages
+Key-Type: RSA
-chroot $INSTALLDIR apt-get -f -y install
+Key-Length: 1024
+Key-Usage: sign
+Name-Real: Qubes builder
+Expire-Date: 0
+%pubring $CACHEDIR/repo-pubring.gpg
+%secring $CACHEDIR/repo-secring.gpg
+%commit
+EOF
+fi
+gpg -abs --no-default-keyring \
+        --secret-keyring $CACHEDIR/repo-secring.gpg \
+        --keyring $CACHEDIR/repo-pubring.gpg \
+        -o $CUSTOMREPO/dists/$DIST/Release.gpg \
+        $CUSTOMREPO/dists/$DIST/Release
+
+mkdir -p $INSTALLDIR/tmp/qubes_repo
+mount --bind $CUSTOMREPO $INSTALLDIR/tmp/qubes_repo
+cat > $INSTALLDIR/etc/apt/sources.list.d/qubes-builder.list <<EOF
+deb file:/tmp/qubes_repo $DEBIANVERSION main
+EOF
+cp $CACHEDIR/repo-pubring.gpg $INSTALLDIR/etc/apt/trusted.gpg.d/qubes-builder.gpg
+chroot $INSTALLDIR apt-get update || { umount $INSTALLDIR/tmp/qubes_repo; exit 1; }
+chroot $INSTALLDIR apt-get -y install `cat $SCRIPTSDIR/packages_qubes.list` || { umount $INSTALLDIR/tmp/qubes_repo; exit 1; }
+umount $INSTALLDIR/tmp/qubes_repo
+rm -f $INSTALLDIR/etc/apt/sources.list.d/qubes-builder.list
+chroot $INSTALLDIR apt-get update || exit 1
 
 # Remove temporary policy layer so services can start normally in the
 # deployed template.

scripts_debian/09_cleanup.sh

@@ -3,5 +3,8 @@
 
 rm -f $INSTALLDIR/var/cache/apt/archives/*
 
+rm -f $INSTALLDIR/etc/apt/sources.list.d/qubes-builder.list
+rm -f $INSTALLDIR/etc/apt/trusted.gpg.d/qubes-builder.gpg
+
 rm -rf buildchroot
 

scripts_debian/packages_qubes.list

@@ -0,0 +1,2 @@
+qubes-core-agent
+qubes-gui-agent

yum_repo_qubes/.gitignore

@@ -1,2 +1,7 @@
 fc*
 archlinux*
+jessie
+wheezy
+squeeze
+sid
+