summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2013-01-24 17:52:55 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-24 20:08:59 (GMT)
commitc98363450fc4ccab82b34a37a95bd172cf6e115f (patch)
treefcde45ee5d1a70d3c6a94b3314b64588ec3537dd
parent4192520bd2347929ac8e6ee3a912daba336547f5 (diff)
downloadpoky-c98363450fc4ccab82b34a37a95bd172cf6e115f.tar.gz
bitbake.conf: unbreak all builds with custom DISTRO_FEATURES
Commit 9e7c64ca9afbf27edd0d35a1830ce55ee6d778ab broke all builds where custom DISTRO_FEATURES were used. Resulting images ended in non-bootable state due to lack of initscripts (unless someone had sysvinit or systemd in D_E already). https://bugs.launchpad.net/linaro-oe/+bug/1102910 https://bugs.launchpad.net/linaro-oe/+bug/1099405/comments/12 (From OE-Core rev: 211e473432230765a48d7af9c66c8737a08cdec7) Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/bitbake.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 2dc50ca..607fb70 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -738,7 +738,7 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
738MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" 738MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
739IMAGE_FEATURES += "${EXTRA_IMAGE_FEATURES}" 739IMAGE_FEATURES += "${EXTRA_IMAGE_FEATURES}"
740 740
741DISTRO_FEATURES_BACKFILL = "pulseaudio" 741DISTRO_FEATURES_BACKFILL = "pulseaudio ${DISTRO_FEATURES_INITMAN}"
742DISTRO_FEATURES_append = "${@oe.utils.features_backfill("DISTRO_FEATURES",d)}" 742DISTRO_FEATURES_append = "${@oe.utils.features_backfill("DISTRO_FEATURES",d)}"
743 743
744MACHINE_FEATURES_BACKFILL = "rtc" 744MACHINE_FEATURES_BACKFILL = "rtc"