Patchwork [v2] rootfs.py: introduce USE_DEVFS check

login
register
mail settings
Submitter Matthieu CRAPET
Date April 2, 2014, 4:01 p.m.
Message ID <1396454510-5744-1-git-send-email-Matthieu.Crapet@ingenico.com>
Download mbox | patch
Permalink /patch/70027/
State New
Headers show

Comments

Matthieu CRAPET - April 2, 2014, 4:01 p.m.
Since commit a83144bac8d67704ff66f5dc0fc56f5b63979694 (2014-02-11), USE_DEVFS is not considered anymore.
For compatibility, let's restore USE_DEVFS semantic.
Also add USE_DEVFS to documentation.conf.

Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
---
 meta/conf/documentation.conf | 1 +
 meta/lib/oe/rootfs.py        | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
Andreas Oberritter - April 2, 2014, 8:04 p.m.
Hello Matthieu,

On 02.04.2014 18:01, Matthieu Crapet wrote:
> Since commit a83144bac8d67704ff66f5dc0fc56f5b63979694 (2014-02-11), USE_DEVFS is not considered anymore.
> For compatibility, let's restore USE_DEVFS semantic.
> Also add USE_DEVFS to documentation.conf.
> 
> Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
> ---
>  meta/conf/documentation.conf | 1 +
>  meta/lib/oe/rootfs.py        | 3 ++-
>  2 files changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf
> index 4d49a02..315e1b5 100644
> --- a/meta/conf/documentation.conf
> +++ b/meta/conf/documentation.conf
> @@ -436,6 +436,7 @@ UBOOT_MACHINE[doc] = "Specifies the value passed on the make command line when b
>  UBOOT_MAKE_TARGET[doc] = "Specifies the target called in the Makefile."
>  UBOOT_SUFFIX[doc] = "Points to the generated U-Boot extension."
>  UBOOT_TARGET[doc] = "Specifies the target used for building U-Boot."
> +USE_DEVFS[doc] = "When building images, specifies to populate or not ${sysconfdir}. This variable defaults to '1' (leave directory empty, surely because devtmpfs do the job). Set it to '0' to use makedevs (or consider using a custom file with IMAGE_DEVICE_TABLES)."

${sysconfdir} usually contains /etc, not /dev.

Regards,
Andreas

Patch

diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf
index 4d49a02..315e1b5 100644
--- a/meta/conf/documentation.conf
+++ b/meta/conf/documentation.conf
@@ -436,6 +436,7 @@  UBOOT_MACHINE[doc] = "Specifies the value passed on the make command line when b
 UBOOT_MAKE_TARGET[doc] = "Specifies the target called in the Makefile."
 UBOOT_SUFFIX[doc] = "Points to the generated U-Boot extension."
 UBOOT_TARGET[doc] = "Specifies the target used for building U-Boot."
+USE_DEVFS[doc] = "When building images, specifies to populate or not ${sysconfdir}. This variable defaults to '1' (leave directory empty, surely because devtmpfs do the job). Set it to '0' to use makedevs (or consider using a custom file with IMAGE_DEVICE_TABLES)."
 USER_CLASSES[doc] = "List of additional classes to use when building images that enable extra features."
 USERADD_PACKAGES[doc] = "When a recipe inherits the useradd class, this variable specifies the individual packages within the recipe that require users and/or groups to be added."
 USERADD_PARAM[doc] = "When a recipe inherits the useradd class, this variable specifies for a package what parameters should be passed to the useradd command if you wish to add a user to the system when the package is installed."
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index 3eac3c9..dddbef4 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -116,7 +116,8 @@  class Rootfs(object):
                          "offline and rootfs is read-only: %s" %
                          delayed_postinsts)
 
-        self._create_devfs()
+        if self.d.getVar('USE_DEVFS', True) != "1":
+            self._create_devfs()
 
         self._uninstall_uneeded()