From: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
To: Khem Raj <raj.khem@gmail.com>,
Markus Lehtonen <markus.lehtonen@linux.intel.com>
Cc: "openembedded-core@lists.openembedded.org"
<openembedded-core@lists.openembedded.org>
Subject: Re: [PATCH 3/7] sysklogd: Use update-alternatives
Date: Thu, 30 Aug 2018 07:44:46 +0000 [thread overview]
Message-ID: <c712539f5fd74697831fb7ed806e6fea@XBOX02.axis.com> (raw)
In-Reply-To: <fae07991f994982404930e78c225db460bd14ae6.1535601148.git.raj.khem@gmail.com>
> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org <openembedded-
> core-bounces@lists.openembedded.org> On Behalf Of Khem Raj
> Sent: den 30 augusti 2018 05:56
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [PATCH 3/7] sysklogd: Use update-alternatives
>
> busybox also provides klogd and syslogd, this change makes it coexist
> peacefully. Currently rootfs fails in situations where both of them are
> providing these binaries and busybox postinsts fail
>
> update-alternatives: Error: not linking
> /mnt/a/oe/build/tmp/work/qemuriscv64-bec-linux/core-image-full-
> cmdline/1.0-r0/rootfs/sbin/klogd
> to /bin/busybox.nosuid since
> /mnt/a/oe/build/tmp/work/qemuriscv64-bec-linux/core-image-full-
> cmdline/1.0-r0/rootfs/sbin/klogd
> exists and is not a link
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> meta/recipes-extended/sysklogd/sysklogd.inc | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc
> b/meta/recipes-extended/sysklogd/sysklogd.inc
> index fc4e67c18e..2a8bed00f3 100644
> --- a/meta/recipes-extended/sysklogd/sysklogd.inc
> +++ b/meta/recipes-extended/sysklogd/sysklogd.inc
> @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \
> file://klogd.c;beginline=2;endline=19;md5=7e87ed0ae6142de079bce738c10c899d \
> "
>
> -inherit update-rc.d systemd
> +inherit update-rc.d systemd update-alternatives
>
> SRC_URI = "http://www.infodrom.org/projects/sysklogd/download/sysklogd-${PV}.tar.gz \
> file://no-strip-install.patch \
> @@ -70,3 +70,9 @@ python () {
> if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d):
> d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1")
> }
> +
> +ALTERNATIVE_PRIORITY = "100"
> +ALTERNATIVE_${PN} = "klogd syslogd"
> +ALTERNATIVE_LINK_NAME[klogd] = "${base_sbindir}/klogd"
> +ALTERNATIVE_LINK_NAME[syslogd] = "${base_sbindir}/syslogd"
> +
> --
> 2.18.0
This is a (partial) revert of commit 988aad01b2 (sysklogd: don't use
update-alternatives). Can you come to an agreement regarding which is
the correct solution?
//Peter
next prev parent reply other threads:[~2018-08-30 7:44 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-30 3:55 [PATCH V2 0/7] postinst and clang fixes Khem Raj
2018-08-30 3:55 ` [PATCH 1/7] boost: Fix invalid const in atomic builtins Khem Raj
2018-08-30 3:55 ` [PATCH 2/7] libc-package: Add risc-v specific options to cross-localedef invocation Khem Raj
2018-08-30 3:55 ` [PATCH 3/7] sysklogd: Use update-alternatives Khem Raj
2018-08-30 7:44 ` Peter Kjellerstedt [this message]
2018-08-30 9:45 ` ChenQi
2018-09-03 6:49 ` Markus Lehtonen
2018-09-03 16:33 ` Khem Raj
2018-09-04 6:15 ` Markus Lehtonen
2018-08-30 3:55 ` [PATCH 4/7] glibc-locale: Enable riscv64 and riscv32 in BINARY_LOCALE_ARCHES supported architectures Khem Raj
2018-08-30 3:55 ` [PATCH 5/7] packagegroup-core-tools-testapps: Exclude gst-examples on riscv64 Khem Raj
2018-08-30 3:55 ` [PATCH 6/7] tcf-agent: Disable non-building features " Khem Raj
2018-08-30 3:55 ` [PATCH 7/7] gdb: Seprate out gold and dwp into a variable Khem Raj
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c712539f5fd74697831fb7ed806e6fea@XBOX02.axis.com \
--to=peter.kjellerstedt@axis.com \
--cc=markus.lehtonen@linux.intel.com \
--cc=openembedded-core@lists.openembedded.org \
--cc=raj.khem@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox