We missed removing this dependency when we flattened the build.

Fixes 9e19fd7d4a (tests/docker: update debian-amd64 with lcitool)
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 tests/docker/Makefile.include | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 5c9398bbc9..c3375f89c5 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -73,7 +73,6 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker
 # we don't run tests on intermediate images (used as base by another image)
 DOCKER_PARTIAL_IMAGES := debian10 debian11
 ifeq ($(HOST_ARCH),x86_64)
-docker-image-debian-amd64: docker-image-debian10
 DOCKER_PARTIAL_IMAGES += debian-amd64-cross
 else
 docker-image-debian-amd64-cross: docker-image-debian10
-- 
2.30.2

On 26/08/2022 19.21, Alex Bennée wrote:
> We missed removing this dependency when we flattened the build.
> 
> Fixes 9e19fd7d4a (tests/docker: update debian-amd64 with lcitool)
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>   tests/docker/Makefile.include | 1 -
>   1 file changed, 1 deletion(-)
> 
> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
> index 5c9398bbc9..c3375f89c5 100644
> --- a/tests/docker/Makefile.include
> +++ b/tests/docker/Makefile.include
> @@ -73,7 +73,6 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker
>   # we don't run tests on intermediate images (used as base by another image)
>   DOCKER_PARTIAL_IMAGES := debian10 debian11
>   ifeq ($(HOST_ARCH),x86_64)
> -docker-image-debian-amd64: docker-image-debian10
>   DOCKER_PARTIAL_IMAGES += debian-amd64-cross
>   else
>   docker-image-debian-amd64-cross: docker-image-debian10

What about the "DOCKER_PARTIAL_IMAGES += debian-amd64" that comes later in 
this file? Do we still need that line?

  Thomas

Thomas Huth <thuth@redhat.com> writes:

> On 26/08/2022 19.21, Alex Bennée wrote:
>> We missed removing this dependency when we flattened the build.
>> Fixes 9e19fd7d4a (tests/docker: update debian-amd64 with lcitool)
>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>> ---
>>   tests/docker/Makefile.include | 1 -
>>   1 file changed, 1 deletion(-)
>> diff --git a/tests/docker/Makefile.include
>> b/tests/docker/Makefile.include
>> index 5c9398bbc9..c3375f89c5 100644
>> --- a/tests/docker/Makefile.include
>> +++ b/tests/docker/Makefile.include
>> @@ -73,7 +73,6 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker
>>   # we don't run tests on intermediate images (used as base by another image)
>>   DOCKER_PARTIAL_IMAGES := debian10 debian11
>>   ifeq ($(HOST_ARCH),x86_64)
>> -docker-image-debian-amd64: docker-image-debian10
>>   DOCKER_PARTIAL_IMAGES += debian-amd64-cross
>>   else
>>   docker-image-debian-amd64-cross: docker-image-debian10
>
> What about the "DOCKER_PARTIAL_IMAGES += debian-amd64" that comes
> later in this file? Do we still need that line?

Yes because this stops us using the image on non-x86 hosts. It's poorly
named but I don't want to further complicate the Makefile while trying
to simplify it ;-)

>
>  Thomas


-- 
Alex Bennée

On 26/08/2022 23.47, Alex Bennée wrote:
> 
> Thomas Huth <thuth@redhat.com> writes:
> 
>> On 26/08/2022 19.21, Alex Bennée wrote:
>>> We missed removing this dependency when we flattened the build.
>>> Fixes 9e19fd7d4a (tests/docker: update debian-amd64 with lcitool)
>>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>>> ---
>>>    tests/docker/Makefile.include | 1 -
>>>    1 file changed, 1 deletion(-)
>>> diff --git a/tests/docker/Makefile.include
>>> b/tests/docker/Makefile.include
>>> index 5c9398bbc9..c3375f89c5 100644
>>> --- a/tests/docker/Makefile.include
>>> +++ b/tests/docker/Makefile.include
>>> @@ -73,7 +73,6 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker
>>>    # we don't run tests on intermediate images (used as base by another image)
>>>    DOCKER_PARTIAL_IMAGES := debian10 debian11
>>>    ifeq ($(HOST_ARCH),x86_64)
>>> -docker-image-debian-amd64: docker-image-debian10
>>>    DOCKER_PARTIAL_IMAGES += debian-amd64-cross
>>>    else
>>>    docker-image-debian-amd64-cross: docker-image-debian10
>>
>> What about the "DOCKER_PARTIAL_IMAGES += debian-amd64" that comes
>> later in this file? Do we still need that line?
> 
> Yes because this stops us using the image on non-x86 hosts. It's poorly
> named but I don't want to further complicate the Makefile while trying
> to simplify it ;-)

All right, thanks for the explanation! In that case the patch seems fine to me:

Reviewed-by: Thomas Huth <thuth@redhat.com>