The complexity of overriding files from the bbclass made the behavior at
times hard to follow. This change replaces the default file with a
heredoc equivalent that creates a default file if the user does not provide
their
own version of run-ptest.
Signed-off-by: Derek Straka <de...@asterius.io>
---
meta/classes-recipe/ptest-python-pytest.bbclass | 12 +++++-------
meta/files/ptest-python-pytest/run-ptest | 3 ---
2 files changed, 5 insertions(+), 10 deletions(-)
delete mode 100755 meta/files/ptest-python-pytest/run-ptest
diff --git a/meta/classes-recipe/ptest-python-pytest.bbclass
b/meta/classes-recipe/ptest-python-pytest.bbclass
index 801079e6ab..7ed84584b7 100644
--- a/meta/classes-recipe/ptest-python-pytest.bbclass
+++ b/meta/classes-recipe/ptest-python-pytest.bbclass
@@ -6,19 +6,17 @@
inherit ptest
-FILESEXTRAPATHS:prepend := "${COREBASE}/meta/files:"
-
-SRC_URI:append = "\
- file://ptest-python-pytest/run-ptest \
-"
-
# Overridable configuration for the directory within the source tree
# containing the pytest files
PTEST_PYTEST_DIR ?= "tests"
do_install_ptest() {
if [ ! -f ${D}${PTEST_PATH}/run-ptest ]; then
- install -m 0755 ${UNPACKDIR}/ptest-python-pytest/run-ptest
${D}${PTEST_PATH}
+ cat > ${D}${PTEST_PATH}/run-ptest << EOF
+#!/bin/sh
+pytest --automake
+EOF
+
fi
if [ -d "${S}/${PTEST_PYTEST_DIR}" ]; then
install -d ${D}${PTEST_PATH}/${PTEST_PYTEST_DIR}
diff --git a/meta/files/ptest-python-pytest/run-ptest
b/meta/files/ptest-python-pytest/run-ptest
deleted file mode 100755
index 8d2017d39c..0000000000
--- a/meta/files/ptest-python-pytest/run-ptest
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-pytest --automake
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#209503):
https://lists.openembedded.org/g/openembedded-core/message/209503
Mute This Topic: https://lists.openembedded.org/mt/110484884/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
