Merge lp://staging/~manjo/ubuntu/trusty/flash-kernel/filter-useable-kernels into lp://staging/ubuntu/trusty/flash-kernel
Status: | Merged |
---|---|
Merge reported by: | Scott Moser |
Merged at revision: | not available |
Proposed branch: | lp://staging/~manjo/ubuntu/trusty/flash-kernel/filter-useable-kernels |
Merge into: | lp://staging/ubuntu/trusty/flash-kernel |
Diff against target: |
228 lines (+105/-7) 10 files modified
README (+14/-0) bootscript/bootscr.keystone2 (+5/-0) bootscript/bootscr.xgene (+4/-3) bootscript/bootscr.xgene-mustang (+1/-0) db/all.db (+7/-0) debian/changelog (+18/-0) debian/control (+1/-1) debian/dirs (+2/-0) debian/flash-kernel-installer.isinstallable (+3/-0) functions (+50/-3) |
To merge this branch: | bzr merge lp://staging/~manjo/ubuntu/trusty/flash-kernel/filter-useable-kernels |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Scott Moser | Approve | ||
Review via email: mp+231441@code.staging.launchpad.net |
Description of the change
Submitting merge proposal for smoser's patch to filter useable kernels for platform. Currently if the platform uses flavor kernels, and the cloud image has a -generic version that is newer than the flavor version, nothing gets installed and boot.scr is not generated. With this patch, the latest useable flavor kernel is discovered and written to /boot and boot.scr is generated.
=== Testing ===
+ basename /usr/sbin/
+ self=flash-kernel
+ mktemp -dt flash-kernel.
+ tmpdir=
+ kernel=
+ initrd=
+ [ -n /boot/boot.scr ]
+ boot_script_
+ boot_script=
+ mkimage_script 0x0 boot script /usr/share/
+ local saddr=0x0
+ local sdesc=boot script
+ local sdata=/
+ local script=
+ basename /usr/share/
+ local tdata=/
+ mktemp --tmpdir=
+ local ubootenv=
+ gen_ubootenv
+ ENVSTUBDIRS=
+ LC_ALL=C+ sortfind -u
/etc/flash-
+ ENVSTUBS=
+ printf Generating boot script u-boot image...
Generating boot script u-boot image... + sed -e /@@UBOOT_
s/@@UBOOT_
r /tmp/flash-
}
+ mkimage -A arm -O linux -T script -C none -a 0x0 -e 0x0 -n boot script -d /tmp/flash-
+ echo done.
done.
+ boot_script=
+ backup_and_install /tmp/flash-
+ local source=
+ local dest=//
+ [ -e //boot/boot.scr ]
+ basename //boot/boot.scr
+ echo Installing new boot.scr.
Installing new boot.scr.
+ mv /tmp/flash-
+ cleanups
+ rm -rf /tmp/flash-
+ [ -d ]
root@lazy:/# ls /boot
abi-3.13.
abi-3.13.
boot.scr System.
config-
config-
grub vmlinuz-
uploaded to trusty-proposed. /launchpad. net/ubuntu/ trusty/ +queue? queue_state= 1&queue_ text=flash- kernel
sitting in queue at
https:/