[PATCH 1/5] utils.py: Modify and rename distro_features_backfill python function

[PATCH 1/5] utils.py: Modify and rename distro_features_backfill python function

[Andrei Gherzan]

This function was written to be used with DISTRO_FEATURES. This behavior
is usefull with MACHINE_FEATURES as well.

Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
---
 meta/lib/oe/utils.py |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
index 8912dac..5a19a76 100644
--- a/meta/lib/oe/utils.py
+++ b/meta/lib/oe/utils.py
@@ -89,15 +89,18 @@ def inherits(d, *classes):
     """Return True if the metadata inherits any of the specified classes"""
     return any(bb.data.inherits_class(cls, d) for cls in classes)
 
-def distro_features_backfill(d):
+def features_backfill(var,d):
+    # This construct allows the addition of new features to variable specified
+    # as var
+    # Example for var = "DISTRO_FEATURES"
     # This construct allows the addition of new features to DISTRO_FEATURES
     # that if not present would disable existing functionality, without
     # disturbing distributions that have already set DISTRO_FEATURES.
     # Distributions wanting to elide a value in DISTRO_FEATURES_BACKFILL should
     # add the feature to DISTRO_FEATURES_BACKFILL_CONSIDERED
 
-    backfill = (d.getVar("DISTRO_FEATURES_BACKFILL", True) or "").split()
-    considered = (d.getVar("DISTRO_FEATURES_BACKFILL_CONSIDERED", True) or "").split()
+    backfill = (d.getVar(var+"_BACKFILL", True) or "").split()
+    considered = (d.getVar(var+"_BACKFILL_CONSIDERED", True) or "").split()
 
     addfeatures = []
     for feature in backfill:
-- 
1.7.9.5

[PATCH 2/5] bitbake.conf: Use the new form of features_backfill function

[Andrei Gherzan]

This function was modified in order to be used with other
variables then DISTRO_FEATURES. Use this new function name and
add the parameter needed.

Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
---
 meta/conf/bitbake.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 3453a86..855ba6a 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -722,7 +722,7 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
 IMAGE_FEATURES += "${EXTRA_IMAGE_FEATURES}"
 
 DISTRO_FEATURES_BACKFILL = "pulseaudio"
-DISTRO_FEATURES_append = "${@oe.utils.distro_features_backfill(d)}"
+DISTRO_FEATURES_append = "${@oe.utils.features_backfill("DISTRO_FEATURES",d)}"
 
 COMBINED_FEATURES = "\
     ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "alsa", d)} \
-- 
1.7.9.5

[PATCH 3/5] bitbake.conf: Add MACHINE_FEATURES_BACKFILL and append to MACHINE_FEATURES

[Andrei Gherzan]

This is works the way DISTRO_FEATURES_BACKFILL does.

Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
---
 meta/conf/bitbake.conf |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 855ba6a..6a4d4ef 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -724,6 +724,9 @@ IMAGE_FEATURES += "${EXTRA_IMAGE_FEATURES}"
 DISTRO_FEATURES_BACKFILL = "pulseaudio"
 DISTRO_FEATURES_append = "${@oe.utils.features_backfill("DISTRO_FEATURES",d)}"
 
+MACHINE_FEATURES_BACKFILL = ""
+MACHINE_FEATURES_append = "${@oe.utils.features_backfill("MACHINE_FEATURES",d)}"
+
 COMBINED_FEATURES = "\
     ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "alsa", d)} \
     ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "bluetooth", d)} \
-- 
1.7.9.5

[PATCH 4/5] bitbake.conf: Add rtc to MACHINE_FEATURES_BACKFILL

[Andrei Gherzan]

This was done this way so that the current machine configuration
would remain unaffected.
The rtc MACHINE_FEATURE will specify if a real time clock is avalaible.

Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
---
 meta/conf/bitbake.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 6a4d4ef..8904132 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -724,7 +724,7 @@ IMAGE_FEATURES += "${EXTRA_IMAGE_FEATURES}"
 DISTRO_FEATURES_BACKFILL = "pulseaudio"
 DISTRO_FEATURES_append = "${@oe.utils.features_backfill("DISTRO_FEATURES",d)}"
 
-MACHINE_FEATURES_BACKFILL = ""
+MACHINE_FEATURES_BACKFILL = "rtc"
 MACHINE_FEATURES_append = "${@oe.utils.features_backfill("MACHINE_FEATURES",d)}"
 
 COMBINED_FEATURES = "\
-- 
1.7.9.5

[PATCH 5/5] busybox.inc: Install hwclock init script only if rtc is present in MACHINE_FEATURES

[Andrei Gherzan]

Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
---
 meta/recipes-core/busybox/busybox.inc |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 82137a3..17ff442 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -180,9 +180,13 @@ do_install () {
 	if grep "CONFIG_UDHCPD=y" ${WORKDIR}/defconfig; then
 		install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/
 	fi
-	if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then
-		install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/
-	fi
+	case "${MACHINE_FEATURES}" in
+	*rtc*)
+		if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then
+			install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/
+		fi
+		;;
+	esac
 	if grep "CONFIG_UDHCPC=y" ${WORKDIR}/defconfig; then
 		install -d ${D}${sysconfdir}/udhcpc.d
 		install -d ${D}${datadir}/udhcpc
-- 
1.7.9.5

Re: [PATCH 5/5] busybox.inc: Install hwclock init script only if rtc is present in MACHINE_FEATURES

[Richard Purdie]

On Tue, 2012-07-10 at 17:59 +0300, Andrei Gherzan wrote:
> Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
> ---
>  meta/recipes-core/busybox/busybox.inc |   10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
> index 82137a3..17ff442 100644
> --- a/meta/recipes-core/busybox/busybox.inc
> +++ b/meta/recipes-core/busybox/busybox.inc
> @@ -180,9 +180,13 @@ do_install () {
>  	if grep "CONFIG_UDHCPD=y" ${WORKDIR}/defconfig; then
>  		install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/
>  	fi
> -	if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then
> -		install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/
> -	fi
> +	case "${MACHINE_FEATURES}" in
> +	*rtc*)
> +		if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then
> +			install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/
> +		fi
> +		;;
> +	esac
>  	if grep "CONFIG_UDHCPC=y" ${WORKDIR}/defconfig; then
>  		install -d ${D}${sysconfdir}/udhcpc.d
>  		install -d ${D}${datadir}/udhcpc

This makes busybox machine specific? Is that really what you want to do?

Cheers,

Richard

Re: [PATCH 5/5] busybox.inc: Install hwclock init script only if rtc is present in MACHINE_FEATURES

[Andrei Gherzan]

[-- Attachment #1: Type: text/plain, Size: 1561 bytes --]

On Tue, Jul 10, 2012 at 7:02 PM, Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:

> On Tue, 2012-07-10 at 17:59 +0300, Andrei Gherzan wrote:
> > Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
> > ---
> >  meta/recipes-core/busybox/busybox.inc |   10 +++++++---
> >  1 file changed, 7 insertions(+), 3 deletions(-)
> >
> > diff --git a/meta/recipes-core/busybox/busybox.inc
> b/meta/recipes-core/busybox/busybox.inc
> > index 82137a3..17ff442 100644
> > --- a/meta/recipes-core/busybox/busybox.inc
> > +++ b/meta/recipes-core/busybox/busybox.inc
> > @@ -180,9 +180,13 @@ do_install () {
> >       if grep "CONFIG_UDHCPD=y" ${WORKDIR}/defconfig; then
> >               install -m 0755 ${WORKDIR}/busybox-udhcpd
> ${D}${sysconfdir}/init.d/
> >       fi
> > -     if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then
> > -             install -m 0755 ${WORKDIR}/hwclock.sh
> ${D}${sysconfdir}/init.d/
> > -     fi
> > +     case "${MACHINE_FEATURES}" in
> > +     *rtc*)
> > +             if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then
> > +                     install -m 0755 ${WORKDIR}/hwclock.sh
> ${D}${sysconfdir}/init.d/
> > +             fi
> > +             ;;
> > +     esac
> >       if grep "CONFIG_UDHCPC=y" ${WORKDIR}/defconfig; then
> >               install -d ${D}${sysconfdir}/udhcpc.d
> >               install -d ${D}${datadir}/udhcpc
>
> This makes busybox machine specific? Is that really what you want to do?
>
> I want to have hwclock init script only on machines with RTC.

@g

[-- Attachment #2: Type: text/html, Size: 2109 bytes --]

Re: [PATCH 5/5] busybox.inc: Install hwclock init script only if rtc is present in MACHINE_FEATURES

[Andrei Gherzan]

[-- Attachment #1: Type: text/plain, Size: 1937 bytes --]

On Tue, Jul 10, 2012 at 11:53 PM, Andrei Gherzan <andrei@gherzan.ro> wrote:

> On Tue, Jul 10, 2012 at 7:02 PM, Richard Purdie <
> richard.purdie@linuxfoundation.org> wrote:
>
>> On Tue, 2012-07-10 at 17:59 +0300, Andrei Gherzan wrote:
>> > Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
>> > ---
>> >  meta/recipes-core/busybox/busybox.inc |   10 +++++++---
>> >  1 file changed, 7 insertions(+), 3 deletions(-)
>> >
>> > diff --git a/meta/recipes-core/busybox/busybox.inc
>> b/meta/recipes-core/busybox/busybox.inc
>> > index 82137a3..17ff442 100644
>> > --- a/meta/recipes-core/busybox/busybox.inc
>> > +++ b/meta/recipes-core/busybox/busybox.inc
>> > @@ -180,9 +180,13 @@ do_install () {
>> >       if grep "CONFIG_UDHCPD=y" ${WORKDIR}/defconfig; then
>> >               install -m 0755 ${WORKDIR}/busybox-udhcpd
>> ${D}${sysconfdir}/init.d/
>> >       fi
>> > -     if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then
>> > -             install -m 0755 ${WORKDIR}/hwclock.sh
>> ${D}${sysconfdir}/init.d/
>> > -     fi
>> > +     case "${MACHINE_FEATURES}" in
>> > +     *rtc*)
>> > +             if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then
>> > +                     install -m 0755 ${WORKDIR}/hwclock.sh
>> ${D}${sysconfdir}/init.d/
>> > +             fi
>> > +             ;;
>> > +     esac
>> >       if grep "CONFIG_UDHCPC=y" ${WORKDIR}/defconfig; then
>> >               install -d ${D}${sysconfdir}/udhcpc.d
>> >               install -d ${D}${datadir}/udhcpc
>>
>> This makes busybox machine specific? Is that really what you want to do?
>>
>> I want to have hwclock init script only on machines with RTC.
>
>
And to move a little further, busybox should be configured
with CONFIG_HWCLOCK=y only if it makes sense for that MACHINE. In my
opinion this is machine specific. So avoiding an init script but still
having useless utils doesn't sound good for me.

@g

[-- Attachment #2: Type: text/html, Size: 2813 bytes --]

Re: [PATCH 5/5] busybox.inc: Install hwclock init script only if rtc is present in MACHINE_FEATURES

[Phil Blundell]

On Wed, 2012-07-11 at 01:15 +0300, Andrei Gherzan wrote:
> And to move a little further, busybox should be configured with
> CONFIG_HWCLOCK=y only if it makes sense for that MACHINE. In my
> opinion this is machine specific. 

That's a DISTRO decision.  I suspect most that have binary feeds would
prefer to have a single busybox binary per architecture, and accept the
few wasted bytes on machines without RTC, than to make it MACHINE
specific and end up building it multiple times.

Anyway, such policy belongs in your distro layer and not in oe-core.

p.

Re: [PATCH 5/5] busybox.inc: Install hwclock init script only if rtc is present in MACHINE_FEATURES

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1008 bytes --]

On Tue, Jul 10, 2012 at 11:43:58PM +0100, Phil Blundell wrote:
> On Wed, 2012-07-11 at 01:15 +0300, Andrei Gherzan wrote:
> > And to move a little further, busybox should be configured with
> > CONFIG_HWCLOCK=y only if it makes sense for that MACHINE. In my
> > opinion this is machine specific. 
> 
> That's a DISTRO decision.  I suspect most that have binary feeds would
> prefer to have a single busybox binary per architecture, and accept the
> few wasted bytes on machines without RTC, than to make it MACHINE
> specific and end up building it multiple times.

Agreed.

It would be better to package initscript + hwclock to separate packages
and then pull it to image only for machines with RTC.. but not making
whole busybox machine specific.

Another advantage of this would be option to use busybox-hwclock as utility
and hwclock-systemd instead of busybox-hwclock-init for images which are
using systemd.

Cheers,

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH 5/5] busybox.inc: Install hwclock init script only if rtc is present in MACHINE_FEATURES

[Andrei Gherzan]

[-- Attachment #1: Type: text/plain, Size: 1310 bytes --]

On Wed, Jul 11, 2012 at 12:11 PM, Martin Jansa <martin.jansa@gmail.com>wrote:

> On Tue, Jul 10, 2012 at 11:43:58PM +0100, Phil Blundell wrote:
> > On Wed, 2012-07-11 at 01:15 +0300, Andrei Gherzan wrote:
> > > And to move a little further, busybox should be configured with
> > > CONFIG_HWCLOCK=y only if it makes sense for that MACHINE. In my
> > > opinion this is machine specific.
> >
> > That's a DISTRO decision.  I suspect most that have binary feeds would
> > prefer to have a single busybox binary per architecture, and accept the
> > few wasted bytes on machines without RTC, than to make it MACHINE
> > specific and end up building it multiple times.
>
> Agreed.
>
> It would be better to package initscript + hwclock to separate packages
> and then pull it to image only for machines with RTC.. but not making
> whole busybox machine specific.
>
> Another advantage of this would be option to use busybox-hwclock as utility
> and hwclock-systemd instead of busybox-hwclock-init for images which are
> using systemd.
>
>
Thank you all. It makes sense to keep busybox machine independent. I agree.
Now if i package this init script separately how would it be pulled in by
images? Think this could brake some image which now relay on this being
pulled in by busybox.

ag

[-- Attachment #2: Type: text/html, Size: 1701 bytes --]