live-build

Merge lp://staging/~mwhudson/live-build/x-build-linaro into lp://staging/~linaro-maintainers/live-build/trunk

  1. x-build-linaro
  2. Merge into trunk
Proposed by Michael Hudson-Doyle
Status: Merged
Merged at revision: 17
Proposed branch: lp://staging/~mwhudson/live-build/x-build-linaro
Merge into: lp://staging/~linaro-maintainers/live-build/trunk
Diff against target: 189 lines (+60/-36)
3 files modified
functions/architecture.sh (+43/-24)
scripts/build/bootstrap_cache (+1/-1)
scripts/build/bootstrap_debootstrap (+16/-11)
To merge this branch: bzr merge lp://staging/~mwhudson/live-build/x-build-linaro
Reviewer Review Type Date Requested Status
Linaro Maintainers Pending
Review via email: mp+42803@code.staging.launchpad.net

Description of the change

Hi,

This branch changes live-build to use qemu-debootstrap when cross building. I've talked about most of the changes to Loic and Steve at some point, I think. We'll probably use this in the linaro offspring install until some panda's turn up.

There isn't interest in this upstream at the moment (apparently "live-build 3.0" will only support multistrap, which noone seems to think is a particularly good idea, but...), so I'm not too worried about the fact that the functions in functions/architecture.sh are still a bit unclear.

Cheers,
mwh

To post a comment you must log in.
Revision history for this message
James Westby (james-w) wrote :

Hi,

The code looks fine to me, and the changes aren't intrusive, so I'm happy with this.

166 - ${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LH_DISTRIBUTION}" chroot "${LH_MIRROR_BOOTSTRAP}" "${LH_DEBOOTSTRAP_SCRIPT}"
167 + ${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LH_DISTRIBUTION}" chroot "${LH_MIRROR_BOOTSTRAP}" ${LH_DEBOOTSTRAP_SCRIPT:+"$LH_DEBOOTSTRAP_SCRIPT"}

That doesn't use $DEBOOTSTRAP, is that intentional?

Thanks,

James

Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

On Mon, 06 Dec 2010 20:42:54 -0000, James Westby <email address hidden> wrote:
> Hi,
>
> The code looks fine to me, and the changes aren't intrusive, so I'm happy with this.
>
> 166 - ${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LH_DISTRIBUTION}" chroot "${LH_MIRROR_BOOTSTRAP}" "${LH_DEBOOTSTRAP_SCRIPT}"
> 167 + ${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LH_DISTRIBUTION}" chroot "${LH_MIRROR_BOOTSTRAP}" ${LH_DEBOOTSTRAP_SCRIPT:+"$LH_DEBOOTSTRAP_SCRIPT"}
>
> That doesn't use $DEBOOTSTRAP, is that intentional?

Yes, qemu-debootstrap doesn't really support --download-only. I guess
this is a bug, but given what it does "qemu-debootstrap --download-only"
doesn't really make a whole lot of sense. I guess I should include this
as a comment in the source :-)

Cheers,
mwh

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