Merge lp://qastaging/~vorlon/linaro-image-tools/uboot-refactoring into lp://qastaging/linaro-image-tools/11.11

On Thu, 16 Sep 2010 00:19:50 -0000, Steve Langasek <email address hidden> wrote:
> +
> + if [ -n "$UBOOT_FILE" ] && [ -e "binary/$UBOOT_FILE" ]; then
> + sudo cp -v binary/${UBOOT_FILE} ${DIR}/disk/u-boot.bin
> + fi
> +

Is there a use case for $UBOOT_FILE existing, but not wanted to be copied?

Otherwise this looks ok to me.

Thanks,

James

On Thu, Sep 16, 2010 at 12:49:08AM -0000, James Westby wrote:
> On Thu, 16 Sep 2010 00:19:50 -0000, Steve Langasek <email address hidden> wrote:
> > +
> > + if [ -n "$UBOOT_FILE" ] && [ -e "binary/$UBOOT_FILE" ]; then
> > + sudo cp -v binary/${UBOOT_FILE} ${DIR}/disk/u-boot.bin
> > + fi
> > +

> Is there a use case for $UBOOT_FILE existing, but not wanted to be copied?

I don't think so; if you don't want u-boot.bin copied in on that subarch,
don't define it for that subarch?

--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
Ubuntu Developer http://www.debian.org/
<email address hidden> <email address hidden>

On Thu, 16 Sep 2010 04:58:43 -0000, Steve Langasek <email address hidden> wrote:
> On Thu, Sep 16, 2010 at 12:49:08AM -0000, James Westby wrote:
> > On Thu, 16 Sep 2010 00:19:50 -0000, Steve Langasek <email address hidden> wrote:
> > > +
> > > + if [ -n "$UBOOT_FILE" ] && [ -e "binary/$UBOOT_FILE" ]; then
> > > + sudo cp -v binary/${UBOOT_FILE} ${DIR}/disk/u-boot.bin
> > > + fi
> > > +
>
> > Is there a use case for $UBOOT_FILE existing, but not wanted to be copied?
>
> I don't think so; if you don't want u-boot.bin copied in on that subarch,
> don't define it for that subarch?

Sounds sensible to me.

The current way just means that we may create images without u-boot if
the file isn't found for some reason. I would expect it to fail instead.

Thanks,

James