On Fri, Nov 18, 2011 at 7:29 AM, Richard Purdie <richard.pur...@linuxfoundation.org> wrote: > On Wed, 2011-11-16 at 14:17 -0700, Chris Larson wrote: >> Signed-off-by: Christopher Larson <chris_lar...@mentor.com> >> --- >> meta/conf/bitbake.conf | 2 ++ >> 1 files changed, 2 insertions(+), 0 deletions(-) >> >> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf >> index 0d6b3b8..c158c61 100644 >> --- a/meta/conf/bitbake.conf >> +++ b/meta/conf/bitbake.conf >> @@ -506,6 +506,7 @@ DEBUG_FLAGS ?= "-g -feliminate-unused-debug-types" >> FULL_OPTIMIZATION = "-O2 -pipe ${DEBUG_FLAGS}" >> DEBUG_OPTIMIZATION = "-O -fno-omit-frame-pointer ${DEBUG_FLAGS} -pipe" >> SELECTED_OPTIMIZATION = "${@bb.data.getVar(['FULL_OPTIMIZATION', >> 'DEBUG_OPTIMIZATION'][d.getVar('DEBUG_BUILD', 1) == '1'], d, 1)}" >> +SELECTED_OPTIMIZATION[vardeps] += "FULL_OPTIMIZATION DEBUG_OPTIMIZATION" >> BUILD_OPTIMIZATION = "-O2 -pipe" >> >> ################################################################## >> @@ -717,6 +718,7 @@ COMBINED_FEATURES = "\ >> ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", >> "usbgadget", d)} \ >> ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", >> "usbhost", d)} \ >> ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "wifi", d)}" >> +COMBINED_FEATURES[vardeps] += "DISTRO_FEATURES MACHINE_FEATURES" >> >> >> # Make sure MACHINE isn't exported > > I merged this to master but your patch was line wrapped so I had to > unmangle it...
Yeah, sorry about that. I was getting an inexplicable error from send-email, so used imap-send, but forgot that the gmail web interface line wraps (stupid thing, they need to add an option to disable that). -- Christopher Larson clarson at kergoth dot com Founder - BitBake, OpenEmbedded, OpenZaurus Maintainer - Tslib Senior Software Engineer, Mentor Graphics _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core