mirror of
https://git.yoctoproject.org/poky
synced 2026-06-01 00:59:48 +00:00
recipes: Update WORKDIR references to UNPACKDIR
Since we want to be able to stop unpacking to WORKDIR, correct the WORKDIR references in recipe do_compile/do_install tasks to use UNPACKDIR in the appropraite places instead. (From OE-Core rev: d73595df69667fe9d12ecd407b77a0b8dae2109c) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -148,7 +148,7 @@ SYSTEMD_SERVICE:${PN}-fstrim = "fstrim.timer fstrim.service"
|
||||
SYSTEMD_AUTO_ENABLE:${PN}-fstrim = "disable"
|
||||
|
||||
do_compile:append () {
|
||||
cp ${WORKDIR}/fcntl-lock.c ${S}/fcntl-lock.c
|
||||
cp ${UNPACKDIR}/fcntl-lock.c ${S}/fcntl-lock.c
|
||||
${CC} ${CFLAGS} ${LDFLAGS} ${S}/fcntl-lock.c -o ${B}/fcntl-lock
|
||||
}
|
||||
|
||||
@@ -194,8 +194,8 @@ do_install () {
|
||||
do_install:append:class-target () {
|
||||
if [ "${@bb.utils.filter('PACKAGECONFIG', 'pam', d)}" ]; then
|
||||
install -d ${D}${sysconfdir}/pam.d
|
||||
install -m 0644 ${WORKDIR}/runuser.pamd ${D}${sysconfdir}/pam.d/runuser
|
||||
install -m 0644 ${WORKDIR}/runuser-l.pamd ${D}${sysconfdir}/pam.d/runuser-l
|
||||
install -m 0644 ${UNPACKDIR}/runuser.pamd ${D}${sysconfdir}/pam.d/runuser
|
||||
install -m 0644 ${UNPACKDIR}/runuser-l.pamd ${D}${sysconfdir}/pam.d/runuser-l
|
||||
# Required for "su -" aka "su --login" because
|
||||
# otherwise it uses "other", which has "auth pam_deny.so"
|
||||
# and thus prevents the operation.
|
||||
@@ -322,7 +322,7 @@ do_install_ptest() {
|
||||
cp ${S}/tests/*.sh ${D}${PTEST_PATH}/tests/
|
||||
cp -pR ${S}/tests/expected ${D}${PTEST_PATH}/tests/expected
|
||||
cp -pR ${S}/tests/ts ${D}${PTEST_PATH}/tests/
|
||||
cp ${WORKDIR}/build/config.h ${D}${PTEST_PATH}
|
||||
cp ${B}/config.h ${D}${PTEST_PATH}
|
||||
|
||||
sed -i 's|@base_sbindir@|${base_sbindir}|g' ${D}${PTEST_PATH}/run-ptest
|
||||
|
||||
|
||||
Reference in New Issue
Block a user