diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-06-08 10:20:52 -0400 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-06-25 16:05:24 -0400 |
| commit | a4e7328186fcc507f4ef5c4c18876ecd5107bec5 (patch) | |
| tree | 283de0d2e42a7f94ce5140af5b79183e87e503c4 /meta-openbmc-machines | |
| parent | cf994353c41012ceabeb20561158d6cdd3319ffb (diff) | |
| download | talos-openbmc-a4e7328186fcc507f4ef5c4c18876ecd5107bec5.tar.gz talos-openbmc-a4e7328186fcc507f4ef5c4c18876ecd5107bec5.zip | |
flash: Move image manager tmpfile config
1e4452449 added a systemd tmpfile config file for the software image
upload path but the config file was added to the systemd recipe.
tmpfile config files should be added to the recipes/config files that
use them. For example on an RPM based distro:
$ rpm -qf /usr/lib/tmpfiles.d/samba.conf
samba-common-4.7.7-0.fc27.noarch
Tested: Validated software.conf present in Witherspoon rootfs
Change-Id: I47e8c8c44eb19440cc98d0380e9634f688eccb21
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openbmc-machines')
| -rw-r--r-- | meta-openbmc-machines/meta-openpower/common/recipes-core/systemd/systemd/software.conf | 3 | ||||
| -rw-r--r-- | meta-openbmc-machines/meta-openpower/common/recipes-core/systemd/systemd_%.bbappend | 25 |
2 files changed, 0 insertions, 28 deletions
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-core/systemd/systemd/software.conf b/meta-openbmc-machines/meta-openpower/common/recipes-core/systemd/systemd/software.conf deleted file mode 100644 index 09ecd92e4..000000000 --- a/meta-openbmc-machines/meta-openpower/common/recipes-core/systemd/systemd/software.conf +++ /dev/null @@ -1,3 +0,0 @@ -# /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/meta-openbmc-machines/meta-openpower/common/recipes-core/systemd/systemd_%.bbappend b/meta-openbmc-machines/meta-openpower/common/recipes-core/systemd/systemd_%.bbappend deleted file mode 100644 index e42259e5f..000000000 --- a/meta-openbmc-machines/meta-openpower/common/recipes-core/systemd/systemd_%.bbappend +++ /dev/null @@ -1,25 +0,0 @@ -inherit obmc-phosphor-utils - -SRC_URI += "${@df_enabled(d, 'openpower-ubi-fs', 'file://software.conf')}" - -install_tmpfile() { - # /tmp/images is the software image upload directory. - # It should not be deleted since it is watched by the Image Manager for - # new images. - - if ${@bb.utils.contains('DISTRO_FEATURES', 'openpower-ubi-fs', 'true', 'false', d)}; then - install -m 0644 ${WORKDIR}/software.conf ${D}${exec_prefix}/lib/tmpfiles.d/ - fi -} - -install_tmpfile_df-obmc-ubi-fs() { - # 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. - - : -} - -do_install_append() { - install_tmpfile -} |
