From 706d5aacd7ab7b37c00df1a1b210e4ced06119e1 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 12 Feb 2021 15:55:30 -0600 Subject: 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 --- poky/meta/lib/oe/path.py | 21 --------------------- poky/meta/lib/oe/qa.py | 1 - 2 files changed, 22 deletions(-) (limited to 'poky/meta/lib/oe') diff --git a/poky/meta/lib/oe/path.py b/poky/meta/lib/oe/path.py index c8d8ad05b..082972457 100644 --- a/poky/meta/lib/oe/path.py +++ b/poky/meta/lib/oe/path.py @@ -320,24 +320,3 @@ def which_wild(pathname, path=None, mode=os.F_OK, *, reverse=False, candidates=F return files -def canonicalize(paths, sep=','): - """Given a string with paths (separated by commas by default), expand - each path using os.path.realpath() and return the resulting paths as a - string (separated using the same separator a the original string). - """ - # Ignore paths containing "$" as they are assumed to be unexpanded bitbake - # variables. Normally they would be ignored, e.g., when passing the paths - # through the shell they would expand to empty strings. However, when they - # are passed through os.path.realpath(), it will cause them to be prefixed - # with the absolute path to the current directory and thus not be empty - # anymore. - # - # Also maintain trailing slashes, as the paths may actually be used as - # prefixes in sting compares later on, where the slashes then are important. - canonical_paths = [] - for path in (paths or '').split(sep): - if '$' not in path: - trailing_slash = path.endswith('/') and '/' or '' - canonical_paths.append(os.path.realpath(path) + trailing_slash) - - return sep.join(canonical_paths) diff --git a/poky/meta/lib/oe/qa.py b/poky/meta/lib/oe/qa.py index e8a854a30..ea831b930 100644 --- a/poky/meta/lib/oe/qa.py +++ b/poky/meta/lib/oe/qa.py @@ -156,7 +156,6 @@ def elf_machine_to_string(machine): """ try: return { - 0x00: "Unset", 0x02: "SPARC", 0x03: "x86", 0x08: "MIPS", -- cgit v1.2.3