recipes: Ensure S is set to a valid directory

Several recipes have S pointing at a directory that does not exist.
Set S in these cases to somethig valid making the metadata and
recipe behaviour more consistent.

Tweak one of the QA test diff offsets to match the changed recipe.

(From OE-Core rev: 22f1f5849a9a3bf287dbe8933546e52e39ddc86e)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2024-05-15 07:53:23 +01:00
parent 992a5dd04c
commit a5cea4c0b4
7 changed files with 20 additions and 2 deletions

View File

@ -6,6 +6,9 @@ LICENSE = "HPND"
LIC_FILES_CHKSUM = "file://${UNPACKDIR}/somefile;md5=d41d8cd98f00b204e9800998ecf8427e"
DEPENDS += "zlib"
S = "${WORKDIR}/sources"
UNPACKDIR = "${S}"
BBCLASSEXTEND = "native nativesdk"
SRC_URI += "file://somefile"

View File

@ -6,6 +6,9 @@ LICENSE = "MIT"
SRC_URI = "file://testfile.txt"
INHIBIT_DEFAULT_DEPS = "1"
S = "${WORKDIR}/sources"
UNPACKDIR = "${S}"
do_compile(){
echo "testdata" > ${B}/"file with [brackets].txt"
echo "testdata" > ${B}/"file with (parentheses).txt"

View File

@ -72,7 +72,7 @@ class RecipeUtilsTests(OESelftestTestCase):
expected_patch = """
--- a/recipes-test/recipeutils/recipeutils-test_1.2.bb
+++ b/recipes-test/recipeutils/recipeutils-test_1.2.bb
@@ -8,6 +8,4 @@
@@ -11,6 +11,4 @@
BBCLASSEXTEND = "native nativesdk"
@ -97,7 +97,7 @@ class RecipeUtilsTests(OESelftestTestCase):
expected_patch = """
--- a/recipes-test/recipeutils/recipeutils-test_1.2.bb
+++ b/recipes-test/recipeutils/recipeutils-test_1.2.bb
@@ -8,6 +8,3 @@
@@ -11,6 +11,3 @@
BBCLASSEXTEND = "native nativesdk"

View File

@ -6,6 +6,9 @@ SRC_URI = "file://dropbear_rsa_host_key \
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
S = "${WORKDIR}/sources"
UNPACKDIR = "${S}"
INHIBIT_DEFAULT_DEPS = "1"
COMPATIBLE_MACHINE = "^qemu.*$"

View File

@ -13,6 +13,9 @@ SRC_URI = " \
file://watchdog.conf \
"
S = "${WORKDIR}/sources"
UNPACKDIR = "${S}"
# The default value is 60 seconds when null.
WATCHDOG_TIMEOUT ??= ""

View File

@ -7,6 +7,9 @@ SRC_URI = "file://dt-doc-validate \
file://dt-mk-schema \
file://dt-validate"
S = "${WORKDIR}/sources"
UNPACKDIR = "${S}"
do_install() {
install -d ${D}${bindir}/
install -m 755 ${UNPACKDIR}/dt-doc-validate ${D}${bindir}/

View File

@ -6,6 +6,9 @@ SRC_URI = "file://system-xuser.conf"
inherit allarch useradd
S = "${WORKDIR}/sources"
UNPACKDIR = "${S}"
do_configure() {
:
}