Merge lp:~rafaelfolco/cirros/cirros into lp:cirros

[Rafael Folco]

Add support for Grub2 on Power architectures.

Power bootable qcow2 images require Grub to be installed on a PreP Boot partition. This patch enables CirrOS to boot from Grub2/PreP.

Unmerged revisions

381. By Rafael Folco on 2016-09-19

Code polishing and Minor fixes

380. By Rafael Folco on 2016-09-01

Download first, build br-source first arch

379. By Rafael Folco on 2016-08-31

Add Grub2 support to Power

=== added directory 'bin'
=== added file 'bin/build-release.OTHER'
--- bin/build-release.OTHER	1970-01-01 00:00:00 +0000
+++ bin/build-release.OTHER	2016-09-20 12:52:40 +0000
@@ -0,0 +1,265 @@
+#!/bin/bash
+#
+#    Authors: Scott Moser <[e-mail]>
+#             Marcin Juszkiewicz <[e-mail]>
+#             Rafael Folco <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, version 3 of the License.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+[ $# -ge 1 ] || { echo "must give version"; exit 1; }
+
+source "${0%/*}/common-functions.sh"
+
+VER=$1
+daily=false
+if [ "$1" = "daily" ]; then
+    VER="d$(date +%y%m%d)"
+    daily=true
+fi
+shift
+pre=cirros-$VER
+BR_VER="2015.05"
+ARCHES="${ARCHES:-i386 x86_64 arm powerpc aarch64 ppc64 ppc64le}"
+KVER="4.4.0-28.47" # Ubuntu 16.04
+GVER="2.02~beta2-36ubuntu8"
+ME=$(readlink -f "$0")
+MY_D=${ME%/*}
+PATH=${MY_D}:$PATH
+
+set -e
+set -o pipefail
+
+OUT="$PWD/../build-$VER"
+LOGFILE="$OUT/date.txt"
+export TMPDIR="$OUT/tmp"
+mkdir -p "$OUT" "$TMPDIR"
+
+msg() {
+    echo "$@" >> "$LOGFILE"
+    echo "$@"
+}
+logevent() {
+    # logevent(msg, [from])
+    # log the message in $1 and time since $2, defaulting to last call.
+    local up delta msg="$1" ref="$2" human=""
+    up=${SECONDS}
+    if [ "$ref" = "-" ]; then
+        ref=""
+    elif [ "$ref" = "" ]; then
+        ref="${_LAST_UP}"
+    fi
+    if [ -n "$ref" ]; then
+        delta="$(($up-$ref))"
+        sec2human "$delta" tshort && human=${_RET}
+    fi
+    msg "$(date -R)" "$msg" "${delta:+Took ${human}. [${delta}s]}"
+    _LAST_UP=$up
+    _RET=${_LAST_UP}
+}
+
+build_arch() {
+    local arch="" quiet=false cmd="" log=""
+    if [ "$1" = "quiet" ]; then
+        quiet=true
+        shift
+    fi
+    arch="$1"
+    log="${OUT}/build-$arch.log"
+    cmd=( make ARCH=$arch "OUT_D=$OUT/build/$arch"
+          ${CCACHE_D:+"BR2_CCACHE_DIR=${CCACHE_D}/$arch"} )
+
+    logevent "start $arch" -
+    if $quiet; then
+        error "building $arch into $log"
+        time "${cmd[@]}" > "$log" 2>&1
+    else
+        time "${cmd[@]}" 2>&1 | tee "$log"
+    fi
+    ret=$?
+    logevent "finish $arch [ret=$ret]"
+    return $ret
+}
+
+get_grub_format() {
+    local arch=$1
+    case "$arch" in
+        powerpc|ppc*) format=ieee;;
+        *) format=efi;;
+    esac
+    echo $format
+}
+
+get_img_size() {
+    local arch=$1
+    case "$arch" in
+        powerpc|ppc*|aarch64) size=96M;;
+        *) size="";;
+    esac
+    echo $size
+}
+
+if [ "$1" = "build_arch" ]; then
+    shift
+    build_arch "$@"
+    exit
+elif [ $# -gt 1 ]; then
+    fail "confused by $# arguments: $*"
+fi
+
+# really just here to check that VER is a tag
+# or source code checkout would fail
+if ! $daily; then
+    revno=$(bzr tags -r "tag:$VER") || fail "$VER: not a tag in $PWD."
+    revno=$(echo "$revno" | awk '{print $2}')
+fi
+
+logevent "begin" -
+tstart=${_RET}
+
+logevent "start download" -
+rm -f download
+mkdir -p ../download
+ln -snf ../download download
+brtgz="buildroot-${BR_VER}.tar.gz"
+dl "http://buildroot.uclibc.org/downloads/$brtgz" "download/$brtgz"
+logevent "end download"
+
+logevent "start unpack" -
+rm -Rf "buildroot-${BR_VER}"
+rm -f buildroot
+tar -xvf download/buildroot-${BR_VER}.tar.gz
+ln -snf buildroot-${BR_VER} buildroot
+
+# we do not do this here, so that we're not dependent on the
+# cvs working (which wont work through http_proxy) and also
+# to have revision controlled information in that file.
+#./bin/mkcabundle > src/etc/ssl/certs/ca-certificates.crt
+
+( cd buildroot && QUILT_PATCHES="$PWD/../patches-buildroot" quilt push -a )
+
+echo "$VER" > "src/etc/cirros/version"
+logevent "end unpack"
+
+# Stage 1: DOWNLOAD
+logevent "start br-source" -
+make ARCH=${ARCHES%% *} br-source
+logevent "end br-source"
+
+for arch in ${ARCHES}; do
+    format=$(get_grub_format "$arch")
+    mkdir -p "$OUT/stage/$arch"
+
+    # grab kernel
+    logevent "start kernel download" -
+    grab-kernels "$KVER" $arch
+    logevent "end kernel download"
+
+    # grab grub
+    logevent "start grub $arch-$format download" -
+    grab-grub-${format} "$GVER" $arch
+    logevent "end grub $arch-$format download"
+done
+
+# STAGE 2: BUILD
+jobs_flag=""
+parallel=true
+case "${CIRROS_PARALLEL:-none}" in
+    none) parallel=false;;
+    0|true) :;;
+    [0-9]|[0-9][0-9]) jobs_flag="--jobs=${CIRROS_PARALLEL}";;
+    auto) command -v parallel >/dev/null || parallel=false;;
+    *) fail "unknown value for CIRROS_PARALLEL=$CIRROS_PARALLEL";;
+esac
+
+if $parallel; then
+    parallel --ungroup ${jobs_flag} \
+        "$0" "$VER" build_arch quiet {} ::: ${ARCHES}
+else
+    for arch in ${ARCHES}; do
+        build_arch "$arch"
+    done;
+fi
+
+# STAGE 3: BUNDLE
+for arch in ${ARCHES}; do
+    # bundle rootfs, kernel & grub
+    format=$(get_grub_format "$arch")
+    size=$(get_img_size "$arch")
+    logevent "start bundling $arch" -
+    sudo ./bin/bundle -v ${size:+--size=$size} --arch="$arch" \
+        "$OUT/build/$arch/rootfs.tar" \
+        ./download/kernel-$arch.tar.gz ./download/grub-${format}-$arch.tar.gz \
+        "$OUT/stage/$arch";
+    logevent "finish bundling $arch"
+done
+
+sudo chown -R $USER:$USER "$OUT/stage"
+
+mkdir -p "$OUT/release"
+
+#srctgz="$OUT/release/cirros-$VER-source.tar.gz"
+#bzr export -r "tag:$VER" --format=tgz --root="cirros-$VER" "$srctgz"
+#echo "wrote source tgz: $srctgz"
+if ! $daily; then
+   ( srcd="$PWD" && tmpd=$(mktemp -d) && cd "$tmpd" &&
+        bzr branch "$srcd" -r tag:$VER cirros-$VER &&
+        rm -Rf cirros-$VER/.bzr &&
+        echo "$VER" > "cirros-$VER/src/etc/cirros/version" &&
+        tar cvzf - cirros-$VER ) > "$OUT/release/cirros-$VER-source.tar.gz"
+fi
+
+rm -f "$OUT/stage"/*/"$pre"*
+for arch in ${ARCHES}; do
+    p=$pre-$arch
+    ( cd "$OUT/stage/$arch" &&
+        ln kernel $p-vmlinuz && ln kernel $p-kernel &&
+        ln initramfs $p-initrd && ln initramfs $p-initramfs &&
+        ln part.img $p-rootfs.img &&
+        ln blank.img $p-blank.img &&
+        ln disk.img $p-disk.img &&
+        ln filesys.tar.gz $p-lxc.tar.gz &&
+        true
+    );
+done
+
+logevent "start populating release" -
+for arch in ${ARCHES}; do
+    p=$pre-$arch
+    ( cd "$OUT/stage/$arch" &&
+        cp $p-kernel $p-initramfs $p-lxc.tar.gz "$OUT/release/" &&
+        gzip -9 -c $p-rootfs.img > $OUT/release/$p-rootfs.img.gz ) &&
+        ( cd "$OUT/stage/$arch" &&
+            tar cvzf - $p-blank.img $p-vmlinuz $p-initrd
+        ) > "$OUT/release/$p-uec.tar.gz"
+    cp "$OUT/stage/$arch/$p-disk.img" "$OUT/release/$p-disk.img"
+done
+
+mkdir -p "$OUT/release/buildroot_rootfs"
+for arch in ${ARCHES}; do
+    t="$OUT/release/buildroot_rootfs/buildroot-$VER-$arch.tar"
+    cp "$OUT/build/$arch/rootfs.tar" "$t"
+    gzip --force -9 "$t"
+done
+
+chmod u+rwX,go+rX -R "$OUT/release/"* 
+
+sumfiles=$(cd "$OUT/release" && for f in *; do
+    [ -f "$f" -a "$f" != MD5SUMS ] && echo "$f"; done)
+( cd "$OUT/release" && md5sum $sumfiles > MD5SUMS )
+
+logevent "finish populate release" -
+msg "output in $OUT/release"
+msg "entire process took $SECONDS seconds"
+logevent "finished" "$tstart"
+
+# vi: tabstop=4 expandtab
 
=== added file 'bin/bundle.OTHER'
--- bin/bundle.OTHER	1970-01-01 00:00:00 +0000
+++ bin/bundle.OTHER	2016-09-20 12:52:40 +0000
@@ -0,0 +1,348 @@
+#!/bin/bash
+#
+#    Authors: Scott Moser <[e-mail]>
+#             Marcin Juszkiewicz <[e-mail]>
+#             Rafael Folco <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, version 3 of the License.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+source "${0%/*}/common-functions.sh"
+
+TEMP_D=""
+UMOUNT=""
+DEF_SIZE=${DEF_SIZE:-32M}
+DEF_MODULES="acpiphp e1000 ne2k-pci 8139cp pcnet32 ip_tables"
+
+Usage() {
+    cat <<EOF
+Usage: ${0##*/} rootfs.tar kpkg.deb output_dir
+    [re]Bundle a buildroot rootfs into a mini-cloud image
+
+    options:
+     -s | --size S            resize image to size (default: ${DEF_SIZE})
+          --arch A            prepare for arch A
+
+   Example:
+    ${0##*/} rootfs.tar linux-image-*-virtuaal*.deb build-output/
+EOF
+}
+cleanup() {
+    [ -z "${UMOUNT}" ] || umount "${UMOUNT}"
+    [ -z "${TEMP_D}" -o ! -d "${TEMP_D}" ] || rm -Rf "${TEMP_D}"
+}
+xrsync() {
+    rsync --archive --xattrs --hard-links --acls --sparse "$@"
+}
+
+short_opts="hs:v"
+long_opts="arch:,initrd-busybox:,help,size:,verbose"
+getopt_out=$(getopt --name "${0##*/}" \
+    --options "${short_opts}" --long "${long_opts}" -- "$@") &&
+    eval set -- "${getopt_out}" ||
+    bad_Usage
+
+topdir=$(cd "${0%/*}/.." && pwd)
+size=${DEF_SIZE}
+FS_LABEL="cirros-rootfs"
+fs_type="ext3"
+arch=""
+
+while [ $# -ne 0 ]; do
+    cur=${1}; next=${2};
+    case "$cur" in
+        -h|--help) Usage; exit 0;;
+        -s|--size) size=${next}; shift;;
+           --arch) arch=${next}; shift;;
+        -v|--verbose) DEBUG=$((${DEBUG}+1));;
+        --) shift; break;;
+    esac
+    shift;
+done
+
+[ $# -eq 4 ] || bad_Usage "must give rootfs.tar, kernel pkg, grub-{efi|ieee}.tar, out_dir"
+rootfs_in=${1}
+kpkg_in=${2}
+grub_in=${3}
+out_d_in=${4}
+
+PATH="$topdir/bin:$PATH"
+src_dir="${topdir}/src"
+src_symlinks="${topdir}/symlinks.list"
+makedevs_list="${topdir}/makedevs.list"
+fixup_fs="${topdir}/fixup-fs"
+xgrubd="$topdir/grubd"
+
+[ "$(id -u)" = "0" ] || fail "sorry... must be root"
+
+[ -d "${src_dir}" ] || fail "no source dir ${src_d}"
+
+TEMP_D=$(mktemp -d "${TMPDIR:-/tmp}/.${0##*/}.XXXXXX") ||
+    fail "failed to make tempd"
+trap cleanup EXIT
+
+mkdir -p "${out_d_in}" && out_d=$(readlink -f "${out_d_in}") &&
+    rootfs=$(readlink -f "${rootfs_in}") &&
+    kpkg=$(readlink -f "${kpkg_in}") ||
+    fail "failed to get full path for input"
+
+out_partimg="${out_d}/part.img"
+out_diskimg="${out_d}/disk.img"
+out_kernel="${out_d}/kernel"
+out_initramfs="${out_d}/initramfs"
+out_diskimg="${out_d}/disk.img"
+out_blankimg="${out_d}/blank.img"
+out_filesys_lxc="${out_d}/filesys.tar.gz"
+inter_d="$out_d/intermediate"
+
+mp="${TEMP_D}/mnt"
+kernel_d="${TEMP_D}/kernel"
+kern_list_full="${TEMP_D}/kernel.files.full"
+kern_files="${TEMP_D}/kernel.files"
+kern_modules="${TEMP_D}/kernel.files.modules"
+overlay_d="${TEMP_D}/overlay"
+initramfs_d="${TEMP_D}/initramfs"
+initramfs="${TEMP_D}/initramfs.img"
+stage_d="$TEMP_D/staging"
+
+kernel_tar="$inter_d/kernel.tar"
+overlay_tar="$inter_d/overlay.tar"
+filesys_tar="$inter_d/filesys.tar"
+
+modfile="$src_dir/etc/modules"
+if [ -f "$modfile" ]; then
+    MODULES=$("$src_dir/etc/init.d/load-modules" parse_modules \
+        "$modfile" "$arch") ||
+        fail "failed to read modules"
+    MODULES=$(echo "$MODULES" | sed 's, .*,,' | tr '\n' ' ')
+else
+    MODULES=${DEF_MODULES}
+fi
+debug 1 "modules: $MODULES"
+
+prepare-grub "$xgrubd" ||
+    fail "failed to get grub binary"
+
+mkdir -p "${mp}" "${kernel_d}" "${overlay_d}" \
+    "${initramfs_d}" "$inter_d" "$stage_d" ||
+    fail "failed to make temp dirs"
+
+debug 1 "creating filesystem in ${out_partimg}"
+rm -f "$out_partimg"
+truncate "--size=${size}" "${out_partimg}" ||
+    fail "failed to create ${out_partimg} of size ${size}"
+
+out=$("mkfs.${fs_type}" -F "${out_partimg}" -L "${FS_LABEL}" 2>&1) ||
+    fail "failed to make filesystem of type ${fs_type}: ${out}" 
+
+cp "$out_partimg" "$out_blankimg" ||
+    fail "failed to to copy blank partition image"
+
+debug 1 "preparing kernel overlay"
+# creating kernel tarball
+case "$kpkg_in" in
+    *.deb)
+        dpkg -x "${kpkg_in}" "${kernel_d}" ||
+            fail "failed extracting kernel deb package in ${kpkg_in}"
+        ;;
+    *.tar*)
+        tar -C "$kernel_d" -xf "$kpkg_in" ||
+            fail "failed extracting kernel tarball in ${kpkg_in}"
+        ;;
+    *) fail "unknown file format for $kpkg_in";;
+esac
+
+( cd "${kernel_d}" && find * -type f ) > "${kern_list_full}" ||
+    fail "failed to extract kernel to ${kernel_d}"
+
+kver=""
+for x in "$kernel_d/lib/modules"/*; do
+    [ -d "$x/kernel" ] || continue
+    [ -z "$kver" ] ||
+        fail "2 or more things looked like kernels in lib/modules of $kpkg_in"
+    kver="${x##*/}"
+done
+[ -n "$kver" ] ||
+    fail "failed to find kernel version. no lib/modules/* ?"
+
+depmod -a --basedir "${kernel_d}" "${kver}" ||
+    fail "failed to run depmod"
+
+mdep="${kernel_d}/lib/modules/${kver}/modules.dep"
+for x in ${MODULES}; do
+    grep -q "/${x}.ko" "${mdep}" ||
+        { error "WARNING: no ${x} in kernel package!"; continue; }
+    awk -F: '$1 ~ mat {
+        sub(":","",$1)
+        printf("%s/%s\n",p,$1)
+        leng=split($0,deps," ")
+        x=2 # strange, but 0 contains nothing, 1 contains first field (with :)
+        while ( x<=leng ) {
+            printf("%s/%s\n", p, deps[x]);
+            x++
+        }
+    }' mat="/${x}.ko$" p="lib/modules/${kver}" "${mdep}"
+done > "${kern_modules}"
+sort -u "${kern_modules}" > "${kern_files}"
+vmlinuz=$( cd "${kernel_d}" && [ -f boot/vmlinu?-* ] &&
+    echo boot/vmlinu?-* ) && echo "${vmlinuz}" >> "${kern_files}" &&
+    ln -sf "$vmlinuz" "$kernel_d/vmlinuz" && echo "vmlinuz" >> "$kern_files" ||
+    fail "no kernel (boot/vmlinuz-*) found in ${kpkg_in}"
+echo "boot/config-$kver" >> "$kern_files"
+
+tar -C "${kernel_d}" -cpf - \
+    --files-from "${kern_files}" > "${kernel_tar}" ||
+    fail "failed to collect kernel files"
+
+debug 1 "preparing source overlay from ${src_dir}"
+xrsync "${src_dir}/" "${overlay_d}" ||
+    fail "failed to copy source dir"
+
+chown -R 0:0 "${overlay_d}" || fail "failed to chown files in overlay"
+    
+if [ -f "${src_symlinks}" ]; then
+    ( cd "${overlay_d}" &&
+        while read src target; do
+            { [ -d "${target%/*}" ] || mkdir -p "${target%/*}"; } ||
+                { error "could not create ${target%/*}"; exit 1; }
+            ln -sf "${src}" "${target}" || exit 1
+        done < "${src_symlinks}"
+    ) || fail "failed to create symlinks"
+fi
+if [ -f "${makedevs_list}" ]; then
+    xmakedevs "$makedevs_list" "$overlay_d" ||
+        fail "failed to makedevs on overlay"
+fi
+
+( cd "$overlay_d" && tar -cpf - * ) > "$overlay_tar" ||
+    fail "failed to make overlay_tar"
+
+debug 1 "populating staging directory"
+tar -C "$stage_d" -xpf - < "$rootfs_in" ||
+    fail "failed to extract rootfs_tar"
+tar -C "$stage_d" -xpf - < "$overlay_tar" ||
+    fail "failed to extract overlay_tar"
+
+if [ -x "${fixup_fs}" ]; then
+    "${fixup_fs}" "${stage_d}" ||
+        fail "failed to fixup filesystem"
+fi
+
+( cd "$stage_d" && tar -Scpzf - -- * ) > "$out_filesys_lxc" ||
+    fail "failed to create filesys tarball"
+
+tar -C "$stage_d" -xpf - < "$kernel_tar" ||
+    fail "failed to extract kernel_tar"
+tar -C "$stage_d" -xpf - < "$xgrubd/bootgrub.tar" ||
+    fail "failed to extract bootgrub"
+
+depmod -a --basedir "$stage_d" "${kver}" ||
+    fail "failed to run depmod for kver ${kver} in output"
+
+debug 1 "creating initramfs"
+xrsync "$stage_d/" "$initramfs_d" ||
+    fail "failed to copy to initramfs_d"
+rm -Rf "$initramfs_d/vmlinuz" "$initramfs_d/boot" ||
+    fail "failed to remove files in initramfs staging dir"
+
+( cd "$initramfs_d" && find . | cpio --quiet -o -H newc |
+    gzip -9 ) > "$initramfs"
+
+# Here we create /boot/initrd.img-${kver}.
+# That is the initramfs that is put inside of disk images.
+# Since the disk images have all the modules available in the
+# filesystem, we put no modules in this initramfs.  Having them
+# in both places would just waste space.
+# 
+# That means that the kernel must have builtin drivers for
+# any block devices.  Another path to accomplishing the same
+# space savings is what cloud-initramfs-copymods does.
+# The solution there is that if there is no /lib/modules/<kver>
+# inside the target filesystem, then the initramfs mount binds
+# its /lib/modules/<kver> into the target.
+rm -Rf "$initramfs_d/lib/modules/$kver" ||
+    fail "failed to remove lib/modules for mini initramfs"
+
+( cd "$initramfs_d" && find . | cpio --quiet -o -H newc |
+    gzip -9 ) > "${initramfs}.smaller"
+
+cp "${initramfs}.smaller" "$stage_d/boot/initrd.img-${kver}" &&
+    ln -s "boot/initrd.img-${kver}" "${stage_d}/initrd.img" ||
+    fail "failed to copy initramfs to stage dir"
+
+debug 1 "packing clean kernel_tar"
+tar -C "$stage_d" -cpf - \
+    vmlinuz initrd.img boot/ lib/modules/ > "$kernel_tar" ||
+    fail "failed to create clean kerne_tar"
+
+( cd "$stage_d" && tar -cpf - * ) > "$filesys_tar" ||
+    fail "failed to create filesys_tar"
+
+debug 1 "populating image"
+mount -o loop "${out_partimg}" "${mp}" && UMOUNT=${mp} ||
+    fail "failed to mount ${out_partimg} loopback"
+
+tar -C "$mp" -xpf - < "$filesys_tar" ||
+    fail "failed to populate mount point"
+
+umount "${mp}" && UMOUNT="" ||
+    fail "failed to unmount ${out_partimg}"
+
+cp "${kernel_d}/${vmlinuz}" "${out_kernel}" ||
+    fail "failed to copy kernel to ${out_kernel}"
+
+{ [ -z "${out_initramfs}" ] || cp "${initramfs}" "${out_initramfs}"; }  ||
+    fail "failed to copy initramfs to ${out_initramfs}"
+
+debug 1 "fixing grub entry in partimg"
+tmp_part="$TEMP_D/part.img.disk"
+cp "$out_partimg" "$tmp_part" &&
+    mount -o loop "$tmp_part" "$mp" && UMOUNT="$mp" ||
+    fail "failed to mount $tmp_part"
+sed -i 's/(hd0)/(hd0,0)/' "$mp/boot/grub/menu.lst" ||
+    fail "failed to edit /boot/grub/menu.lst in image"
+umount "$mp" && UMOUNT="" ||
+    fail "failed to unmount partimg"
+
+case $arch in
+	i386|x86_64) grub_options="--grub1 --grub-efi";;
+	arm|aarch64) grub_options="--grub-efi";;
+	powerpc|ppc*) grub_options="--grub-ieee";;
+	*) grub_options=;;
+esac
+
+debug 1 "creating disk image"
+out=$(PATH=$xgrubd:$PATH part2disk $grub_options "$tmp_part" \
+    "$grub_in" "$arch" "$out_diskimg.raw" 2>&1) ||
+    fail "failed to create disk image: $out"
+qemu-img convert -O qcow2 -c "$out_diskimg.raw" "$out_diskimg" ||
+    fail "failed to convert disk image"
+rm -f "$out_diskimg.raw" "$tmp_part"
+
+if [ -n "${SUDO_USER}" ]; then
+    u=${SUDO_USER}
+    g=$(id -g "${u}") || g=${u}
+    chown "${u}:${g}" -R "$out_d" ||
+        fail "failed to grant ownership of ${u}:${g} to ${u}:${g}"
+fi
+
+echo "wrote ${out_partimg}"
+echo "wrote ${out_diskimg}"
+echo "wrote ${out_kernel}"
+echo "wrote ${out_initramfs}"
+echo "wrote ${out_blankimg}"
+echo "wrote ${out_filesys_lxc}"
+
+exit 0
+
+# vi: tabstop=4 expandtab
 
=== added file 'bin/grab-grub-ieee'
--- bin/grab-grub-ieee	1970-01-01 00:00:00 +0000
+++ bin/grab-grub-ieee	2016-09-20 12:52:40 +0000
@@ -0,0 +1,100 @@
+#!/bin/bash
+#
+#    Copyright (C) 2016 IBM Corp.
+#
+#    Author: Rafael Folco <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, version 3 of the License.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+source "${0%/*}/common-functions.sh"
+
+burl="https://launchpad.net/ubuntu/+archive/primary/+files/"
+outdir="./download"
+def_arches="ppc64le powerpc ppc64"
+
+[ "$1" = "--outdir" ] && { outdir="$1" && shift; }
+gver="$1"
+shift
+
+if [ $# -eq 0 ]; then
+   set -- ${def_arches}
+fi
+
+[ -d "$outdir" ] || mkdir -p "$outdir" ||
+   fail "failed mkdir $outdir"
+
+[ -n "$gver" ] || fail "must give grub version"
+
+deb2tar() {
+
+    local deb="$1" tar="$2"
+
+    t=$(dirname "$deb")
+    tdir=$(mktemp -d "$t/.XXXXXX") || return
+
+    debug 1 "creating $out in tempdir at $tdir"
+
+    mkdir -p "$tdir/deb"
+    dpkg -x "$deb" "$tdir/deb" || fail "failed to unpack $deb"
+
+    gbin="grub"
+    gmod="boot cat configfile echo ext2 halt loadenv minicmd normal part_gpt
+          reboot search search_fs_uuid search_fs_file search_label serial sleep
+          test linux"
+
+    debug 2 "grub-mkimage: creating grub powerpc-ieee1275 image"
+    grub-mkimage --directory "${tdir}/deb/usr/lib/grub/powerpc-ieee1275" \
+        --prefix "(ieee1275/disk,gpt1)/boot/grub" \
+        --output "$tdir/${gbin}" \
+        --format "powerpc-ieee1275" \
+        --compression "none" $gmod
+
+    rm -rf "$tdir/deb"
+    debug 2 "creating grub.tar.gz"
+    tar -C "$tdir/" -czf "$tdir/grub.tar.gz" $gbin &&
+        mv "$tdir/grub.tar.gz" "$tar" || {
+            error "failed creating tarball";
+            rm -Rf "$tdir"
+            return 1;
+        }
+    rm -Rf "$tdir"
+    return 0
+    
+}
+
+for arch in "$@"; do
+    case "$arch" in
+        ppc64le)
+		debarch='ppc64el'
+		;;
+        powerpc|ppc64)
+		debarch='powerpc'
+		;;
+        *) debug 1 "no grub-ieee1275 for $arch";;
+    esac
+
+    # e.g. https://launchpad.net/ubuntu/+archive/primary/+files/grub-ieee1275-bin_2.02~beta2-36ubuntu8_ppc64el.deb
+    deb="grub-ieee1275-bin_${gver}_${debarch}.deb"
+    if [ ! -f "${outdir}/${deb}" ]; then
+            dl $burl/$deb "$outdir/$deb" || fail "failed dl $burl/$deb"
+    fi	
+    tar="grub-ieee-${gver}-${arch}.tar.gz"
+    deb2tar "$outdir/$deb" "$outdir/$tar" || 
+        fail "failed deb2tar from $deb to $tar"
+    
+    error "wrote $outdir/${tar}"
+    ln -sf "${tar}" "$outdir/grub-ieee-${arch}.tar.gz" ||
+        fail "failed symlink for $outdir/grub-ieee-${arch}.tar.gz"
+done
+# vi: ts=4 expandtab
 
=== added file 'bin/part2disk.OTHER'
--- bin/part2disk.OTHER	1970-01-01 00:00:00 +0000
+++ bin/part2disk.OTHER	2016-09-20 12:52:40 +0000
@@ -0,0 +1,284 @@
+#!/bin/bash
+#    part2disk - wrap a partition image in a disk image
+#
+#    Copyright (C) 2010 Canonical Ltd.
+#
+#    Authors: Scott Moser <[e-mail]>
+#             Marcin Juszkiewicz <[e-mail]>
+#             Rafael Folco <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, version 3 of the License.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+source "${0%/*}/common-functions.sh"
+
+DEF_SECTOR_SIZE=512
+base_d=$(dirname $(readlink -f "${0}"))
+PATH="${PATH}:${base_d}"
+
+getsize() {
+    local fname="$1" kname="" size=""
+    if [ -b "${fname}" ]; then
+        kname=$(readlink -f "${fname}") &&
+            size=$(awk '$4 == kn { print $3 * 1024 }' \
+                         "kn=${kname##*/}" /proc/partitions) &&
+            [ -n "${size}" ] || {
+                error "failed to read size of ${fname} from /proc/partitions";
+                return 1;
+            }
+    else
+        size=$(stat --format "%s" "${fname}") || {
+            error "failed to get size of ${fname}"
+            return 1;
+        }
+    fi
+    _RET="$size"
+}
+
+Usage() {
+    cat <<EOF
+Usage: ${0##*/} [options] partition-image grub-{efi|ieee}-tarball architecture disk-image
+
+    Create disk image 'disk-image' with 'partition-image' in a partition
+    inside it. Add grub if requested.
+
+    options:
+      -G | --grub       install grub to disk image mbr
+         | --grub1      install grub1 to disk image mbr
+         | --grub-efi   install EFI grub to disk image
+         | --grub-ieee  install ieee1275 grub to disk image prep partition
+      -s | --size  S    create the disk image of size 'S'.
+                        default is large enough to fit partition-image
+      -v | --verbose    increase verbosity
+EOF
+}
+human2bytes() {
+    # converts size suitable for input to resize2fs to bytes
+    # s:512 byte sectors, K:kilobytes, M:megabytes, G:gigabytes
+    # none: block size of the image
+    local input=${1} defunit=${2:-1024}
+    local unit count;
+    case "$input" in
+        *s) count=${input%s}; unit=512;;
+        *K) count=${input%K}; unit=1024;;
+        *M) count=${input%M}; unit=$((1024*1024));;
+        *G) count=${input%G}; unit=$((1024*1024*1024));;
+        *)  count=${input}  ; unit=${2:-1024};;
+    esac
+    _RET=$((${count}*${unit}))
+}
+
+cleanup() {
+    umount "$TMP/efi"
+    umount "$TMP/rootfs"
+    kpartx -d "$dimg"
+}
+
+trap cleanup EXIT
+
+short_opts="b:c:Ghs:v"
+long_opts="grub-ieee,grub-efi,grub1,grub,help,size:,verbose"
+getopt_out=$(getopt --name "${0##*/}" \
+    --options "${short_opts}" --long "${long_opts}" -- "$@") &&
+    eval set -- "${getopt_out}" ||
+    bad_Usage
+
+ssize=${DEF_SECTOR_SIZE}
+size_in=""
+grub_ptnum=1
+grub=0
+grub1=0
+grub_efi=0
+grub_ieee=0
+while [ $# -ne 0 ]; do
+    cur=${1}; next=${2};
+    case "$cur" in
+        -G|--grub)
+            grub=1
+        ;;
+        -G|--grub1) 
+            grub1=1
+        ;;
+        --grub-efi) 
+            grub_efi=1
+            ptype="ef00" # EFI System
+        ;;
+        --grub-ieee)
+            grub_ieee=1
+            ptype="4100" # PowerPC PreP Boot
+        ;;
+        -h|--help) Usage; exit 0;;
+        -s|--size) size_in=$2; shift;;
+        -v|--verbose) DEBUG=$((${DEBUG}+1));;
+        --) shift; break;;
+    esac
+    shift;
+done
+
+[ $# -eq 4 ] || bad_Usage "must supply partition image, grub-{efi|ieee} tarball, architecture and output file"
+
+pimg=${1}
+grub_in=${2}
+arch=${3}
+dimg=${4}
+
+{ [ ${grub} -eq 0 ] || phelper=$(command -v part2disk-grubhelper); } ||
+    fail "no part2disk-grubhelper in PATH"
+[ $grub1 -eq 0 ] || command -v grub >/dev/null || fail "no 'grub' in path";
+
+[ -f "${pimg}" -o -b "${pimg}" ] || fail "${pimg}: not a file or block device"
+
+getsize "$pimg" ||
+    fail "failed to get size of $pimg"
+pimg_s="$_RET"
+
+front_pad=$((12*1024*1024))
+tot_size=$(($front_pad+$pimg_s))
+tot_size_sectors=$(($tot_size/$ssize))
+
+if [ -n "${size_in}" ]; then
+    human2bytes "${size_in}" 1 || fail "failed to convert ${size_in} to bytes"
+    size=${_RET}
+else
+    size=$tot_size_sectors
+fi
+
+if [ -e "$dimg" ]; then
+    getsize "$dimg" ||
+        fail "failed to get size of $dimg"
+    dimg_s="$_RET"
+else
+    dimg_s="$size"
+fi
+
+if [ "${dimg_s}" -lt "$size" ]; then
+    fail "size of $dimg ($dimg_s) not large enough to fit $size"
+fi
+
+debug 1 "input is ${pimg_s} bytes."
+debug 1 "target is ${tot_size} bytes."
+
+debug 2 "create target image"
+dd if=/dev/zero of="${dimg}" bs=$ssize count=$tot_size_sectors \
+    2>/dev/null ||
+    fail "failed to write to ${dimg}"
+
+debug 2 "create partitions"
+sgdisk -n 15:2048:+8M -t 15:${ptype} -N 1 $dimg
+loop_nr=`kpartx -av $dimg | head -n1 | cut -d" " -f3 | cut -d"p" -f2`
+
+debug 2 "parted $dimg print"
+parted $dimg print
+
+# copy partition image. this writes $pimg bytes even if that is
+# not divivisble by $ssize
+debug 2 "copying ${pimg} to partition in ${dimg}"
+dd if="$pimg" of=/dev/mapper/loop${loop_nr}p1 conv=notrunc \
+    2>/dev/null ||
+    fail "failed to write ${pimg} into ${dimg}"
+
+if [ ${grub} -ne 0 ]; then
+    debug 2 "invoking part2disk-grubhelper ${dimg}"
+    sudo "${phelper}" "${dimg}" ||
+        fail "part2disk-grubhelper ${dimg} failed"
+fi
+
+if [ $grub1 -ne 0 ]; then
+    debug 2 "installing grub"
+    grub --no-floppy --batch <<EOF
+device (hd0) $dimg
+root (hd0,0)
+setup (hd0)
+quit
+EOF
+fi
+
+if [ $grub_efi -ne 0 ]; then
+    case $arch in
+        x86_64)  efiarch=x64;;
+        aarch64) efiarch=aa64;;
+        i386)    efiarch=ia32;;
+        arm)     efiarch=arm;;
+        *) fail "arch $arch without EFI grub"
+    esac
+    TMP=$(mktemp -d)
+    install -d $TMP/tar $TMP/efi $TMP/rootfs
+
+    mkfs.vfat /dev/mapper/loop${loop_nr}p15
+    mount /dev/mapper/loop${loop_nr}p15 $TMP/efi
+    install -d $TMP/efi/EFI/BOOT $TMP/efi/EFI/ubuntu
+    tar -xf $grub_in -C $TMP/efi/EFI/BOOT
+
+    mount /dev/mapper/loop${loop_nr}p1 $TMP/rootfs
+    kernelfile=$(cd $TMP/rootfs/boot; ls vmlinu* | head -n1)
+    initrdfile=$(cd $TMP/rootfs/boot; ls initrd.img-* | head -n1)
+
+        
+    cat >$TMP/efi/EFI/ubuntu/grub.cfg <<EOF
+set default=0
+set timeout=1
+menuentry 'CirrOS' {
+        set root='hd0,gpt1'
+        if [ x$feature_platform_search_hint = xy ]; then
+          search --no-floppy --label --set=root --hint-bios=hd0,gpt1 --hint-efi=hd0,gpt1 --hint-baremetal=ahci1,gpt1  cirros-rootfs
+        else
+          search --no-floppy --label --set=root cirros-rootfs
+        fi
+
+    linux  /boot/${kernelfile} LABEL=cirros-rootfs ro
+    initrd /boot/${initrdfile} 
+}
+EOF
+
+    umount "$TMP/efi"
+    umount "$TMP/rootfs"
+fi
+
+set -x
+
+# grub-ieee1275 (powerpc)
+if [ $grub_ieee -ne 0 ]; then
+    TMP=$(mktemp -d)
+    install -d $TMP/rootfs $TMP/tar
+
+    mkfs.vfat /dev/mapper/loop${loop_nr}p15
+    tar -xf $grub_in -C $TMP/tar
+    dd if=$TMP/tar/grub of=/dev/mapper/loop${loop_nr}p15
+    
+    mount /dev/mapper/loop${loop_nr}p1 $TMP/rootfs
+    kernelfile=$(cd $TMP/rootfs/boot; ls vmlinu* | head -n1)
+    initrdfile=$(cd $TMP/rootfs/boot; ls initrd.img-* | head -n1)
+        
+    cat >$TMP/rootfs/boot/grub/grub.cfg <<EOF
+set default=0
+set timeout=1
+menuentry 'CirrOS' {
+        set root='ieee1275/disk,gpt1'
+
+        if [ x$feature_platform_search_hint = xy ]; then
+          search --no-floppy --label --set=root --hint-ieee1275=ieee1275/disk,gpt1 cirros-rootfs
+        else
+          search --no-floppy --label --set=root cirros-rootfs
+        fi
+
+    linux  /boot/${kernelfile} LABEL=cirros-rootfs ro
+    initrd /boot/${initrdfile} 
+}
+EOF
+
+    umount "$TMP/rootfs"
+fi
+
+
+kpartx -d "$dimg"
+error "wrote to ${dimg}"
+# vi: ts=4 noexpandtab
 
=== added directory 'doc'
=== added file 'doc/README-powerpc.txt.OTHER'
--- doc/README-powerpc.txt.OTHER	1970-01-01 00:00:00 +0000
+++ doc/README-powerpc.txt.OTHER	2016-09-20 12:52:40 +0000
@@ -0,0 +1,49 @@
+
+CirrOS PowerPC images
+=====================
+
+ * Use the build-release script w/ daily option
+   $ export ARCHES="ppc64le powerpc ppc64"; ./bin/build-release daily
+
+   This will build rootfs, grab kernels and grub, install grub w/ modules on
+   prep partition, and bundle image. The *-disk.img is a qcow2 bootable image
+   and contains a grub2 installed on a PreP Boot partition.
+
+ * Quick test
+   $ img=cirros-{YYMMDD}-ppc64le-disk.img; qemu-system-ppc64le -echr 0x05 \
+         -machine pseries-2.5,accel=kvm,usb=off -cpu host -m 512 -nographic \
+         $img
+
+ * Add the image to OpenStack
+   $ openstack image create --disk-format qcow2 --container-format bare \
+     --public --property os_command_line="console=hvc0 console=tty0" \
+     --property arch=ppc64le --property hypervisor_type=kvm \
+     --property hw_disk_bus=scsi --property hw_scsi_model=virtio-scsi \
+     --property hw_cdrom_bus=scsi cirros_qcow2 \ 
+     < cirros-{YYMMDD}-ppc64le-disk.img
+
+ NOTE: ppc64le/ppc64 images have been tested extensively on the OpenStack CI
+ using the daily builds - http://download.cirros-cloud.net/daily/ - and works
+ well with virtio drivers (network and disk).
+ 
+Currently known working on PowerKVM:
+
+$ { echo '#!/bin/sh'; echo 'echo HELLO WORLD'; } > user-data
+$ cloud-localds seed.img user-data
+
+## usb=off is required
+## -net nic and -drive get default (ibmveth and ibmvscsi) drivers
+$ qemu-system-ppc64 -machine pseries,accel=kvm,usb=off -m 1G \
+   -name foo -M pseries \
+   -device spapr-vscsi \
+   -net nic -net user \
+   -display none -nographic \
+   -drive file=disk1.img \
+   -kernel "$1" ${2:+-initrd "$2"} \
+   -append "root=/dev/sda console=hvc0"
+
+Also known working is adding 'blank.img' as a '-drive'.
+
+Historical NOTE(smoser) about virtio:
+What is not working is virtio.  I have not successfully gotten virtio network
+or virtio disk working.