[oe-commits] Enrico Scholz : package.bbclass: replace AUTOINC directly in PKGV
git at git.openembedded.org
git at git.openembedded.org
Sun Jan 20 13:05:32 UTC 2013
Module: openembedded-core.git
Branch: master
Commit: 6e46664085fa49bc204fc944ca23ed6383e2ec51
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=6e46664085fa49bc204fc944ca23ed6383e2ec51
Author: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date: Sat Jan 19 17:23:01 2013 +0100
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.
Signed-off-by: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Cc: Constantin Musca <constantinx.musca at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/classes/package.bbclass | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index b06cca5..8609e75 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}"
More information about the Openembedded-commits
mailing list