diff options
| -rw-r--r-- | meta-poky/classes/poky-sanity.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-poky/classes/poky-sanity.bbclass b/meta-poky/classes/poky-sanity.bbclass index 81cd2eb6a6..a068c7368c 100644 --- a/meta-poky/classes/poky-sanity.bbclass +++ b/meta-poky/classes/poky-sanity.bbclass | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | # Provide some extensions to sanity.bbclass to handle poky-specific conf file upgrades | 1 | # Provide some extensions to sanity.bbclass to handle poky-specific conf file upgrades |
| 2 | 2 | ||
| 3 | python poky_update_bblayersconf() { | 3 | python poky_update_bblayersconf() { |
| 4 | current_version = int(d.getVar('POKY_BBLAYERS_CONF_VERSION', True) or -1) | 4 | current_version = int(d.getVar('POKY_BBLAYERS_CONF_VERSION') or -1) |
| 5 | latest_version = int(d.getVar('REQUIRED_POKY_BBLAYERS_CONF_VERSION', True) or -1) | 5 | latest_version = int(d.getVar('REQUIRED_POKY_BBLAYERS_CONF_VERSION') or -1) |
| 6 | if current_version == -1 or latest_version == -1: | 6 | if current_version == -1 or latest_version == -1: |
| 7 | # one or the other missing => malformed configuration | 7 | # one or the other missing => malformed configuration |
| 8 | raise NotImplementedError("You need to update bblayers.conf manually for this version transition") | 8 | raise NotImplementedError("You need to update bblayers.conf manually for this version transition") |
| @@ -11,7 +11,7 @@ python poky_update_bblayersconf() { | |||
| 11 | 11 | ||
| 12 | # check for out of date templateconf.cfg file | 12 | # check for out of date templateconf.cfg file |
| 13 | lines = [] | 13 | lines = [] |
| 14 | fn = os.path.join(d.getVar('TOPDIR', True), 'conf/templateconf.cfg') | 14 | fn = os.path.join(d.getVar('TOPDIR'), 'conf/templateconf.cfg') |
| 15 | 15 | ||
| 16 | lines = sanity_conf_read(fn) | 16 | lines = sanity_conf_read(fn) |
| 17 | index, meta_yocto_line = sanity_conf_find_line(r'^meta-yocto/', lines) | 17 | index, meta_yocto_line = sanity_conf_find_line(r'^meta-yocto/', lines) |
