Re: Moving angstrom under the yocto banner

[Richard Purdie <richard.purdie@linuxfoundation.org>]

On Fri, 2012-03-30 at 20:00 -0700, Chris Larson wrote:
> Not to be terribly pendatic or difficult here, but technically, the
> comparison you make here doesn't ring true. bitbake in poky *still*
> has changes that never went into the upstream repository.

I was surprised to hear that but its easy enough to test:

diff -ur bitbake/ ../bitbake/
Only in bitbake//bin: bitbake-runtask
Only in ../bitbake/: classes
Only in ../bitbake/: conf
Only in ../bitbake/: .git
Only in ../bitbake/: .gitignore
diff -ur bitbake//lib/bb/cooker.py ../bitbake//lib/bb/cooker.py
--- bitbake//lib/bb/cooker.py	2012-03-22 14:40:40.488135297 +0000
+++ ../bitbake//lib/bb/cooker.py	2012-03-22 14:32:17.336127747 +0000
@@ -178,7 +178,7 @@
         self.configuration.data = bb.data.init()
 
         if not self.server_registration_cb:
-            bb.data.setVar("BB_WORKERCONTEXT", "1", self.configuration.data)
+            self.configuration.data.setVar("BB_WORKERCONTEXT", "1")
 
         filtered_keys = bb.utils.approved_variables()
         bb.data.inheritFromOS(self.configuration.data, self.savedenv, filtered_keys)
Only in bitbake//lib/bb: shell.py
Only in ../bitbake/: MANIFEST.in
Only in ../bitbake/: setup.py
Only in ../bitbake/: TODO

(where one tree is on bitbake master and the other is poky master).

Of these, the classes/conf/.git/setup.py/MANIFEST/TODO are deliberately
removed. Those are upstream too. shell.py is still around as a reminder
that at some point I think we should resurrect it in a new form. I also
evidently never added bitbake-runtask upstream which I thought I had.

So, yes, there is a one line change that we've screwed up merging and
its not even functionally different.

Cheers,

Richard