Merge lp:~sergiusens/goget-ubuntu-touch/static_ited into lp:goget-ubuntu-touch

[Sergio Schvezov]

ubuntu-emulator: fixing password setup for phablet user when setting up an armhf instance

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:97
http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-ci/100/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-vivid-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-vivid-armhf-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-vivid-i386-ci/13

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/goget-ubuntu-touch-ci/100/rebuild

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

Good, works as expected.

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-11-18 16:31:22 +0000
+++ debian/control	2014-11-25 13:09:00 +0000
@@ -43,6 +43,7 @@
          ${misc:Depends},
          ${shlibs:Depends},
 Recommends: android-tools-adb,
+            qemu-user-static,
 Built-Using: ${misc:Built-Using}
 Description: Create and run emulator images of Ubuntu Touch
  Create and destroy Ubuntu Touch instances and run them with the emulator

=== modified file 'diskimage/customization.go'
--- diskimage/customization.go	2014-11-03 14:30:04 +0000
+++ diskimage/customization.go	2014-11-25 13:09:00 +0000
@@ -20,11 +20,9 @@
 // with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import (
-	"errors"
 	"fmt"
 	"io/ioutil"
 	"os"
-	"os/exec"
 	"path/filepath"
 )
 
@@ -85,14 +83,3 @@
 	writeFlag := filepath.Join(img.Mountpoint, ".adb_onlock")
 	return ioutil.WriteFile(writeFlag, []byte(""), 0644)
 }
-
-//SetPassword is an ugly hack to set the password
-func (img DiskImage) SetPassword(user, password string) error {
-	// Run something that would look like this
-	// PATH=$path chroot "$SYSTEM_MOUNTPOINT" /bin/sh -c "echo -n "$user:$password" | chpasswd"
-	chrootCmd := fmt.Sprintf("echo -n '%s:%s' | chpasswd", user, password)
-	if out, err := exec.Command("chroot", img.Mountpoint, "/bin/sh", "-c", chrootCmd).CombinedOutput(); err != nil {
-		return errors.New(string(out))
-	}
-	return nil
-}

=== modified file 'ubuntu-emulator/create.go'
--- ubuntu-emulator/create.go	2014-11-25 13:09:00 +0000
+++ ubuntu-emulator/create.go	2014-11-25 13:09:00 +0000
@@ -23,6 +23,7 @@
 	"errors"
 	"fmt"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"runtime"
 	"syscall"
@@ -50,6 +51,11 @@
 	defaultArch    = "i386"
 )
 
+const (
+	binQemuArmStatic  = "/usr/bin/qemu-arm-static"
+	pkgQemuUserStatic = "qemu-user-static"
+)
+
 func init() {
 	createCmd.Arch = defaultArch
 	createCmd.Channel = defaultChannel
@@ -67,6 +73,10 @@
 	}
 	instanceName := args[0]
 
+	if err := createCmd.verifyDependencies(); err != nil {
+		return err
+	}
+
 	var device string
 	if d, ok := devices[createCmd.Arch]; ok {
 		device = d["name"]
@@ -180,6 +190,17 @@
 	return systemImage.ExtractFile("build.prop", filepath.Join(dataDir, "system"))
 }
 
+func (createCmd *CreateCmd) verifyDependencies() error {
+	switch createCmd.Arch {
+	case "armhf":
+		if _, err := os.Stat(binQemuArmStatic); err != nil {
+			return fmt.Errorf("missing dependency %s (apt install %s)", binQemuArmStatic, pkgQemuUserStatic)
+		}
+	}
+
+	return nil
+}
+
 func (createCmd *CreateCmd) createSystem(ubuntuImage, sdcardImage *diskimage.DiskImage, files []string) (err error) {
 	for _, img := range []*diskimage.DiskImage{ubuntuImage, sdcardImage} {
 		if err := img.CreateExt4(); err != nil {
@@ -206,13 +227,15 @@
 		}
 		return err
 	}
+
 	fmt.Printf("Setting up a default password for phablet to: '%s'\n", createCmd.Password)
-	if err := ubuntuImage.SetPassword("phablet", createCmd.Password); err != nil {
+	if err := createCmd.setPassword(ubuntuImage.Mountpoint); err != nil {
 		if err := ubuntuImage.Unmount(); err != nil {
 			fmt.Println("Unmount error :", err)
 		}
 		return err
 	}
+
 	if err := ubuntuImage.Unmount(); err != nil {
 		return err
 	}
@@ -232,6 +255,25 @@
 	return nil
 }
 
+// setPassword is an ugly hack to set the password
+func (createCmd *CreateCmd) setPassword(chroot string) error {
+	if createCmd.Arch == "armhf" {
+		dst := filepath.Join(chroot, binQemuArmStatic)
+		if out, err := exec.Command("cp", binQemuArmStatic, dst).CombinedOutput(); err != nil {
+			return fmt.Errorf("issues while setting up password: %s", out)
+		}
+		defer os.Remove(dst)
+	}
+
+	// Run something that would look like this
+	// PATH=$path chroot "$SYSTEM_MOUNTPOINT" /bin/sh -c "echo -n "$user:$password" | chpasswd"
+	chrootCmd := fmt.Sprintf("echo -n '%s:%s' | chpasswd", "phablet", createCmd.Password)
+	if out, err := exec.Command("chroot", chroot, "/bin/sh", "-c", chrootCmd).CombinedOutput(); err != nil {
+		return errors.New(string(out))
+	}
+	return nil
+}
+
 func download(image ubuntuimage.Image) (files []string, err error) {
 	cacheDir := ubuntuimage.GetCacheDir()
 	totalFiles := len(image.Files)