diff options
author | Peter Korsgaard <peter@korsgaard.com> | 2014-02-28 14:30:23 +0100 |
---|---|---|
committer | Peter Korsgaard <peter@korsgaard.com> | 2014-02-28 14:30:23 +0100 |
commit | b108fdcb83d457e5d43298fb93dbfd805d076f24 (patch) | |
tree | 7fbd64a13fc915f5cea93708419cb3c6aa1b40ea /docs/manual/adding-packages-directory.txt | |
parent | a6cfaea44e5105cb66e4e797042f64335f5e7c01 (diff) | |
parent | 9e40a1005f51d10784db295797ed270a130d79d5 (diff) | |
download | buildroot-b108fdcb83d457e5d43298fb93dbfd805d076f24.tar.gz buildroot-b108fdcb83d457e5d43298fb93dbfd805d076f24.zip |
Merge branch 'next'
Conflicts:
Makefile
package/dmraid/Config.in
package/gdb/Config.in.host
package/linux-headers/linux-headers.mk
package/python/python.mk
package/python3/python3.mk
package/rt-tests/Config.in
package/sdl/sdl.mk
package/systemd/systemd-01-fix-getty-unit.patch
package/systemd/systemd-02-fix-page-size.patch
package/systemd/systemd-03-uclibc-fix.patch
package/udev/Config.in
package/udisks/Config.in
package/vlc/vlc.mk
system/Config.in
Quite some merge conflicts, hopefully I didn't screw up anything.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'docs/manual/adding-packages-directory.txt')
-rw-r--r-- | docs/manual/adding-packages-directory.txt | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt index 40e543c8bd..6145f54479 100644 --- a/docs/manual/adding-packages-directory.txt +++ b/docs/manual/adding-packages-directory.txt @@ -235,7 +235,12 @@ use in the comment. * thread support ** Dependency symbol: +BR2_TOOLCHAIN_HAS_THREADS+ -** Comment string: +threads+ +** Comment string: +threads+ (unless +BR2_TOOLCHAIN_HAS_THREADS_NPTL+ + is also needed, in which case, specifying only +NPTL+ is sufficient) + +* NPTL thread support +** Dependency symbol: +BR2_TOOLCHAIN_HAS_THREADS_NPTL+ +** Comment string: +NPTL+ * RPC support ** Dependency symbol: +BR2_TOOLCHAIN_HAS_NATIVE_RPC+ @@ -273,8 +278,7 @@ foo needs a toolchain w/ featA, featB, featC and a Linux kernel to be built Dependencies on udev /dev management ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ If a package needs udev /dev management, it should depend on symbol -+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV+, and the following comment -should be added: ++BR2_PACKAGE_HAS_UDEV+, and the following comment should be added: -------------------------- foo needs udev /dev management |