[PATCH] hello-isar: Improve patches apply testcase

[PATCH] hello-isar: Improve patches apply testcase

[Anton Mikanovich]

Move one of the patches to meta-test to cover multilayer patching.
Also add the coverage of FILESPATH autofixing for multiarch.

Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
 meta-isar/recipes-app/hello-isar/hello-isar.bb            | 2 +-
 meta-test/recipes-app/hello-isar/hello-isar.bbappend      | 8 ++++++++
 .../hello-isar/hello-isar}/yet-another-change.txt         | 0
 3 files changed, 9 insertions(+), 1 deletion(-)
 rename {meta-isar/recipes-app/hello-isar/files => meta-test/recipes-app/hello-isar/hello-isar}/yet-another-change.txt (100%)

diff --git a/meta-isar/recipes-app/hello-isar/hello-isar.bb b/meta-isar/recipes-app/hello-isar/hello-isar.bb
index 6304b6b4..57ee7346 100644
--- a/meta-isar/recipes-app/hello-isar/hello-isar.bb
+++ b/meta-isar/recipes-app/hello-isar/hello-isar.bb
@@ -17,7 +17,7 @@ DEPENDS += "libhello"
 SRC_URI = " \
     git://github.com/ilbers/hello.git;protocol=https;branch=master;destsuffix=${P} \
     file://subdir/0001-Add-some-help.patch \
-    file://yet-another-change.txt;apply=yes;striplevel=0"
+"
 SRCREV = "b48d15629667377f544e71c7310b80a71d00d9dd"
 
 inherit dpkg
diff --git a/meta-test/recipes-app/hello-isar/hello-isar.bbappend b/meta-test/recipes-app/hello-isar/hello-isar.bbappend
index d567599f..44686458 100644
--- a/meta-test/recipes-app/hello-isar/hello-isar.bbappend
+++ b/meta-test/recipes-app/hello-isar/hello-isar.bbappend
@@ -1,3 +1,11 @@
+# Checking patches apply
+# Using PN only for testing autofix, BPN should be used instead
+FILESPATH:prepend := "${FILE_DIRNAME}/${PN}:"
+
+SRC_URI += " \
+    file://yet-another-change.txt;apply=yes;striplevel=0 \
+"
+
 # Examples for SRC_URI parser testing
 SRC_URI += " \
     file://nonexist-file \
diff --git a/meta-isar/recipes-app/hello-isar/files/yet-another-change.txt b/meta-test/recipes-app/hello-isar/hello-isar/yet-another-change.txt
similarity index 100%
rename from meta-isar/recipes-app/hello-isar/files/yet-another-change.txt
rename to meta-test/recipes-app/hello-isar/hello-isar/yet-another-change.txt
-- 
2.34.1

Re: [PATCH] hello-isar: Improve patches apply testcase

[Anton Mikanovich]

02/04/2024 13:15, Anton Mikanovich wrote:
> Move one of the patches to meta-test to cover multilayer patching.
> Also add the coverage of FILESPATH autofixing for multiarch.
>
> Signed-off-by: Anton Mikanovich <amikan@ilbers.de>

This patch should be placed on top of 'multiarch: Fix PN-to-BPN 
massaging' to
become buildable.

Re: [PATCH] hello-isar: Improve patches apply testcase

[Uladzimir Bely]

On Tue, 2024-04-02 at 13:15 +0300, Anton Mikanovich wrote:
> Move one of the patches to meta-test to cover multilayer patching.
> Also add the coverage of FILESPATH autofixing for multiarch.
> 
> Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
> ---
>  meta-isar/recipes-app/hello-isar/hello-isar.bb            | 2 +-
>  meta-test/recipes-app/hello-isar/hello-isar.bbappend      | 8
> ++++++++
>  .../hello-isar/hello-isar}/yet-another-change.txt         | 0
>  3 files changed, 9 insertions(+), 1 deletion(-)
>  rename {meta-isar/recipes-app/hello-isar/files => meta-test/recipes-
> app/hello-isar/hello-isar}/yet-another-change.txt (100%)
> 
> diff --git a/meta-isar/recipes-app/hello-isar/hello-isar.bb b/meta-
> isar/recipes-app/hello-isar/hello-isar.bb
> index 6304b6b4..57ee7346 100644
> --- a/meta-isar/recipes-app/hello-isar/hello-isar.bb
> +++ b/meta-isar/recipes-app/hello-isar/hello-isar.bb
> @@ -17,7 +17,7 @@ DEPENDS += "libhello"
>  SRC_URI = " \
>     
> git://github.com/ilbers/hello.git;protocol=https;branch=master;destsu
> ffix=${P} \
>      file://subdir/0001-Add-some-help.patch \
> -    file://yet-another-change.txt;apply=yes;striplevel=0"
> +"
>  SRCREV = "b48d15629667377f544e71c7310b80a71d00d9dd"
>  
>  inherit dpkg
> diff --git a/meta-test/recipes-app/hello-isar/hello-isar.bbappend
> b/meta-test/recipes-app/hello-isar/hello-isar.bbappend
> index d567599f..44686458 100644
> --- a/meta-test/recipes-app/hello-isar/hello-isar.bbappend
> +++ b/meta-test/recipes-app/hello-isar/hello-isar.bbappend
> @@ -1,3 +1,11 @@
> +# Checking patches apply
> +# Using PN only for testing autofix, BPN should be used instead
> +FILESPATH:prepend := "${FILE_DIRNAME}/${PN}:"
> +
> +SRC_URI += " \
> +    file://yet-another-change.txt;apply=yes;striplevel=0 \
> +"
> +
>  # Examples for SRC_URI parser testing
>  SRC_URI += " \
>      file://nonexist-file \
> diff --git a/meta-isar/recipes-app/hello-isar/files/yet-another-
> change.txt b/meta-test/recipes-app/hello-isar/hello-isar/yet-another-
> change.txt
> similarity index 100%
> rename from meta-isar/recipes-app/hello-isar/files/yet-another-
> change.txt
> rename to meta-test/recipes-app/hello-isar/hello-isar/yet-another-
> change.txt
> -- 
> 2.34.1
> 

-- 
Applied to next, thanks.