diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2021-02-13 00:55:30 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2021-02-25 23:15:06 +0300 |
| commit | 706d5aacd7ab7b37c00df1a1b210e4ced06119e1 (patch) | |
| tree | ed0bec373424d01accfb2e9c895c177a3e2d7abe /poky/meta/lib/oeqa/selftest/cases/buildoptions.py | |
| parent | ac970dd705934286df062e0f1501f776dc2ef01d (diff) | |
| download | openbmc-706d5aacd7ab7b37c00df1a1b210e4ced06119e1.tar.xz | |
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>
Diffstat (limited to 'poky/meta/lib/oeqa/selftest/cases/buildoptions.py')
| -rw-r--r-- | poky/meta/lib/oeqa/selftest/cases/buildoptions.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/poky/meta/lib/oeqa/selftest/cases/buildoptions.py b/poky/meta/lib/oeqa/selftest/cases/buildoptions.py index d0f647730..e91f0bd18 100644 --- a/poky/meta/lib/oeqa/selftest/cases/buildoptions.py +++ b/poky/meta/lib/oeqa/selftest/cases/buildoptions.py @@ -33,10 +33,10 @@ class ImageOptionsTests(OESelftestTestCase): self.assertTrue(incremental_removed, msg = "Match failed in:\n%s" % log_data_removed) def test_ccache_tool(self): - bb_vars = get_bb_vars(['HOSTTOOLS_DIR'], 'm4-native') - p = bb_vars['HOSTTOOLS_DIR'] + "/" + "ccache" - if not os.path.isfile(p): - self.skipTest("No ccache binary found in %s" % bb_vars['HOSTTOOLS_DIR']) + bitbake("ccache-native") + bb_vars = get_bb_vars(['SYSROOT_DESTDIR', 'bindir'], 'ccache-native') + p = bb_vars['SYSROOT_DESTDIR'] + bb_vars['bindir'] + "/" + "ccache" + self.assertTrue(os.path.isfile(p), msg = "No ccache found (%s)" % p) self.write_config('INHERIT += "ccache"') self.add_command_to_tearDown('bitbake -c clean m4-native') bitbake("m4-native -c clean") |