Revert "xlnx-compatible-os.bbclass: Class to allow recipes to list OS compatibility"

This reverts commit 4f3edb6da405ffff957d6f194bc7db7bdd9f1463.

Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>

12 files changed, 0 insertions, 38 deletions

diff --git a/meta-xilinx-standalone/classes/esw.bbclass b/meta-xilinx-standalone/classes/esw.bbclass
index 99b36859..31bbec72 100644
--- a/meta-xilinx-standalone/classes/esw.bbclass
+++ b/meta-xilinx-standalone/classes/esw.bbclass
@@ -28,9 +28,6 @@ ESW_CFLAGS += "-specs=${SPECFILE_PATH}"
 
 inherit ccmake
 
-COMPATIBLE_OS = "elf"
-COMPATIBLE_OS_arm = "eabi"
-
 DTBFILE ?= "${RECIPE_SYSROOT}/boot/devicetree/system-top.dtb"
 
 def get_xlnx_cmake_machine(fam, d):
diff --git a/meta-xilinx-standalone/classes/xlnx-compatible-os.bbclass b/meta-xilinx-standalone/classes/xlnx-compatible-os.bbclass
deleted file mode 100644
index 4b06ddd8..00000000
--- a/meta-xilinx-standalone/classes/xlnx-compatible-os.bbclass
+++ /dev/null
@@ -1,16 +0,0 @@
-# We assume everything is Linux compatible, deviations to this
-# must define their own compatible OS
-COMPATIBLE_OS ?= "linux${LIBCEXTENSION}${ABIEXTENSION}"
-
-python() {
-    # Only do this check for target recipes
-    if d.getVar('CLASSOVERRIDE') != "class-target":
-        return
-
-    need_os = d.getVar('COMPATIBLE_OS')
-    if need_os:
-        import re
-        target_os = d.getVar('TARGET_OS')
-        if not re.match(need_os, target_os):
-            raise bb.parse.SkipRecipe("incompatible with os %s (not in COMPATIBLE_OS '%s')" % (target_os, need_os))
-}
diff --git a/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc b/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc
index 0704c4fd..18ce4da6 100644
--- a/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc
+++ b/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc
@@ -24,8 +24,6 @@ INHERIT += "buildhistory"
 # Cortex R5 requires an additional cflag to be passed for compatibility with the embeddedsw
 TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexr5', ' -DARMR5', '', d)}"
 
-INHERIT += "xlnx-compatible-os"
-
 # Clear defaults
 DISTRO_FEATURES_BACKFILL_xilinx-standalone = ""
 VIRTUAL-RUNTIME_init_manager_xilinx-standalone = ""
diff --git a/meta-xilinx-standalone/recipes-core/meta/meta-toolchain.bbappend b/meta-xilinx-standalone/recipes-core/meta/meta-toolchain.bbappend
index cd8638ef..0b4812d0 100644
--- a/meta-xilinx-standalone/recipes-core/meta/meta-toolchain.bbappend
+++ b/meta-xilinx-standalone/recipes-core/meta/meta-toolchain.bbappend
@@ -1,3 +1 @@
-COMPATIBLE_OS_xilinx-standalone = "${TARGET_OS}"
-
 TOOLCHAIN_TARGET_TASK_xilinx-standalone = "${@multilib_pkg_extend(d, 'packagegroup-newlib-standalone-sdk-target')}"
diff --git a/meta-xilinx-standalone/recipes-core/newlib/libgloss_3.1.0.bbappend b/meta-xilinx-standalone/recipes-core/newlib/libgloss_3.1.0.bbappend
index aaf4b77f..c5dda818 100644
--- a/meta-xilinx-standalone/recipes-core/newlib/libgloss_3.1.0.bbappend
+++ b/meta-xilinx-standalone/recipes-core/newlib/libgloss_3.1.0.bbappend
@@ -1,6 +1,3 @@
-COMPATIBLE_OS_xilinx-standalone = "elf"
-COMPATIBLE_OS_arm_xilinx-standalone = "eabi"
-
 # When building multiple, we need to depend on the multilib newlib
 DEPENDS_append_xilinx-standalone = " ${MLPREFIX}newlib"
 
diff --git a/meta-xilinx-standalone/recipes-core/newlib/newlib_3.1.0.bbappend b/meta-xilinx-standalone/recipes-core/newlib/newlib_3.1.0.bbappend
index 4e2533d0..d57f97b1 100644
--- a/meta-xilinx-standalone/recipes-core/newlib/newlib_3.1.0.bbappend
+++ b/meta-xilinx-standalone/recipes-core/newlib/newlib_3.1.0.bbappend
@@ -1,5 +1,3 @@
-COMPATIBLE_OS_xilinx-standalone = "elf"
-COMPATIBLE_OS_arm_xilinx-standalone = "eabi"
 
 EXTRA_OECONF_append_xilinx-standalone = " \
         --enable-newlib-io-c99-formats \
diff --git a/meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-newlib-standalone-sdk-target.bb b/meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-newlib-standalone-sdk-target.bb
index 6f06f61a..d943938b 100644
--- a/meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-newlib-standalone-sdk-target.bb
+++ b/meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-newlib-standalone-sdk-target.bb
@@ -1,5 +1,3 @@
-COMPATIBLE_OS_xilinx-standalone = "${TARGET_OS}"
-
 SUMMARY = "Target packages for the standalone SDK"
 
 PACKAGE_ARCH = "${TUNE_PKGARCH}"
diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend
index d4220640..0d25e066 100644
--- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend
+++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend
@@ -1,5 +1,3 @@
-COMPATIBLE_OS_xilinx-standalone = "${TARGET_OS}"
-
 # Copy of gcc-xilinx-standalone.inc, but with _class-target added
 LINKER_HASH_STYLE_xilinx-standalone_class-target = ""
 SYMVERS_CONF_xilinx-standalone_class-target = ""
diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_9.%.bbappend b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_9.%.bbappend
index 479e13f9..1a75e000 100644
--- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_9.%.bbappend
+++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_9.%.bbappend
@@ -1,5 +1,3 @@
-COMPATIBLE_OS_xilinx-standalone = "${TARGET_OS}"
-
 # Add MicroBlaze Patches (only when using MicroBlaze)
 FILESEXTRAPATHS_append_microblaze_xilinx-standalone := ":${THISDIR}/gcc-9"
 SRC_URI_append_microblaze_xilinx-standalone = " \
diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/libgcc_%.bbappend b/meta-xilinx-standalone/recipes-devtools/gcc/libgcc_%.bbappend
index a2062f6f..e6801c2f 100644
--- a/meta-xilinx-standalone/recipes-devtools/gcc/libgcc_%.bbappend
+++ b/meta-xilinx-standalone/recipes-devtools/gcc/libgcc_%.bbappend
@@ -1,5 +1,3 @@
-COMPATIBLE_OS_xilinx-standalone = "${TARGET_OS}"
-
 python do_multilib_install_xilinx-standalone_class-target () {
     pass
 }
diff --git a/meta-xilinx-standalone/recipes-devtools/qemu/qemuwrapper-cross_1.0.bbappend b/meta-xilinx-standalone/recipes-devtools/qemu/qemuwrapper-cross_1.0.bbappend
deleted file mode 100644
index 0efa796c..00000000
--- a/meta-xilinx-standalone/recipes-devtools/qemu/qemuwrapper-cross_1.0.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-COMPATIBLE_OS_xilinx-standalone = "${TARGET_OS}"
diff --git a/meta-xilinx-standalone/recipes-kernel/linux/linux-dummy.bbappend b/meta-xilinx-standalone/recipes-kernel/linux/linux-dummy.bbappend
deleted file mode 100644
index 0efa796c..00000000
--- a/meta-xilinx-standalone/recipes-kernel/linux/linux-dummy.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-COMPATIBLE_OS_xilinx-standalone = "${TARGET_OS}"