From 1a4b7ee28bf7413af6513fb45ad0d0736048f866 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sun, 16 Dec 2018 17:11:34 -0800 Subject: reset upstream subtrees to yocto 2.6 Reset the following subtrees on thud HEAD: poky: 87e3a9739d meta-openembedded: 6094ae18c8 meta-security: 31dc4e7532 meta-raspberrypi: a48743dc36 meta-xilinx: c42016e2e6 Also re-apply backports that didn't make it into thud: poky: 17726d0 systemd-systemctl-native: handle Install wildcards meta-openembedded: 4321a5d libtinyxml2: update to 7.0.1 042f0a3 libcereal: Add native and nativesdk classes e23284f libcereal: Allow empty package 030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG 179a1b9 gtest: update to 1.8.1 Squashed OpenBMC subtree compatibility updates: meta-aspeed: Brad Bishop (1): aspeed: add yocto 2.6 compatibility meta-ibm: Brad Bishop (1): ibm: prepare for yocto 2.6 meta-ingrasys: Brad Bishop (1): ingrasys: set layer compatibility to yocto 2.6 meta-openpower: Brad Bishop (1): openpower: set layer compatibility to yocto 2.6 meta-phosphor: Brad Bishop (3): phosphor: set layer compatibility to thud phosphor: libgpg-error: drop patches phosphor: react to fitimage artifact rename Ed Tanous (4): Dropbear: upgrade options for latest upgrade yocto2.6: update openssl options busybox: remove upstream watchdog patch systemd: Rebase CONFIG_CGROUP_BPF patch Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7 Signed-off-by: Brad Bishop --- poky/meta/lib/oeqa/selftest/case.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'poky/meta/lib/oeqa/selftest/case.py') diff --git a/poky/meta/lib/oeqa/selftest/case.py b/poky/meta/lib/oeqa/selftest/case.py index 2e446b0a6..9c08d595e 100644 --- a/poky/meta/lib/oeqa/selftest/case.py +++ b/poky/meta/lib/oeqa/selftest/case.py @@ -215,31 +215,31 @@ to ensure accurate results.") ftools.remove_from_file(self.testinc_path, data) def recipeinc(self, recipe): - """Return absolute path of meta-sefltest/recipes-test//test_recipe.inc""" + """Return absolute path of meta-selftest/recipes-test//test_recipe.inc""" return os.path.join(self.testlayer_path, 'recipes-test', recipe, 'test_recipe.inc') def write_recipeinc(self, recipe, data): - """Write to meta-sefltest/recipes-test//test_recipe.inc""" + """Write to meta-selftest/recipes-test//test_recipe.inc""" inc_file = self.recipeinc(recipe) self.logger.debug("Writing to: %s\n%s\n" % (inc_file, data)) ftools.write_file(inc_file, data) return inc_file def append_recipeinc(self, recipe, data): - """Append data to meta-sefltest/recipes-test//test_recipe.inc""" + """Append data to meta-selftest/recipes-test//test_recipe.inc""" inc_file = self.recipeinc(recipe) self.logger.debug("Appending to: %s\n%s\n" % (inc_file, data)) ftools.append_file(inc_file, data) return inc_file def remove_recipeinc(self, recipe, data): - """Remove data from meta-sefltest/recipes-test//test_recipe.inc""" + """Remove data from meta-selftest/recipes-test//test_recipe.inc""" inc_file = self.recipeinc(recipe) self.logger.debug("Removing from: %s\n%s\n" % (inc_file, data)) ftools.remove_from_file(inc_file, data) def delete_recipeinc(self, recipe): - """Delete meta-sefltest/recipes-test//test_recipe.inc file""" + """Delete meta-selftest/recipes-test//test_recipe.inc file""" inc_file = self.recipeinc(recipe) self.logger.debug("Deleting file: %s" % inc_file) try: -- cgit v1.2.3