[yocto] [meta-cgl][PATCH] poky-cgl: avoid installing multiple syslogs
Adrian Dudau
Adrian.Dudau at enea.com
Thu Jun 8 05:01:01 PDT 2017
On fre, 2017-06-02 at 15:59 +0800, jackie.huang at windriver.com wrote:
> From: Jackie Huang <jackie.huang at windriver.com>
>
> do_rootfs fails if multiple syslogs are installed:
> >
> > Error: package syslog-ng-3.8.1-r0.i586 conflicts with sysklogd
> > provided
> by sysklogd-1.5.1-r0.i586
>
> core-image-cgl requires packagegroup-core-full-cmdline which depends
> on VIRTUAL-RUNTIME_syslog (default to sysklogd), so set the
> VIRTUAL-RUNTIME_syslog in distro conf and no need to depends
> on any syslog in packagegroup-cgl-applications, then we ensure
> that only one syslog is installed to avoid conflicts.
>
> Signed-off-by: Jackie Huang <jackie.huang at windriver.com>
> ---
> meta-cgl-common/conf/distro/poky-cgl.conf | 4
> ++++
> meta-cgl-common/packagegroups/packagegroup-cgl-applications.bb | 2
> --
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/meta-cgl-common/conf/distro/poky-cgl.conf b/meta-cgl-
> common/conf/distro/poky-cgl.conf
> index 90cc82b..69f6200 100644
> --- a/meta-cgl-common/conf/distro/poky-cgl.conf
> +++ b/meta-cgl-common/conf/distro/poky-cgl.conf
> @@ -5,3 +5,7 @@ DISTRO = "poky-cgl"
>
> IMAGE_CLASSES += "image_types_uboot"
> PREFERRED_PROVIDER_virtual/refpolicy="refpolicy-targeted"
> +
> +# we want to use rsyslog as the default syslog, but it's GPLv3, so
> need this
> +# check to switch to syslog-ng if GLPv3 is blacklisted.
> +VIRTUAL-RUNTIME_syslog ?= "${@bb.utils.contains('INCOMPATIBLE_LICENS
> E', 'GPLv3', 'syslog-ng', 'rsyslog', d)}"
> diff --git a/meta-cgl-common/packagegroups/packagegroup-cgl-
> applications.bb b/meta-cgl-common/packagegroups/packagegroup-cgl-
> applications.bb
> index b566e2d..be36075 100644
> --- a/meta-cgl-common/packagegroups/packagegroup-cgl-applications.bb
> +++ b/meta-cgl-common/packagegroups/packagegroup-cgl-applications.bb
> @@ -40,7 +40,6 @@ RDEPENDS_${PN} = " \
> quota \
> smartmontools \
> monit \
> - syslog-ng \
> ocfs2-tools \
> logcheck \
> samhain-client \
> @@ -48,7 +47,6 @@ RDEPENDS_${PN} = " \
> audit \
> pam-passwdqc \
> libpam \
> - rsyslog \
> makedumpfile \
> "
>
> --
> 2.11.0
>
Patch good but doesn't apply. Please rebase on origin/master and send
again.
best regards
--Adrian
More information about the yocto
mailing list