Skip to contentSkip to conversation

systemd-conf: unpack to $S

PATCH In review Joe Slater 3 participants 3 messages Jul 1, 2020 – Jul 2, 2020

lore
Share & tools
lore

Joe Slater

author
#0 lore raw

PATCH 1/1 systemd-conf: unpack to $S

systemd-conf copies some files to the target but they are in WORKDIR and not visible to the archiver. Unpack them to S.

---
 .../systemd/systemd-conf_245.6.bb             | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
meta/recipes-core/systemd/systemd-conf_245.6.bb +10 -10
index d9ec023bfd..d205a60859 100644
@@ -6,23 +6,23 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 SRC_URI = "\
-    file://journald.conf \
-    file://logind.conf \
-    file://system.conf \
-    file://system.conf-qemuall \
-    file://wired.network \
+    file://journald.conf;subdir=${BP} \
+    file://logind.conf;subdir=${BP} \
+    file://system.conf;subdir=${BP} \
+    file://system.conf-qemuall;subdir=${BP} \
+    file://wired.network;subdir=${BP} \
 "
 
 do_install() {
-	install -D -m0644 ${WORKDIR}/journald.conf ${D}${systemd_unitdir}/journald.conf.d/00-${PN}.conf
-	install -D -m0644 ${WORKDIR}/logind.conf ${D}${systemd_unitdir}/logind.conf.d/00-${PN}.conf
-	install -D -m0644 ${WORKDIR}/system.conf ${D}${systemd_unitdir}/system.conf.d/00-${PN}.conf
-	install -D -m0644 ${WORKDIR}/wired.network ${D}${systemd_unitdir}/network/80-wired.network
+	install -D -m0644 ${S}/journald.conf ${D}${systemd_unitdir}/journald.conf.d/00-${PN}.conf
+	install -D -m0644 ${S}/logind.conf ${D}${systemd_unitdir}/logind.conf.d/00-${PN}.conf
+	install -D -m0644 ${S}/system.conf ${D}${systemd_unitdir}/system.conf.d/00-${PN}.conf
+	install -D -m0644 ${S}/wired.network ${D}${systemd_unitdir}/network/80-wired.network
 }
 
 # Based on change from YP bug 8141, OE commit 5196d7bacaef1076c361adaa2867be31759c1b52
 do_install_append_qemuall() {
-	install -D -m0644 ${WORKDIR}/system.conf-qemuall ${D}${systemd_unitdir}/system.conf.d/01-${PN}.conf
+	install -D -m0644 ${S}/system.conf-qemuall ${D}${systemd_unitdir}/system.conf.d/01-${PN}.conf
 
 	# Do not install wired.network for qemu bsps
 	rm -rf ${D}${systemd_unitdir}/network
Signature · 1 line
2.17.1
#1 lore raw
Quoted 9 lines · Joe Slater

systemd-conf copies some files to the target but they are in WORKDIR and not visible to the archiver. Unpack them to S.

---
 .../systemd/systemd-conf_245.6.bb             | 20 +++++++++------
----
 1 file changed, 10 insertions(+), 10 deletions(-)

Whilst these patches are kind of ok but I can't help feeling the archiver really needs fixing...

Cheers,

Richard

#2 lore raw
Quoted 6 lines · Richard Purdie
Quoted 4 lines · Joe Slater

systemd-conf copies some files to the target but they are in WORKDIR and not visible to the archiver. Unpack them to S.

Quoted 8 lines
Quoted 5 lines
---
 .../systemd/systemd-conf_245.6.bb             | 20 +++++++++------
----
 1 file changed, 10 insertions(+), 10 deletions(-)

Whilst these patches are kind of ok but I can't help feeling the archiver really needs fixing...

Agreed.

Joe, how are you configuring the archiver here?

Also, are you not providing your layers along with the copies of the upstream source code? If you're providing the layers then you shouldn't need to worry about files like these being picked up by the archiver.

Thanks,

Signature · 2 lines
Paul Barker
Konsulko Group