Merge lp:~snappy-dev/livecd-rootfs/core_update into lp:livecd-rootfs
Status: | Merged |
---|---|
Merged at revision: | 1089 |
Proposed branch: | lp:~snappy-dev/livecd-rootfs/core_update |
Merge into: | lp:livecd-rootfs |
Diff against target: |
65 lines (+37/-2) 1 file modified
live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary (+37/-2) |
To merge this branch: | bzr merge lp:~snappy-dev/livecd-rootfs/core_update |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michael Vogt (community) | Needs Fixing | ||
Review via email: mp+250245@code.launchpad.net |
Description of the change
This is my initial proposal.
Some thoughts that I've had:
- MLO, u-boot and uEnv.txt are missing here for the bbb, if this goes to the oem part, do we plan to "live" install those or is this a bootstrap only thing; if it becomes part of the oem part it will be on disk wasting space.
- Maybe an intermediate solution for the bbb case is to do something like the click sync hook in livecd-rootfs to copy over the MLO, u-boot and uEnv.txt to not break compatibility.
- My preference would be for u-d-f to have a mapping to flash assets on p.c.c/~
- Maybe the kernel and initrd entry need to be removed from hardware.yaml, they make little sense and can lie in ./boot/
I haven't really tested this code, have been failing gracefully trying to run this locally.
This fails unfortunately with: boot/filesystem .dir/usr/ share/doc -depth -type f ! -name copyright boot/filesystem .dir/usr/ share/doc rmdir boot/filesystem .dir/usr/ share/doc -type f -exec gzip -9 {} ; boot/filesystem .dir/usr/ share/man binary/ boot/filesystem .dir/usr/ share/groff binary/ boot/filesystem .dir/usr/ share/info binary/ boot/filesystem .dir/usr/ share/lintian binary/ boot/filesystem .dir/usr/ share/linda binary/ boot/filesystem .dir/var/ cache/man apt/lists/ * apt/lists/ * boot/filesystem .dir/var/ lib/apt/ lists/ -type f apt/*.bin apt/*.bin boot/filesystem .dir/var/ cache/apt/ pkgcache. bin binary/ boot/filesystem .dir/var/ cache/apt/ srcpkgcache. bin binary/ boot/filesystem .dir boot/filesystem .dir/usr/ local/bin boot/filesystem .dir/usr/ local/bin/ no-apt boot/filesystem .dir/usr/ local/bin/ apt boot/filesystem .dir/usr/ local/bin/ apt-cache boot/filesystem .dir/usr/ local/bin/ apt-get hooks/500- move-kernel- to-device- tar.binary failed (exit non-zero). You should check for errors. launchpad- buildd/ slavebin/ buildlivefs" , line 198, in main launchpad- buildd/ slavebin/ buildlivefs" , line 159, in build run_build_ command( ["lb", "build"], env=base_lb_env) launchpad- buildd/ slavebin/ buildlivefs" , line 108, in run_build_command chroot( ["/bin/ sh", "-c", command], echo=echo) launchpad- buildd/ slavebin/ buildlivefs" , line 89, in chroot bin/sudo" , "/usr/sbin/chroot", self.chroot_path] + args) python2. 7/subprocess. py", line 511, in check_call ror(retcode, cmd)
"""
[2015-03-25 14:19:26] lb_binary_hooks
P: Begin executing hooks...
+ echo I: Remove unneeded files from /usr/share/doc
I: Remove unneeded files from /usr/share/doc
+ find binary/
+ xargs rm -f
+ + findxargs binary/
-empty
+ find binary/
+ echo I: Remove man/info pages
I: Remove man/info pages
+ rm -rf binary/
+ echo I: Removing /var/lib/
I: Removing /var/lib/
+ find binary/
+ xargs rm -f
+ echo I: Removing /var/cache/
I: Removing /var/cache/
+ rm -f binary/
+ echo I: Creating warning to use snappy when apt-get is used
I: Creating warning to use snappy when apt-get is used
+ PREFIX=
+ mkdir -p binary/
+ cat
+ chmod 755 binary/
+ ln -s no-apt binary/
+ ln -s no-apt binary/
+ ln -s no-apt binary/
I: Moving kernel into device tarball
cp: with --parents, the destination must be a directory
Try 'cp --help' for more information.
E: config/
P: Begin unmounting filesystems...
P: Saving caches...
Reading package lists...
Building dependency tree...
Reading state information...
Traceback (most recent call last):
File "/usr/share/
builder.build()
File "/usr/share/
self.
File "/usr/share/
self.
File "/usr/share/
"/usr/
File "/usr/lib/
raise CalledProcessEr
""""