summaryrefslogtreecommitdiffstats
path: root/meta-selftest
diff options
context:
space:
mode:
authorAlexander Kanavin <alex@linutronix.de>2025-06-16 11:49:56 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-06-20 12:07:26 +0100
commitefb0410d388cb389a18e299b87fdb3554d527b39 (patch)
tree0ba990254e449a421ab7ec56c3409c69e9100d24 /meta-selftest
parente1f059f34e7f1e6a252aff1ec5b1eb3376bd4d65 (diff)
downloadpoky-efb0410d388cb389a18e299b87fdb3554d527b39.tar.gz
meta: set S from UNPACKDIR in recipes that use only local files
There is no need to have two assignments; also setting S from UNPACKDIR (and not vice versa) is more logical as unpack task comes first, and tasks that come after unpack use S to access unpack results. Also adjust reference test data in selftest/recipeutils to reflect changes in test recipes. (From OE-Core rev: f64b7e5fb3181734c8dde87b27e872a026261a74) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-selftest')
-rw-r--r--meta-selftest/recipes-test/cpp/cpp-example.inc3
-rw-r--r--meta-selftest/recipes-test/devtool/devtool-test-localonly.bb3
-rw-r--r--meta-selftest/recipes-test/devtool/devtool-test-reset-re++.bb3
-rw-r--r--meta-selftest/recipes-test/fortran/fortran-helloworld.bb3
-rw-r--r--meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb3
-rw-r--r--meta-selftest/recipes-test/selftest-chown/selftest-chown.bb3
-rw-r--r--meta-selftest/recipes-test/selftest-hardlink/selftest-hardlink.bb3
-rw-r--r--meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb3
-rw-r--r--meta-selftest/recipes-test/selftest-users/acreategroup.bb3
-rw-r--r--meta-selftest/recipes-test/selftest-users/bcreategroup.bb3
-rw-r--r--meta-selftest/recipes-test/selftest-users/ccreategroup.bb3
-rw-r--r--meta-selftest/recipes-test/selftest-users/creategroup1.bb3
-rw-r--r--meta-selftest/recipes-test/selftest-users/creategroup2.bb3
-rw-r--r--meta-selftest/recipes-test/selftest-users/dcreategroup.bb3
-rw-r--r--meta-selftest/recipes-test/selftest-users/useraddbadtask.bb3
-rw-r--r--meta-selftest/recipes-test/testrpm/testrpm_0.0.1.bb3
16 files changed, 16 insertions, 32 deletions
diff --git a/meta-selftest/recipes-test/cpp/cpp-example.inc b/meta-selftest/recipes-test/cpp/cpp-example.inc
index 41aaa7219a..76ff64e87f 100644
--- a/meta-selftest/recipes-test/cpp/cpp-example.inc
+++ b/meta-selftest/recipes-test/cpp/cpp-example.inc
@@ -19,7 +19,6 @@ SRC_URI = "\
19 file://run-ptest \ 19 file://run-ptest \
20" 20"
21 21
22S = "${WORKDIR}/sources" 22S = "${UNPACKDIR}"
23UNPACKDIR = "${S}"
24 23
25inherit ptest 24inherit ptest
diff --git a/meta-selftest/recipes-test/devtool/devtool-test-localonly.bb b/meta-selftest/recipes-test/devtool/devtool-test-localonly.bb
index 446c51f09b..54463fed98 100644
--- a/meta-selftest/recipes-test/devtool/devtool-test-localonly.bb
+++ b/meta-selftest/recipes-test/devtool/devtool-test-localonly.bb
@@ -6,8 +6,7 @@ SRC_URI = "file://file1 \
6 6
7SRC_URI:append:class-native = " file://file3" 7SRC_URI:append:class-native = " file://file3"
8 8
9S = "${WORKDIR}/sources" 9S = "${UNPACKDIR}"
10UNPACKDIR = "${S}"
11 10
12EXCLUDE_FROM_WORLD = "1" 11EXCLUDE_FROM_WORLD = "1"
13BBCLASSEXTEND = "native" 12BBCLASSEXTEND = "native"
diff --git a/meta-selftest/recipes-test/devtool/devtool-test-reset-re++.bb b/meta-selftest/recipes-test/devtool/devtool-test-reset-re++.bb
index 35672a5265..0146be4c52 100644
--- a/meta-selftest/recipes-test/devtool/devtool-test-reset-re++.bb
+++ b/meta-selftest/recipes-test/devtool/devtool-test-reset-re++.bb
@@ -3,7 +3,6 @@ INHIBIT_DEFAULT_DEPS = "1"
3 3
4SRC_URI = "file://file1" 4SRC_URI = "file://file1"
5 5
6S = "${WORKDIR}/sources" 6S = "${UNPACKDIR}"
7UNPACKDIR = "${S}"
8 7
9EXCLUDE_FROM_WORLD = "1" 8EXCLUDE_FROM_WORLD = "1"
diff --git a/meta-selftest/recipes-test/fortran/fortran-helloworld.bb b/meta-selftest/recipes-test/fortran/fortran-helloworld.bb
index 11928dc95a..240ed473cc 100644
--- a/meta-selftest/recipes-test/fortran/fortran-helloworld.bb
+++ b/meta-selftest/recipes-test/fortran/fortran-helloworld.bb
@@ -6,8 +6,7 @@ DEPENDS = "libgfortran"
6 6
7SRC_URI = "file://hello.f95" 7SRC_URI = "file://hello.f95"
8 8
9S = "${WORKDIR}/sources" 9S = "${UNPACKDIR}"
10UNPACKDIR = "${S}"
11 10
12# These set flags that Fortran doesn't support 11# These set flags that Fortran doesn't support
13SECURITY_CFLAGS = "" 12SECURITY_CFLAGS = ""
diff --git a/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb b/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb
index 8b314d396e..dfaf67c938 100644
--- a/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb
+++ b/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb
@@ -6,8 +6,7 @@ LICENSE = "HPND"
6LIC_FILES_CHKSUM = "file://${UNPACKDIR}/somefile;md5=d41d8cd98f00b204e9800998ecf8427e" 6LIC_FILES_CHKSUM = "file://${UNPACKDIR}/somefile;md5=d41d8cd98f00b204e9800998ecf8427e"
7DEPENDS += "zlib" 7DEPENDS += "zlib"
8 8
9S = "${WORKDIR}/sources" 9S = "${UNPACKDIR}"
10UNPACKDIR = "${S}"
11 10
12BBCLASSEXTEND = "native nativesdk" 11BBCLASSEXTEND = "native nativesdk"
13 12
diff --git a/meta-selftest/recipes-test/selftest-chown/selftest-chown.bb b/meta-selftest/recipes-test/selftest-chown/selftest-chown.bb
index a0eeb4f223..ca22e1e19c 100644
--- a/meta-selftest/recipes-test/selftest-chown/selftest-chown.bb
+++ b/meta-selftest/recipes-test/selftest-chown/selftest-chown.bb
@@ -5,8 +5,7 @@ LICENSE = "MIT"
5 5
6DEPENDS += "coreutils-native" 6DEPENDS += "coreutils-native"
7 7
8S = "${WORKDIR}/sources" 8S = "${UNPACKDIR}"
9UNPACKDIR = "${S}"
10 9
11inherit useradd allarch 10inherit useradd allarch
12 11
diff --git a/meta-selftest/recipes-test/selftest-hardlink/selftest-hardlink.bb b/meta-selftest/recipes-test/selftest-hardlink/selftest-hardlink.bb
index 64fea8ed95..8b2aa6c737 100644
--- a/meta-selftest/recipes-test/selftest-hardlink/selftest-hardlink.bb
+++ b/meta-selftest/recipes-test/selftest-hardlink/selftest-hardlink.bb
@@ -6,8 +6,7 @@ SRC_URI = "file://hello.c \
6 file://gdb.sh \ 6 file://gdb.sh \
7" 7"
8 8
9S = "${WORKDIR}/sources" 9S = "${UNPACKDIR}"
10UNPACKDIR = "${S}"
11 10
12do_compile () { 11do_compile () {
13 ${CC} hello.c -o hello1 ${CFLAGS} ${LDFLAGS} 12 ${CC} hello.c -o hello1 ${CFLAGS} ${LDFLAGS}
diff --git a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
index 2dc352d479..0ffe7308ba 100644
--- a/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
+++ b/meta-selftest/recipes-test/selftest-hello/selftest-hello_1.0.bb
@@ -5,8 +5,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
5 5
6SRC_URI = "file://helloworld.c" 6SRC_URI = "file://helloworld.c"
7 7
8S = "${WORKDIR}/sources" 8S = "${UNPACKDIR}"
9UNPACKDIR = "${S}"
10 9
11do_compile() { 10do_compile() {
12 ${CC} ${CFLAGS} ${LDFLAGS} helloworld.c -o helloworld 11 ${CC} ${CFLAGS} ${LDFLAGS} helloworld.c -o helloworld
diff --git a/meta-selftest/recipes-test/selftest-users/acreategroup.bb b/meta-selftest/recipes-test/selftest-users/acreategroup.bb
index a970c41134..07771ecf40 100644
--- a/meta-selftest/recipes-test/selftest-users/acreategroup.bb
+++ b/meta-selftest/recipes-test/selftest-users/acreategroup.bb
@@ -3,8 +3,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
3 3
4LICENSE = "MIT" 4LICENSE = "MIT"
5 5
6S = "${WORKDIR}/sources" 6S = "${UNPACKDIR}"
7UNPACKDIR = "${S}"
8 7
9EXCLUDE_FROM_WORLD = "1" 8EXCLUDE_FROM_WORLD = "1"
10 9
diff --git a/meta-selftest/recipes-test/selftest-users/bcreategroup.bb b/meta-selftest/recipes-test/selftest-users/bcreategroup.bb
index 08106dab7c..0071fcc331 100644
--- a/meta-selftest/recipes-test/selftest-users/bcreategroup.bb
+++ b/meta-selftest/recipes-test/selftest-users/bcreategroup.bb
@@ -7,8 +7,7 @@ LICENSE = "MIT"
7 7
8USERADD_DEPENDS = "acreategroup ccreategroup" 8USERADD_DEPENDS = "acreategroup ccreategroup"
9 9
10S = "${WORKDIR}/sources" 10S = "${UNPACKDIR}"
11UNPACKDIR = "${S}"
12 11
13EXCLUDE_FROM_WORLD = "1" 12EXCLUDE_FROM_WORLD = "1"
14 13
diff --git a/meta-selftest/recipes-test/selftest-users/ccreategroup.bb b/meta-selftest/recipes-test/selftest-users/ccreategroup.bb
index c82ced8481..1685916630 100644
--- a/meta-selftest/recipes-test/selftest-users/ccreategroup.bb
+++ b/meta-selftest/recipes-test/selftest-users/ccreategroup.bb
@@ -5,8 +5,7 @@ LICENSE = "MIT"
5 5
6USERADD_DEPENDS = "acreategroup" 6USERADD_DEPENDS = "acreategroup"
7 7
8S = "${WORKDIR}/sources" 8S = "${UNPACKDIR}"
9UNPACKDIR = "${S}"
10 9
11EXCLUDE_FROM_WORLD = "1" 10EXCLUDE_FROM_WORLD = "1"
12 11
diff --git a/meta-selftest/recipes-test/selftest-users/creategroup1.bb b/meta-selftest/recipes-test/selftest-users/creategroup1.bb
index 4ab278f589..28651d3ed7 100644
--- a/meta-selftest/recipes-test/selftest-users/creategroup1.bb
+++ b/meta-selftest/recipes-test/selftest-users/creategroup1.bb
@@ -3,8 +3,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
3 3
4LICENSE = "MIT" 4LICENSE = "MIT"
5 5
6S = "${WORKDIR}/sources" 6S = "${UNPACKDIR}"
7UNPACKDIR = "${S}"
8 7
9inherit useradd allarch 8inherit useradd allarch
10 9
diff --git a/meta-selftest/recipes-test/selftest-users/creategroup2.bb b/meta-selftest/recipes-test/selftest-users/creategroup2.bb
index 179aba9bfc..2840c92106 100644
--- a/meta-selftest/recipes-test/selftest-users/creategroup2.bb
+++ b/meta-selftest/recipes-test/selftest-users/creategroup2.bb
@@ -5,8 +5,7 @@ LICENSE = "MIT"
5 5
6USERADD_DEPENDS = "creategroup1" 6USERADD_DEPENDS = "creategroup1"
7 7
8S = "${WORKDIR}/sources" 8S = "${UNPACKDIR}"
9UNPACKDIR = "${S}"
10 9
11inherit useradd allarch 10inherit useradd allarch
12 11
diff --git a/meta-selftest/recipes-test/selftest-users/dcreategroup.bb b/meta-selftest/recipes-test/selftest-users/dcreategroup.bb
index 0030e81ee0..eba91fe63d 100644
--- a/meta-selftest/recipes-test/selftest-users/dcreategroup.bb
+++ b/meta-selftest/recipes-test/selftest-users/dcreategroup.bb
@@ -5,8 +5,7 @@ LICENSE = "MIT"
5 5
6USERADD_DEPENDS = "bcreategroup" 6USERADD_DEPENDS = "bcreategroup"
7 7
8S = "${WORKDIR}/sources" 8S = "${UNPACKDIR}"
9UNPACKDIR = "${S}"
10 9
11EXCLUDE_FROM_WORLD = "1" 10EXCLUDE_FROM_WORLD = "1"
12 11
diff --git a/meta-selftest/recipes-test/selftest-users/useraddbadtask.bb b/meta-selftest/recipes-test/selftest-users/useraddbadtask.bb
index 2863541010..7ba7ec85fe 100644
--- a/meta-selftest/recipes-test/selftest-users/useraddbadtask.bb
+++ b/meta-selftest/recipes-test/selftest-users/useraddbadtask.bb
@@ -5,8 +5,7 @@ LICENSE = "MIT"
5 5
6DEPENDS:append = "coreutils-native" 6DEPENDS:append = "coreutils-native"
7 7
8S = "${WORKDIR}/sources" 8S = "${UNPACKDIR}"
9UNPACKDIR = "${S}"
10 9
11inherit useradd allarch 10inherit useradd allarch
12 11
diff --git a/meta-selftest/recipes-test/testrpm/testrpm_0.0.1.bb b/meta-selftest/recipes-test/testrpm/testrpm_0.0.1.bb
index db674d0efc..17ab7af0ab 100644
--- a/meta-selftest/recipes-test/testrpm/testrpm_0.0.1.bb
+++ b/meta-selftest/recipes-test/testrpm/testrpm_0.0.1.bb
@@ -6,8 +6,7 @@ LICENSE = "MIT"
6SRC_URI = "file://testfile.txt" 6SRC_URI = "file://testfile.txt"
7INHIBIT_DEFAULT_DEPS = "1" 7INHIBIT_DEFAULT_DEPS = "1"
8 8
9S = "${WORKDIR}/sources" 9S = "${UNPACKDIR}"
10UNPACKDIR = "${S}"
11 10
12do_compile(){ 11do_compile(){
13 echo "testdata" > ${B}/"file with [brackets].txt" 12 echo "testdata" > ${B}/"file with [brackets].txt"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-10-04 02:57:07 +0000