This is a correspnding patch to match one from Richard Purdie in
oe-core. [1]
Where recipes use S = ${WORKDIR}, ensure they are referencing ${S} correctly
to access files as soon we want to stop doing this in WORKDIR at which point
they would break unless corrected.
[1]
https://git.openembedded.org/openembedded-core/commit/?id=f25dd633fffe6560f191526d1869e657e129bad9
Signed-off-by: Ryan Eatmon <[email protected]>
---
meta-arago-demos/recipes-core/matrix/matrix-lighttpd-config.bb | 2 +-
.../recipes-connectivity/systemd-telnetd/systemd-telnetd.bb | 2 +-
.../recipes-core/arago-gpl-notice/arago-gpl-notice.bb | 2 +-
.../recipes-graphics/tslib/ts-calibrate-init_1.0.bb | 2 +-
.../recipes-sysrepo/nw-configurator/nw-configurator.bb | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta-arago-demos/recipes-core/matrix/matrix-lighttpd-config.bb
b/meta-arago-demos/recipes-core/matrix/matrix-lighttpd-config.bb
index c932e67f..f9ef7881 100644
--- a/meta-arago-demos/recipes-core/matrix/matrix-lighttpd-config.bb
+++ b/meta-arago-demos/recipes-core/matrix/matrix-lighttpd-config.bb
@@ -16,7 +16,7 @@ S = "${WORKDIR}"
do_install() {
install -d ${D}${sysconfdir}/lighttpd
- install -m 0644 ${WORKDIR}/lighttpd.conf.matrix
${D}${sysconfdir}/lighttpd/lighttpd.conf.matrix
+ install -m 0644 ${S}/lighttpd.conf.matrix
${D}${sysconfdir}/lighttpd/lighttpd.conf.matrix
}
FILES:${PN} = "${sysconfdir}/lighttpd/lighttpd.conf.matrix"
diff --git
a/meta-arago-distro/recipes-connectivity/systemd-telnetd/systemd-telnetd.bb
b/meta-arago-distro/recipes-connectivity/systemd-telnetd/systemd-telnetd.bb
index 3158da5a..471e2c78 100644
--- a/meta-arago-distro/recipes-connectivity/systemd-telnetd/systemd-telnetd.bb
+++ b/meta-arago-distro/recipes-connectivity/systemd-telnetd/systemd-telnetd.bb
@@ -16,5 +16,5 @@ SYSTEMD_AUTO_ENABLE:${PN} = "enable"
do_install:append () {
# install systemd unit files
install -d ${D}${systemd_system_unitdir}
- install -m 0644 ${WORKDIR}/telnetd.service ${D}${systemd_system_unitdir}
+ install -m 0644 ${S}/telnetd.service ${D}${systemd_system_unitdir}
}
diff --git
a/meta-arago-distro/recipes-core/arago-gpl-notice/arago-gpl-notice.bb
b/meta-arago-distro/recipes-core/arago-gpl-notice/arago-gpl-notice.bb
index 6cb428a5..309e72df 100644
--- a/meta-arago-distro/recipes-core/arago-gpl-notice/arago-gpl-notice.bb
+++ b/meta-arago-distro/recipes-core/arago-gpl-notice/arago-gpl-notice.bb
@@ -24,7 +24,7 @@ do_install(){
install -d ${D}${bindir}
install -d ${D}${systemd_system_unitdir}
install -m 0755 ${S}/print-gplv3-packages.sh
${D}${bindir}/gplv3-notice
- install -m 0644 ${WORKDIR}/gplv3-notice.service
${D}${systemd_system_unitdir}
+ install -m 0644 ${S}/gplv3-notice.service
${D}${systemd_system_unitdir}
fi
}
diff --git a/meta-arago-extras/recipes-graphics/tslib/ts-calibrate-init_1.0.bb
b/meta-arago-extras/recipes-graphics/tslib/ts-calibrate-init_1.0.bb
index db48d746..f67ba558 100644
--- a/meta-arago-extras/recipes-graphics/tslib/ts-calibrate-init_1.0.bb
+++ b/meta-arago-extras/recipes-graphics/tslib/ts-calibrate-init_1.0.bb
@@ -26,5 +26,5 @@ do_install(){
# Install the init script
# TODO: replace init script with systemd files
install -d ${D}${sysconfdir}/init.d
- install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/ts-calibrate
+ install -m 0755 ${S}/init ${D}${sysconfdir}/init.d/ts-calibrate
}
diff --git
a/meta-arago-extras/recipes-sysrepo/nw-configurator/nw-configurator.bb
b/meta-arago-extras/recipes-sysrepo/nw-configurator/nw-configurator.bb
index c5d9a86b..65dff2cc 100644
--- a/meta-arago-extras/recipes-sysrepo/nw-configurator/nw-configurator.bb
+++ b/meta-arago-extras/recipes-sysrepo/nw-configurator/nw-configurator.bb
@@ -14,7 +14,7 @@ DEPENDS = "sysrepo"
inherit autotools pkgconfig
do_compile() {
- ${CC} ${CFLAGS} ${LDFLAGS} -I=${STAGING_INCDIR}
${WORKDIR}/nw-configurator.c -o nw-configurator -lsysrepo
+ ${CC} ${CFLAGS} ${LDFLAGS} -I=${STAGING_INCDIR} ${S}/nw-configurator.c
-o nw-configurator -lsysrepo
}
BBCLASSEXTEND = "native nativesdk"
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#15329):
https://lists.yoctoproject.org/g/meta-arago/message/15329
Mute This Topic: https://lists.yoctoproject.org/mt/105942039/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-arago/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
