From 116fb4a72f352623b22a0c1a1a1500085f5918d3 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Sat, 19 Jan 2013 17:23:01 +0100 Subject: 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 Cc: Constantin Musca Signed-off-by: Richard Purdie --- meta/classes/package.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/classes') 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() { return d.setVar('PRAUTO',str(auto_pr)) else: - pv = d.getVar("PV", True) - if 'AUTOINC' in pv: - d.setVar("PKGV", pv.replace("AUTOINC", "0")) + pkgv = d.getVar("PKGV", True) + if 'AUTOINC' in pkgv: + d.setVar("PKGV", pkgv.replace("AUTOINC", "0")) } LOCALEBASEPN ??= "${PN}" -- cgit v1.2.3-54-g00ecf