From 4873add6e11c1bd421c83cd08df589f1184aa673 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 2 Nov 2020 18:44:49 -0600 Subject: Revert "poky: subtree update:b23aa6b753..ad30a6d470" This reverts commit af5e4ef732faedf66c6dc1756432e9de2ac72988. This commit introduced openbmc/openbmc#3720 and no solution has been forthcoming. Revert until we can get to the bottom of this. Change-Id: I2fb0d81eb26cf3dadb2f2abdd1a1bb7a95eaf03c --- .../meta-selftest/recipes-test/devtool/devtool-patch-overrides.bb | 8 -------- .../devtool/devtool-patch-overrides/qemuarm/arm.patch | 5 ----- .../devtool/devtool-patch-overrides/qemux86/x86.patch | 5 ----- .../recipes-test/devtool/devtool-patch-overrides/source | 1 - 4 files changed, 19 deletions(-) delete mode 100644 poky/meta-selftest/recipes-test/devtool/devtool-patch-overrides.bb delete mode 100644 poky/meta-selftest/recipes-test/devtool/devtool-patch-overrides/qemuarm/arm.patch delete mode 100644 poky/meta-selftest/recipes-test/devtool/devtool-patch-overrides/qemux86/x86.patch delete mode 100644 poky/meta-selftest/recipes-test/devtool/devtool-patch-overrides/source (limited to 'poky/meta-selftest/recipes-test') diff --git a/poky/meta-selftest/recipes-test/devtool/devtool-patch-overrides.bb b/poky/meta-selftest/recipes-test/devtool/devtool-patch-overrides.bb deleted file mode 100644 index d36c9edee..000000000 --- a/poky/meta-selftest/recipes-test/devtool/devtool-patch-overrides.bb +++ /dev/null @@ -1,8 +0,0 @@ -SUMMARY = "devtool test for overrides and patches" -LICENSE = "CLOSED" -INHIBIT_DEFAULT_DEPS = "1" -EXCLUDE_FROM_WORLD = "1" - -SRC_URI = "file://source;subdir=${BP}" -SRC_URI_append_qemuarm = " file://arm.patch;striplevel=0" -SRC_URI_append_qemux86 = " file://x86.patch;striplevel=0" diff --git a/poky/meta-selftest/recipes-test/devtool/devtool-patch-overrides/qemuarm/arm.patch b/poky/meta-selftest/recipes-test/devtool/devtool-patch-overrides/qemuarm/arm.patch deleted file mode 100644 index e33a2753f..000000000 --- a/poky/meta-selftest/recipes-test/devtool/devtool-patch-overrides/qemuarm/arm.patch +++ /dev/null @@ -1,5 +0,0 @@ ---- source.orig 2020-10-06 13:26:10.792688630 +0100 -+++ source 2020-10-06 13:26:18.853424694 +0100 -@@ -1 +1 @@ --This is a test for something -+This is a test for qemuarm diff --git a/poky/meta-selftest/recipes-test/devtool/devtool-patch-overrides/qemux86/x86.patch b/poky/meta-selftest/recipes-test/devtool/devtool-patch-overrides/qemux86/x86.patch deleted file mode 100644 index 1a0a175fa..000000000 --- a/poky/meta-selftest/recipes-test/devtool/devtool-patch-overrides/qemux86/x86.patch +++ /dev/null @@ -1,5 +0,0 @@ ---- source.orig 2020-10-06 13:26:10.792688630 +0100 -+++ source 2020-10-06 13:26:18.853424694 +0100 -@@ -1 +1 @@ --This is a test for something -+This is a test for qemux86 diff --git a/poky/meta-selftest/recipes-test/devtool/devtool-patch-overrides/source b/poky/meta-selftest/recipes-test/devtool/devtool-patch-overrides/source deleted file mode 100644 index cc14ce627..000000000 --- a/poky/meta-selftest/recipes-test/devtool/devtool-patch-overrides/source +++ /dev/null @@ -1 +0,0 @@ -This is a test for something -- cgit v1.2.3