debian: use maruos APT server for dependencies

This points to maruos's APT server to download the latest cleanly
packaged mclient instead of shipping a binary artifact.

Signed-off-by: Preetam D'Souza <preetamjdsouza@gmail.com>

README.md

@@ -2,11 +2,11 @@
 
 [![Build Status](https://travis-ci.org/maruos/blueprints.svg?branch=master)](https://travis-ci.org/maruos/blueprints)
 
-Builds container images for Maru OS based on a set of "blueprints".
+Container image builder for Maru OS.
 
 ### Blueprints
 
-Image building logic is separated into standalone blueprint plugins.
+Image building logic is separated into standalone plugins called blueprints.
 
 To create your own blueprint, all you need to do is:
 
@@ -24,6 +24,19 @@ To create your own blueprint, all you need to do is:
 
 See blueprint/debian as the canonical example for Debian.
 
+### Examples
+
+Build a Debian Jessie armhf container called 'debian' (option defaults):
+
+    $ ./build.sh
+
+Build a Debian Jessie arm64 container called 'jessie64':
+
+    $ ./build.sh -b debian -n jessie64 -- -a arm64
+
+*Tip: You will need root privileges to mount binfmt_misc for bootstrapping
+foreign architecture containers.*
+
 ### Contributing
 
 See the [main Maru OS repository](https://github.com/maruos/maruos) for more

blueprint/debian/Makefile

@@ -17,7 +17,7 @@
 NAME=maru
 VERSION=0.1
 PKG_VERSION=1
-ARCH=armhf
+ARCH=all
 PKG=$(NAME)_$(VERSION)-$(PKG_VERSION)_$(ARCH).deb
 
 pkg:

blueprint/debian/chroot-configure.sh

@@ -46,7 +46,7 @@ apt-get -y install xfce4-terminal \
 dpkg -i maru_* || true
 
 # install all missing packages in "Depends"
-apt-get -y install -f
+apt-get -y --allow-unauthenticated install -f
 
 # get rid of xscreensaver and annoying warning
 apt-get -y purge xscreensaver xscreensaver-data

blueprint/debian/debpkg/DEBIAN/control

@@ -2,12 +2,13 @@ Package: maru
 Version: 0.1-1
 Section: x11
 Priority: optional
-Architecture: armhf
-Depends: libc6, libx11-6, libxfixes3, libxext6, libxdamage1, libxi6, libxrandr2,
+Architecture: all
+Depends: libc6,
     xserver-xorg-video-dummy,
     xfce4,
     lightdm,
-    sudo, rsync
+    sudo, rsync,
+    maru-mflinger-client
 Recommends: xfce4-terminal, xfce4-screenshooter,
     lxtask,
     vim,

blueprint/debian/debpkg/DEBIAN/postinst

@@ -65,9 +65,6 @@ adduser "$USER" sdcard_rw
 # so disable it using update-rc.d
 /usr/sbin/update-rc.d networking disable
 
-# start mclient service on startup
-ln -s /lib/systemd/system/mclient.service /etc/systemd/system/multi-user.target.wants/mclient.service
-
 ## udev ##
 
 # remove any persistent interface naming rules

blueprint/debian/debpkg/DEBIAN/prerm

@@ -20,6 +20,3 @@
 #
 # Stop any daemons associated with the package before removal.
 #
-
-# remove mclient from systemd startup
-systemctl disable mclient

blueprint/debian/plugin.sh

@@ -20,6 +20,8 @@ BLUEPRINT_NAME="DEBIAN"
 DEFAULT_RELEASE="jessie"
 DEFAULT_ARCH="armhf"
 
+DEFAULT_MARU_RELEASE="testing"
+
 # tweaks to upstream template, must be absolute path
 # note: this is only used because older versions of LXC do not support
 # cross-debootstrapping in the debian template
@@ -78,6 +80,11 @@ EOF
     # make sure we have a dynamic mirror for installing packages
     cat > "${rootfs}/etc/apt/sources.list" <<EOF
 deb http://httpredir.debian.org/debian ${release} main
+EOF
+
+    # add maru apt repository for installing dependencies
+    cat > "${rootfs}/etc/apt/sources.list.d/maruos.list" <<EOF
+deb http://packages.maruos.com/debian ${DEFAULT_MARU_RELEASE}/
 EOF
 
     # disable any default.target
@@ -99,6 +106,10 @@ EOF
     pecho "configuring rootfs..."
     cp "$CHROOT_SCRIPT" "${rootfs}/tmp"
     chroot "$rootfs" bash -c "cd /tmp && ./${CHROOT_SCRIPT}"
+
+    # delete maru apt repository for now (upgrades not tested)
+    rm "${rootfs}/etc/apt/sources.list.d/maruos.list"
+
 }
 
 blueprint_build () {