Skip to contentSkip to conversation

Updates for defaultval being internal

PATCH New Ross Burton 1 participant 5 messages Dec 1, 2014

lore
Share & tools
lore

Ross Burton

author
#0 lore raw

cover Updates for defaultval being internal

Hi,

This series cleans up oe-core once the bitbake patch "data: rename defaultval to _defaultval" is merged.

Ross

The following changes since commit d7bc23167154c336913739b4cf9f2efda4e61499:

data: rename defaultval to _defaultval (2014-12-01 20:40:18 +0000)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib ross/defaultval

for you to fetch changes up to d818f59b6da77c778d8af9f91ce1ad97dc847c2d:

bitbake.conf: remove internal flags from BB_SIGNATURE_EXCLUDE_FLAGS (2014-12-01 23:42:51 +0000)

----------------------------------------------------------------
Ross Burton (4):
base.bbclass: don't skip defaultval uboot-config.bbclass: don't skip defaultval
scripts: don't skip defaultval
bitbake.conf: remove internal flags from BB_SIGNATURE_EXCLUDE_FLAGS

 meta/classes/base.bbclass                   |    2 --
 meta/classes/uboot-config.bbclass           |    3 ---
 meta/conf/bitbake.conf                      |    2 +-
 scripts/contrib/list-packageconfig-flags.py |    4 +---
 4 files changed, 2 insertions(+), 9 deletions(-)

Ross Burton (4):
base.bbclass: don't skip defaultval uboot-config.bbclass: don't skip defaultval
scripts: don't skip defaultval
bitbake.conf: remove internal flags from BB_SIGNATURE_EXCLUDE_FLAGS

 meta/classes/base.bbclass                   |    2 --
 meta/classes/uboot-config.bbclass           |    3 ---
 meta/conf/bitbake.conf                      |    2 +-
 scripts/contrib/list-packageconfig-flags.py |    4 +---
 4 files changed, 2 insertions(+), 9 deletions(-)
Signature · 1 line
1.7.10.4
author
#1 lore raw

PATCH 1/4 base.bbclass: don't skip defaultval

This field is now internal and won't be seen.

Signed-off-by Ross Burton <[email protected]>
---
 meta/classes/base.bbclass |    2 --
 1 file changed, 2 deletions(-)
meta/classes/base.bbclass +0 -2
index fcb7d89..f3185b4 100644
@@ -347,8 +347,6 @@ python () {
         extrardeps = []
         extraconf = []
         for flag, flagval in sorted(pkgconfigflags.items()):
-            if flag == "defaultval":
-                continue
             items = flagval.split(",")
             num = len(items)
             if num > 4:
Signature · 1 line
1.7.10.4
author
#2 lore raw

PATCH 2/4 uboot-config.bbclass: don't skip defaultval

In reply to Ross Burton

This field is now internal and won't be seen.

Signed-off-by Ross Burton <[email protected]>
---
 meta/classes/uboot-config.bbclass |    3 ---
 1 file changed, 3 deletions(-)
meta/classes/uboot-config.bbclass +0 -3
index 8ac1b71..b467659 100644
@@ -38,9 +38,6 @@ python () {
     ubootconfig = ubootconfig[0]
 
     for f, v in ubootconfigflags.items():
-        if f == 'defaultval':
-            continue
-
         items = v.split(',')
         if items[0] and len(items) > 2:
             raise bb.parse.SkipPackage('Only config,images can be specified!')
Signature · 1 line
1.7.10.4
author
#3 lore raw

PATCH 3/4 scripts: don't skip defaultval

In reply to Ross Burton

This field is now internal and won't be seen.

Signed-off-by Ross Burton <[email protected]>
---
 scripts/contrib/list-packageconfig-flags.py |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
scripts/contrib/list-packageconfig-flags.py +1 -3
index 598b5c3..2f3b8b0 100755
@@ -65,7 +65,6 @@ def get_recipesdata(bbhandler, preferred):
         data = bb.cache.Cache.loadDataFull(fn, bbhandler.cooker.collection.get_file_appends(fn), bbhandler.config_data)
         flags = data.getVarFlags("PACKAGECONFIG")
         flags.pop('doc', None)
-        flags.pop('defaultval', None)
         if flags:
             data_dict[fn] = data
 

@@ -78,7 +77,6 @@ def collect_pkgs(data_dict):
     for fn in data_dict:
         pkgconfigflags = data_dict[fn].getVarFlags("PACKAGECONFIG")
         pkgconfigflags.pop('doc', None)
-        pkgconfigflags.pop('defaultval', None)
         pkgname = data_dict[fn].getVar("P", True)
         pkg_dict[pkgname] = sorted(pkgconfigflags.keys())
 

@@ -135,7 +133,7 @@ def display_all(data_dict):
         print('PACKAGECONFIG %s' % packageconfig)
 
         for flag,flag_val in data_dict[fn].getVarFlags("PACKAGECONFIG").iteritems():
-            if flag in ["defaultval", "doc"]:
+            if flag == "doc":
                 continue
             print('PACKAGECONFIG[%s] %s' % (flag, flag_val))
         print ''
Signature · 1 line
1.7.10.4
author
#4 lore raw

PATCH 4/4 bitbake.conf: remove internal flags from BB_SIGNATURE_EXCLUDE_FLAGS

In reply to Ross Burton

As the code that uses BB_SIGNATURE_EXCLUDE_FLAGS uses d.getVarFlags() so doesn't get to see the internal flags, remove _append and _prepend. Also defaultval is now _defaultval and thus internal, so remove that too.

Signed-off-by Ross Burton <[email protected]>
---
 meta/conf/bitbake.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/bitbake.conf +1 -1
index 0ccaac0..7902bd7 100644
@@ -775,7 +775,7 @@ BB_HASHBASE_WHITELIST ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH DL_DIR \
 BB_HASHCONFIG_WHITELIST ?= "${BB_HASHBASE_WHITELIST} DATE TIME SSH_AGENT_PID \
     SSH_AUTH_SOCK PSEUDO_BUILD BB_ENV_EXTRAWHITE DISABLE_SANITY_CHECKS \
     PARALLEL_MAKE BB_NUMBER_THREADS BB_ORIGENV BB_INVALIDCONF BBINCLUDED"
-BB_SIGNATURE_EXCLUDE_FLAGS ?= "doc defaultval _append _prepend deps depends \
+BB_SIGNATURE_EXCLUDE_FLAGS ?= "doc deps depends \
     lockfiles type vardepsexclude vardeps vardepvalue vardepvalueexclude \
     file-checksums python func task export unexport noexec nostamp dirs cleandirs \
     sstate-lockfile-shared prefuncs postfuncs export_func deptask rdeptask \
Signature · 1 line
1.7.10.4