From c98363450fc4ccab82b34a37a95bd172cf6e115f Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 24 Jan 2013 17:52:55 +0000 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 2dc50ca533..607fb70243 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -738,7 +738,7 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" IMAGE_FEATURES += "${EXTRA_IMAGE_FEATURES}" -DISTRO_FEATURES_BACKFILL = "pulseaudio" +DISTRO_FEATURES_BACKFILL = "pulseaudio ${DISTRO_FEATURES_INITMAN}" DISTRO_FEATURES_append = "${@oe.utils.features_backfill("DISTRO_FEATURES",d)}" MACHINE_FEATURES_BACKFILL = "rtc" -- cgit v1.2.3-54-g00ecf