diff options
| author | Ed Tanous <ed.tanous@intel.com> | 2019-07-31 20:43:37 +0300 |
|---|---|---|
| committer | Ed Tanous <ed.tanous@intel.com> | 2019-08-01 18:19:38 +0300 |
| commit | d0f63ef62c76c932a2003eaa42c0b250065ae06f (patch) | |
| tree | 4c0e3cb32dc80f80460bdbf82ff6d401d4ff194f /meta-openbmc-mods/meta-common/recipes-extended | |
| parent | b4f66bacb1b8e661d794fa7a189e2f66f5092e2e (diff) | |
| download | openbmc-d0f63ef62c76c932a2003eaa42c0b250065ae06f.tar.xz | |
Update to internal 7-31-19
Signed-off-by: Ed Tanous <ed.tanous@intel.com>
Diffstat (limited to 'meta-openbmc-mods/meta-common/recipes-extended')
| -rw-r--r-- | meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog-policy.bbappend | 4 | ||||
| -rw-r--r-- | meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog-override.conf (renamed from meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog-policy/rsyslog-override.conf) | 0 | ||||
| -rw-r--r-- | meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend | 6 | ||||
| -rw-r--r-- | meta-openbmc-mods/meta-common/recipes-extended/sdbusplus/sdbusplus_%.bbappend | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog-policy.bbappend b/meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog-policy.bbappend deleted file mode 100644 index 58512234d..000000000 --- a/meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog-policy.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://rsyslog-override.conf \ -" diff --git a/meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog-policy/rsyslog-override.conf b/meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog-override.conf index 14bcc0781..14bcc0781 100644 --- a/meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog-policy/rsyslog-override.conf +++ b/meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog-override.conf diff --git a/meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend b/meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend index 03a81e2cb..15e557c79 100644 --- a/meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend @@ -12,13 +12,19 @@ SRC_URI += "file://rsyslog.conf \ file://rsyslog.logrotate \ file://rotate-event-logs.service \ file://rotate-event-logs.timer \ + file://rsyslog-override.conf \ " +FILES_${PN} += "${systemd_system_unitdir}/rsyslog.service.d/rsyslog-override.conf" + PACKAGECONFIG_append = " imjournal" do_install_append() { install -m 0644 ${WORKDIR}/rotate-event-logs.service ${D}${systemd_system_unitdir} install -m 0644 ${WORKDIR}/rotate-event-logs.timer ${D}${systemd_system_unitdir} + install -d ${D}${systemd_system_unitdir}/rsyslog.service.d + install -m 0644 ${WORKDIR}/rsyslog-override.conf \ + ${D}${systemd_system_unitdir}/rsyslog.service.d/rsyslog-override.conf rm ${D}${sysconfdir}/rsyslog.d/imjournal.conf } diff --git a/meta-openbmc-mods/meta-common/recipes-extended/sdbusplus/sdbusplus_%.bbappend b/meta-openbmc-mods/meta-common/recipes-extended/sdbusplus/sdbusplus_%.bbappend index af5fa8b05..a7fefea96 100644 --- a/meta-openbmc-mods/meta-common/recipes-extended/sdbusplus/sdbusplus_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-extended/sdbusplus/sdbusplus_%.bbappend @@ -1,4 +1,4 @@ #SRC_URI += "git://github.com/openbmc/sdbusplus" -SRCREV = "f8bbf17c3db879359b0984b40250e4db3d274be1" +SRCREV = "4212292bcf136d04b38ba5116aa568b0fa312798" |