Merge lp:~snappy-dev/goget-ubuntu-touch/all-snaps into lp:goget-ubuntu-touch
| Status: | Needs review |
|---|---|
| Proposed branch: | lp:~snappy-dev/goget-ubuntu-touch/all-snaps |
| Merge into: | lp:goget-ubuntu-touch |
| Diff against target: |
1882 lines (+1243/-150) (has conflicts) 14 files modified
debian/changelog (+15/-0) debian/control (+14/-0) dependencies.tsv (+6/-1) diskimage/bootloader.go (+21/-12) diskimage/common.go (+99/-69) diskimage/common_test.go (+14/-14) diskimage/core_grub.go (+31/-27) diskimage/core_uboot.go (+32/-16) diskimage/partition.go (+1/-0) ubuntu-device-flash/common.go (+3/-3) ubuntu-device-flash/core.go (+12/-5) ubuntu-device-flash/helpers.go (+89/-0) ubuntu-device-flash/helpers_test.go (+135/-0) ubuntu-device-flash/snappy.go (+771/-3) Text conflict in debian/changelog Text conflict in debian/control Text conflict in dependencies.tsv Text conflict in diskimage/bootloader.go Text conflict in diskimage/common.go Text conflict in diskimage/core_grub.go Text conflict in diskimage/core_uboot.go Text conflict in ubuntu-device-flash/core.go Text conflict in ubuntu-device-flash/snappy.go |
| To merge this branch: | bzr merge lp:~snappy-dev/goget-ubuntu-touch/all-snaps |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Sergio Schvezov | 2015-10-22 | Approve on 2016-03-30 | |
|
Review via email:
|
|||
Commit Message
Add support to build all-snaps images.
Description of the Change
Add support to build all-snaps images.
| Michael Vogt (mvo) wrote : | # |
| Sergio Schvezov (sergiusens) wrote : | # |
On Oct 22, 2015 4:28 AM, "Michael Vogt" <email address hidden> wrote:
>
> Just added some comments so that we don't forget them :)
>
> Diff comments:
>
> > === modified file 'diskimage/
> > --- diskimage/common.go 2015-09-09 14:36:46 +0000
> > +++ diskimage/common.go 2015-10-22 07:16:55 +0000
> > @@ -190,16 +190,19 @@
> >
> > // BaseImage implements the basic primitives to manage images.
> > type BaseImage struct {
> > - baseMount string
> > - hardware HardwareDescription
> > - location string
> > - oem OemDescription
> > - parts []partition
> > - partCount int
> > - size int64
> > - rootSize int
> > + baseMount string
> > + bindMounts []string
> > + hardware HardwareDescription
> > + location string
> > + oem OemDescription
> > + parts []partition
> > + partCount int
> > + size int64
> > + rootSize int
> > }
> >
> > +var bindMounts = []string{"dev", "sys", "proc", filepath.
"firmware")}
>
> It looks like we are doing this twice (once here, once in snappy).
You will see a bunch of these little things which could go away when
migrating the provisioner into snappy itself.
>
> > +
> > // Mount mounts the image. This also maps the loop device.
> > func (img *BaseImage) Mount() error {
> > if err := img.doMap(); err != nil {
> >
> > === modified file 'ubuntu-
> > --- ubuntu-
> > +++ ubuntu-
> > @@ -339,7 +343,21 @@
> > return hw, err
> > }
> >
> > -func (s *Snapper) setup(filePathChan <-chan string, fileCount int)
error {
> > +func (s *Snapper) bindMount(d string) (string, error) {
>
> I gues the name could be better, something like bindMountInWritable or so
>
> > + src := filepath.
> > + dst := filepath.
> > +
> > + if err := os.MkdirAll(src, 0755); err != nil {
> > + return "", err
> > + }
> > + cmd := exec.Command(
> > + if o, err := cmd.CombinedOut
> > + return "", fmt.Errorf("os snap mount failed with: %s %v
", err, string(o))
> > + }
> > + return dst, nil
> > +}
> > +
> > +func (s *Snapper) setup(systemIma
> > printOut(
> > if err := s.img.Mount(); err != nil {
> > return err
> > @@ -362,14 +379,82 @@
> >
> > systemPath := s.img.System()
> >
> > + // setup a fake system
> > + if s.oem.Partition
> > + if err := os.MkdirAll(
> > + return err
> > + }
> > + // mount os snap
> > + cmd := exec.Command(
> > + if o, err := cmd.CombinedOut
> > + return fmt.Errorf("os snap mount failed with: %s
%v ", err, string(o))
> > + }
> > + defer exec.Command(
> > +
> > + //...
| Sergio Schvezov (sergiusens) wrote : | # |
Thanks for this, it removes a bunch of legacy. I added a couple of inline comments, nothing major.
MPs like this https:/
| Michael Vogt (mvo) wrote : | # |
This is updated and all comments are addressed now.
| Snappy Tarmac (snappydevtarmac) wrote : | # |
The attempt to merge lp:~snappy-dev/goget-ubuntu-touch/all-snaps into lp:goget-ubuntu-touch failed. Below is the output from the failed tests.
Checking formatting
Installing godeps
Install golint
Obtaining dependencies
update launchpad.
launchpad.
update github.
github.
update github.
github.
update github.
github.
update github.
github.
update github.
github.
update github.
github.
update gopkg.in/yaml.v2 failed; trying to fetch newer version
gopkg.in/yaml.v2 now at 7ad95dd0798a40d
Building
# we always run in a fresh dir in tarmac
export GOPATH=$(mktemp -d)
trap 'rm -rf "$GOPATH"' EXIT
# this is a hack, but not sure tarmac is golang friendly
mkdir -p $GOPATH/
cp -a . $GOPATH/
cd $GOPATH/
./run-checks
launchpad.
launchpad.
launchpad.
launchpad.
launchpad.
github.
github.
launchpad.
github.
github.
launchpad.
github.
github.
github.
github.
github.
github.
github.
gopkg.in/yaml.v2
github.
github.
github.
github.
github.
github.
github.
launchpad.
github.
github.
github.
github.
github.
github.
launchpad.
# launchpad.
ubuntu-
ubuntu-
- 264. By Sergio Schvezov on 2016-04-01
-
Update to latest snappy code
- 265. By Michael Vogt on 2016-04-06
-
ppa uploads
- 266. By Michael Vogt on 2016-04-09
-
fix bind mounts
- 267. By Michael Vogt on 2016-04-15
-
update to the latest api
- 268. By Michael Vogt on 2016-04-18
-
manually enable all snaps on the system
- 269. By Michael Vogt on 2016-04-19
-
remove debug code
- 270. By Michael Vogt on 2016-04-19
-
update for latest snappy
- 271. By Michael Vogt on 2016-04-26
-
add check for having systemctl
- 272. By Michael Vogt on 2016-04-27
-
set snappy_
{,good} _{kernel, os} to fix LP:#1534137 - 273. By Michael Vogt on 2016-05-02
-
fix squashfs format issue
- 274. By Michael Vogt on 2016-05-04
-
use gadget snap whitelist in preparation for the rework of the gadget yaml
- 275. By Michael Vogt on 2016-05-04
-
merged lp:~pedronis/goget-ubuntu-touch/use-read-info-from-snapfile
- 276. By Michael Vogt on 2016-05-10
-
fix for latest api change
Unmerged revisions
- 276. By Michael Vogt on 2016-05-10
-
fix for latest api change
- 275. By Michael Vogt on 2016-05-04
-
merged lp:~pedronis/goget-ubuntu-touch/use-read-info-from-snapfile
- 274. By Michael Vogt on 2016-05-04
-
use gadget snap whitelist in preparation for the rework of the gadget yaml
- 273. By Michael Vogt on 2016-05-02
-
fix squashfs format issue
- 272. By Michael Vogt on 2016-04-27
-
set snappy_
{,good} _{kernel, os} to fix LP:#1534137 - 271. By Michael Vogt on 2016-04-26
-
add check for having systemctl
- 270. By Michael Vogt on 2016-04-19
-
update for latest snappy
- 269. By Michael Vogt on 2016-04-19
-
remove debug code
- 268. By Michael Vogt on 2016-04-18
-
manually enable all snaps on the system
- 267. By Michael Vogt on 2016-04-15
-
update to the latest api
Just added some comments so that we don't forget them :)