diff options
author | Matthieu Crapet <Matthieu.Crapet@ingenico.com> | 2014-04-03 07:05:50 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-04 11:53:51 +0100 |
commit | 69a88dabbe028fe6f2423b25ad985f84372f4584 (patch) | |
tree | 2960e4d3e19bfe97198dd27e55db9a57733e3441 /meta | |
parent | 5d93e04baf22e2e5c37e7b0aaababc32b9b17396 (diff) | |
download | poky-69a88dabbe028fe6f2423b25ad985f84372f4584.tar.gz |
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.
(From OE-Core rev: d12a5e38a02abe3feb3db8ae5ffd9a5005124294)
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>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/conf/documentation.conf | 1 | ||||
-rw-r--r-- | meta/lib/oe/rootfs.py | 3 |
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 | |||
436 | UBOOT_MAKE_TARGET[doc] = "Specifies the target called in the Makefile." | 436 | UBOOT_MAKE_TARGET[doc] = "Specifies the target called in the Makefile." |
437 | UBOOT_SUFFIX[doc] = "Points to the generated U-Boot extension." | 437 | UBOOT_SUFFIX[doc] = "Points to the generated U-Boot extension." |
438 | UBOOT_TARGET[doc] = "Specifies the target used for building U-Boot." | 438 | UBOOT_TARGET[doc] = "Specifies the target used for building U-Boot." |
439 | 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)." | ||
439 | USER_CLASSES[doc] = "List of additional classes to use when building images that enable extra features." | 440 | USER_CLASSES[doc] = "List of additional classes to use when building images that enable extra features." |
440 | 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." | 441 | 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." |
441 | 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." | 442 | 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): | |||
116 | "offline and rootfs is read-only: %s" % | 116 | "offline and rootfs is read-only: %s" % |
117 | delayed_postinsts) | 117 | delayed_postinsts) |
118 | 118 | ||
119 | self._create_devfs() | 119 | if self.d.getVar('USE_DEVFS', True) != "1": |
120 | self._create_devfs() | ||
120 | 121 | ||
121 | self._uninstall_uneeded() | 122 | self._uninstall_uneeded() |
122 | 123 | ||