summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorEnrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>2013-01-19 17:23:01 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-20 12:58:57 +0000
commit116fb4a72f352623b22a0c1a1a1500085f5918d3 (patch)
tree220b82040e2d6d2c360ce924781700d0a6f30aed /meta
parentb5659b7acdf6138640cc72ff8efc993e9ddebc58 (diff)
downloadpoky-116fb4a72f352623b22a0c1a1a1500085f5918d3.tar.gz
package.bbclass: replace AUTOINC directly in PKGV
b27b438221e16ac3df6ac66d761b77e3bd43db67 introduced a regression when PKGV is modified by the recipe. E.g. when having something like | PV = "1.7.33+gitr${SRCPV}" | PKGV = "1.7.33+gitr${GITPKGV}" | RDEPENDS_${PN}-subpkg += "${PN} (= ${EXTENDPKGV})" | inherit gitpkgv The resulting core package has | Version: 1.7.33+git234+cd01e8c-r11 and because the subpackage has | Depends: vdr (= 1.7.33+git0+cd01e8c18d494150730214f033f84e5282ce7639-r11) image build fails with | * satisfy_dependencies_for: Cannot satisfy the following dependencies ... | * vdr (= 1.7.33+git0+cd01e8c18d494150730214f033f84e5282ce7639-r11) Patch avoids the 'PKGV = "cleanup(${PV})"' operation and replaces AUTOINC directly within PKGV. This might introduce a regression too when 'AUTOINC' is added to PKGV intentionally but impact is small and can be fixed trivially by using another string. (From OE-Core rev: 6e46664085fa49bc204fc944ca23ed6383e2ec51) Signed-off-by: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> Cc: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/package.bbclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index b06cca5f57..8609e75354 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -418,9 +418,9 @@ python package_get_auto_pr() {
418 return 418 return
419 d.setVar('PRAUTO',str(auto_pr)) 419 d.setVar('PRAUTO',str(auto_pr))
420 else: 420 else:
421 pv = d.getVar("PV", True) 421 pkgv = d.getVar("PKGV", True)
422 if 'AUTOINC' in pv: 422 if 'AUTOINC' in pkgv:
423 d.setVar("PKGV", pv.replace("AUTOINC", "0")) 423 d.setVar("PKGV", pkgv.replace("AUTOINC", "0"))
424} 424}
425 425
426LOCALEBASEPN ??= "${PN}" 426LOCALEBASEPN ??= "${PN}"