From ffc64e9c6fee0af7eea3466135416d011172a5e6 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 13 May 2024 14:16:55 -0700 Subject: 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. Signed-off-by: Khem Raj --- meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb | 4 ++-- meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb | 2 +- meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb | 2 +- meta-filesystems/recipes-utils/xfstests/xfstests_2024.03.03.bb | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'meta-filesystems') diff --git a/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb b/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb index b641e4c24e..7768a734d6 100644 --- a/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb +++ b/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb @@ -37,8 +37,8 @@ EXTRA_OECONF = " \ do_install:prepend() { install -d ${D}${sysconfdir}/default/ install -d ${D}${sysconfdir}/init.d/ - install -m 0755 ${WORKDIR}/owhttpd ${D}${sysconfdir}/init.d/owhttpd - install -m 0755 ${WORKDIR}/owserver ${D}${sysconfdir}/init.d/owserver + install -m 0755 ${UNPACKDIR}/owhttpd ${D}${sysconfdir}/init.d/owhttpd + install -m 0755 ${UNPACKDIR}/owserver ${D}${sysconfdir}/init.d/owserver } PACKAGES =+ "owftpd owhttpd owserver owshell libowcapi libow libownet owmon owtap" diff --git a/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb b/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb index cee4879eee..6f613e9cd1 100644 --- a/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb +++ b/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb @@ -68,7 +68,7 @@ do_install:append() { # Install systemd related configuration file if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/modules-load.d - install -m 0644 ${WORKDIR}/fuse.conf ${D}${sysconfdir}/modules-load.d + install -m 0644 ${UNPACKDIR}/fuse.conf ${D}${sysconfdir}/modules-load.d fi } diff --git a/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb b/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb index ad846af470..4d2b909809 100644 --- a/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb +++ b/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb @@ -33,7 +33,7 @@ do_configure:prepend() { do_configure:append () { install -d ${S}/include/linux/ - cp ${WORKDIR}/aufs_type.h ${S}/include/linux/ + cp ${UNPACKDIR}/aufs_type.h ${S}/include/linux/ sed -i -e 's;__user;;' ${S}/include/linux/aufs_type.h } diff --git a/meta-filesystems/recipes-utils/xfstests/xfstests_2024.03.03.bb b/meta-filesystems/recipes-utils/xfstests/xfstests_2024.03.03.bb index c8a80523dd..9e82b0f749 100644 --- a/meta-filesystems/recipes-utils/xfstests/xfstests_2024.03.03.bb +++ b/meta-filesystems/recipes-utils/xfstests/xfstests_2024.03.03.bb @@ -58,10 +58,10 @@ do_install() { unionmount_target_dir=${D}${prefix}/xfstests/unionmount-testsuite install -d $unionmount_target_dir/tests - install ${WORKDIR}/unionmount-testsuite/tests/* -t $unionmount_target_dir/tests - install ${WORKDIR}/unionmount-testsuite/*.py -t $unionmount_target_dir - install ${WORKDIR}/unionmount-testsuite/run -t $unionmount_target_dir - install ${WORKDIR}/unionmount-testsuite/README -t $unionmount_target_dir + install ${UNPACKDIR}/unionmount-testsuite/tests/* -t $unionmount_target_dir/tests + install ${UNPACKDIR}/unionmount-testsuite/*.py -t $unionmount_target_dir + install ${UNPACKDIR}/unionmount-testsuite/run -t $unionmount_target_dir + install ${UNPACKDIR}/unionmount-testsuite/README -t $unionmount_target_dir } FILES:${PN} += "${prefix}/xfstests" -- cgit v1.2.3-54-g00ecf