diff options
| author | Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> | 2013-01-19 17:23:01 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-20 12:49:16 +0000 |
| commit | 6e46664085fa49bc204fc944ca23ed6383e2ec51 (patch) | |
| tree | 9e4823ba93ade86b421621bdbc3c26b42f0c3b6b /meta/classes/package.bbclass | |
| parent | 8d0074ef2b61bf022ed1bb3b5f1afe526d8c921b (diff) | |
| download | openembedded-core-6e46664085fa49bc204fc944ca23ed6383e2ec51.tar.gz openembedded-core-6e46664085fa49bc204fc944ca23ed6383e2ec51.tar.bz2 openembedded-core-6e46664085fa49bc204fc944ca23ed6383e2ec51.zip | |
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@informatik.tu-chemnitz.de>
Cc: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package.bbclass')
| -rw-r--r-- | 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 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}" |