diff mbox

force devtmpfs and inotify kernel option when udev is used as dev handler

Message ID 1389188913-15173-1-git-send-email-jeremy.rosen@openwide.fr
State Accepted
Headers show

Commit Message

Jeremy Rosen Jan. 8, 2014, 1:48 p.m. UTC 
Signed-off-by: Jérémy Rosen <jeremy.rosen@openwide.fr>

---
patch suggested by Thomas Petazzoni

I also added devtmpfs because it's documented as needed but wasn't enforced
---
 linux/linux.mk | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Danomi Manchego Jan. 8, 2014, 2:13 p.m. UTC | #1 
Jérémy,

On Wed, Jan 8, 2014 at 8:48 AM, Jérémy Rosen <jeremy.rosen@openwide.fr> wrote:
> Signed-off-by: Jérémy Rosen <jeremy.rosen@openwide.fr>
>
> ---
> patch suggested by Thomas Petazzoni
>
> I also added devtmpfs because it's documented as needed but wasn't enforced
> ---
>  linux/linux.mk | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/linux/linux.mk b/linux/linux.mk
> index fa8aa0c..2482952 100644
> --- a/linux/linux.mk
> +++ b/linux/linux.mk
> @@ -185,6 +185,10 @@ define LINUX_CONFIGURE_CMDS
>                 $(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS_MOUNT,$(@D)/.config))
>         $(if $(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV),
>                 $(call KCONFIG_SET_OPT,CONFIG_UEVENT_HELPER_PATH,\"/sbin/mdev\",$(@D)/.config))
> +       $(if $(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV),
> +                $(call KCONFIG_ENABLE_OPT,CONFIG_INOTIFY_USER,$(@D)/.config)

The above INOTIFY line has an extra leading space compared with the other lines.

Danomi -

> +               $(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS,$(@D)/.config)
> +               $(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS_MOUNT,$(@D)/.config))
>         $(if $(BR2_PACKAGE_KTAP),
>                 $(call KCONFIG_ENABLE_OPT,CONFIG_DEBUG_FS,$(@D)/.config)
>                 $(call KCONFIG_ENABLE_OPT,CONFIG_EVENT_TRACING,$(@D)/.config)
> --
> 1.8.5.2
>
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
Jeremy Rosen Jan. 8, 2014, 3:42 p.m. UTC | #2 
good catch, i'll wait for more feedback (if any) and then resend

Cordialement 

Jérémy Rosen 
+33 (0)1 42 68 28 04

fight key loggers : write some perl using vim 


Open Wide Ingenierie

23, rue Daviel
75012 Paris - France
www.openwide.fr





----- Mail original -----
> Jérémy,
> 
> On Wed, Jan 8, 2014 at 8:48 AM, Jérémy Rosen
> <jeremy.rosen@openwide.fr> wrote:
> > Signed-off-by: Jérémy Rosen <jeremy.rosen@openwide.fr>
> >
> > ---
> > patch suggested by Thomas Petazzoni
> >
> > I also added devtmpfs because it's documented as needed but wasn't
> > enforced
> > ---
> >  linux/linux.mk | 4 ++++
> >  1 file changed, 4 insertions(+)
> >
> > diff --git a/linux/linux.mk b/linux/linux.mk
> > index fa8aa0c..2482952 100644
> > --- a/linux/linux.mk
> > +++ b/linux/linux.mk
> > @@ -185,6 +185,10 @@ define LINUX_CONFIGURE_CMDS
> >                 $(call
> >                 KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS_MOUNT,$(@D)/.config))
> >         $(if $(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV),
> >                 $(call
> >                 KCONFIG_SET_OPT,CONFIG_UEVENT_HELPER_PATH,\"/sbin/mdev\",$(@D)/.config))
> > +       $(if $(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV),
> > +                $(call
> > KCONFIG_ENABLE_OPT,CONFIG_INOTIFY_USER,$(@D)/.config)
> 
> The above INOTIFY line has an extra leading space compared with the
> other lines.
> 
> Danomi -
> 
> > +               $(call
> > KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS,$(@D)/.config)
> > +               $(call
> > KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS_MOUNT,$(@D)/.config))
> >         $(if $(BR2_PACKAGE_KTAP),
> >                 $(call
> >                 KCONFIG_ENABLE_OPT,CONFIG_DEBUG_FS,$(@D)/.config)
> >                 $(call
> >                 KCONFIG_ENABLE_OPT,CONFIG_EVENT_TRACING,$(@D)/.config)
> > --
> > 1.8.5.2
> >
> > _______________________________________________
> > buildroot mailing list
> > buildroot@busybox.net
> > http://lists.busybox.net/mailman/listinfo/buildroot
>
Thomas Petazzoni Jan. 8, 2014, 3:45 p.m. UTC | #3 
Dear Jérémy Rosen,

On Wed,  8 Jan 2014 14:48:33 +0100, Jérémy Rosen wrote:

> +	$(if $(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV),
> +                $(call KCONFIG_ENABLE_OPT,CONFIG_INOTIFY_USER,$(@D)/.config)
> +		$(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS,$(@D)/.config)
> +		$(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS_MOUNT,$(@D)/.config))

These two last lines are not needed, we already have:

        $(if $(BR2_ROOTFS_DEVICE_CREATION_STATIC),,
                $(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS,$(@D)/.config)
                $(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS_MOUNT,$(@D)/.config))

Note the two commas at the end of the first line. It means that when
BR2_ROOTFS_DEVICE_CREATION_STATIC is *NOT* enabled, then we enabled
devtmpfs and devtmpfs_mount.

Thomas
Peter Korsgaard Jan. 8, 2014, 9:28 p.m. UTC | #4 
>>>>> "Jérémy" == Jérémy Rosen <jeremy.rosen@openwide.fr> writes:

 > Signed-off-by: Jérémy Rosen <jeremy.rosen@openwide.fr>
 > ---
 > patch suggested by Thomas Petazzoni

 > I also added devtmpfs because it's documented as needed but wasn't enforced
 > ---
 >  linux/linux.mk | 4 ++++
 >  1 file changed, 4 insertions(+)

 > diff --git a/linux/linux.mk b/linux/linux.mk
 > index fa8aa0c..2482952 100644
 > --- a/linux/linux.mk
 > +++ b/linux/linux.mk
 > @@ -185,6 +185,10 @@ define LINUX_CONFIGURE_CMDS
 >  		$(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS_MOUNT,$(@D)/.config))
 >  	$(if $(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV),
 >  		$(call KCONFIG_SET_OPT,CONFIG_UEVENT_HELPER_PATH,\"/sbin/mdev\",$(@D)/.config))
 > +	$(if $(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV),
 > +                $(call KCONFIG_ENABLE_OPT,CONFIG_INOTIFY_USER,$(@D)/.config)
 > +		$(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS,$(@D)/.config)
 > +		$(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS_MOUNT,$(@D)/.config))

Committed with the indentation fixed and the unneeded devtmpfs handling
removed, thanks.
Jeremy Rosen Jan. 9, 2014, 8:03 a.m. UTC | #5 
----- Mail original -----
> Dear Jérémy Rosen,
> 
> On Wed,  8 Jan 2014 14:48:33 +0100, Jérémy Rosen wrote:
> 
> > +	$(if $(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV),
> > +                $(call
> > KCONFIG_ENABLE_OPT,CONFIG_INOTIFY_USER,$(@D)/.config)
> > +		$(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS,$(@D)/.config)
> > +		$(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS_MOUNT,$(@D)/.config))
> 
> These two last lines are not needed, we already have:
> 
>         $(if $(BR2_ROOTFS_DEVICE_CREATION_STATIC),,
>                 $(call
>                 KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS,$(@D)/.config)
>                 $(call
>                 KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS_MOUNT,$(@D)/.config))
> 
> Note the two commas at the end of the first line. It means that when
> BR2_ROOTFS_DEVICE_CREATION_STATIC is *NOT* enabled, then we enabled
> devtmpfs and devtmpfs_mount.
> 

geez, I hate make syntax :(

thx for the catch, someday i'll learn.

> Thomas
> --
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux, Kernel and Android engineering
> http://free-electrons.com
>
diff mbox

Patch

diff --git a/linux/linux.mk b/linux/linux.mk
index fa8aa0c..2482952 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -185,6 +185,10 @@  define LINUX_CONFIGURE_CMDS
 		$(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS_MOUNT,$(@D)/.config))
 	$(if $(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV),
 		$(call KCONFIG_SET_OPT,CONFIG_UEVENT_HELPER_PATH,\"/sbin/mdev\",$(@D)/.config))
+	$(if $(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV),
+                $(call KCONFIG_ENABLE_OPT,CONFIG_INOTIFY_USER,$(@D)/.config)
+		$(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS,$(@D)/.config)
+		$(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS_MOUNT,$(@D)/.config))
 	$(if $(BR2_PACKAGE_KTAP),
 		$(call KCONFIG_ENABLE_OPT,CONFIG_DEBUG_FS,$(@D)/.config)
 		$(call KCONFIG_ENABLE_OPT,CONFIG_EVENT_TRACING,$(@D)/.config)