Merge lp://staging/~manjo/ubuntu/trusty/flash-kernel/filter-useable-kernels into lp://staging/ubuntu/trusty/flash-kernel

Proposed by Manoj Iyer
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
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/flash-kernel
+ self=flash-kernel
+ mktemp -dt flash-kernel.XXXXXXXX
+ tmpdir=/tmp/flash-kernel.YDX2TwaC
+ kernel=/boot/vmlinuz-3.13.0-9-keystone
+ initrd=/boot/initrd.img-3.13.0-9-keystone
+ [ -n /boot/boot.scr ]
+ boot_script_path=//boot/boot.scr
+ boot_script=/usr/share/flash-kernel/bootscript/bootscr.keystone2
+ mkimage_script 0x0 boot script /usr/share/flash-kernel/bootscript/bootscr.keystone2 /tmp/flash-kernel.YDX2TwaC/boot.scr
+ local saddr=0x0
+ local sdesc=boot script
+ local sdata=/usr/share/flash-kernel/bootscript/bootscr.keystone2
+ local script=/tmp/flash-kernel.YDX2TwaC/boot.scr
+ basename /usr/share/flash-kernel/bootscript/bootscr.keystone2
+ local tdata=/tmp/flash-kernel.YDX2TwaC/bootscr.keystone2
+ mktemp --tmpdir=/tmp/flash-kernel.YDX2TwaC
+ local ubootenv=/tmp/flash-kernel.YDX2TwaC/tmp.roGZAJGKP2
+ gen_ubootenv
+ ENVSTUBDIRS=/etc/flash-kernel/ubootenv.d /usr/share/flash-kernel/ubootenv.d
+ LC_ALL=C+ sortfind -u
 /etc/flash-kernel/ubootenv.d /usr/share/flash-kernel/ubootenv.d -type f -regex .*/[0-9a-zA-Z_-]+ -printf %f\n
+ ENVSTUBS=
+ printf Generating boot script u-boot image...
Generating boot script u-boot image... + sed -e /@@UBOOT_ENV_EXTRA@@/{
  s/@@UBOOT_ENV_EXTRA@@//g
  r /tmp/flash-kernel.YDX2TwaC/tmp.roGZAJGKP2
  }
+ mkimage -A arm -O linux -T script -C none -a 0x0 -e 0x0 -n boot script -d /tmp/flash-kernel.YDX2TwaC/bootscr.keystone2 /tmp/flash-kernel.YDX2TwaC/boot.scr
+ echo done.
done.
+ boot_script=/tmp/flash-kernel.YDX2TwaC/boot.scr
+ backup_and_install /tmp/flash-kernel.YDX2TwaC/boot.scr //boot/boot.scr
+ local source=/tmp/flash-kernel.YDX2TwaC/boot.scr
+ local dest=//boot/boot.scr
+ [ -e //boot/boot.scr ]
+ basename //boot/boot.scr
+ echo Installing new boot.scr.
Installing new boot.scr.
+ mv /tmp/flash-kernel.YDX2TwaC/boot.scr //boot/boot.scr
+ cleanups
+ rm -rf /tmp/flash-kernel.YDX2TwaC
+ [ -d ]

root@lazy:/# ls /boot
abi-3.13.0-34-generic-lpae initrd.img-3.13.0-34-generic-lpae
abi-3.13.0-9-keystone initrd.img-3.13.0-9-keystone
boot.scr System.map-3.13.0-34-generic-lpae
config-3.13.0-34-generic-lpae System.map-3.13.0-9-keystone
config-3.13.0-9-keystone vmlinuz-3.13.0-34-generic-lpae
grub vmlinuz-3.13.0-9-keystone

To post a comment you must log in.
Revision history for this message
Scott Moser (smoser) wrote :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: