diff -Nru livecd-rootfs-2.420+ppa15/debian/changelog livecd-rootfs-2.420+ppa16/debian/changelog
--- livecd-rootfs-2.420+ppa15/debian/changelog	2016-07-21 10:04:58.000000000 +0200
+++ livecd-rootfs-2.420+ppa16/debian/changelog	2016-08-12 13:43:34.000000000 +0200
@@ -1,3 +1,11 @@
+livecd-rootfs (2.420+ppa16) xenial; urgency=medium
+
+  * drop all snapcraft calls, kernel builds and hacked up code from
+    live-build/auto/build for ubuntu-core to speed up the new builds that we
+    now do on launchpad.
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Fri, 12 Aug 2016 13:42:18 +0200
+
 livecd-rootfs (2.420+ppa15) xenial; urgency=medium
 
   * do not use lsb_release for the ubuntu-core version, it will not give us
diff -Nru livecd-rootfs-2.420+ppa15/live-build/auto/build livecd-rootfs-2.420+ppa16/live-build/auto/build
--- livecd-rootfs-2.420+ppa15/live-build/auto/build	2016-07-21 10:03:27.000000000 +0200
+++ livecd-rootfs-2.420+ppa16/live-build/auto/build	2016-08-12 13:47:48.000000000 +0200
@@ -256,25 +256,6 @@
         for dir in lib/modules lib/firmware writable meta; do
             mkdir -p $rootfs/$dir
         done
-
-        # get a proper version from the chroot
-        . $rootfs/etc/os-release
-        VERSION="$(echo $PRETTY_NAME | sed 's/[^0-9.]*//g')"
-
-        CORENAME="ubuntu-core"
-        cat > $rootfs/meta/snap.yaml <<EOF
-name: $CORENAME
-version: $VERSION
-summary: The core runtime environment for snapd
-architectures: [$ARCH]
-type: os
-EOF
-
-        apt-get -y install snapcraft
-        snapcraft snap $rootfs
-
-        snapfile="$(ls ${CORENAME}*.snap)"
-        cp -a $snapfile $PREFIX.os.snap
     fi
 fi
 
@@ -302,246 +283,6 @@
 # in a binary hook
 case $PROJECT:$SUBPROJECT in
         ubuntu-core:system-image|ubuntu-desktop-next:system-image)
-
-    # create device tarball (for snappy only atm)
-    if [ "$PROJECT:$SUBPROJECT" = "ubuntu-core:system-image" ]; then
-      case $ARCH in
-          armhf)
-            subarches="generic raspi2"
-            ;;
-          arm64)
-            subarches="generic dragonboard"
-            ;;
-          i386|amd64|powerpc|ppc64el|s390x)
-            subarches="generic"
-            ;;
-      esac
-
-      # create a clean chroot
-      debootstrap --variant=minbase $LB_DISTRIBUTION chroot-device $LB_PARENT_MIRROR_BOOTSTRAP
-
-      # ... but keep the PPA setup
-      cp -a chroot/etc/apt/* chroot-device/etc/apt/
-
-      # ... and move it in place
-      rm -rf chroot
-      mv chroot-device chroot
-
-      for devarch in $subarches; do
-        (echo "I: creating $devarch device tarball for $ARCH"
-        HERE="$(pwd)"
-        set -x
-
-        linux_package="linux-image-$devarch"
-        case $ARCH in
-            amd64)
-              linux_package="linux-signed-image-generic"
-              ;;
-            arm64)
-              if [ "$devarch" = "dragonboard" ]; then
-                  linux_package="linux-image-snapdragon linux-firmware-snapdragon"
-              fi
-              ;;
-            armhf)
-              if [ "$devarch" = "raspi2" ]; then
-                  linux_package="linux-image-raspi2"
-              fi
-              ;;
-            ppc64el|s390x)
-              echo "I: skipping kernel and device tarball for $ARCH"
-              return
-              ;;
-        esac
-
-        # make sure all virtual filesystems are available
-        lb chroot_proc install "$@"
-        lb chroot_sysfs install "$@"
-        lb chroot_devpts install "$@"
-
-        # prepare the env
-        Chroot chroot "apt-get -y update"
-        Chroot chroot "apt-get -y purge linux-image-*"
-        Chroot chroot "apt-get -y autoremove"
-        rm -rf chroot/boot/initrd.img* chroot/boot/vmlinu?-* chroot/lib/modules/* \
-            chroot/boot/abi-* chroot/boot/System.map-* chroot/boot/config-*
-        mkdir -p chroot/etc/initramfs-tools/conf.d
-        echo "COMPRESS=lzma" >chroot/etc/initramfs-tools/conf.d/snappy-device-tarball.conf
-
-        # install needed packages and the kernel itself
-        Chroot chroot "apt-get -y install initramfs-tools-ubuntu-core linux-firmware xz-utils"
-        Chroot chroot "apt-get -y install $linux_package"
-
-        Chroot chroot "dpkg -l" > chroot/dpkg.list
-        
-        # clean up
-        lb chroot_devpts remove "$@"
-        lb chroot_sysfs remove "$@"
-        lb chroot_proc remove "$@"
-
-        # now build the actual device tarball
-        TMPDIR="$(mktemp -d)"
-        mkdir -p $TMPDIR/system/
-        mkdir -p $TMPDIR/assets/
-
-        cd chroot
-        cp -ar lib/modules/ $TMPDIR/system/
-        cp -ar lib/firmware/ $TMPDIR/system/
-        # FIXME: compat with the old kernel spec/old initramfs that
-        #        expects lib/{modules,firmware}
-        # 
-        # FIXME2: update the initramfs-tools-ubuntu-core scripts/ubuntu-core
-        #         to look at the new location        
-        mkdir $TMPDIR/system/lib
-        ln -s $TMPDIR/system/modules $TMPDIR/system/lib
-        ln -s $TMPDIR/system/firmware $TMPDIR/system/lib
-
-        # new assets handling
-        if [ -f boot/vmlinu?-*.signed ]; then
-            kernel=boot/vmlinu?-*.signed
-        else
-            kernel=boot/vmlinu?-*
-        fi
-
-        initrd=boot/initrd.img-*
-
-        cp -ar $initrd $TMPDIR/assets/
-        cp -ar $kernel $TMPDIR/assets/
-        cp -ar boot/abi-* boot/System.map-* boot/config-* $TMPDIR/assets/
-
-        dtbs=$(find lib/firmware -type d -name 'device-tree' -print0)
-        if [ -n "$dtbs" ]; then
-           mv "$dtbs" $TMPDIR/assets/dtbs
-           case $devarch in
-               raspi2)
-                   # ubuntu-device-flash does not like subdirs here, we need to tar it up
-                   if [ -e $TMPDIR/assets/dtbs/overlays ]; then
-                       tar -C $TMPDIR/assets/dtbs -f $TMPDIR/assets/dtbs/overlays.tgz -czv overlays
-                       rm -rf $TMPDIR/assets/dtbs/overlays
-                   fi
-                   ;;
-               dragonboard)
-                   cp $TMPDIR/assets/dtbs/qcom/apq8016-sbc-snappy.dtb $TMPDIR/assets/dtbs/apq8016-sbc.dtb
-                   # add special link needed by the dragonboard wifi driver
-                   mkdir -p $TMPDIR/system/lib/firmware/wlan/
-                   ln -s /run/macaddr0 $TMPDIR/system/lib/firmware/wlan/
-                   ;;
-           esac
-        fi
-
-        # copy dpkg manifest
-        cp -ar dpkg.list $TMPDIR/assets
-
-        # create hardware.yaml
-        # this assumes armhf == u-boot
-        # and all others grub
-        # common bits
-        cat > $TMPDIR/hardware.yaml << EOF
-kernel: assets/$(basename $kernel)
-initrd: assets/$(basename $initrd)
-partition-layout: system-AB
-EOF
-        # arch specific ones
-        if [ "$ARCH" = "armhf" ]; then
-          cat >> $TMPDIR/hardware.yaml << EOF
-dtbs: assets/dtbs
-bootloader: u-boot
-EOF
-        else
-          cat >> $TMPDIR/hardware.yaml << EOF
-bootloader: grub
-EOF
-        fi
-
-        # compress everything
-        cd $TMPDIR
-        tarname="device.tar.gz"
-        manifestname="device.manifest"
-        if [ "$devarch" = "raspi2" ];then
-            tarname="raspi2.$tarname"
-            manifestname="$devarch.$manifestname"
-        elif [ "$devarch" = "dragonboard" ];then
-            tarname="$devarch.$tarname"
-            manifestname="$devarch.$manifestname"
-        fi
-        # create tarfile
-        tar -c -z -f $HERE/$PREFIX.$tarname system assets hardware.yaml
-
-        # create device specific manifest to track kernel dpkg version
-        cp assets/dpkg.list $HERE/$PREFIX.$manifestname
-
-        # show size of initrd and kernel in the log
-        ls -lh assets/
-
-        # dump the content list into the log
-        echo "I: device tarball contents for $PREFIX.$tarname:"
-        find . -type f
-
-        # azure wants its own device tarball
-        if [ "$ARCH" = "amd64" ]; then
-            cp $HERE/$PREFIX.$tarname $HERE/$PREFIX.azure.$tarname
-        fi
-
-        # create snap
-        snapname="kernel.snap"
-        metaname=canonical-pc-linux
-
-        if [ "$devarch" = "raspi2" ];then
-            metaname=canonical-pi2-linux
-            snapname="$devarch.kernel.snap"
-        elif [ "$devarch" = "generic" ] && [ "$ARCH" = "armhf" ];then
-            metaname=canonical-bbb-linux
-        elif [ "$devarch" = "dragonboard" ] && [ "$ARCH" = "arm64" ];then
-            metaname=canonical-snapdragon-linux
-            snapname="$devarch.kernel.snap"
-        fi
-
-        rm -rf $HERE/snap || true
-        mkdir -p $HERE/snap/meta
-        cp -a $TMPDIR/assets/* $HERE/snap
-        cp -a $TMPDIR/system/* $HERE/snap
-
-        cd $HERE/snap
-        kernel="$(ls vmlinuz-*)"
-        initrd="$(ls initrd.img-*)"
-        # old kernel spec
-        ln -s $kernel vmlinuz
-        ln -s $initrd initrd.img
-        # new kernel spec
-        ln -s $kernel kernel.img
-        kvers="$(ls vmlinuz-*|sed 's/^.*vmlinuz-//;s/-[a-z.]*$//')"
-
-        VERSION=$kvers
-
-        cat > meta/kernel.yaml <<EOF
-version: $kvers
-EOF
-        
-        cat > meta/snap.yaml <<EOF
-name: $metaname
-version: $VERSION
-architectures: [$ARCH]
-summary: The canonical $devarch $ARCH kernel
-type: kernel
-
-kernel: $(ls vmlinuz-*)
-initrd: $(ls initrd.img-*)
-modules: $(ls -d lib/modules/*)
-firmware: lib/firmware
-EOF
-        if [ -d dtbs ]; then
-            printf "dtbs: dtbs/ \n" >> meta/snap.yaml
-        fi
-        cd $HERE
-
-        apt-get -y install snapcraft
-        snapcraft snap snap
-
-        snapfile="$(ls $metaname*.snap)"
-        cp -a $snapfile $PREFIX.$snapname
-        )
-      done
-    fi
-
     LB_LINUX_FLAVOURS=none
     ;;
 esac