[PATCH] Do not call 'make build' twice

[Adrian Chadd]

Hi,

The reason why we are calling build twice is because the original
build stuff would not generate firmware images for some reason after
build #1.

So I'll commit this; if things start not building firmware images
after attempt #1 then we should figure out why rather than leaving
this in.


Adrian


On 22 April 2013 12:54, Eugene Krasnikov <k.eugene.e at gmail.com> wrote:
> Signed-off-by: Eugene Krasnikov <k.eugene.e at gmail.com>
> ---
>  build                                              |    4 ++--
>  .../build/k2_1_0/image/k2_ram/Makefile             |    2 +-
>  .../build/magpie_1_1/image/magpie_ram/Makefile     |    2 +-
>  3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/build b/build
> index 2ccaff6..0f3f9e1 100755
> --- a/build
> +++ b/build
> @@ -9,13 +9,13 @@ MAKE=make
>  echo "*** AR9271 ***"
>  ( cd target_firmware/magpie_fw_dev/build/k2_1_0/image/k2_ram   \
>      && source builds_fusion_vista.ram                          \
> -    && ${MAKE} clean ; ${MAKE} && ${MAKE} build && ${MAKE} build )
> +    && ${MAKE} clean ; ${MAKE} && ${MAKE} build )
>  cp target_firmware/magpie_fw_dev/build/k2_1_0/image/k2_ram/htc_9271.fw .
>
>  echo "*** AR7010 ***"
>  ( cd target_firmware/magpie_fw_dev/build/magpie_1_1/image/magpie_ram   \
>      && source merlin_fusion.ram                                        \
> -    && ${MAKE} clean ; ${MAKE} && ${MAKE} build && ${MAKE} build )
> +    && ${MAKE} clean ; ${MAKE} && ${MAKE} build )
>
>  cp target_firmware/magpie_fw_dev/build/magpie_1_1/image/magpie_ram/htc_7010.fw .
>
> diff --git a/target_firmware/magpie_fw_dev/build/k2_1_0/image/k2_ram/Makefile b/target_firmware/magpie_fw_dev/build/k2_1_0/image/k2_ram/Makefile
> index 5870104..85aef6c 100755
> --- a/target_firmware/magpie_fw_dev/build/k2_1_0/image/k2_ram/Makefile
> +++ b/target_firmware/magpie_fw_dev/build/k2_1_0/image/k2_ram/Makefile
> @@ -73,7 +73,7 @@ image:
>         $(shell cp -f htc_9271.fw htc_9271.fw.back 2> /dev/null)
>         $(BIN2HEX) $(PRJNAME).bin fwu.c 0 $(MAGPIE_IF)
>         $(MAKE) -C ../../../utility/athfw2lnx ATH_FW=$(PRJ_ROOT)/image/k2_ram/fwu.c
> -       $(shell ../../../utility/athfw2lnx/athfw2lnx > htc_9271.fw)
> +       ../../../utility/athfw2lnx/athfw2lnx> htc_9271.fw
>
>  util:
>         $(MAKE) -C ../../../utility/ clean
> diff --git a/target_firmware/magpie_fw_dev/build/magpie_1_1/image/magpie_ram/Makefile b/target_firmware/magpie_fw_dev/build/magpie_1_1/image/magpie_ram/Makefile
> index 6193b99..d6d5f3b 100755
> --- a/target_firmware/magpie_fw_dev/build/magpie_1_1/image/magpie_ram/Makefile
> +++ b/target_firmware/magpie_fw_dev/build/magpie_1_1/image/magpie_ram/Makefile
> @@ -74,7 +74,7 @@ image:
>         $(shell cp -f htc_7010.fw htc_7010.fw.back 2> /dev/null)
>         $(BIN2HEX) $(PRJNAME).bin fwu.c 0 usb
>         $(MAKE) -C ../../../utility/athfw2lnx ATH_FW=$(PRJ_ROOT)/image/magpie_ram/fwu.c
> -       $(shell ../../../utility/athfw2lnx/athfw2lnx > htc_7010.fw)
> +       ../../../utility/athfw2lnx/athfw2lnx > htc_7010.fw
>
>  util:
>         @cd ../../../utility && $(MAKE) all
> --
> 1.7.9.5
>
>
> _______________________________________________
> ath9k_htc_fw mailing list
> ath9k_htc_fw at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/ath9k_htc_fw