summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Crapet <Matthieu.Crapet@ingenico.com>2014-04-03 07:05:50 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-04 11:51:15 +0100
commitd12a5e38a02abe3feb3db8ae5ffd9a5005124294 (patch)
treeedb1a9fcf8e8e8a231dad0699e0c990aaa3e3b87
parent4f650b538924b1736783fec0de661ec16dc590b5 (diff)
downloadopenembedded-core-d12a5e38a02abe3feb3db8ae5ffd9a5005124294.tar.gz
openembedded-core-d12a5e38a02abe3feb3db8ae5ffd9a5005124294.tar.bz2
openembedded-core-d12a5e38a02abe3feb3db8ae5ffd9a5005124294.zip
rootfs.py: introduce USE_DEVFS check
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> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/documentation.conf1
-rw-r--r--meta/lib/oe/rootfs.py3
2 files changed, 3 insertions, 1 deletions
diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf
index 4d49a02ece..9d6e78f9e6 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 /dev. 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 3eac3c947d..dddbef4d64 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()