From fbe8f13d8d728d3faa3e8e98fa33f73707d1c099 Mon Sep 17 00:00:00 2001
From: Mark Hatle <mark.hatle@amd.com>
Date: Thu, 23 Feb 2023 17:03:16 -0800
Subject: Move multilib specific PLNX/Vitis items to meta-petalinux

These items are specific to the special PetaLinux/Vitis multilib toolchain,
move these to meta-petalinux.

Signed-off-by: Mark Hatle <mark.hatle@amd.com>
---
 .../recipes-core/meta/gnu-toolchain-canadian.bb    | 27 ----------------------
 .../packagegroup-cross-canadian.bbappend           | 14 -----------
 .../packagegroup-newlib-standalone-sdk-target.bb   | 13 -----------
 3 files changed, 54 deletions(-)
 delete mode 100644 meta-xilinx-standalone/recipes-core/meta/gnu-toolchain-canadian.bb
 delete mode 100644 meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend
 delete mode 100644 meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-newlib-standalone-sdk-target.bb

diff --git a/meta-xilinx-standalone/recipes-core/meta/gnu-toolchain-canadian.bb b/meta-xilinx-standalone/recipes-core/meta/gnu-toolchain-canadian.bb
deleted file mode 100644
index 1af09a5f..00000000
--- a/meta-xilinx-standalone/recipes-core/meta/gnu-toolchain-canadian.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-inherit cross-canadian
-
-SUMMARY = "Links to the various GNU toolchains for use with the Xilinx multilib toolchain"
-PN = "gnu-toolchain-canadian-${TARGET_SYS}"
-BPN = "gnu-toolchain-canadian"
-
-LICENSE = "MIT"
-
-EXEEXT:sdkmingw32 = ".exe"
-
-do_install () {
-	if [ "${TARGET_SYS_MULTILIB_ORIGINAL}" != "" -a "${TARGET_SYS_MULTILIB_ORIGINAL}" != "${TARGET_SYS}" ]; then
-		mkdir -p ${D}${bindir}
-
-		# Create a link for each item references by the environment files
-		for each in gcc g++ as ld gdb strip ranlib objcopy objdump readelf ar nm ; do
-			ln -s ../${TARGET_SYS_MULTILIB_ORIGINAL}/${TARGET_SYS_MULTILIB_ORIGINAL}-${each}${EXEEXT} ${D}${bindir}/${TARGET_SYS}-${each}${EXEEXT}
-		done
-	fi
-}
-
-INHIBIT_DEFAULT_DEPS = "1"
-
-ALLOW_EMPTY:${PN} = "1"
-FILES:${PN} = "${bindir}"
-
-PACKAGES = "${PN}"
diff --git a/meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend b/meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend
deleted file mode 100644
index 7ef0693b..00000000
--- a/meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend
+++ /dev/null
@@ -1,14 +0,0 @@
-# Avoid installing all of the alternative toolchains
-# due to multilib enabled in the primary toolchain.
-
-# Create the links to the multilib toolchain components
-GNUTCLINKS = "gnu-toolchain-canadian-${TARGET_SYS}"
-
-# Without the := the eval during do_package is occasionally missing multilibs
-RDEPENDS:${PN}:xilinx-standalone := " \
-    ${@all_multilib_tune_values(d, 'GNUTCLINKS')} \
-    ${BINUTILS} \
-    ${GCC} \
-    ${GDB} \
-    meta-environment-${MACHINE} \
-"
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
deleted file mode 100644
index 5534e1d9..00000000
--- a/meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-newlib-standalone-sdk-target.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-COMPATIBLE_HOST = "${HOST_SYS}"
-
-SUMMARY = "Target packages for the standalone SDK"
-
-PACKAGE_ARCH = "${TUNE_PKGARCH}"
-
-inherit packagegroup
-
-RDEPENDS:${PN} = "\
-    libgcc-dev \
-    libstdc++-dev \
-    ${LIBC_DEPENDENCIES} \
-    "
-- 
cgit v1.2.3-54-g00ecf