Reset poky to before our libpam hacks
Things got a bit out of synch with openbmc-config due to the libpam
issues and the migration from the meta-* layers.
Revert the two previous commits and then put the latest poky in with the
libpam revert and get openbmc-config right again.
Revert "Revert "libpam: update 1.3.1 -> 1.5.1""
This reverts commit 87ddd3eab4df68e624b5350ccaab28b3b97547c0.
Revert "poky: subtree update:796be0593a..10c69538c0"
This reverts commit c723b72979bfac6362509cf1fe086900f6641f28.
Change-Id: I3a1f405193aee6a21fe0cd24be9927c143a23d9a
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
diff --git a/poky/bitbake/lib/bb/utils.py b/poky/bitbake/lib/bb/utils.py
index 5c775bd..f73d31f 100644
--- a/poky/bitbake/lib/bb/utils.py
+++ b/poky/bitbake/lib/bb/utils.py
@@ -129,7 +129,6 @@
return r
def vercmp_string(a, b):
- """ Split version strings and compare them """
ta = split_version(a)
tb = split_version(b)
return vercmp(ta, tb)
@@ -248,12 +247,6 @@
return r
def explode_dep_versions(s):
- """
- Take an RDEPENDS style string of format:
- "DEPEND1 (optional version) DEPEND2 (optional version) ..."
- skip null value and items appeared in dependancy string multiple times
- and return a dictionary of dependencies and versions.
- """
r = explode_dep_versions2(s)
for d in r:
if not r[d]:
@@ -699,7 +692,7 @@
raise
def prunedir(topdir, ionice=False):
- """ Delete everything reachable from the directory named in 'topdir'. """
+ # Delete everything reachable from the directory named in 'topdir'.
# CAUTION: This is dangerous!
if _check_unsafe_delete_path(topdir):
raise Exception('bb.utils.prunedir: called with dangerous path "%s", refusing to delete!' % topdir)
@@ -710,10 +703,8 @@
# but thats possibly insane and suffixes is probably going to be small
#
def prune_suffix(var, suffixes, d):
- """
- See if var ends with any of the suffixes listed and
- remove it if found
- """
+ # See if var ends with any of the suffixes listed and
+ # remove it if found
for suffix in suffixes:
if suffix and var.endswith(suffix):
return var[:-len(suffix)]
@@ -965,10 +956,6 @@
os.umask(current_mask)
def to_boolean(string, default=None):
- """
- Check input string and return boolean value True/False/None
- depending upon the checks
- """
if not string:
return default
@@ -1012,23 +999,6 @@
return falsevalue
def contains_any(variable, checkvalues, truevalue, falsevalue, d):
- """Check if a variable contains any values specified.
-
- Arguments:
-
- variable -- the variable name. This will be fetched and expanded (using
- d.getVar(variable)) and then split into a set().
-
- checkvalues -- if this is a string it is split on whitespace into a set(),
- otherwise coerced directly into a set().
-
- truevalue -- the value to return if checkvalues is a subset of variable.
-
- falsevalue -- the value to return if variable is empty or if checkvalues is
- not a subset of variable.
-
- d -- the data store.
- """
val = d.getVar(variable)
if not val:
return falsevalue
@@ -1590,8 +1560,8 @@
except:
pass
+# export common proxies variables from datastore to environment
def export_proxies(d):
- """ export common proxies variables from datastore to environment """
import os
variables = ['http_proxy', 'HTTP_PROXY', 'https_proxy', 'HTTPS_PROXY',