Skip to contentSkip to conversation

HOB: MACHINE should be saved in conf files using ?=

PATCH In review Valentin Popa 3 participants 5 messages Sep 27, 2013 – Oct 4, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 HOB: MACHINE should be saved in conf files using ?=

MACHINE var is saved using early assignment operator. Calling MACHINE=x bitbake core-image-... works properly. Comment "#added by bitbake" is replaced with "#added by hob".

[YOCTO #5070]
---
 bitbake/lib/bb/cooker.py                    | 17 ++++++++++-------
 bitbake/lib/bb/ui/crumbs/builder.py         |  2 +-
 bitbake/lib/bb/ui/crumbs/hobeventhandler.py |  7 ++++++-
 3 files changed, 17 insertions(+), 9 deletions(-)
bitbake/lib/bb/cooker.py +10 -7
index ff2af69..ce7ca43 100644
@@ -193,7 +193,10 @@ class BBCooker:
         if op == "append":
             self.appendConfigurationVar(var, val, default_file)
         elif op == "set":
-            self.saveConfigurationVar(var, val, default_file)
+            self.saveConfigurationVar(var, val, default_file, "=")
+        elif op == "earlyAssign":
+            self.saveConfigurationVar(var, val, default_file, "?=")
+
 
     def appendConfigurationVar(self, var, val, default_file):
         #add append var operation to the end of default_file
@@ -207,7 +210,7 @@ class BBCooker:
         for c in contents:
             total += c
 
-        total += "#added by bitbake"
+        total += "#added by hob"
         total += "\n%s += \"%s\"\n" % (var, val)
 
         with open(default_file, 'w') as f:
@@ -218,7 +221,7 @@ class BBCooker:
         loginfo = {"op":append, "file":default_file, "line":total.count("\n")}
         self.data.appendVar(var, val, **loginfo)
 
-    def saveConfigurationVar(self, var, val, default_file):
+    def saveConfigurationVar(self, var, val, default_file, op):
 
         replaced = False
         #do not save if nothing changed
@@ -260,8 +263,8 @@ class BBCooker:
                     #check if the variable was saved before in the same way
                     #if true it replace the place where the variable was declared
                     #else it comments it
-                    if contents[begin_line-1]== "#added by bitbake\n":
-                        contents[begin_line] = "%s = \"%s\"\n" % (var, val)
+                    if contents[begin_line-1]== "#added by hob\n":
+                        contents[begin_line] = "%s %s \"%s\"\n" % (var, op, val)
                         replaced = True
                     else:
                         for ii in range(begin_line, end_line):
@@ -290,8 +293,8 @@ class BBCooker:
                 total += c
 
             #add the variable on a single line, to be easy to replace the second time
-            total += "\n#added by bitbake"
-            total += "\n%s = \"%s\"\n" % (var, val)
+            total += "\n#added by hob"
+            total += "\n%s %s \"%s\"\n" % (var, op, val)
 
             with open(default_file, 'w') as f:
                 f.write(total)
bitbake/lib/bb/ui/crumbs/builder.py +1 -1
index 86fdbfe..f9fd15a 100755
@@ -197,7 +197,7 @@ class Configuration:
         handler.set_var_in_file("BBLAYERS", self.layers, "bblayers.conf")
         # local.conf
         if not defaults:
-            handler.set_var_in_file("MACHINE", self.curr_mach, "local.conf")
+            handler.early_assign_var_in_file("MACHINE", self.curr_mach, "local.conf")
         handler.set_var_in_file("DISTRO", self.curr_distro, "local.conf")
         handler.set_var_in_file("DL_DIR", self.dldir, "local.conf")
         handler.set_var_in_file("SSTATE_DIR", self.sstatedir, "local.conf")
bitbake/lib/bb/ui/crumbs/hobeventhandler.py +6 -1
index ef74e56..3f5beba 100644
@@ -315,7 +315,7 @@ class HobHandler(gobject.GObject):
 
     def set_machine(self, machine):
         if machine:
-            self.set_var_in_file("MACHINE", machine, "local.conf")
+            self.early_assign_var_in_file("MACHINE", machine, "local.conf")
 
     def set_sdk_machine(self, sdk_machine):
         self.set_var_in_file("SDKMACHINE", sdk_machine, "local.conf")
@@ -472,6 +472,11 @@ class HobHandler(gobject.GObject):
         self.server.runCommand(["setVarFile", var, val, default_file, "set"])
         self.runCommand(["disableDataTracking"])
 
+    def early_assign_var_in_file(self, var, val, default_file=None):
+        self.runCommand(["enableDataTracking"])
+        self.server.runCommand(["setVarFile", var, val, default_file, "earlyAssign"])
+        self.runCommand(["disableDataTracking"])
+
     def append_var_in_file(self, var, val, default_file=None):
         self.server.runCommand(["setVarFile", var, val, default_file, "append"])
 
Signature · 1 line
1.8.1.2
#1 lore raw
Quoted 96 lines · Valentin Popa

MACHINE var is saved using early assignment operator. Calling MACHINE=x bitbake core-image-... works properly. Comment "#added by bitbake" is replaced with "#added by hob".

[YOCTO #5070]
---
  bitbake/lib/bb/cooker.py                    | 17 ++++++++++-------
  bitbake/lib/bb/ui/crumbs/builder.py         |  2 +-
  bitbake/lib/bb/ui/crumbs/hobeventhandler.py |  7 ++++++-
  3 files changed, 17 insertions(+), 9 deletions(-)
bitbake/lib/bb/cooker.py +10 -7
index ff2af69..ce7ca43 100644
@@ -193,7 +193,10 @@ class BBCooker:
          if op == "append":
              self.appendConfigurationVar(var, val, default_file)
          elif op == "set":
-            self.saveConfigurationVar(var, val, default_file)
+            self.saveConfigurationVar(var, val, default_file, "=")
+        elif op == "earlyAssign":
+            self.saveConfigurationVar(var, val, default_file, "?=")
+
 
      def appendConfigurationVar(self, var, val, default_file):
          #add append var operation to the end of default_file
@@ -207,7 +210,7 @@ class BBCooker:
          for c in contents:
              total += c
 
-        total += "#added by bitbake"
+        total += "#added by hob"
          total += "\n%s += \"%s\"\n" % (var, val)
 
          with open(default_file, 'w') as f:
@@ -218,7 +221,7 @@ class BBCooker:
          loginfo = {"op":append, "file":default_file, "line":total.count("\n")}
          self.data.appendVar(var, val, **loginfo)
 
-    def saveConfigurationVar(self, var, val, default_file):
+    def saveConfigurationVar(self, var, val, default_file, op):
 
          replaced = False
          #do not save if nothing changed
@@ -260,8 +263,8 @@ class BBCooker:
                      #check if the variable was saved before in the same way
                      #if true it replace the place where the variable was declared
                      #else it comments it
-                    if contents[begin_line-1]== "#added by bitbake\n":
-                        contents[begin_line] = "%s = \"%s\"\n" % (var, val)
+                    if contents[begin_line-1]== "#added by hob\n":
+                        contents[begin_line] = "%s %s \"%s\"\n" % (var, op, val)
                          replaced = True
                      else:
                          for ii in range(begin_line, end_line):
@@ -290,8 +293,8 @@ class BBCooker:
                  total += c
 
              #add the variable on a single line, to be easy to replace the second time
-            total += "\n#added by bitbake"
-            total += "\n%s = \"%s\"\n" % (var, val)
+            total += "\n#added by hob"
+            total += "\n%s %s \"%s\"\n" % (var, op, val)
 
              with open(default_file, 'w') as f:
                  f.write(total)
bitbake/lib/bb/ui/crumbs/builder.py +1 -1
index 86fdbfe..f9fd15a 100755
@@ -197,7 +197,7 @@ class Configuration:
          handler.set_var_in_file("BBLAYERS", self.layers, "bblayers.conf")
          # local.conf
          if not defaults:
-            handler.set_var_in_file("MACHINE", self.curr_mach, "local.conf")
+            handler.early_assign_var_in_file("MACHINE", self.curr_mach, "local.conf")
          handler.set_var_in_file("DISTRO", self.curr_distro, "local.conf")
          handler.set_var_in_file("DL_DIR", self.dldir, "local.conf")
          handler.set_var_in_file("SSTATE_DIR", self.sstatedir, "local.conf")
bitbake/lib/bb/ui/crumbs/hobeventhandler.py +1 -1
index ef74e56..3f5beba 100644
@@ -315,7 +315,7 @@ class HobHandler(gobject.GObject):
 
      def set_machine(self, machine):
          if machine:
-            self.set_var_in_file("MACHINE", machine, "local.conf")
+            self.early_assign_var_in_file("MACHINE", machine, "local.conf")
 
      def set_sdk_machine(self, sdk_machine):
          self.set_var_in_file("SDKMACHINE", sdk_machine, "local.conf")
@@ -472,6 +472,11 @@ class HobHandler(gobject.GObject):
          self.server.runCommand(["setVarFile", var, val, default_file, "set"])

bitbake/lib/bb/ui/crumbs/hobeventhandler.py class HobHandler(gobject.GObject): · line 482

Quoted 10 lines
bitbake/lib/bb/ui/crumbs/hobeventhandler.py +5 -0
          self.runCommand(["disableDataTracking"])
 
+    def early_assign_var_in_file(self, var, val, default_file=None):
+        self.runCommand(["enableDataTracking"])
+        self.server.runCommand(["setVarFile", var, val, default_file, "earlyAssign"])
+        self.runCommand(["disableDataTracking"])
+
      def append_var_in_file(self, var, val, default_file=None):
          self.server.runCommand(["setVarFile", var, val, default_file, "append"])
 

Looks good to me.
Cristiana

#2 lore raw
Quoted 109 lines · cristiana.voicu
Quoted 108 lines · Valentin Popa

MACHINE var is saved using early assignment operator. Calling MACHINE=x bitbake core-image-... works properly. Comment "#added by bitbake" is replaced with "#added by hob".

[YOCTO #5070]
---
  bitbake/lib/bb/cooker.py                    | 17 ++++++++++-------
  bitbake/lib/bb/ui/crumbs/builder.py         |  2 +-
  bitbake/lib/bb/ui/crumbs/hobeventhandler.py |  7 ++++++-
  3 files changed, 17 insertions(+), 9 deletions(-)
bitbake/lib/bb/cooker.py +6 -1
index ff2af69..ce7ca43 100644
@@ -193,7 +193,10 @@ class BBCooker:
          if op == "append":
              self.appendConfigurationVar(var, val, default_file)
          elif op == "set":
-            self.saveConfigurationVar(var, val, default_file)
+            self.saveConfigurationVar(var, val, default_file, "=")
+        elif op == "earlyAssign":
+            self.saveConfigurationVar(var, val, default_file, "?=")
+
        def appendConfigurationVar(self, var, val, default_file):
          #add append var operation to the end of default_file
@@ -207,7 +210,7 @@ class BBCooker:
          for c in contents:
              total += c
  -        total += "#added by bitbake"
+        total += "#added by hob"
          total += "\n%s += \"%s\"\n" % (var, val)
            with open(default_file, 'w') as f:
@@ -218,7 +221,7 @@ class BBCooker:
          loginfo = {"op":append, "file":default_file, 
 "line":total.count("\n")}
          self.data.appendVar(var, val, **loginfo)
  -    def saveConfigurationVar(self, var, val, default_file):
+    def saveConfigurationVar(self, var, val, default_file, op):
            replaced = False
          #do not save if nothing changed
@@ -260,8 +263,8 @@ class BBCooker:
                      #check if the variable was saved before in the 

same way

                      #if true it replace the place where the 
variable was declared
                      #else it comments it
bitbake/lib/bb/cooker.py +0 -2
-                    if contents[begin_line-1]== "#added by bitbake\n":
-                        contents[begin_line] = "%s = \"%s\"\n" % 

(var, val)

bitbake/lib/bb/cooker.py +2 -0
+                    if contents[begin_line-1]== "#added by hob\n":
+                        contents[begin_line] = "%s %s \"%s\"\n" % 

(var, op, val)
replaced = True
else:
for ii in range(begin_line, end_line):

bitbake/lib/bb/cooker.py +0 -0
@@ -290,8 +293,8 @@ class BBCooker:
                  total += c
                #add the variable on a single line, to be easy to 

replace the second time

bitbake/lib/bb/cooker.py +2 -2
-            total += "\n#added by bitbake"
-            total += "\n%s = \"%s\"\n" % (var, val)
+            total += "\n#added by hob"
+            total += "\n%s %s \"%s\"\n" % (var, op, val)
                with open(default_file, 'w') as f:
                  f.write(total)
bitbake/lib/bb/ui/crumbs/builder.py +1 -1
index 86fdbfe..f9fd15a 100755
@@ -197,7 +197,7 @@ class Configuration:
          handler.set_var_in_file("BBLAYERS", self.layers, 
 "bblayers.conf")
          # local.conf
          if not defaults:
-            handler.set_var_in_file("MACHINE", self.curr_mach, 
 "local.conf")
+            handler.early_assign_var_in_file("MACHINE", 
 self.curr_mach, "local.conf")

handler.set_var_in_file("DISTRO", self.curr_distro,
"local.conf")

          handler.set_var_in_file("DL_DIR", self.dldir, "local.conf")
          handler.set_var_in_file("SSTATE_DIR", self.sstatedir, 

"local.conf")

bitbake/lib/bb/ui/crumbs/hobeventhandler.py +5 -1
index ef74e56..3f5beba 100644
@@ -315,7 +315,7 @@ class HobHandler(gobject.GObject):
        def set_machine(self, machine):
          if machine:
-            self.set_var_in_file("MACHINE", machine, "local.conf")
+            self.early_assign_var_in_file("MACHINE", machine, 
 "local.conf")
        def set_sdk_machine(self, sdk_machine):
          self.set_var_in_file("SDKMACHINE", sdk_machine, "local.conf")
@@ -472,6 +472,11 @@ class HobHandler(gobject.GObject):
          self.server.runCommand(["setVarFile", var, val, 
 default_file, "set"])
          self.runCommand(["disableDataTracking"])
  +    def early_assign_var_in_file(self, var, val, default_file=None):
+        self.runCommand(["enableDataTracking"])
+        self.server.runCommand(["setVarFile", var, val, 
 default_file, "earlyAssign"])
+        self.runCommand(["disableDataTracking"])
+
      def append_var_in_file(self, var, val, default_file=None):
Quoted 8 lines
Quoted 2 lines

self.server.runCommand(["setVarFile", var, val,
default_file, "append"])

Looks good to me.
Cristiana
_______________________________________________
bitbake-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/bitbake-devel

Hi Valentin,

I know I replied with an ack for this patch, but working on a similar bug I realized that replacing the comment "total += "\n#added by bitbake" with total += "\n#added by hob" in bitbake code is not ok. I think it will be better to give as argument the comment string, in order to keep this method reusable in other ui. Cristiana

#3 lore raw
Quoted 5 lines · cristiana.voicu

I know I replied with an ack for this patch, but working on a similar bug I realized that replacing the comment "total += "\n#added by bitbake" with total += "\n#added by hob" in bitbake code is not ok. I think it will be better to give as argument the comment string, in order to keep this method reusable in other ui.

To make things simpler can someone send a follow up patch to make this a parameter please?

Cheers,

Richard

#4 lore raw
Quoted 6 lines · Richard Purdie
Quoted 5 lines · cristiana.voicu

I know I replied with an ack for this patch, but working on a similar bug I realized that replacing the comment "total += "\n#added by bitbake" with total += "\n#added by hob" in bitbake code is not ok. I think it will be better to give as argument the comment string, in order to keep this method reusable in other ui.

Quoted 7 lines

To make things simpler can someone send a follow up patch to make this a parameter please?

Cheers,

Richard

In case of multiple UI's in case some of them assigns(or earlyassigns) a var then another one wants to do the same thing, which lines do we cancel/comment in local.conf ? Do we let configurations from different UIs to coexist in local.conf? (with the respect of the code from cooker.py:
#check if the variable was saved before in the same way
#if true it replace the place where the variable was
declared
#else it comments it

                    if contents[begin_line-1]== "#added by hob\n":
                        contents[begin_line] = "%s %s \"%s\"\n" % (var, 

op, val)
replaced = True
else:
for ii in range(begin_line, end_line):
contents[ii] = "#" + contents[ii]
)