Merge lp:~james-w/linaro-image-tools/fix-install-latest-logic into lp:linaro-image-tools/11.11

Proposed by James Westby
Status: Merged
Merged at revision: 143
Proposed branch: lp:~james-w/linaro-image-tools/fix-install-latest-logic
Merge into: lp:linaro-image-tools/11.11
Diff against target: 12 lines (+1/-1)
1 file modified
linaro-hwpack-install (+1/-1)
To merge this branch: bzr merge lp:~james-w/linaro-image-tools/fix-install-latest-logic
Reviewer Review Type Date Requested Status
Linaro Maintainers Pending
Review via email: mp+38426@code.launchpad.net

Description of the change

Hi,

The logic of --install-latest dropped the =version from the apt-get install
command line if the option /wasn't/ given. This reverses that, which should
mean we stop getting problems when the kernel changes ABI.

Thanks,

James

To post a comment you must log in.
Revision history for this message
Tom Gall (tom-gall) wrote :

+1

Tested with alip, headless and netbook-efl images from today 10/14, 10/14 hardware pack

Works.

Without this patch, mkimage fails with two kernel being passed in. From the log (note the 1006 ANND 1007)

+ sudo mkimage -A arm -O linux -T kernel -C none -a 0x80008000 -e 0x80008000 -n Linux -d /home/tgall/bzr/projects/linaro-image-tools/rsync-speedup/binary/boot/vmlinuz-2.6.35-1006-linaro-omap /home/tgall/bzr/projects/linaro-image-tools/rsync-speedup/binary/boot/vmlinuz-2.6.35-1007-linaro-omap /home/tgall/bzr/projects/linaro-image-tools/rsync-speedup/boot-disc/uImage
Usage: mkimage -l image
          -l ==> list image header information
       mkimage [-x] -A arch -O os -T type -C comp -a addr -e ep -n name -d data_file[:data_file...] image
          -A ==> set architecture to 'arch'
          -O ==> set operating system to 'os'
          -T ==> set image type to 'type'
          -C ==> set compression type 'comp'
          -a ==> set load address to 'addr' (hex)
          -e ==> set entry point to 'ep' (hex)
          -n ==> set image name to 'name'
          -d ==> use image data from 'datafile'
          -x ==> set XIP (execute in place)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'linaro-hwpack-install'
2--- linaro-hwpack-install 2010-10-07 16:33:34 +0000
3+++ linaro-hwpack-install 2010-10-14 14:58:55 +0000
4@@ -113,7 +113,7 @@
5 sudo apt-get -o "$APT_GET_OPTIONS" update -qq
6
7 echo -n "Installing packages ..."
8-if [ "$INSTALL_LATEST" == "no" ]; then
9+if [ "$INSTALL_LATEST" == "yes" ]; then
10 packages=`sed 's/=.*//' "${HWPACK_DIR}"/manifest`
11 else
12 packages=`cat "${HWPACK_DIR}"/manifest`

Subscribers

People subscribed via source and target branches