diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-05-09 17:02:39 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-05-21 12:08:04 +0100 |
commit | 71c6db8e65ced98db74fd18b726fa4b4c0346f05 (patch) | |
tree | 0e5d7f21a2d65ba5b562068eb44d4e9b34465bed /meta/recipes-devtools | |
parent | c6c1ed6ba0b7e529d955eeda71c4a66317fa1331 (diff) | |
download | poky-71c6db8e65ced98db74fd18b726fa4b4c0346f05.tar.gz |
recipes: Start WORKDIR -> UNPACKDIR transition
Replace references of WORKDIR with UNPACKDIR where it makes sense to do
so in preparation for changing the default value of UNPACKDIR.
(From OE-Core rev: 1f18b9a512800860d5153d89eb82b56388efad6f)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/apt/apt_2.6.1.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/lua/lua_5.4.6.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/perl-cross/perlcross_1.5.2.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/perl/perl_5.38.2.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3-cryptography_42.0.5.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3-hypothesis_6.100.1.bb | 4 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3-pyyaml_6.0.1.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/quilt/quilt.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/rust/cargo_1.75.0.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/rust/rust_1.75.0.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/valgrind/valgrind_3.23.0.bb | 6 |
12 files changed, 15 insertions, 15 deletions
diff --git a/meta/recipes-devtools/apt/apt_2.6.1.bb b/meta/recipes-devtools/apt/apt_2.6.1.bb index fb4ff899d2..68bd7c5407 100644 --- a/meta/recipes-devtools/apt/apt_2.6.1.bb +++ b/meta/recipes-devtools/apt/apt_2.6.1.bb | |||
@@ -49,7 +49,7 @@ DEPENDS += "db gnutls lz4 zlib bzip2 xz libgcrypt xxhash" | |||
49 | 49 | ||
50 | EXTRA_OECMAKE:append = " -DCURRENT_VENDOR=debian -DWITH_DOC=False \ | 50 | EXTRA_OECMAKE:append = " -DCURRENT_VENDOR=debian -DWITH_DOC=False \ |
51 | -DDPKG_DATADIR=${datadir}/dpkg \ | 51 | -DDPKG_DATADIR=${datadir}/dpkg \ |
52 | -DTRIEHASH_EXECUTABLE=${WORKDIR}/triehash \ | 52 | -DTRIEHASH_EXECUTABLE=${UNPACKDIR}/triehash \ |
53 | -DCMAKE_DISABLE_FIND_PACKAGE_ZSTD=True \ | 53 | -DCMAKE_DISABLE_FIND_PACKAGE_ZSTD=True \ |
54 | -DCMAKE_DISABLE_FIND_PACKAGE_SECCOMP=True \ | 54 | -DCMAKE_DISABLE_FIND_PACKAGE_SECCOMP=True \ |
55 | -DWITH_TESTS=False \ | 55 | -DWITH_TESTS=False \ |
diff --git a/meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb b/meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb index bf8be1ad0c..98308e5d37 100644 --- a/meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb +++ b/meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb | |||
@@ -29,7 +29,7 @@ inherit native | |||
29 | do_configure() { | 29 | do_configure() { |
30 | install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/autoconf | 30 | install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/autoconf |
31 | install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/autoconf | 31 | install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/autoconf |
32 | install -m 0644 ${WORKDIR}/riscv64-linux-gcc.rul ${S}/RULES/ | 32 | install -m 0644 ${UNPACKDIR}/riscv64-linux-gcc.rul ${S}/RULES/ |
33 | } | 33 | } |
34 | 34 | ||
35 | do_install() { | 35 | do_install() { |
diff --git a/meta/recipes-devtools/lua/lua_5.4.6.bb b/meta/recipes-devtools/lua/lua_5.4.6.bb index 65f19ae247..17dc8fb17d 100644 --- a/meta/recipes-devtools/lua/lua_5.4.6.bb +++ b/meta/recipes-devtools/lua/lua_5.4.6.bb | |||
@@ -51,7 +51,7 @@ do_install () { | |||
51 | } | 51 | } |
52 | 52 | ||
53 | do_install_ptest () { | 53 | do_install_ptest () { |
54 | cp -R --no-dereference --preserve=mode,links -v ${WORKDIR}/lua-${PV_testsuites}-tests ${D}${PTEST_PATH}/test | 54 | cp -R --no-dereference --preserve=mode,links -v ${UNPACKDIR}/lua-${PV_testsuites}-tests ${D}${PTEST_PATH}/test |
55 | } | 55 | } |
56 | 56 | ||
57 | do_install_ptest:append:libc-musl () { | 57 | do_install_ptest:append:libc-musl () { |
diff --git a/meta/recipes-devtools/perl-cross/perlcross_1.5.2.bb b/meta/recipes-devtools/perl-cross/perlcross_1.5.2.bb index b41c182fad..48bda7e4b6 100644 --- a/meta/recipes-devtools/perl-cross/perlcross_1.5.2.bb +++ b/meta/recipes-devtools/perl-cross/perlcross_1.5.2.bb | |||
@@ -6,7 +6,7 @@ SECTION = "devel" | |||
6 | LICENSE = "Artistic-1.0 | GPL-1.0-or-later" | 6 | LICENSE = "Artistic-1.0 | GPL-1.0-or-later" |
7 | # README.md is taken from https://github.com/arsv/perl-cross/blob/master/README.md | 7 | # README.md is taken from https://github.com/arsv/perl-cross/blob/master/README.md |
8 | # but is not provided inside the release tarballs | 8 | # but is not provided inside the release tarballs |
9 | LIC_FILES_CHKSUM = "file://${WORKDIR}/README.md;md5=252fcce2026b765fee1ad74d2fb07a3b" | 9 | LIC_FILES_CHKSUM = "file://${UNPACKDIR}/README.md;md5=252fcce2026b765fee1ad74d2fb07a3b" |
10 | 10 | ||
11 | inherit allarch github-releases | 11 | inherit allarch github-releases |
12 | 12 | ||
diff --git a/meta/recipes-devtools/perl/perl_5.38.2.bb b/meta/recipes-devtools/perl/perl_5.38.2.bb index b6c9cda7ae..63909c242d 100644 --- a/meta/recipes-devtools/perl/perl_5.38.2.bb +++ b/meta/recipes-devtools/perl/perl_5.38.2.bb | |||
@@ -331,7 +331,7 @@ python split_perl_packages () { | |||
331 | d.setVar(d.expand("RDEPENDS:${PN}-modules"), ' '.join(packages)) | 331 | d.setVar(d.expand("RDEPENDS:${PN}-modules"), ' '.join(packages)) |
332 | 332 | ||
333 | # Read the pre-generated dependency file, and use it to set module dependecies | 333 | # Read the pre-generated dependency file, and use it to set module dependecies |
334 | for line in open(d.expand("${WORKDIR}") + '/perl-rdepends.txt').readlines(): | 334 | for line in open(d.getVar("UNPACKDIR") + '/perl-rdepends.txt').readlines(): |
335 | splitline = line.split() | 335 | splitline = line.split() |
336 | # Filter empty lines and comments | 336 | # Filter empty lines and comments |
337 | if len(splitline) == 0 or splitline[0].startswith("#"): | 337 | if len(splitline) == 0 or splitline[0].startswith("#"): |
diff --git a/meta/recipes-devtools/python/python3-cryptography_42.0.5.bb b/meta/recipes-devtools/python/python3-cryptography_42.0.5.bb index 732f925d92..0300330c60 100644 --- a/meta/recipes-devtools/python/python3-cryptography_42.0.5.bb +++ b/meta/recipes-devtools/python/python3-cryptography_42.0.5.bb | |||
@@ -49,7 +49,7 @@ RDEPENDS:${PN}-ptest += " \ | |||
49 | inherit ptest | 49 | inherit ptest |
50 | 50 | ||
51 | do_install_ptest() { | 51 | do_install_ptest() { |
52 | install -D ${WORKDIR}/check-memfree.py ${D}${PTEST_PATH}/ | 52 | install -D ${UNPACKDIR}/check-memfree.py ${D}${PTEST_PATH}/ |
53 | install -d ${D}${PTEST_PATH}/tests | 53 | install -d ${D}${PTEST_PATH}/tests |
54 | cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ | 54 | cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ |
55 | # remove test_x509.py as it needs benchmark and we don't | 55 | # remove test_x509.py as it needs benchmark and we don't |
diff --git a/meta/recipes-devtools/python/python3-hypothesis_6.100.1.bb b/meta/recipes-devtools/python/python3-hypothesis_6.100.1.bb index af7facfe7e..a689be9a1a 100644 --- a/meta/recipes-devtools/python/python3-hypothesis_6.100.1.bb +++ b/meta/recipes-devtools/python/python3-hypothesis_6.100.1.bb | |||
@@ -32,8 +32,8 @@ RDEPENDS:${PN}-ptest += " \ | |||
32 | 32 | ||
33 | do_install_ptest() { | 33 | do_install_ptest() { |
34 | install -d ${D}${PTEST_PATH}/examples | 34 | install -d ${D}${PTEST_PATH}/examples |
35 | install -m 0755 ${WORKDIR}/test_binary_search.py ${D}${PTEST_PATH}/examples/ | 35 | install -m 0755 ${UNPACKDIR}/test_binary_search.py ${D}${PTEST_PATH}/examples/ |
36 | install -m 0755 ${WORKDIR}/test_rle.py ${D}${PTEST_PATH}/examples/ | 36 | install -m 0755 ${UNPACKDIR}/test_rle.py ${D}${PTEST_PATH}/examples/ |
37 | } | 37 | } |
38 | 38 | ||
39 | BBCLASSEXTEND = "native nativesdk" | 39 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta/recipes-devtools/python/python3-pyyaml_6.0.1.bb b/meta/recipes-devtools/python/python3-pyyaml_6.0.1.bb index 3388312557..6e2022719c 100644 --- a/meta/recipes-devtools/python/python3-pyyaml_6.0.1.bb +++ b/meta/recipes-devtools/python/python3-pyyaml_6.0.1.bb | |||
@@ -34,7 +34,7 @@ RDEPENDS:${PN}-ptest += " \ | |||
34 | 34 | ||
35 | do_install_ptest() { | 35 | do_install_ptest() { |
36 | install -d ${D}${PTEST_PATH}/tests | 36 | install -d ${D}${PTEST_PATH}/tests |
37 | cp -rf ${WORKDIR}/test_dump_load.py ${D}${PTEST_PATH}/tests/ | 37 | cp -rf ${UNPACKDIR}/test_dump_load.py ${D}${PTEST_PATH}/tests/ |
38 | } | 38 | } |
39 | 39 | ||
40 | BBCLASSEXTEND = "native nativesdk" | 40 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc index 3374f4dfbf..1d90d3d84d 100644 --- a/meta/recipes-devtools/quilt/quilt.inc +++ b/meta/recipes-devtools/quilt/quilt.inc | |||
@@ -67,7 +67,7 @@ DEPENDS:append:class-target = "${@bb.utils.contains('PTEST_ENABLED', '1', ' ptes | |||
67 | PACKAGE_WRITE_DEPS += "ptest-runner" | 67 | PACKAGE_WRITE_DEPS += "ptest-runner" |
68 | 68 | ||
69 | do_install_ptest() { | 69 | do_install_ptest() { |
70 | install ${WORKDIR}/test.sh ${D}${PTEST_PATH} | 70 | install ${UNPACKDIR}/test.sh ${D}${PTEST_PATH} |
71 | mkdir ${D}${PTEST_PATH}/test | 71 | mkdir ${D}${PTEST_PATH}/test |
72 | install ${S}/test/* ${D}${PTEST_PATH}/test | 72 | install ${S}/test/* ${D}${PTEST_PATH}/test |
73 | # mail needs a MTA, and the patch-wrapper is disabled | 73 | # mail needs a MTA, and the patch-wrapper is disabled |
diff --git a/meta/recipes-devtools/rust/cargo_1.75.0.bb b/meta/recipes-devtools/rust/cargo_1.75.0.bb index 50b7e7c7b4..123032cdf7 100644 --- a/meta/recipes-devtools/rust/cargo_1.75.0.bb +++ b/meta/recipes-devtools/rust/cargo_1.75.0.bb | |||
@@ -22,7 +22,7 @@ inherit cargo pkgconfig | |||
22 | DEBUG_PREFIX_MAP += "-fdebug-prefix-map=${RUSTSRC}/vendor=${TARGET_DBGSRC_DIR}" | 22 | DEBUG_PREFIX_MAP += "-fdebug-prefix-map=${RUSTSRC}/vendor=${TARGET_DBGSRC_DIR}" |
23 | 23 | ||
24 | do_cargo_setup_snapshot () { | 24 | do_cargo_setup_snapshot () { |
25 | ${WORKDIR}/rust-snapshot-components/${CARGO_SNAPSHOT}/install.sh --prefix="${WORKDIR}/${CARGO_SNAPSHOT}" --disable-ldconfig | 25 | ${UNPACKDIR}/rust-snapshot-components/${CARGO_SNAPSHOT}/install.sh --prefix="${WORKDIR}/${CARGO_SNAPSHOT}" --disable-ldconfig |
26 | # Need to use uninative's loader if enabled/present since the library paths | 26 | # Need to use uninative's loader if enabled/present since the library paths |
27 | # are used internally by rust and result in symbol mismatches if we don't | 27 | # are used internally by rust and result in symbol mismatches if we don't |
28 | if [ ! -z "${UNINATIVE_LOADER}" -a -e "${UNINATIVE_LOADER}" ]; then | 28 | if [ ! -z "${UNINATIVE_LOADER}" -a -e "${UNINATIVE_LOADER}" ]; then |
diff --git a/meta/recipes-devtools/rust/rust_1.75.0.bb b/meta/recipes-devtools/rust/rust_1.75.0.bb index 76e1fe2d84..662117c92c 100644 --- a/meta/recipes-devtools/rust/rust_1.75.0.bb +++ b/meta/recipes-devtools/rust/rust_1.75.0.bb | |||
@@ -48,7 +48,7 @@ setup_cargo_environment () { | |||
48 | inherit rust-target-config | 48 | inherit rust-target-config |
49 | 49 | ||
50 | do_rust_setup_snapshot () { | 50 | do_rust_setup_snapshot () { |
51 | for installer in "${WORKDIR}/rust-snapshot-components/"*"/install.sh"; do | 51 | for installer in "${UNPACKDIR}/rust-snapshot-components/"*"/install.sh"; do |
52 | "${installer}" --prefix="${WORKDIR}/rust-snapshot" --disable-ldconfig | 52 | "${installer}" --prefix="${WORKDIR}/rust-snapshot" --disable-ldconfig |
53 | done | 53 | done |
54 | 54 | ||
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.23.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.23.0.bb index 46719bf8a1..ad9e26cb6b 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.23.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.23.0.bb | |||
@@ -194,9 +194,9 @@ do_install_ptest() { | |||
194 | 194 | ||
195 | # The scripts reference config.h so add it to the top ptest dir. | 195 | # The scripts reference config.h so add it to the top ptest dir. |
196 | cp ${B}/config.h ${D}${PTEST_PATH} | 196 | cp ${B}/config.h ${D}${PTEST_PATH} |
197 | install -D ${WORKDIR}/remove-for-aarch64 ${D}${PTEST_PATH} | 197 | install -D ${UNPACKDIR}/remove-for-aarch64 ${D}${PTEST_PATH} |
198 | install -D ${WORKDIR}/remove-for-all ${D}${PTEST_PATH} | 198 | install -D ${UNPACKDIR}/remove-for-all ${D}${PTEST_PATH} |
199 | install -D ${WORKDIR}/taskset_nondeterministic_tests ${D}${PTEST_PATH} | 199 | install -D ${UNPACKDIR}/taskset_nondeterministic_tests ${D}${PTEST_PATH} |
200 | 200 | ||
201 | # Add an executable need by none/tests/bigcode | 201 | # Add an executable need by none/tests/bigcode |
202 | mkdir ${D}${PTEST_PATH}/perf | 202 | mkdir ${D}${PTEST_PATH}/perf |