cluster-glue: Start WORKDIR -> UNPACKDIR transition
PATCH 1/1 cluster-glue: Start WORKDIR -> UNPACKDIR transition
From: Wang Mingyu <[email protected]>
Replace references of WORKDIR with UNPACKDIR where it makes sense to do so in preparation for changing the default value of UNPACKDIR.
--- .../recipes-cgl/cluster-glue/cluster-glue_1.0.12.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.12.bb +2 -2
@@ -62,9 +62,9 @@ do_configure:prepend() { do_install:append() { install -d ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/04_cluster-glue + install -m 0644 ${UNPACKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/04_cluster-glue install -d ${D}${sysconfdir}/tmpfiles.d - install -m 0644 ${WORKDIR}/tmpfiles ${D}${sysconfdir}/tmpfiles.d/${PN}.conf + install -m 0644 ${UNPACKDIR}/tmpfiles ${D}${sysconfdir}/tmpfiles.d/${PN}.conf oe_multilib_header heartbeat/glue_config.h }
Signature · 1 line
2.34.1
PATCH 1/1 swupdate: Start WORKDIR -> UNPACKDIR transition
From: Wang Mingyu <[email protected]>
Replace references of WORKDIR with UNPACKDIR where it makes sense to do so in preparation for changing the default value of UNPACKDIR.
--- recipes-support/swupdate/swupdate.inc | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
recipes-support/swupdate/swupdate.inc +13 -13
@@ -245,13 +245,13 @@ python () { } do_configure () { - cat > ${WORKDIR}/.config <<HEREDOC + cat > ${UNPACKDIR}/.config <<HEREDOC CONFIG_EXTRA_CFLAGS="${CFLAGS}" CONFIG_EXTRA_LDFLAGS="${LDFLAGS}" HEREDOC - cat ${WORKDIR}/defconfig >> ${WORKDIR}/.config + cat ${UNPACKDIR}/defconfig >> ${UNPACKDIR}/.config - merge_config.sh -O ${B} -m ${WORKDIR}/.config ${@" ".join(find_cfgs(d))} + merge_config.sh -O ${B} -m ${UNPACKDIR}/.config ${@" ".join(find_cfgs(d))} (cd ${S} && cml1_do_configure) }
@@ -271,34 +271,34 @@ do_install () { fi install -d ${D}${sysconfdir}/init.d - install -m 755 ${WORKDIR}/swupdate ${D}${sysconfdir}/init.d + install -m 755 ${UNPACKDIR}/swupdate ${D}${sysconfdir}/init.d sed -i -e "s|/usr/lib/|${libdir}/|" ${D}${sysconfdir}/init.d/swupdate # shell based configuration loader allows to place code snippets into this folder install -d ${D}${libdir}/swupdate/conf.d - install -m 755 ${WORKDIR}/swupdate.sh ${D}${libdir}/swupdate + install -m 755 ${UNPACKDIR}/swupdate.sh ${D}${libdir}/swupdate sed -i 's#@LIBDIR@#${libdir}#g' ${D}${libdir}/swupdate/swupdate.sh if ${SWUPDATE_MONGOOSE}; then - install -m 644 ${WORKDIR}/10-mongoose-args ${D}${libdir}/swupdate/conf.d/ + install -m 644 ${UNPACKDIR}/10-mongoose-args ${D}${libdir}/swupdate/conf.d/ fi install -d ${D}${systemd_unitdir}/system - install -m 644 ${WORKDIR}/swupdate.service ${D}${systemd_system_unitdir} + install -m 644 ${UNPACKDIR}/swupdate.service ${D}${systemd_system_unitdir} sed -i 's#@LIBDIR@#${libdir}#' ${D}${systemd_system_unitdir}/swupdate.service - install -m 644 ${WORKDIR}/swupdate.socket.tmpl ${D}${systemd_system_unitdir}/swupdate.socket + install -m 644 ${UNPACKDIR}/swupdate.socket.tmpl ${D}${systemd_system_unitdir}/swupdate.socket sed -e "s,@@SWUPDATE_SOCKET_CTRL_PATH@@,${SWUPDATE_SOCKET_CTRL_PATH},g" \ -e "s,@@SWUPDATE_SOCKET_PROGRESS_PATH@@,${SWUPDATE_SOCKET_PROGRESS_PATH},g" \ -i ${D}${systemd_system_unitdir}/swupdate.socket - install -m 644 ${WORKDIR}/[email protected] ${D}${systemd_system_unitdir} - install -m 644 ${WORKDIR}/swupdate-progress.service ${D}${systemd_system_unitdir} + install -m 644 ${UNPACKDIR}/[email protected] ${D}${systemd_system_unitdir} + install -m 644 ${UNPACKDIR}/swupdate-progress.service ${D}${systemd_system_unitdir} if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}${nonarch_libdir}/tmpfiles.d - install -m 0644 ${WORKDIR}/tmpfiles-swupdate.conf ${D}${nonarch_libdir}/tmpfiles.d/swupdate.conf + install -m 0644 ${UNPACKDIR}/tmpfiles-swupdate.conf ${D}${nonarch_libdir}/tmpfiles.d/swupdate.conf install -d ${D}${sysconfdir}/udev/rules.d - install -m 0644 ${WORKDIR}/swupdate-usb.rules ${D}${sysconfdir}/udev/rules.d/ + install -m 0644 ${UNPACKDIR}/swupdate-usb.rules ${D}${sysconfdir}/udev/rules.d/ else # in case of systemd there is a service file, for sysv init we need to start it as well - install -m 0644 ${WORKDIR}/90-start-progress ${D}${libdir}/swupdate/conf.d/ + install -m 0644 ${UNPACKDIR}/90-start-progress ${D}${libdir}/swupdate/conf.d/ fi }
Signature · 1 line
2.34.1
ping
--
Best Regards
---------------------------------------------------
Wang Mingyu
FUJITSU NANJING SOFTWARE TECHNOLOGY CO., LTD. (FNST) No.6 Wenzhu Road, Nanjing, 210012, China TEL:+86+25-86630566--8568
COINS: 79988548
FAX: +86+25-83317685
MAIL: [email protected]
Quoted 40 lines
-----Original Message-----
From: [email protected] <[email protected]>
Sent: Monday, June 17, 2024 4:13 PM
To: [email protected]
Cc: Wang, Mingyu/王 鸣瑜 <[email protected]>
Subject: [yocto] [meta-cgl] [PATCH] cluster-glue: Start WORKDIR -> UNPACKDIR transitionFrom: Wang Mingyu <[email protected]>
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 Wang Mingyu <[email protected]>--- .../recipes-cgl/cluster-glue/cluster-glue_1.0.12.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.12.bb +0
-1@@ -62,9 +62,9 @@ do_configure:prepend() { do_install:append() { install -d ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/volatiles${D}${sysconfdir}/default/volatiles/04_cluster-glue
meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.12.bb +2
-1+ install -m 0644 ${UNPACKDIR}/volatiles +${D}${sysconfdir}/default/volatiles/04_cluster-glue install -d ${D}${sysconfdir}/tmpfiles.d - install -m 0644 ${WORKDIR}/tmpfiles
${D}${sysconfdir}/tmpfiles.d/${PN}.confmeta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.12.bb +2
-1+ install -m 0644 ${UNPACKDIR}/tmpfiles +${D}${sysconfdir}/tmpfiles.d/${PN}.conf oe_multilib_header heartbeat/glue_config.h } --2.34.1
merged.
Quoted 34 lines · wangmy via lists.yoctoproject.org
From: Wang Mingyu <[email protected]>
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 Wang Mingyu <[email protected]>--- .../recipes-cgl/cluster-glue/cluster-glue_1.0.12.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.12.bb +2
-3@@ -62,9 +62,9 @@ do_configure:prepend() { do_install:append() { install -d ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/04_cluster-glue + install -m 0644 ${UNPACKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/04_cluster-glue install -d ${D}${sysconfdir}/tmpfiles.d - install -m 0644 ${WORKDIR}/tmpfiles ${D}${sysconfdir}/tmpfiles.d/${PN}.conf + install -m 0644 ${UNPACKDIR}/tmpfiles ${D}${sysconfdir}/tmpfiles.d/${PN}.conf oe_multilib_header heartbeat/glue_config.h } -=-=-=-=-=-=-=-=-=-=-=-Links: You receive all messages sent to this group.
View/Reply Online (#63349): https://lists.yoctoproject.org/g/yocto/message/63349
Mute This Topic: https://lists.yoctoproject.org/mt/106717032/2167262
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Signature · 2 lines
Jeremy Puhlman [email protected]