From: Anton Mikanovich <amikan@ilbers.de>
To: isar-users@googlegroups.com
Cc: Anton Mikanovich <amikan@ilbers.de>
Subject: [PATCH] hello-isar: Improve patches apply testcase
Date: Tue, 2 Apr 2024 13:15:27 +0300 [thread overview]
Message-ID: <20240402101527.55012-1-amikan@ilbers.de> (raw)
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
next reply other threads:[~2024-04-02 10:15 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-02 10:15 Anton Mikanovich [this message]
2024-04-02 10:20 ` Anton Mikanovich
2024-04-09 5:28 ` Uladzimir Bely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240402101527.55012-1-amikan@ilbers.de \
--to=amikan@ilbers.de \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox