Patchwork [meta-oe,1/1] busybox: remove bbappend

login
register
mail settings
Submitter Paul Eggleton
Date Aug. 23, 2013, 11:33 a.m.
Message ID <da4ddacdf801a6744fbdd2081bcc41586ec326ac.1377257565.git.paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/56323/
State Accepted, archived
Commit 3671cffbb6183a67a60591c5feeca43665770242
Headers show

Comments

Paul Eggleton - Aug. 23, 2013, 11:33 a.m.
This bbappend has effectively been merged into OE-Core, although the
log buffer size is the busybox default rather than 64K - layers may
change this either by providing their own /etc/default/busybox-syslog
file (when using systemd) or modifying the
CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE option in busybox's build time
config.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta-oe/recipes-core/busybox/busybox/busybox-syslog.default |  1 -
 meta-oe/recipes-core/busybox/busybox_1.21.1.bbappend        | 11 -----------
 2 files changed, 12 deletions(-)
 delete mode 100644 meta-oe/recipes-core/busybox/busybox/busybox-syslog.default
 delete mode 100644 meta-oe/recipes-core/busybox/busybox_1.21.1.bbappend
Khem Raj - Aug. 23, 2013, 5:36 p.m.
On Aug 23, 2013, at 4:33 AM, Paul Eggleton <paul.eggleton@linux.intel.com> wrote:

> This bbappend has effectively been merged into OE-Core, although the
> log buffer size is the busybox default rather than 64K - layers may
> change this either by providing their own /etc/default/busybox-syslog
> file (when using systemd) or modifying the
> CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE option in busybox's build time
> config

I think it would be better if we added this option via a kconfig fragment
in OE-Core if DISTRO_FEATURES contained systemd and then remove this from
here. I say this because otherwise size of circular buffer goes back to 16k
from 64k and may not be enough to hold valuable info. On modern systems I
think we can afford 64k. I would even argue to make it default in busybox.
having said that, busybox-syslogd may be redundant when using systemd since
we have journald with systemd but there might still be lot of use cases
of busybox-syslogd. Either of these above approaches are fine with me.

> 
> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> ---
> meta-oe/recipes-core/busybox/busybox/busybox-syslog.default |  1 -
> meta-oe/recipes-core/busybox/busybox_1.21.1.bbappend        | 11 -----------
> 2 files changed, 12 deletions(-)
> delete mode 100644 meta-oe/recipes-core/busybox/busybox/busybox-syslog.default
> delete mode 100644 meta-oe/recipes-core/busybox/busybox_1.21.1.bbappend
> 
> diff --git a/meta-oe/recipes-core/busybox/busybox/busybox-syslog.default b/meta-oe/recipes-core/busybox/busybox/busybox-syslog.default
> deleted file mode 100644
> index 8a21e6d..0000000
> --- a/meta-oe/recipes-core/busybox/busybox/busybox-syslog.default
> +++ /dev/null
> @@ -1 +0,0 @@
> -OPTIONS="-C64"
> diff --git a/meta-oe/recipes-core/busybox/busybox_1.21.1.bbappend b/meta-oe/recipes-core/busybox/busybox_1.21.1.bbappend
> deleted file mode 100644
> index 7a2f0c3..0000000
> --- a/meta-oe/recipes-core/busybox/busybox_1.21.1.bbappend
> +++ /dev/null
> @@ -1,11 +0,0 @@
> -# look for files in the layer first
> -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> -
> -SRC_URI += "file://busybox-syslog.default"
> -
> -do_install_append() {
> -    install -d ${D}${sysconfdir}/default
> -    install -m 0644 ${WORKDIR}/busybox-syslog.default ${D}${sysconfdir}/default/busybox-syslog
> -}
> -
> -FILES_${PN}-syslog += "${sysconfdir}/default/busybox-syslog"
> -- 
> 1.8.1.2
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Paul Eggleton - Aug. 24, 2013, 9:47 a.m.
On Friday 23 August 2013 10:36:15 Khem Raj wrote:
> On Aug 23, 2013, at 4:33 AM, Paul Eggleton <paul.eggleton@linux.intel.com> 
> wrote:
> > This bbappend has effectively been merged into OE-Core, although the
> > log buffer size is the busybox default rather than 64K - layers may
> > change this either by providing their own /etc/default/busybox-syslog
> > file (when using systemd) or modifying the
> > CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE option in busybox's build time
> > config
> 
> I think it would be better if we added this option via a kconfig fragment
> in OE-Core if DISTRO_FEATURES contained systemd and then remove this from
> here. I say this because otherwise size of circular buffer goes back to 16k
> from 64k and may not be enough to hold valuable info.

Why is this specific to systemd?

Cheers,
Paul
Khem Raj - Aug. 26, 2013, 9:39 p.m.
On Aug 24, 2013, at 2:47 AM, Paul Eggleton <paul.eggleton@linux.intel.com> wrote:

> On Friday 23 August 2013 10:36:15 Khem Raj wrote:
>> On Aug 23, 2013, at 4:33 AM, Paul Eggleton <paul.eggleton@linux.intel.com> 
>> wrote:
>>> This bbappend has effectively been merged into OE-Core, although the
>>> log buffer size is the busybox default rather than 64K - layers may
>>> change this either by providing their own /etc/default/busybox-syslog
>>> file (when using systemd) or modifying the
>>> CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE option in busybox's build time
>>> config
>> 
>> I think it would be better if we added this option via a kconfig fragment
>> in OE-Core if DISTRO_FEATURES contained systemd and then remove this from
>> here. I say this because otherwise size of circular buffer goes back to 16k
>> from 64k and may not be enough to hold valuable info.
> 
> Why is this specific to systemd?

It probably is not. Otavio added it, so I am CCing him
however this is default used in many distros, just to keep enough
messages around while you can affort 64K buffer which is not a huge ask
these days.
 

> 
> Cheers,
> Paul
> 
> -- 
> 
> Paul Eggleton
> Intel Open Source Technology Centre
Paul Eggleton - Aug. 26, 2013, 9:53 p.m.
On Monday 26 August 2013 14:39:10 Khem Raj wrote:
> On Aug 24, 2013, at 2:47 AM, Paul Eggleton <paul.eggleton@linux.intel.com>
> wrote:
> > On Friday 23 August 2013 10:36:15 Khem Raj wrote:
> >> On Aug 23, 2013, at 4:33 AM, Paul Eggleton
> >> <paul.eggleton@linux.intel.com> wrote:
> >>> This bbappend has effectively been merged into OE-Core, although the
> >>> log buffer size is the busybox default rather than 64K - layers may
> >>> change this either by providing their own /etc/default/busybox-syslog
> >>> file (when using systemd) or modifying the
> >>> CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE option in busybox's build time
> >>> config
> >> 
> >> I think it would be better if we added this option via a kconfig fragment
> >> in OE-Core if DISTRO_FEATURES contained systemd and then remove this from
> >> here. I say this because otherwise size of circular buffer goes back to
> >> 16k from 64k and may not be enough to hold valuable info.
> > 
> > Why is this specific to systemd?
> 
> It probably is not. Otavio added it, so I am CCing him
> however this is default used in many distros, just to keep enough
> messages around while you can affort 64K buffer which is not a huge ask
> these days.

If it's generally useful and not specific to systemd (and it seems it isn't the 
latter) I'd have to say I agree, let's set the default in our busybox 
defconfig.

Cheers,
Paul
Khem Raj - Aug. 27, 2013, 5:03 a.m.
On Aug 26, 2013, at 2:53 PM, Paul Eggleton <paul.eggleton@linux.intel.com> wrote:

> On Monday 26 August 2013 14:39:10 Khem Raj wrote:
>> On Aug 24, 2013, at 2:47 AM, Paul Eggleton <paul.eggleton@linux.intel.com>
>> wrote:
>>> On Friday 23 August 2013 10:36:15 Khem Raj wrote:
>>>> On Aug 23, 2013, at 4:33 AM, Paul Eggleton
>>>> <paul.eggleton@linux.intel.com> wrote:
>>>>> This bbappend has effectively been merged into OE-Core, although the
>>>>> log buffer size is the busybox default rather than 64K - layers may
>>>>> change this either by providing their own /etc/default/busybox-syslog
>>>>> file (when using systemd) or modifying the
>>>>> CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE option in busybox's build time
>>>>> config
>>>> 
>>>> I think it would be better if we added this option via a kconfig fragment
>>>> in OE-Core if DISTRO_FEATURES contained systemd and then remove this from
>>>> here. I say this because otherwise size of circular buffer goes back to
>>>> 16k from 64k and may not be enough to hold valuable info.
>>> 
>>> Why is this specific to systemd?
>> 
>> It probably is not. Otavio added it, so I am CCing him
>> however this is default used in many distros, just to keep enough
>> messages around while you can affort 64K buffer which is not a huge ask
>> these days.
> 
> If it's generally useful and not specific to systemd (and it seems it isn't the 
> latter) I'd have to say I agree, let's set the default in our busybox 
> defconfig.
> 

I have no issues with changed the defconfig.

> Cheers,
> Paul
> 
> -- 
> 
> Paul Eggleton
> Intel Open Source Technology Centre
Otavio Salvador - Aug. 29, 2013, 10:04 p.m.
On Mon, Aug 26, 2013 at 6:53 PM, Paul Eggleton
<paul.eggleton@linux.intel.com> wrote:
> On Monday 26 August 2013 14:39:10 Khem Raj wrote:
>> On Aug 24, 2013, at 2:47 AM, Paul Eggleton <paul.eggleton@linux.intel.com>
>> wrote:
>> > On Friday 23 August 2013 10:36:15 Khem Raj wrote:
>> >> On Aug 23, 2013, at 4:33 AM, Paul Eggleton
>> >> <paul.eggleton@linux.intel.com> wrote:
>> >>> This bbappend has effectively been merged into OE-Core, although the
>> >>> log buffer size is the busybox default rather than 64K - layers may
>> >>> change this either by providing their own /etc/default/busybox-syslog
>> >>> file (when using systemd) or modifying the
>> >>> CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE option in busybox's build time
>> >>> config
>> >>
>> >> I think it would be better if we added this option via a kconfig fragment
>> >> in OE-Core if DISTRO_FEATURES contained systemd and then remove this from
>> >> here. I say this because otherwise size of circular buffer goes back to
>> >> 16k from 64k and may not be enough to hold valuable info.
>> >
>> > Why is this specific to systemd?
>>
>> It probably is not. Otavio added it, so I am CCing him
>> however this is default used in many distros, just to keep enough
>> messages around while you can affort 64K buffer which is not a huge ask
>> these days.
>
> If it's generally useful and not specific to systemd (and it seems it isn't the
> latter) I'd have to say I agree, let's set the default in our busybox
> defconfig.

+1
Martin Jansa - Sept. 3, 2013, 5:59 p.m.
On Fri, Aug 23, 2013 at 12:33:37PM +0100, Paul Eggleton wrote:
> This bbappend has effectively been merged into OE-Core, although the
> log buffer size is the busybox default rather than 64K - layers may
> change this either by providing their own /etc/default/busybox-syslog
> file (when using systemd) or modifying the
> CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE option in busybox's build time
> config.

Applied, thanks!

> 
> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> ---
>  meta-oe/recipes-core/busybox/busybox/busybox-syslog.default |  1 -
>  meta-oe/recipes-core/busybox/busybox_1.21.1.bbappend        | 11 -----------
>  2 files changed, 12 deletions(-)
>  delete mode 100644 meta-oe/recipes-core/busybox/busybox/busybox-syslog.default
>  delete mode 100644 meta-oe/recipes-core/busybox/busybox_1.21.1.bbappend
> 
> diff --git a/meta-oe/recipes-core/busybox/busybox/busybox-syslog.default b/meta-oe/recipes-core/busybox/busybox/busybox-syslog.default
> deleted file mode 100644
> index 8a21e6d..0000000
> --- a/meta-oe/recipes-core/busybox/busybox/busybox-syslog.default
> +++ /dev/null
> @@ -1 +0,0 @@
> -OPTIONS="-C64"
> diff --git a/meta-oe/recipes-core/busybox/busybox_1.21.1.bbappend b/meta-oe/recipes-core/busybox/busybox_1.21.1.bbappend
> deleted file mode 100644
> index 7a2f0c3..0000000
> --- a/meta-oe/recipes-core/busybox/busybox_1.21.1.bbappend
> +++ /dev/null
> @@ -1,11 +0,0 @@
> -# look for files in the layer first
> -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> -
> -SRC_URI += "file://busybox-syslog.default"
> -
> -do_install_append() {
> -    install -d ${D}${sysconfdir}/default
> -    install -m 0644 ${WORKDIR}/busybox-syslog.default ${D}${sysconfdir}/default/busybox-syslog
> -}
> -
> -FILES_${PN}-syslog += "${sysconfdir}/default/busybox-syslog"
> -- 
> 1.8.1.2
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Patch

diff --git a/meta-oe/recipes-core/busybox/busybox/busybox-syslog.default b/meta-oe/recipes-core/busybox/busybox/busybox-syslog.default
deleted file mode 100644
index 8a21e6d..0000000
--- a/meta-oe/recipes-core/busybox/busybox/busybox-syslog.default
+++ /dev/null
@@ -1 +0,0 @@ 
-OPTIONS="-C64"
diff --git a/meta-oe/recipes-core/busybox/busybox_1.21.1.bbappend b/meta-oe/recipes-core/busybox/busybox_1.21.1.bbappend
deleted file mode 100644
index 7a2f0c3..0000000
--- a/meta-oe/recipes-core/busybox/busybox_1.21.1.bbappend
+++ /dev/null
@@ -1,11 +0,0 @@ 
-# look for files in the layer first
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += "file://busybox-syslog.default"
-
-do_install_append() {
-    install -d ${D}${sysconfdir}/default
-    install -m 0644 ${WORKDIR}/busybox-syslog.default ${D}${sysconfdir}/default/busybox-syslog
-}
-
-FILES_${PN}-syslog += "${sysconfdir}/default/busybox-syslog"