Patchwork [2/3] busybox: enable mdev by default

login
register
mail settings
Submitter Otavio Salvador
Date May 23, 2011, 12:13 p.m.
Message ID <596fd53943dd383f89abb767d7a3b624e6b20b92.1306152724.git.otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/4633/
State New, archived
Headers show

Comments

Otavio Salvador - May 23, 2011, 12:13 p.m.
Since we do not require a configuration file by default we don't force
it's addition on the package. If the a layer wants to have it enabled
it should also set the CONFFILES for busybox-mdev package.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta/recipes-core/busybox/busybox-1.18.4/defconfig |    2 +-
 meta/recipes-core/busybox/busybox.inc              |    1 -
 meta/recipes-core/busybox/busybox_1.18.4.bb        |    2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)
Phil Blundell - May 23, 2011, 1:06 p.m.
On Mon, 2011-05-23 at 12:13 +0000, Otavio Salvador wrote:
>  CONFIG_LOSETUP=y
>  # CONFIG_LSPCI is not set
>  # CONFIG_LSUSB is not set
> -# CONFIG_MDEV is not set
> +CONFIG_MDEV=y
>  # CONFIG_FEATURE_MDEV_CONF is not set
>  # CONFIG_FEATURE_MDEV_RENAME is not set
>  # CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set

This sort of thing, as we've seen previously in classic oe, doesn't
really scale very well since everyone's requirements for busybox are
subtly different.  Others will doubtless disagree but, personally, I
think it would be best for you to just maintain a busybox.conf in your
own distro layer which sets it up the way that you want.

> diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
> index 341c5c4..de711d2 100644
> --- a/meta/recipes-core/busybox/busybox.inc
> +++ b/meta/recipes-core/busybox/busybox.inc
> @@ -29,7 +29,6 @@ INITSCRIPT_PARAMS_${PN}-mdev = "start 06 S ."
>  INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" 
>  INITSCRIPT_NAME_${PN}-udhcpc = "busybox-udhcpc" 
>  CONFFILES_${PN}-syslog = "${sysconfdir}/syslog.conf.${PN}"
> -CONFFILES_${PN}-mdev = "${sysconfdir}/mdev.conf"

Agreed, it seems silly to declare the file as a CONFFILE if we aren't
shipping it in the first place.

p.
Otavio Salvador - May 23, 2011, 1:10 p.m.
On Mon, May 23, 2011 at 13:06, Phil Blundell <pb@pbcl.net> wrote:
> On Mon, 2011-05-23 at 12:13 +0000, Otavio Salvador wrote:
>>  CONFIG_LOSETUP=y
>>  # CONFIG_LSPCI is not set
>>  # CONFIG_LSUSB is not set
>> -# CONFIG_MDEV is not set
>> +CONFIG_MDEV=y
>>  # CONFIG_FEATURE_MDEV_CONF is not set
>>  # CONFIG_FEATURE_MDEV_RENAME is not set
>>  # CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
>
> This sort of thing, as we've seen previously in classic oe, doesn't
> really scale very well since everyone's requirements for busybox are
> subtly different.  Others will doubtless disagree but, personally, I
> think it would be best for you to just maintain a busybox.conf in your
> own distro layer which sets it up the way that you want.

Yes.

>> diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
>> index 341c5c4..de711d2 100644
>> --- a/meta/recipes-core/busybox/busybox.inc
>> +++ b/meta/recipes-core/busybox/busybox.inc
>> @@ -29,7 +29,6 @@ INITSCRIPT_PARAMS_${PN}-mdev = "start 06 S ."
>>  INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd"
>>  INITSCRIPT_NAME_${PN}-udhcpc = "busybox-udhcpc"
>>  CONFFILES_${PN}-syslog = "${sysconfdir}/syslog.conf.${PN}"
>> -CONFFILES_${PN}-mdev = "${sysconfdir}/mdev.conf"
>
> Agreed, it seems silly to declare the file as a CONFFILE if we aren't
> shipping it in the first place.

The idea is to not require it to be declared and do the right thing by default.

Patch

diff --git a/meta/recipes-core/busybox/busybox-1.18.4/defconfig b/meta/recipes-core/busybox/busybox-1.18.4/defconfig
index 5327a64..6b48cc1 100644
--- a/meta/recipes-core/busybox/busybox-1.18.4/defconfig
+++ b/meta/recipes-core/busybox/busybox-1.18.4/defconfig
@@ -518,7 +518,7 @@  CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
 CONFIG_LOSETUP=y
 # CONFIG_LSPCI is not set
 # CONFIG_LSUSB is not set
-# CONFIG_MDEV is not set
+CONFIG_MDEV=y
 # CONFIG_FEATURE_MDEV_CONF is not set
 # CONFIG_FEATURE_MDEV_RENAME is not set
 # CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 341c5c4..de711d2 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -29,7 +29,6 @@  INITSCRIPT_PARAMS_${PN}-mdev = "start 06 S ."
 INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" 
 INITSCRIPT_NAME_${PN}-udhcpc = "busybox-udhcpc" 
 CONFFILES_${PN}-syslog = "${sysconfdir}/syslog.conf.${PN}"
-CONFFILES_${PN}-mdev = "${sysconfdir}/mdev.conf"
 
 RRECOMMENDS_${PN} = "${PN}-syslog ${PN}-udhcpc"
 
diff --git a/meta/recipes-core/busybox/busybox_1.18.4.bb b/meta/recipes-core/busybox/busybox_1.18.4.bb
index cf37650..a5080d5 100644
--- a/meta/recipes-core/busybox/busybox_1.18.4.bb
+++ b/meta/recipes-core/busybox/busybox_1.18.4.bb
@@ -1,5 +1,5 @@ 
 require busybox.inc
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
            file://udhcpscript.patch \