From 243c130a919c7037b5edd3a8097317340796ce85 Mon Sep 17 00:00:00 2001 From: "Jason M. Bills" Date: Thu, 5 Dec 2019 13:29:56 -0800 Subject: Update to internal 2019-12-05 Signed-off-by: Jason M. Bills --- .../meta-common/recipes-extended/pam/pam-ipmi_%.bbappend | 4 ++++ .../meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend | 8 -------- 2 files changed, 4 insertions(+), 8 deletions(-) create mode 100644 meta-openbmc-mods/meta-common/recipes-extended/pam/pam-ipmi_%.bbappend (limited to 'meta-openbmc-mods/meta-common/recipes-extended') diff --git a/meta-openbmc-mods/meta-common/recipes-extended/pam/pam-ipmi_%.bbappend b/meta-openbmc-mods/meta-common/recipes-extended/pam/pam-ipmi_%.bbappend new file mode 100644 index 000000000..55fb00a77 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-extended/pam/pam-ipmi_%.bbappend @@ -0,0 +1,4 @@ +do_install_append () { +# Remove ipmi_pass from image, if debug-tweaks is not enabled + ${@bb.utils.contains('EXTRA_IMAGE_FEATURES', 'debug-tweaks', '', 'rm ${D}/${sysconfdir}/ipmi_pass', d)} +} 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 15e557c79..7e282804e 100644 --- a/meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend @@ -1,13 +1,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -# Pin to rsyslog v8.1904.0 for now -# v8.1903.0 has a couple issues with the imjournal module: -# 1. Enabling the "WorkAroundJournalBug" option causes rsyslogd to fail to start -# 2. Logging data especially while rotating the journal causes a double free error -PV = "8.1904.0" -SRC_URI[md5sum] = "b9398b5aa68a829bf2c18a87490d30c0" -SRC_URI[sha256sum] = "7098b459dfc3f8bfc35d5b114c56e7945614ba76efa4e513b1db9c38b0ff9c3d" - SRC_URI += "file://rsyslog.conf \ file://rsyslog.logrotate \ file://rotate-event-logs.service \ -- cgit v1.2.3