Merge lp:~ogra/goget-ubuntu-touch/dragonboard into lp:goget-ubuntu-touch

[Oliver Grawert]

- adds general amd64 channel support
- adds support for "raw-partitions" to boot-assets of the oem snap so you can have android style "non-filesystem" boot partitions (see http://paste.ubuntu.com/13933298/ for the dragonboard package.yaml)
- set the default partition table for arm64 u-boot to GPT

- adds general amd64 channel support
- adds support for "raw-partitions" to boot-assets of the oem snap so you can have android style "non-filesystem" boot partitions (see http://paste.ubuntu.com/13933298/ for the dragonboard package.yaml)
- set the default partition table for arm64 u-boot to GPT

[Oliver Grawert (ogra)]

a binary ubuntu-device-flash_0.33-0ubuntu1_amd64.deb can be found at:
http://people.canonical.com/~ogra/snappy/ubuntu-device-flash_0.33-0ubuntu1_amd64.deb

an oem snap (with still a few issues regarding uboot.env) is at:
http://people.canonical.com/~ogra/snappy/dragonboard_0.1_all.snap

and there is a device tarball (sadly missing apparmor, since it is a linaro kernel, so snappy install wont work):
http://people.canonical.com/~ogra/snappy/device-dragonboard-0.1.tar.xz

to build an image do:
sudo ubuntu-device-flash -v core rolling --channel=edge --developer-mode --oem=dragonboard_0.1_all.snap --device-part=device-dragonboard-0.1.tar.xz -o dragonboard-sd.img

[lp:~ogra/goget-ubuntu-touch/dragonboard]

222. By Oliver Grawert on 2015-12-12

slightly clean up error reporting

[Michael Vogt (mvo)]

Thanks for this branch! This looks fine. I did some minor tweaks (really minor) at lp:~mvo/goget-ubuntu-touch/dragonboard that we should also merge.

review: Approve

=== modified file 'diskimage/bootloader.go'
--- diskimage/bootloader.go	2015-10-26 18:30:45 +0000
+++ diskimage/bootloader.go	2015-12-12 01:20:39 +0000
@@ -22,8 +22,10 @@
 import (
 	"io"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"strconv"
+	"fmt"
 
 	"launchpad.net/goget-ubuntu-touch/sysutils"
 )
@@ -83,6 +85,46 @@
 	return nil
 }
 
+func setupBootAssetRawPartitions(imagePath string, partCount int, rawPartitions []BootAssetRawPartitions) error {
+	printOut("Setting up raw boot asset partitions for", imagePath, "...")
+	var part int = partCount
+
+	for _, asset := range rawPartitions{
+		part += 1
+
+		size, err := strconv.Atoi(asset.Size)
+		if err != nil {
+			return err
+		}
+		size = size * 2
+
+		printOut("creating partition:", asset.Name)
+
+		opts := fmt.Sprintf("0:0:+%d", size)
+		if err := exec.Command("sgdisk", "-a", "1", "-n", opts, imagePath).Run(); err != nil {
+			return err
+		}
+
+		opts = fmt.Sprintf("%d:%s", part, asset.Name)
+		if err := exec.Command("sgdisk", "-c", opts, imagePath).Run(); err != nil {
+			return err
+		}
+
+		opts = fmt.Sprintf("%d:%s", part, asset.Type)
+		if err := exec.Command("sgdisk", "-t", opts, imagePath).Run(); err != nil {
+			return err
+		}
+
+	}
+
+	printOut("sorting partitions")
+	if err := exec.Command("sgdisk", "-s", imagePath).Run(); err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func offsetBytes(offset string) (int64, error) {
 	// TODO add support for units
 	return strconv.ParseInt(offset, 10, 64)

=== modified file 'diskimage/common.go'
--- diskimage/common.go	2015-10-26 18:30:45 +0000
+++ diskimage/common.go	2015-12-12 01:20:39 +0000
@@ -87,6 +87,12 @@
 	Offset string `yaml:"offset"`
 }
 
+type BootAssetRawPartitions struct {
+	Name   string `yaml:"name"`
+	Size   string `yaml:"size"`
+	Type   string `yaml:"type"`
+}
+
 type BootAssetFiles struct {
 	Path string `yaml:"path"`
 	// Target is the deprecated target relative to $bootloader dir
@@ -98,6 +104,7 @@
 type BootAssets struct {
 	Files    []BootAssetFiles    `yaml:"files,omitempty"`
 	RawFiles []BootAssetRawFiles `yaml:"raw-files,omitempty"`
+	RawPartitions []BootAssetRawPartitions `yaml:"raw-partitions,omitempty"`
 }
 
 type OemDescription struct {
@@ -201,6 +208,7 @@
 	partCount int
 	size      int64
 	rootSize  int
+        label   string
 }
 
 // Mount mounts the image. This also maps the loop device.
@@ -501,6 +509,11 @@
 	}
 
 	if bootAssets := img.oem.OEM.Hardware.BootAssets; bootAssets != nil {
+		if bootAssets.RawPartitions != nil {
+			if err := setupBootAssetRawPartitions(img.location, img.partCount, bootAssets.RawPartitions); err != nil {
+				return err
+			}
+		}
 		return setupBootAssetRawFiles(img.location, oemRoot, bootAssets.RawFiles)
 	}
 

=== modified file 'diskimage/core_grub.go'
--- diskimage/core_grub.go	2015-09-25 10:12:33 +0000
+++ diskimage/core_grub.go	2015-12-12 01:20:39 +0000
@@ -37,7 +37,7 @@
 	legacyGrub bool
 }
 
-func NewCoreGrubImage(location string, size int64, rootSize int, hw HardwareDescription, oem OemDescription, updateGrub bool) *CoreGrubImage {
+func NewCoreGrubImage(location string, size int64, rootSize int, hw HardwareDescription, oem OemDescription, updateGrub bool, label string) *CoreGrubImage {
 	return &CoreGrubImage{
 		BaseImage: BaseImage{
 			location:  location,
@@ -46,6 +46,7 @@
 			hardware:  hw,
 			oem:       oem,
 			partCount: 5,
+			label: label,
 		},
 		legacyGrub: updateGrub,
 	}

=== modified file 'diskimage/core_uboot.go'
--- diskimage/core_uboot.go	2015-09-25 10:12:19 +0000
+++ diskimage/core_uboot.go	2015-12-12 01:20:39 +0000
@@ -66,7 +66,7 @@
 	Bootloader []string `yaml:"bootloader"`
 }
 
-func NewCoreUBootImage(location string, size int64, rootSize int, hw HardwareDescription, oem OemDescription) *CoreUBootImage {
+func NewCoreUBootImage(location string, size int64, rootSize int, hw HardwareDescription, oem OemDescription, label string) *CoreUBootImage {
 	return &CoreUBootImage{
 		BaseImage{
 			hardware:  hw,
@@ -75,6 +75,7 @@
 			size:      size,
 			rootSize:  rootSize,
 			partCount: 4,
+			label: label,
 		},
 	}
 }
@@ -84,8 +85,12 @@
 	if err := sysutils.CreateEmptyFile(img.location, img.size, sysutils.GB); err != nil {
 		return err
 	}
+	table := mkLabelMsdos
 
-	parted, err := newParted(mkLabelMsdos)
+	if img.label == "gpt" {
+		table = mkLabelGpt
+	}
+	parted, err := newParted(table)
 	if err != nil {
 		return err
 	}

=== modified file 'ubuntu-device-flash/channel_maps.go'
--- ubuntu-device-flash/channel_maps.go	2015-04-19 02:53:21 +0000
+++ ubuntu-device-flash/channel_maps.go	2015-12-12 01:20:39 +0000
@@ -28,12 +28,14 @@
 
 const (
 	archArmhf = "armhf"
+	archArm64 = "arm64"
 	archAmd64 = "amd64"
 	archi386  = "i386"
 )
 
 const (
 	deviceArmhf = "generic_armhf"
+	deviceArm64 = "generic_arm64"
 	deviceAmd64 = "generic_amd64"
 	devicei386  = "generic_i386"
 )
@@ -42,6 +44,8 @@
 	switch arch {
 	case archArmhf:
 		return deviceArmhf
+	case archArm64:
+		return deviceArm64
 	case archAmd64:
 		return deviceAmd64
 	case archi386:

=== modified file 'ubuntu-device-flash/snappy.go'
--- ubuntu-device-flash/snappy.go	2015-11-12 16:48:10 +0000
+++ ubuntu-device-flash/snappy.go	2015-12-12 01:20:39 +0000
@@ -523,9 +523,13 @@
 			printOut("Using legacy setup")
 		}
 
-		s.img = diskimage.NewCoreGrubImage(s.Output, s.size, s.flavor.rootSize(), s.hardware, s.oem, legacy)
+		s.img = diskimage.NewCoreGrubImage(s.Output, s.size, s.flavor.rootSize(), s.hardware, s.oem, legacy, "gpt")
 	case "u-boot":
-		s.img = diskimage.NewCoreUBootImage(s.Output, s.size, s.flavor.rootSize(), s.hardware, s.oem)
+		label := "msdos"
+		if s.oem.Architecture() == archArm64 {
+			label = "gpt"
+                }
+		s.img = diskimage.NewCoreUBootImage(s.Output, s.size, s.flavor.rootSize(), s.hardware, s.oem, label)
 	default:
 		return errors.New("no hardware description in OEM snap")
 	}