When building OpenBMC . . . ?

[Patrick Voelker]

> -----Original Message-----
> From: openbmc [mailto:openbmc-
> bounces+patrick_voelker=phoenix.com at lists.ozlabs.org] On Behalf Of Bills,
> Jason M
> Sent: Wednesday, September 2, 2020 2:40 PM
> To: openbmc at lists.ozlabs.org
> Subject: Re: When building OpenBMC . . . ?
<snip>
> > Is there a way now for me to force bitbake to ignore (or not use)
> rsyslog*.bbappend in meta-tiogapass from another layer?
> >
> > The two appends that are conflicting are:
> > meta-facebook/meta-tiogapass/recipes-
> extended/rsyslog/rsyslog_%.bbappend
> > meta-intel/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend
> I hit a similar issue when moving this recipe out of my downstream
> build.  I was able to resolve it by putting this change in my downstream
> version:
> diff --git a/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend
> b/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend
> index 7e282804..ef670451 100644
> --- a/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend
> +++ b/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend
> @@ -17,7 +17,7 @@ do_install_append() {
>           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
> +        rm -f ${D}${sysconfdir}/rsyslog.d/imjournal.conf
>   }
> 
>   SYSTEMD_SERVICE_${PN} += " rotate-event-logs.service
> rotate-event-logs.timer"
> 
> We can apply a similar change to one or both of these upstream recipes.
> Or, is this a candidate for meta-phosphor?

Yes, I think the '-f' argument would be a good option to upstream to both .bbappend files.  That would prevent conflict in case they both get used.

Conceptually though it doesn't make sense to keep layering the do_install() instructions in this way.  Is there a way around that?  Or can the meta-facebook/meta-tiogapass version be moved elsewhere?