Re: [PATCH] fix rebuild of wakeup.bin

[Rafael J. Wysocki]

On Thursday, 1 of May 2008, Sam Ravnborg wrote:
> In kernel/acpi/realmode/Makefile use the 'always'
> variable to say that wakeup.bin should always
> be made.
> 
> In acpi/Makefile we then do not need to specify the
> requested target and we avoid the message from make:
> 
>    `arch/x86/kernel/acpi/realmode/wakeup.bin' is up to date.
> 
> Add wakeup.lds to list af targets to avoid rebuilding
> wakeup.bin - from Roland McGrath.

Thanks for fixing this!

Ingo, please merge.

> Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
> Cc: Rafael J. Wysocki <rjw@xxxxxxx>
> Cc: Pavel Machek <pavel@xxxxxxx>
> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> 
> Cc: H. Peter Anvin <hpa@xxxxxxxxx>
> Cc: Ingo Molnar <mingo@xxxxxxx>
> Cc: Roland McGrath <roland@xxxxxxxxxx>
> ---
> diff --git a/arch/x86/kernel/acpi/Makefile b/arch/x86/kernel/acpi/Makefile
> index 7335959..fd5ca97 100644
> --- a/arch/x86/kernel/acpi/Makefile
> +++ b/arch/x86/kernel/acpi/Makefile
> @@ -10,5 +10,5 @@ endif
>  $(obj)/wakeup_rm.o:    $(obj)/realmode/wakeup.bin
>  
>  $(obj)/realmode/wakeup.bin: FORCE
> -	$(Q)$(MAKE) $(build)=$(obj)/realmode $@
> +	$(Q)$(MAKE) $(build)=$(obj)/realmode
>  
> diff --git a/arch/x86/kernel/acpi/realmode/Makefile b/arch/x86/kernel/acpi/realmode/Makefile
> index 0929008..1c31cc0 100644
> --- a/arch/x86/kernel/acpi/realmode/Makefile
> +++ b/arch/x86/kernel/acpi/realmode/Makefile
> @@ -6,7 +6,8 @@
>  # for more details.
>  #
>  
> -targets		:= wakeup.bin wakeup.elf
> +always		:= wakeup.bin
> +targets		:= wakeup.elf wakeup.lds
>  
>  wakeup-y	+= wakeup.o wakemain.o video-mode.o copy.o
>  
> @@ -48,7 +49,7 @@ LDFLAGS_wakeup.elf	:= -T
>  
>  CPPFLAGS_wakeup.lds += -P -C
>  
> -$(obj)/wakeup.elf: $(src)/wakeup.lds $(WAKEUP_OBJS) FORCE
> +$(obj)/wakeup.elf: $(obj)/wakeup.lds $(WAKEUP_OBJS) FORCE
>  	$(call if_changed,ld)
>  
>  OBJCOPYFLAGS_wakeup.bin	:= -O binary

Thanks,
Rafael
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/