[scarthgap][PATCH] docker: fix Upstream-Status format

[scarthgap][PATCH] docker: fix Upstream-Status format

[martin.jansa]

From: Martin Jansa <martin.jansa@gmail.com>

* fixes:
DEBUG: Executing python function do_qa_patch
ERROR: QA Issue: Malformed Upstream-Status in patch
TOPDIR/meta-virtualization/recipes-containers/docker/files/CVE-2024-36620.patch
Please correct according to https://docs.yoctoproject.org/contributor-guide/recipe-style-guide.html#patch-upstream-status :
Upstream-Status: [patch-status]
ERROR: QA Issue: Malformed Upstream-Status in patch
TOPDIR/meta-virtualization/recipes-containers/docker/files/CVE-2024-36621.patch
Please correct according to https://docs.yoctoproject.org/contributor-guide/recipe-style-guide.html#patch-upstream-status :
Upstream-Status: [patch-status]
ERROR: Fatal QA errors were found, failing task.

Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
---
 recipes-containers/docker/files/CVE-2024-36620.patch | 3 +--
 recipes-containers/docker/files/CVE-2024-36621.patch | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/recipes-containers/docker/files/CVE-2024-36620.patch b/recipes-containers/docker/files/CVE-2024-36620.patch
index 7bce4137..03628fb3 100644
--- a/recipes-containers/docker/files/CVE-2024-36620.patch
+++ b/recipes-containers/docker/files/CVE-2024-36620.patch
@@ -8,8 +8,7 @@ First released in v25.0.0-beta.1
 
 CVE: CVE-2024-36620
 
-Upstream-Status:
-Backport [https://github.com/moby/moby/commit/ab570ab3d62038b3d26f96a9bb585d0b6095b9b4]
+Upstream-Status: Backport [https://github.com/moby/moby/commit/ab570ab3d62038b3d26f96a9bb585d0b6095b9b4]
 
 Signed-off-by: Praveen Kumar <praveen.kumar@windriver.com>
 ---
diff --git a/recipes-containers/docker/files/CVE-2024-36621.patch b/recipes-containers/docker/files/CVE-2024-36621.patch
index a6c06ef2..6560f46a 100644
--- a/recipes-containers/docker/files/CVE-2024-36621.patch
+++ b/recipes-containers/docker/files/CVE-2024-36621.patch
@@ -12,8 +12,7 @@ release only one of these layers was actually released.
 
 CVE: CVE-2024-36621
 
-Upstream-Status:
-Backport [https://github.com/moby/moby/commit/37545cc644344dcb576cba67eb7b6f51a463d31e]
+Upstream-Status: Backport [https://github.com/moby/moby/commit/37545cc644344dcb576cba67eb7b6f51a463d31e]
 
 Signed-off-by: Praveen Kumar <praveen.kumar@windriver.com>
 ---

Re: [meta-virtualization] [scarthgap][PATCH] docker: fix Upstream-Status format

[Bruce Ashfield]

Thanks for the fixup!

This is now merged.

Bruce


In message: [meta-virtualization] [scarthgap][PATCH] docker: fix Upstream-Status format
on 02/04/2025 Martin Jansa via lists.yoctoproject.org wrote:

> From: Martin Jansa <martin.jansa@gmail.com>
> 
> * fixes:
> DEBUG: Executing python function do_qa_patch
> ERROR: QA Issue: Malformed Upstream-Status in patch
> TOPDIR/meta-virtualization/recipes-containers/docker/files/CVE-2024-36620.patch
> Please correct according to https://docs.yoctoproject.org/contributor-guide/recipe-style-guide.html#patch-upstream-status :
> Upstream-Status: [patch-status]
> ERROR: QA Issue: Malformed Upstream-Status in patch
> TOPDIR/meta-virtualization/recipes-containers/docker/files/CVE-2024-36621.patch
> Please correct according to https://docs.yoctoproject.org/contributor-guide/recipe-style-guide.html#patch-upstream-status :
> Upstream-Status: [patch-status]
> ERROR: Fatal QA errors were found, failing task.
> 
> Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
> ---
>  recipes-containers/docker/files/CVE-2024-36620.patch | 3 +--
>  recipes-containers/docker/files/CVE-2024-36621.patch | 3 +--
>  2 files changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/recipes-containers/docker/files/CVE-2024-36620.patch b/recipes-containers/docker/files/CVE-2024-36620.patch
> index 7bce4137..03628fb3 100644
> --- a/recipes-containers/docker/files/CVE-2024-36620.patch
> +++ b/recipes-containers/docker/files/CVE-2024-36620.patch
> @@ -8,8 +8,7 @@ First released in v25.0.0-beta.1
>  
>  CVE: CVE-2024-36620
>  
> -Upstream-Status:
> -Backport [https://github.com/moby/moby/commit/ab570ab3d62038b3d26f96a9bb585d0b6095b9b4]
> +Upstream-Status: Backport [https://github.com/moby/moby/commit/ab570ab3d62038b3d26f96a9bb585d0b6095b9b4]
>  
>  Signed-off-by: Praveen Kumar <praveen.kumar@windriver.com>
>  ---
> diff --git a/recipes-containers/docker/files/CVE-2024-36621.patch b/recipes-containers/docker/files/CVE-2024-36621.patch
> index a6c06ef2..6560f46a 100644
> --- a/recipes-containers/docker/files/CVE-2024-36621.patch
> +++ b/recipes-containers/docker/files/CVE-2024-36621.patch
> @@ -12,8 +12,7 @@ release only one of these layers was actually released.
>  
>  CVE: CVE-2024-36621
>  
> -Upstream-Status:
> -Backport [https://github.com/moby/moby/commit/37545cc644344dcb576cba67eb7b6f51a463d31e]
> +Upstream-Status: Backport [https://github.com/moby/moby/commit/37545cc644344dcb576cba67eb7b6f51a463d31e]
>  
>  Signed-off-by: Praveen Kumar <praveen.kumar@windriver.com>
>  ---

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#9191): https://lists.yoctoproject.org/g/meta-virtualization/message/9191
> Mute This Topic: https://lists.yoctoproject.org/mt/112046797/1050810
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [bruce.ashfield@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>