package_ipk/deb/rpm: Improve OVERRIDES handling

PATCH New Richard Purdie 1 participant 1 message Jun 11, 2015

Share & tools

Richard Purdie

author

2015-06-11 22:32 UTC #0 lore raw

PATCH 1/1 package_ipk/deb/rpm: Improve OVERRIDES handling

Current code doesn't handle dynamic overrides so removing all existing OVERRIDES works ok. In future this may not be the case so ensure we add to existing overrides, not overwrite them.

Signed-off-by Richard Purdie <[email protected]>

meta/classes/package_deb.bbclass +1 -1

index 9d7c59b..d797663 100644
@@ -75,7 +75,7 @@ python do_package_deb () {
             pkgname = pkg
         localdata.setVar('PKG', pkgname)
 
-        localdata.setVar('OVERRIDES', pkg)
+        localdata.setVar('OVERRIDES', d.getVar("OVERRIDES", False) + ":" + pkg)
 
         bb.data.update_data(localdata)
         basedir = os.path.join(os.path.dirname(root))

meta/classes/package_ipk.bbclass +1 -1

index dba6804..9fb9d53 100644
@@ -58,7 +58,7 @@ python do_package_ipk () {
             pkgname = pkg
         localdata.setVar('PKG', pkgname)
 
-        localdata.setVar('OVERRIDES', pkg)
+        localdata.setVar('OVERRIDES', d.getVar("OVERRIDES", False) + ":" + pkg)
 
         bb.data.update_data(localdata)
         basedir = os.path.join(os.path.dirname(root))

meta/classes/package_rpm.bbclass +1 -1

index e305e8b..3988b73 100644
@@ -330,7 +330,7 @@ python write_specfile () {
             pkgname = pkg
         localdata.setVar('PKG', pkgname)
 
-        localdata.setVar('OVERRIDES', pkg)
+        localdata.setVar('OVERRIDES', d.getVar("OVERRIDES", False) + ":" + pkg)
 
         bb.data.update_data(localdata)