Merge lp:~mvo/goget-ubuntu-touch/populate-ab into lp:goget-ubuntu-touch

[Michael Vogt]

Populate both /boot/uboot/{a,b} when creating a ubuntu-core image.

Tiny branch that populates both A/B partitions so that the snappy tool can be simpler - but testing gives me /tmp/core-uboot-disk045485567/boot/a/hardware.yaml: - so maybe its not good? I will dig into this tomorrow unless you have a hint for me :)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:137
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~mvo/goget-ubuntu-touch/populate-ab/+merge/251124/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-ci/143/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-vivid-amd64-ci/56
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-vivid-armhf-ci/56
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-vivid-i386-ci/56

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

review: Needs Fixing (continuous-integration)

[lp:~mvo/goget-ubuntu-touch/populate-ab]

138. By Michael Vogt on 2015-03-04

merged trunk

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~mvo/goget-ubuntu-touch/populate-ab]

139. By Michael Vogt on 2015-03-04

add missing directory create

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Michael Vogt (mvo)]

I tested this branch this morning and wrote a daily snappy arm image on my card. The image contains both /boot/uboot/{a,b} with kernel/initrd/dtbs as expected.

I then tested this with the snappy-go branch lp:~mvo/ppy/snappy-sync-bootloader-udf that does no longer contains "SyncBootFiles()" and upgraded with a fake stating point of "1" in "system-b". This upgraded the kernel in /boot/uboot/b from the assets/ as expected. Then rebooted, set "system-a" to "1", upgraded and /boot/uboot/a got updated too. I then set system-b to "N-1" (without a kernel update) and updated. This caused no change to the kernels (as expected).

So I think once this branch lands in u-d-f we can simplify the snappy-go code.

[Sergio Schvezov (sergiusens)]

On jueves 5 de marzo de 2015 05h'24:43 ART, Michael Vogt wrote:
> I tested this branch this morning and wrote a daily snappy arm
> image on my card. The image contains both /boot/uboot/{a,b} with
> kernel/initrd/dtbs as expected.
>
> I then tested this with the snappy-go branch
> lp:~mvo/ppy/snappy-sync-bootloader-udf that does no longer
> contains "SyncBootFiles()" and upgraded with a fake stating
> point of "1" in "system-b". This upgraded the kernel in
> /boot/uboot/b from the assets/ as expected. Then rebooted, set
> "system-a" to "1", upgraded and /boot/uboot/a got updated too. I
> then set system-b to "N-1" (without a kernel update) and
> updated. This caused no change to the kernels (as expected).
>
> So I think once this branch lands in u-d-f we can simplify the
> snappy-go code.

Great, thanks for the detailed per testing! There's one thing I guess I
need and it's a bug report to link to to be able to be compliant with FF.

Thanks!

[Michael Vogt (mvo)]

On Thu, Mar 05, 2015 at 01:06:29PM -0000, Sergio Schvezov wrote:
> On jueves 5 de marzo de 2015 05h'24:43 ART, Michael Vogt wrote:
> > I tested this branch this morning and wrote a daily snappy arm
> > image on my card. The image contains both /boot/uboot/{a,b} with
> > kernel/initrd/dtbs as expected.
[..]
> > So I think once this branch lands in u-d-f we can simplify the
> > snappy-go code.
>
>
> Great, thanks for the detailed per testing! There's one thing I guess I
> need and it's a bug report to link to to be able to be compliant with FF.

I filed #1428640 - but I don't think this needs a FFe, as its not a
feature but a bugfix in my book. I mean its creating a system
with system-a (and /boot/uboot/a) and system-b populated but not
/boot/uboot/b. Unless you feel strongly differently I think its fine
to upload tihs a bugfix.

Cheers,
 Michael

[Sergio Schvezov (sergiusens)]

The bug is to have an upload with a bug number, not an FFe per se... unless I'm terribly mistaken about the policy :-)

[Sergio Schvezov (sergiusens)]

review: Approve

[Michael Vogt (mvo)]

Oh, misread FF for FFe :) Indeed, a bug is fine.

=== modified file 'diskimage/core_uboot.go'
--- diskimage/core_uboot.go	2015-01-29 14:26:27 +0000
+++ diskimage/core_uboot.go	2015-03-04 14:47:11 +0000
@@ -295,7 +295,6 @@
 	bootPath := filepath.Join(img.baseMount, string(bootDir))
 	bootAPath := filepath.Join(bootPath, "a")
 	bootBPath := filepath.Join(bootPath, "b")
-	bootDtbPath := filepath.Join(bootAPath, "dtbs")
 	bootuEnvPath := filepath.Join(bootPath, "uEnv.txt")
 	bootSnappySystemPath := filepath.Join(bootPath, "snappy-system.txt")
 
@@ -304,29 +303,37 @@
 	kernelPath := filepath.Join(img.baseMount, img.hardware.Kernel)
 	initrdPath := filepath.Join(img.baseMount, img.hardware.Initrd)
 
-	// create layout
-	if err := os.MkdirAll(bootDtbPath, 0755); err != nil {
-		return err
-	}
-
 	if err := os.MkdirAll(bootBPath, 0755); err != nil {
 		return err
 	}
 
-	if err := copyFile(hardwareYamlPath, filepath.Join(bootAPath, "hardware.yaml")); err != nil {
-		return err
-	}
-
-	if err := copyFile(kernelPath, filepath.Join(bootAPath, filepath.Base(kernelPath))); err != nil {
-		return err
-	}
-
-	if err := copyFile(initrdPath, filepath.Join(bootAPath, filepath.Base(initrdPath))); err != nil {
-		return err
-	}
-
-	if err := img.provisionDtbs(oem, bootDtbPath); err != nil {
-		return err
+	// populate both A/B
+	for _, path := range []string{bootAPath, bootBPath} {
+		if err := os.MkdirAll(path, 0755); err != nil {
+			return err
+		}
+
+		if err := copyFile(hardwareYamlPath, filepath.Join(path, "hardware.yaml")); err != nil {
+			return err
+		}
+
+		if err := copyFile(kernelPath, filepath.Join(path, filepath.Base(kernelPath))); err != nil {
+			return err
+		}
+
+		if err := copyFile(initrdPath, filepath.Join(path, filepath.Base(initrdPath))); err != nil {
+			return err
+		}
+
+		// create layout
+		bootDtbPath := filepath.Join(path, "dtbs")
+		if err := os.MkdirAll(bootDtbPath, 0755); err != nil {
+			return err
+		}
+
+		if err := img.provisionDtbs(oem, bootDtbPath); err != nil {
+			return err
+		}
 	}
 
 	if err := img.provisionUenv(bootuEnvPath); err != nil {