Exclude /tmp/images from cleanup
/tmp is deleted every 10 days
/usr/lib/tmpfiles.d/tmp.conf does this cleanup with this entry,
"q /tmp 1777 root root 10d".
Exclude /tmp/images from the cleanup, by adding "x /tmp/images"
to /usr/lib/tmpfiles.d/software.conf, if a feature of the machine is
obmc-ubi-fs or openpower-ubi-fs.
Resolves openbmc/openbmc#2544
Change-Id: I3ead88724adcd63ebfd809d310109a19232b1def
Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
diff --git a/common/recipes-core/systemd/systemd/software.conf b/common/recipes-core/systemd/systemd/software.conf
new file mode 100644
index 0000000..09ecd92
--- /dev/null
+++ b/common/recipes-core/systemd/systemd/software.conf
@@ -0,0 +1,3 @@
+# /tmp/images is the software image upload directory
+# It should not be deleted if the UBI code update is used.
+x /tmp/images
diff --git a/common/recipes-core/systemd/systemd_%.bbappend b/common/recipes-core/systemd/systemd_%.bbappend
new file mode 100644
index 0000000..134bab5
--- /dev/null
+++ b/common/recipes-core/systemd/systemd_%.bbappend
@@ -0,0 +1,13 @@
+SRC_URI += "${@mf_enabled(d, 'openpower-ubi-fs', 'file://software.conf')}"
+
+do_install_append() {
+
+ # /tmp/images is the software image upload directory.
+ # It should not be deleted since it is watched by the Image Manager for
+ # new images. Don't install software.conf if obmc-ubi-fs is set since
+ # the bbappend in the meta-phosphor layer already installs if
+ # obmc-ubi-fs is set.
+ if ${@bb.utils.contains('MACHINE_FEATURES', 'openpower-ubi-fs', 'true', 'false', d)} && ! ${@bb.utils.contains('MACHINE_FEATURES', 'obmc-ubi-fs', 'true', 'false', d)}; then
+ install -m 0644 ${WORKDIR}/software.conf ${D}${exec_prefix}/lib/tmpfiles.d/
+ fi
+}