recipes: Switch WORKDIR use with UNPACKDIR

This is being enforced in master oe-core

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2024-05-22 13:25:43 -07:00
parent 23ceaa0ecd
commit 365e9110b9
No known key found for this signature in database
GPG Key ID: BB053355919D3314
14 changed files with 30 additions and 34 deletions

View File

@ -4,6 +4,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
SRC_URI:append:qoriq-ppc = " file://qemu.conf"
do_install:append:qoriq-ppc() {
install -m 0644 ${WORKDIR}/qemu.conf ${D}${sysconfdir}/libvirt/qemu.conf
install -m 0644 ${UNPACKDIR}/qemu.conf ${D}${sysconfdir}/libvirt/qemu.conf
}

View File

@ -73,11 +73,11 @@ do_install() {
PLATFORM=${PLATFORM} \
install
if [ -e ${WORKDIR}/clocks.sh ]; then
install -m 755 ${WORKDIR}/clocks.sh ${D}/unit_tests/clocks.sh
if [ -e ${UNPACKDIR}/clocks.sh ]; then
install -m 755 ${UNPACKDIR}/clocks.sh ${D}/unit_tests/clocks.sh
fi
install -d -m 0755 ${D}${ROOT_HOME}/
install -m 0644 ${WORKDIR}/memtool_profile ${D}${ROOT_HOME}/.profile
install -m 0644 ${UNPACKDIR}/memtool_profile ${D}${ROOT_HOME}/.profile
}
FILES:${PN} += "/unit_tests ${ROOT_HOME}/.profile"

View File

@ -82,7 +82,7 @@ PACKAGECONFIG[dma-heap-uncached] = "--with-dma-heap-allocator=yes ${UNCACHED_DMA
# Using do_install_ptest_base instead of do_install_ptest, since
# the default do_install_ptest_base is hardcoded to expect Makefiles.
do_install_ptest_base() {
install -D ${WORKDIR}/run-ptest ${D}${PTEST_PATH}/run-ptest
install -D ${UNPACKDIR}/run-ptest ${D}${PTEST_PATH}/run-ptest
install -m 0755 ${B}/test-alloc ${D}${PTEST_PATH}
}

View File

@ -9,7 +9,6 @@ SRC_URI = "\
file://74-ls1046a-xfi2-networking.rules \
file://73-fsl-enetc-networking.rules \
"
S = "${WORKDIR}"
RULE = "71-fsl-dpaa-persistent-networking.rules"
RULE:e6500 = "72-fsl-dpaa-persistent-networking.rules"
@ -26,7 +25,7 @@ RULE:ls1012a = ""
do_install () {
install -d ${D}${sysconfdir}/udev/rules.d/
for r in ${RULE};do
install -m 0644 ${WORKDIR}/${r} ${D}${sysconfdir}/udev/rules.d/
install -m 0644 ${UNPACKDIR}/${r} ${D}${sysconfdir}/udev/rules.d/
done
}

View File

@ -19,14 +19,12 @@ SRC_URI[Linux.sha256sum] = "f863bba022202361d19e5026be0af408d307f78d2dbf2c139fb7
SRC_URI[Mac.sha256sum] = "62da0bd7e333931fba100823aa50133621c7e6047be0546bc12e29c0ea78a4d8"
SRC_URI[Windows.sha256sum] = "013ed8bb45e21b971b6b3a5802c5f154733913714bece0b020cb770a809cd206"
S = "${WORKDIR}"
inherit allarch
do_install() {
install -D -m 0755 ${WORKDIR}/uuu-${PV} ${D}${libdir}/uuu/uuu
install -D -m 0755 ${WORKDIR}/uuu-${PV}_mac ${D}${libdir}/uuu/uuu_mac
install -D -m 0644 ${WORKDIR}/uuu-${PV}.exe ${D}${libdir}/uuu/uuu.exe
install -D -m 0755 ${UNPACKDIR}/uuu-${PV} ${D}${libdir}/uuu/uuu
install -D -m 0755 ${UNPACKDIR}/uuu-${PV}_mac ${D}${libdir}/uuu/uuu_mac
install -D -m 0644 ${UNPACKDIR}/uuu-${PV}.exe ${D}${libdir}/uuu/uuu.exe
}
# HACK! We are not aiming to run those binaries during the build but copy then for MFGTOOL bundle.

View File

@ -5,14 +5,13 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
inherit allarch
SRC_URI = "file://merge"
S = "${WORKDIR}"
MERGED_DST ?= "${ROOT_HOME}"
do_install () {
install -d ${D}/${MERGED_DST}
find ${WORKDIR}/merge/ -maxdepth 1 -mindepth 1 -not -name README \
find ${UNPACKDIR}/merge/ -maxdepth 1 -mindepth 1 -not -name README \
-exec cp -fr '{}' ${D}/${MERGED_DST}/ \;
find ${WORKDIR}/merge/ -maxdepth 1 -mindepth 1 -exec rm -fr '{}' \;
find ${UNPACKDIR}/merge/ -maxdepth 1 -mindepth 1 -exec rm -fr '{}' \;
}
do_configure[noexec] = "1"
do_compile[noexec] = "1"

View File

@ -18,7 +18,7 @@ SRC_URI[SoftFloat.sha256sum] = "89d14b55113a2ba8cbda7011443ba1d298d381c89d939515
S = "${WORKDIR}/TestFloat-2a"
do_unpack2(){
mv ${WORKDIR}/SoftFloat-2b ${S}/SoftFloat-2b
mv ${UNPACKDIR}/SoftFloat-2b ${S}/SoftFloat-2b
cd ${S}
if [ -n "$(which fromdos)" ];then
find -type f -exec fromdos {} \;

View File

@ -17,13 +17,13 @@ do_install:use-mainline-bsp() {
# systemd
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
install -D -m 644 ${WORKDIR}/mesa-etnaviv.conf \
install -D -m 644 ${UNPACKDIR}/mesa-etnaviv.conf \
${D}${sysconfdir}/systemd/system.conf.d/mesa-etnaviv.conf
fi
# sysvinit
if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
install -D -m 644 ${WORKDIR}/mesa-etnaviv.sh \
install -D -m 644 ${UNPACKDIR}/mesa-etnaviv.sh \
${D}${sysconfdir}/profile.d/mesa-etnaviv.sh
fi
}

View File

@ -58,8 +58,8 @@ PACKAGECONFIG[use-g2d] = ",,"
PACKAGECONFIG[xwayland] = ",,"
do_install:append() {
if [ -f "${WORKDIR}/weston.config" ]; then
install -Dm0755 ${WORKDIR}/weston.config ${D}${sysconfdir}/default/weston
if [ -f "${UNPACKDIR}/weston.config" ]; then
install -Dm0755 ${UNPACKDIR}/weston.config ${D}${sysconfdir}/default/weston
fi
if [ "${@bb.utils.contains('PACKAGECONFIG', 'gbm-format', 'yes', 'no', d)}" = "yes" ]; then

View File

@ -109,18 +109,18 @@ do_install:append() {
# If X11, ship a desktop file to launch it
if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then
install -d ${D}${datadir}/applications
install ${WORKDIR}/weston.desktop ${D}${datadir}/applications
install ${UNPACKDIR}/weston.desktop ${D}${datadir}/applications
install -d ${D}${datadir}/icons/hicolor/48x48/apps
install ${WORKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps
install ${UNPACKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps
fi
if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then
install -Dm 644 ${WORKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland
install -Dm 644 ${UNPACKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland
fi
if [ "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'yes', 'no', d)}" = "yes" ]; then
install -Dm 644 ${WORKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify
install -Dm 644 ${UNPACKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify
fi
if [ "${@bb.utils.contains('PACKAGECONFIG', 'launch', 'yes', 'no', d)}" = "yes" ]; then

View File

@ -116,18 +116,18 @@ do_install:append() {
# If X11, ship a desktop file to launch it
if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then
install -d ${D}${datadir}/applications
install ${WORKDIR}/weston.desktop ${D}${datadir}/applications
install ${UNPACKDIR}/weston.desktop ${D}${datadir}/applications
install -d ${D}${datadir}/icons/hicolor/48x48/apps
install ${WORKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps
install ${UNPACKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps
fi
if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then
install -Dm 644 ${WORKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland
install -Dm 644 ${UNPACKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland
fi
if [ "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'yes', 'no', d)}" = "yes" ]; then
install -Dm 644 ${WORKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify
install -Dm 644 ${UNPACKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify
fi
if [ "${@bb.utils.contains('PACKAGECONFIG', 'launch', 'yes', 'no', d)}" = "yes" ]; then

View File

@ -17,9 +17,9 @@ SRC_URI_IMX:mx9-nxp-bsp = " \
CACHED_CONFIGUREVARS:append:mx6-nxp-bsp = " ax_cv_PTHREAD_PRIO_INHERIT=no"
do_install:append() {
if [ -e "${WORKDIR}/daemon.conf" ] && [ -e "${WORKDIR}/default.pa" ]; then
install -m 0644 ${WORKDIR}/daemon.conf ${D}${sysconfdir}/pulse/daemon.conf
install -m 0644 ${WORKDIR}/default.pa ${D}${sysconfdir}/pulse/default.pa
if [ -e "${UNPACKDIR}/daemon.conf" ] && [ -e "${UNPACKDIR}/default.pa" ]; then
install -m 0644 ${UNPACKDIR}/daemon.conf ${D}${sysconfdir}/pulse/daemon.conf
install -m 0644 ${UNPACKDIR}/default.pa ${D}${sysconfdir}/pulse/default.pa
fi
}

View File

@ -37,6 +37,6 @@ do_install () {
cp -a ${B}/export/usr/include ${D}${includedir}
sed -i -e s:/etc:${sysconfdir}:g -e s:/usr/bin:${bindir}:g ${WORKDIR}/tee-supplicant.service
install -D -p -m0644 ${WORKDIR}/tee-supplicant.service ${D}${systemd_system_unitdir}/tee-supplicant.service
sed -i -e s:/etc:${sysconfdir}:g -e s:/usr/bin:${bindir}:g ${UNPACKDIR}/tee-supplicant.service
install -D -p -m0644 ${UNPACKDIR}/tee-supplicant.service ${D}${systemd_system_unitdir}/tee-supplicant.service
}

View File

@ -41,7 +41,7 @@ do_install () {
cp -a ${B}/export/usr/include ${D}${includedir}
install -d ${D}${systemd_system_unitdir}/
install -m0644 ${WORKDIR}/tee-supplicant.service ${D}${systemd_system_unitdir}/
install -m0644 ${UNPACKDIR}/tee-supplicant.service ${D}${systemd_system_unitdir}/
sed -i -e s:/etc:${sysconfdir}:g -e s:/usr/bin:${bindir}:g ${D}${systemd_system_unitdir}/tee-supplicant.service
}