When commit bdf523e6923 made configure generate config.status, it
added a fallback to Makefile to smooth the transition, with a TODO
"code can be removed after QEMU 1.7."  It's been more than five years.
Remove it.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 Makefile | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 155f066a20..8ec833a5fb 100644
--- a/Makefile
+++ b/Makefile
@@ -69,14 +69,7 @@ CONFIG_ALL=y
 
 config-host.mak: $(SRC_PATH)/configure $(SRC_PATH)/pc-bios $(SRC_PATH)/VERSION
 	@echo $@ is out-of-date, running configure
-	@# TODO: The next lines include code which supports a smooth
-	@# transition from old configurations without config.status.
-	@# This code can be removed after QEMU 1.7.
-	@if test -x config.status; then \
-	    ./config.status; \
-        else \
-	    sed -n "/.*Configured with/s/[^:]*: //p" $@ | sh; \
-	fi
+	./config.status
 else
 config-host.mak:
 ifneq ($(filter-out $(UNCHECKED_GOALS),$(MAKECMDGOALS)),$(if $(MAKECMDGOALS),,fail))
-- 
2.17.2

On 5/23/19 4:15 AM, Markus Armbruster wrote:
> When commit bdf523e6923 made configure generate config.status, it
> added a fallback to Makefile to smooth the transition, with a TODO
> "code can be removed after QEMU 1.7."  It's been more than five years.
> Remove it.
> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  Makefile | 9 +--------
>  1 file changed, 1 insertion(+), 8 deletions(-)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>


r~

Hi Markus,

On 5/23/19 10:15 AM, Markus Armbruster wrote:
> When commit bdf523e6923 made configure generate config.status, it
> added a fallback to Makefile to smooth the transition, with a TODO
> "code can be removed after QEMU 1.7."  It's been more than five years.
> Remove it.
> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  Makefile | 9 +--------
>  1 file changed, 1 insertion(+), 8 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index 155f066a20..8ec833a5fb 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -69,14 +69,7 @@ CONFIG_ALL=y
>  
>  config-host.mak: $(SRC_PATH)/configure $(SRC_PATH)/pc-bios $(SRC_PATH)/VERSION
>  	@echo $@ is out-of-date, running configure
> -	@# TODO: The next lines include code which supports a smooth
> -	@# transition from old configurations without config.status.
> -	@# This code can be removed after QEMU 1.7.
> -	@if test -x config.status; then \
> -	    ./config.status; \
> -        else \
> -	    sed -n "/.*Configured with/s/[^:]*: //p" $@ | sh; \
> -	fi
> +	./config.status

We could prepend a '@' since we already describe what this rule does
("config-host.mak is out-of-date, running configure").

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>

>  else
>  config-host.mak:
>  ifneq ($(filter-out $(UNCHECKED_GOALS),$(MAKECMDGOALS)),$(if $(MAKECMDGOALS),,fail))
> 

Philippe Mathieu-Daudé <philmd@redhat.com> writes:

> Hi Markus,
>
> On 5/23/19 10:15 AM, Markus Armbruster wrote:
>> When commit bdf523e6923 made configure generate config.status, it
>> added a fallback to Makefile to smooth the transition, with a TODO
>> "code can be removed after QEMU 1.7."  It's been more than five years.
>> Remove it.
>> 
>> Signed-off-by: Markus Armbruster <armbru@redhat.com>
>> ---
>>  Makefile | 9 +--------
>>  1 file changed, 1 insertion(+), 8 deletions(-)
>> 
>> diff --git a/Makefile b/Makefile
>> index 155f066a20..8ec833a5fb 100644
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -69,14 +69,7 @@ CONFIG_ALL=y
>>  
>>  config-host.mak: $(SRC_PATH)/configure $(SRC_PATH)/pc-bios $(SRC_PATH)/VERSION
>>  	@echo $@ is out-of-date, running configure
>> -	@# TODO: The next lines include code which supports a smooth
>> -	@# transition from old configurations without config.status.
>> -	@# This code can be removed after QEMU 1.7.
>> -	@if test -x config.status; then \
>> -	    ./config.status; \
>> -        else \
>> -	    sed -n "/.*Configured with/s/[^:]*: //p" $@ | sh; \
>> -	fi
>> +	./config.status
>
> We could prepend a '@' since we already describe what this rule does
> ("config-host.mak is out-of-date, running configure").

You're right, my patch loses the @.

> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Thanks!

[...]