diff options
Diffstat (limited to 'meta/lib/oe/classextend.py')
-rw-r--r-- | meta/lib/oe/classextend.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/lib/oe/classextend.py b/meta/lib/oe/classextend.py index 4c8a00070c..d2eeaf0e5c 100644 --- a/meta/lib/oe/classextend.py +++ b/meta/lib/oe/classextend.py | |||
@@ -25,7 +25,7 @@ class ClassExtender(object): | |||
25 | return name | 25 | return name |
26 | 26 | ||
27 | def map_variable(self, varname, setvar = True): | 27 | def map_variable(self, varname, setvar = True): |
28 | var = self.d.getVar(varname, True) | 28 | var = self.d.getVar(varname) |
29 | if not var: | 29 | if not var: |
30 | return "" | 30 | return "" |
31 | var = var.split() | 31 | var = var.split() |
@@ -38,7 +38,7 @@ class ClassExtender(object): | |||
38 | return newdata | 38 | return newdata |
39 | 39 | ||
40 | def map_regexp_variable(self, varname, setvar = True): | 40 | def map_regexp_variable(self, varname, setvar = True): |
41 | var = self.d.getVar(varname, True) | 41 | var = self.d.getVar(varname) |
42 | if not var: | 42 | if not var: |
43 | return "" | 43 | return "" |
44 | var = var.split() | 44 | var = var.split() |
@@ -60,7 +60,7 @@ class ClassExtender(object): | |||
60 | return dep | 60 | return dep |
61 | else: | 61 | else: |
62 | # Do not extend for that already have multilib prefix | 62 | # Do not extend for that already have multilib prefix |
63 | var = self.d.getVar("MULTILIB_VARIANTS", True) | 63 | var = self.d.getVar("MULTILIB_VARIANTS") |
64 | if var: | 64 | if var: |
65 | var = var.split() | 65 | var = var.split() |
66 | for v in var: | 66 | for v in var: |
@@ -74,7 +74,7 @@ class ClassExtender(object): | |||
74 | varname = varname + "_" + suffix | 74 | varname = varname + "_" + suffix |
75 | orig = self.d.getVar("EXTENDPKGV", False) | 75 | orig = self.d.getVar("EXTENDPKGV", False) |
76 | self.d.setVar("EXTENDPKGV", "EXTENDPKGV") | 76 | self.d.setVar("EXTENDPKGV", "EXTENDPKGV") |
77 | deps = self.d.getVar(varname, True) | 77 | deps = self.d.getVar(varname) |
78 | if not deps: | 78 | if not deps: |
79 | self.d.setVar("EXTENDPKGV", orig) | 79 | self.d.setVar("EXTENDPKGV", orig) |
80 | return | 80 | return |
@@ -87,7 +87,7 @@ class ClassExtender(object): | |||
87 | self.d.setVar("EXTENDPKGV", orig) | 87 | self.d.setVar("EXTENDPKGV", orig) |
88 | 88 | ||
89 | def map_packagevars(self): | 89 | def map_packagevars(self): |
90 | for pkg in (self.d.getVar("PACKAGES", True).split() + [""]): | 90 | for pkg in (self.d.getVar("PACKAGES").split() + [""]): |
91 | self.map_depends_variable("RDEPENDS", pkg) | 91 | self.map_depends_variable("RDEPENDS", pkg) |
92 | self.map_depends_variable("RRECOMMENDS", pkg) | 92 | self.map_depends_variable("RRECOMMENDS", pkg) |
93 | self.map_depends_variable("RSUGGESTS", pkg) | 93 | self.map_depends_variable("RSUGGESTS", pkg) |
@@ -97,7 +97,7 @@ class ClassExtender(object): | |||
97 | self.map_depends_variable("PKG", pkg) | 97 | self.map_depends_variable("PKG", pkg) |
98 | 98 | ||
99 | def rename_packages(self): | 99 | def rename_packages(self): |
100 | for pkg in (self.d.getVar("PACKAGES", True) or "").split(): | 100 | for pkg in (self.d.getVar("PACKAGES") or "").split(): |
101 | if pkg.startswith(self.extname): | 101 | if pkg.startswith(self.extname): |
102 | self.pkgs_mapping.append([pkg.split(self.extname + "-")[1], pkg]) | 102 | self.pkgs_mapping.append([pkg.split(self.extname + "-")[1], pkg]) |
103 | continue | 103 | continue |