Patchwork bitbake.conf: unbreak all builds with custom DISTRO_FEATURES

login
register
mail settings
Submitter Marcin Juszkiewicz
Date Jan. 23, 2013, 11:38 a.m.
Message ID <1358941121-12772-1-git-send-email-marcin.juszkiewicz@linaro.org>
Download mbox | patch
Permalink /patch/43209/
State Accepted
Commit 211e473432230765a48d7af9c66c8737a08cdec7
Headers show

Comments

Marcin Juszkiewicz - Jan. 23, 2013, 11:38 a.m.
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

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
---
 meta/conf/bitbake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Ross Burton - Jan. 23, 2013, 11:43 a.m.
On 23 January 2013 11:38, Marcin Juszkiewicz
<marcin.juszkiewicz@linaro.org> wrote:
> 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
>
> Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>

Signed-off-by: Ross Burton <ross.burton@intel.com>

Wow, it's like you're reading my mind.  When I next realise what the
problem is and what the solution is, I'll await eagerly your fix.

Ross
Marcin Juszkiewicz - Jan. 23, 2013, 11:47 a.m.
W dniu 23.01.2013 12:43, Burton, Ross pisze:
> On 23 January 2013 11:38, Marcin Juszkiewicz
> <marcin.juszkiewicz@linaro.org> wrote:
>> 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
>>
>> Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
> 
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> 
> Wow, it's like you're reading my mind.  When I next realise what the
> problem is and what the solution is, I'll await eagerly your fix.

Without help from Paul Eggleton and Martin Jansa I would not get to this
fix.

Patch

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 ?= ""
 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"