diff options
author | Darren Hart <dvhart@linux.intel.com> | 2012-01-03 08:18:34 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-03 21:32:48 +0000 |
commit | fdbb0d96c971b8a91bdd5a3cc53fb7f18ebecad6 (patch) | |
tree | 643c3ca6d90465a084a076e4fa807dd8ecf1bfa0 | |
parent | 1fcf1fae71965fd3da27bfb9aaf654ba407a30a8 (diff) | |
download | poky-fdbb0d96c971b8a91bdd5a3cc53fb7f18ebecad6.tar.gz |
distro: Add POKY_DEFAULT_EXTRA_R* variables
Allow the reuse of poky.conf by distro definitions wanting to remove
content by introducting POKY_DEFAULT_EXTRA_R*. These are appended
to the corresponding DISTRO_EXTRA_R* variables and can be overriden
by distro configs that "require poky.conf".
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta-yocto/conf/distro/poky.conf | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf index 80d4e471b3..86f9bf6489 100644 --- a/meta-yocto/conf/distro/poky.conf +++ b/meta-yocto/conf/distro/poky.conf | |||
@@ -24,8 +24,12 @@ SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}" | |||
24 | 24 | ||
25 | EXTRAOPKGCONFIG = "poky-feed-config-opkg" | 25 | EXTRAOPKGCONFIG = "poky-feed-config-opkg" |
26 | 26 | ||
27 | DISTRO_EXTRA_RDEPENDS += "task-core-boot" | 27 | # Override these in poky based distros to modify DISTRO_EXTRA_R* |
28 | DISTRO_EXTRA_RRECOMMENDS += "kernel-module-af-packet" | 28 | POKY_DEFAULT_EXTRA_RDEPENDS = "task-core-boot" |
29 | POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet" | ||
30 | |||
31 | DISTRO_EXTRA_RDEPENDS += " ${POKY_DEFAULT_EXTRA_RDEPENDS}" | ||
32 | DISTRO_EXTRA_RRECOMMENDS += " ${POKY_DEFAULT_EXTRA_RRECOMMENDS}" | ||
29 | 33 | ||
30 | POKYQEMUDEPS = "${@base_contains("INCOMPATIBLE_LICENSE", "GPLv3", "", "qemu-config",d)}" | 34 | POKYQEMUDEPS = "${@base_contains("INCOMPATIBLE_LICENSE", "GPLv3", "", "qemu-config",d)}" |
31 | DISTRO_EXTRA_RDEPENDS_append_qemuarm = " ${POKYQEMUDEPS}" | 35 | DISTRO_EXTRA_RDEPENDS_append_qemuarm = " ${POKYQEMUDEPS}" |