diff mbox series

[master/kirkstone] meta-arago-distro: drop support for handling source IPKs in SDK

Message ID 20221028010333.866303-1-denis@denix.org
State Accepted
Delegated to: Ryan Eatmon
Headers show
Series [master/kirkstone] meta-arago-distro: drop support for handling source IPKs in SDK | expand

Commit Message

Denys Dmytriyenko Oct. 28, 2022, 1:03 a.m. UTC
From: Denys Dmytriyenko <denys@konsulko.com>

As support for top-level Makefile in SDK is being dropped, there's no need to
generate source IPK packages to include sources in the SDK for cross-compiling.
Generation of source IPKs is a bit kludgy as it's not supported upstream or by
opkg, hence it often gets in the way of migrating the layer to the new release.
Therefore, remove sourceipk.bbclass, arago-source-ipk.inc package configs and
corresponding packagegroup-*-sdk-host.bb that pulled src packages to the SDK.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-arago-distro/classes/sourceipk.bbclass   | 305 ---------------
 meta-arago-distro/conf/distro/arago.conf      |   3 -
 .../conf/distro/include/arago-source-ipk.inc  | 368 ------------------
 .../recipes-core/images/tisdk-core-bundle.inc |  10 +-
 ...ackagegroup-arago-tisdk-addons-sdk-host.bb | 104 -----
 ...packagegroup-arago-tisdk-amsdk-sdk-host.bb |  14 +-
 ...ackagegroup-arago-tisdk-crypto-sdk-host.bb |  18 -
 ...kagegroup-arago-tisdk-graphics-sdk-host.bb |  14 -
 .../packagegroup-arago-tisdk-hmi-sdk-host.bb  |  37 --
 ...ackagegroup-arago-tisdk-matrix-sdk-host.bb |  17 -
 ...gegroup-arago-tisdk-multimedia-sdk-host.bb |  41 --
 ...ackagegroup-arago-tisdk-opencl-sdk-host.bb |  22 --
 .../packagegroup-arago-tisdk-qte-sdk-host.bb  |  11 -
 .../recipes-kernel/linux/copy-defconfig.inc   |  22 --
 .../linux/linux-ti-staging-rt_%.bbappend      |   1 -
 .../linux/linux-ti-staging-systest_%.bbappend |   1 -
 .../linux/linux-ti-staging_%.bbappend         |   1 -
 17 files changed, 2 insertions(+), 987 deletions(-)
 delete mode 100644 meta-arago-distro/classes/sourceipk.bbclass
 delete mode 100644 meta-arago-distro/conf/distro/include/arago-source-ipk.inc
 delete mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb
 delete mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto-sdk-host.bb
 delete mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics-sdk-host.bb
 delete mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-hmi-sdk-host.bb
 delete mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix-sdk-host.bb
 delete mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb
 delete mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl-sdk-host.bb
 delete mode 100644 meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte-sdk-host.bb
 delete mode 100644 meta-arago-distro/recipes-kernel/linux/copy-defconfig.inc
diff mbox series

Patch

diff --git a/meta-arago-distro/classes/sourceipk.bbclass b/meta-arago-distro/classes/sourceipk.bbclass
deleted file mode 100644
index 5ffb75a8..00000000
--- a/meta-arago-distro/classes/sourceipk.bbclass
+++ /dev/null
@@ -1,305 +0,0 @@ 
-# sourceipk.bbclass enables the creation of an ipk file that contains the
-# sources used during the build.  The sources contained in the ipk are the
-# patched sources before configuration has been done.
-#
-# This class is used to provide an easy method to ship the corresponding
-# sources for a package to end users so that they can install them on their
-# host or target systems.
-#
-# This package uses the following variables to control its operations:
-#   - CREATE_SRCIPK         = When set to 1 this variable indicates that 
-#                             a source ipk should be generated for the package.
-#   - SRCIPK_INSTALL_DIR    = This variable indicates the directory to install
-#                             the sources into.
-#   - SRCIPK_PACKAGE_ARCH   = This variable allows specific recipies to
-#                             specify an architecture for the sourcetree
-#                             package, defaults to the same as binary pkg
-#   - SRCIPK_INC_EXTRAFILES = When set to 1 this variable indicates that
-#                             the source ipk should contain extra files
-#                             such as the README file and recipe.
-#
-# The default installation directory for the sources is:
-#   /usr/src/${PN}-source
-#
-# By setting the SRCIPK_INSTALL_DIR this default can be changed to any
-# location desired.  When combined with the opkg -o option this allows for the
-# system building to specify a relative package install location to the
-# install root given to opkg.  Each source ipk can have a different directory.
-# 
-# Creation of the source ipk can be controlled per package by setting
-# CREATE_SRCIPK = "1" in the package recipe or by setting
-# CREATE_SRCIPK:pn-<package name> = "1" in your local.conf
-#
-#TODO: 
-# Need to figure out how to use opkg-build in this class.
-# I tried adding it as a dependency for the do_create_srcipk
-# task using:
-#   do_create_srcipk[depends] += "opkg-utils-native:do_populate_sysroot"
-# But then there is a circular dependency between sourcipk.bbclass and
-# opkg-utils-native.  Until I can figure out how to resolve this
-# circular dependency I am extracting the needed pieces from opkg-build
-# into this class and building the source ipk myself.
-
-
-# Default is to not create the source ipk
-CREATE_SRCIPK ?= "0"
-
-# Default installation prefix
-SRCIPK_INSTALL_DIR ?= "/usr/src/${PN}-source"
-
-# Directory to preserve sources until they can be installed for packaging
-SRCIPK_STAGING_DIR = "${WORKDIR}/srcipk-staging"
-
-# Specify the directory of the sources
-SRCIPK_SRC_DIR ?= "${S}"
-
-# Default PACKAGE_ARCH for sources is "all"
-SRCIPK_PACKAGE_ARCH ?= "${PACKAGE_ARCH}"
-
-# Default section matches the recipe section
-SRCIPK_SECTION ?= "${SECTION}"
-
-# Default SRCIPK_INCLUDE_EXTRAFILES is to include the extra files
-SRCIPK_INCLUDE_EXTRAFILES ?= "1"
-
-SRCIPK_PRESERVE_GIT ?= "false"
-
-# Git commit message that explains the purpose of the custom git branch
-SRCIPK_CUSTOM_GIT_MESSAGE ?= ""
-
-# File that will store the same information as the commit message but is also
-# used to add something to insure a commit can be committed.
-SRCIPK_SDK_README ?= "TISDK-README"
-
-# Name used when creating the custom branch
-SRCIPK_CUSTOM_GIT_BRANCH ?= ""
-
-# Create a shallow clone of the git repository to reduce the size of
-# the sourceipk
-SRCIPK_SHALLOW_CLONE ?= "false"
-
-# By default limit the history to 1 commit since the user can always
-# use git pull --unshallow to fetch the rest of history.  The depth
-# level of 1 is set to keep from tracking through all merges and
-# pulling excess history
-SRCIPK_SHALLOW_DEPTH ?= "1"
-
-# This function will return the fetch URL for a git repository passed as
-# the first parameter.
-get_remote() {
-    git_repo="$1"
-
-    if [ "$git_repo" = "" ]
-    then
-        echo "git_repo not passed to get_remote"
-        exit 1
-    fi
-
-    cd $git_repo
-
-    # Get the remote repository fetch URL
-    remote=`git remote -v | grep "(fetch)" | cut -d ' ' -f 1   | cut -c 7- | tr -d ' '`
-
-    # Since the echo'ed value of this statment is the returned value redirect
-    # the output of this command to /dev/null
-    cd - > /dev/null
-
-    # echo back the remote repository URL as the output of this function
-    echo $remote
-
-    return 0
-}
-
-# Some git repositories are very large and we do not want to ship the
-# full history.  Instead we want to limit history to reduce the size while
-# still keeping the git repository in place.  The full history can be
-# fetched using git pull --unshallow or just git pull
-# NOTE: This function depends on a git version >= 1.7.10.  It will work
-#       with older versions but the size will be larger because rather
-#       than just a single branch the limited history will be a depth of
-#       1 for all branches and tags.
-limit_git_history() {
-
-    # Temporary directory to make shallow clones in
-    gitshallowclone="${WORKDIR}/temp-git-shallow-clone"
-
-    # Change directory to the git repository to be safe
-    cd ${SRCIPK_STAGING_DIR}/${SRCIPK_INSTALL_DIR}
-
-    # Create a temporary directory to hold the shallow git clone
-    mkdir -p $gitshallowclone
-
-    remote=`get_remote $PWD`
-
-    # Clone a shallow version of the workdir repo so that the preserved git
-    # points to the commit used in the build.
-    git clone --depth ${SRCIPK_SHALLOW_DEPTH} --branch ${BRANCH} file://$PWD/.git $gitshallowclone
-
-    # remove original kernel clone since we will replace it with the shallow
-    # clone
-    rm -rf ${SRCIPK_STAGING_DIR}/${SRCIPK_INSTALL_DIR}/.git
-
-    # replace the original kernel git data with the shallow clone git data
-    mv $gitshallowclone/.git ${SRCIPK_STAGING_DIR}/${SRCIPK_INSTALL_DIR}/
-    rm -rf $gitshallowclone
-
-    # Remove the local remote
-    git remote rm origin
-
-    # This is forceful, but unfortuantely, removing the origin remote does not
-    # remove all origin refs, and that causes problems.
-    rm -rf ./.git/refs/remotes/origin
-
-    # Point remote back to upstream
-    git remote add origin $remote
-
-    cd -
-}
-
-adjust_git() {
-    orig_dir="$PWD"
-
-    cd ${SRCIPK_STAGING_DIR}/${SRCIPK_INSTALL_DIR}
-
-    if [ -d ".git" ]
-    then
-        if [ "${SRCIPK_PRESERVE_GIT}" = "true" ]
-        then
-            # If SRCIPK_SHALLOW_CLONE is true then make a shallow copy of the
-            # git repository and then fix up the git URLs
-            if [ "${SRCIPK_SHALLOW_CLONE}" = "true" ]
-            then
-                limit_git_history
-            fi
-
-            # Repackage the repository so its a proper clone of the original
-            # (remote) git repository
-            git repack -a -d
-
-            if [ "${SRCIPK_CUSTOM_GIT_BRANCH}" != "" -a "${SRCIPK_CUSTOM_GIT_MESSAGE}" != "" ]
-            then
-                # Create local git config settings to create commit
-                git config user.email "<>"
-                git config user.name "Texas Instruments SDK Builder"
-
-                # For recipes like the kernel which may end up running
-                # sourceipk more than once.
-                branch_exist=`git branch | grep ${SRCIPK_CUSTOM_GIT_BRANCH}` || echo ""
-                if [ "$branch_exist" != "" -a -f ${SRCIPK_SDK_README} ]
-                then
-                    git add -A
-                    git commit --amend
-                else
-                    echo -e ${SRCIPK_CUSTOM_GIT_MESSAGE} > ${SRCIPK_SDK_README}
-                    git add -A
-                    git commit -F ${SRCIPK_SDK_README}
-                    git checkout -b "${SRCIPK_CUSTOM_GIT_BRANCH}"
-                fi
-
-                # Delete local git config settings previously set
-                git config --unset user.email
-                git config --unset user.name
-
-            fi
-
-            rm -f .git/objects/info/alternates
-
-        else
-            rm -rf .git
-        fi
-
-    fi
-
-    cd $orig_dir
-}
-
-# Create a README file that describes the contents of the source ipk
-sourceipk_create_readme() {
-    readme="$1/README.${PN}-source"
-    touch $readme
-    echo 'This package contains the patched sources for ${PN} that' >> $readme
-    echo 'were used to generate the ${PN} binary ipk package(s).' >> $readme
-    echo 'This package does not build or generate the binaries' >> $readme
-    echo 'directly.  To build the binaries you must either' >> $readme
-    echo 'configure and build the sources yourself or use:' >> $readme
-    echo '    bitbake ${PN}' >> $readme
-    echo '' >> $readme
-    echo 'NOTE: The patches applied to the sources can be found in' >> $readme
-    echo "      the \"patches\" directory" >> $readme
-}
-
-do_create_srcipk[dirs] = "${SRCIPK_SRC_DIR} ${SRCIPK_STAGING_DIR}"
-do_create_srcipk[cleandirs] = "${SRCIPK_STAGING_DIR}"
-do_create_srcipk[umask] = "022"
-
-# Create the source ipk file.  The ipk is manually created here instead
-# of using the normal ipk system because some recipes will over write
-# the PACKAGES variable.  Thus if this class added a -source package
-# to the list of packages to be created that package would be lost.
-# See the linux kernel recipe for an example of this issue.
-sourceipk_do_create_srcipk() {
-    if [ ${CREATE_SRCIPK} != "0" ]
-    then
-        # Copy sources for packaging
-        mkdir -p ${SRCIPK_STAGING_DIR}/${SRCIPK_INSTALL_DIR}
-        if [ -e ${SRCIPK_SRC_DIR} ]; then
-            if [ "${SRCIPK_SRC_DIR}" = "${WORKDIR}" ]; then
-                excludes='--exclude ./temp --exclude ${SRCIPK_STAGING_DIR}'
-            fi
-            tar -C ${SRCIPK_SRC_DIR} -cO $excludes . | tar -C ${SRCIPK_STAGING_DIR}/${SRCIPK_INSTALL_DIR} -xpf -
-        fi
-
-        # Fix up patches/ directory to contain actual patches instead of symlinks
-        if [ -e ${SRCIPK_STAGING_DIR}/${SRCIPK_INSTALL_DIR}/patches ]
-        then
-            mv ${SRCIPK_STAGING_DIR}/${SRCIPK_INSTALL_DIR}/patches ${SRCIPK_STAGING_DIR}/${SRCIPK_INSTALL_DIR}/patches-links
-            cp -rL ${SRCIPK_STAGING_DIR}/${SRCIPK_INSTALL_DIR}/patches-links ${SRCIPK_STAGING_DIR}/${SRCIPK_INSTALL_DIR}/patches
-            rm -rf ${SRCIPK_STAGING_DIR}/${SRCIPK_INSTALL_DIR}/patches-links
-        fi
-
-        if [ ${SRCIPK_INCLUDE_EXTRAFILES} != "0" ]
-        then
-            sourceipk_create_readme ${SRCIPK_STAGING_DIR}/${SRCIPK_INSTALL_DIR}/
-            cp ${FILE} ${SRCIPK_STAGING_DIR}/${SRCIPK_INSTALL_DIR}/
-        fi
-
-        # Adjust the git repository if there is one.  Do this adjustment
-        # here so we don't have to modify the original sources.
-        adjust_git
-    fi
-}
-
-EXPORT_FUNCTIONS do_create_srcipk
-
-do_create_srcipk[deptask] = "do_patch"
-
-addtask create_srcipk after do_patch before do_configure
-
-python () {
-    if d.getVar('do_compileconfigs', False):
-        deps = d.getVarFlag('do_compileconfigs', 'deps') or []
-        deps.append('do_create_srcipk')
-        d.setVarFlag('do_compileconfigs', 'deps', deps)
-}
-
-#Add source packages to list of packages OE knows about
-PACKAGES_DYNAMIC += "${PN}-source"
-
-# Do not perform any QA checks on sourceipk packages
-INSANE_SKIP:${PN}-source += "${@oe.utils.conditional("${CREATE_SRCIPK}", "0", "", "${ALL_QA}", d)}"
-
-python __anonymous () {
-    if d.getVar("CREATE_SRCIPK") != "0":
-        if '${PN}-source' not in d.getVar("PACKAGES", False):
-            d.appendVar('PACKAGES', ' ${PN}-source')
-        pn = d.getVar("PN")
-        d.setVar('FILES:%s-source' % (pn), '${SRCIPK_INSTALL_DIR}')
-}
-
-PACKAGESPLITFUNCS:append = " ${@oe.utils.conditional('CREATE_SRCIPK','0','','populate_srcipk_package',d)}"
-populate_srcipk_package() {
-    install -d ${PKGDEST}/${PN}-source/${SRCIPK_INSTALL_DIR}
-    cp -Prf --preserve=mode,timestamps --no-preserve=ownership \
-        ${SRCIPK_STAGING_DIR}/${SRCIPK_INSTALL_DIR}/. \
-        ${PKGDEST}/${PN}-source/${SRCIPK_INSTALL_DIR}
-}
diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf
index 088faa16..c1eb8f6d 100644
--- a/meta-arago-distro/conf/distro/arago.conf
+++ b/meta-arago-distro/conf/distro/arago.conf
@@ -189,9 +189,6 @@  INHERIT += "recipe-data"
 # Load default preferences
 require conf/distro/include/arago-prefs.inc
 
-# Enable generation of source packages for SDKs
-require conf/distro/include/arago-source-ipk.inc
-
 # Allow branding on top of Arago Distro and Core TI-SDK
 # If ARAGO_BRAND is not set in local.conf, default to core
 ARAGO_BRAND ??= "core"
diff --git a/meta-arago-distro/conf/distro/include/arago-source-ipk.inc b/meta-arago-distro/conf/distro/include/arago-source-ipk.inc
deleted file mode 100644
index c03d5383..00000000
--- a/meta-arago-distro/conf/distro/include/arago-source-ipk.inc
+++ /dev/null
@@ -1,368 +0,0 @@ 
-#===============================================================================
-# BOM Configuration file
-#
-# Syntax:
-#   Select one of available providers (recipes) for a package.
-#   Usually used for virtual/xyz style packages. i.e virtual/kernel
-#       PREFERRED_PROVIDER_<pkg> = "recipe"
-#       PREFERRED_PROVIDER_<pkg>_<mach> = "recipe"
-#   i.e.
-#       PREFERRED_PROVIDER_virtual/kernel = "linux-davinci"
-#       PREFERRED_PROVIDER_virtual/kenrel_omap3evm = "linux-omap3"
-#
-#   Select one of the available versions for a package
-#       PREFERRED_VERSION_<pkg> = "X.Y.Z"
-#       PREFERRED_VERSION_<pkg>_<mach> = "X.Y.Z"
-#   i.e.
-#       PREFERRED_VERSION_udev = "141"
-#       PREFERRED_VERSION_udev_omap3evm = "124"
-#
-#   Enable source ipk creation for a package
-#       CREATE_SRCIPK:pn-<pkg> = "1"
-#   i.e.
-#       CREATE_SRCIPK:pn-u-boot = "1"
-#
-#   Change install diretory of source ipk for a package
-#       SRCIPK_INSTALL_DIR:pn-<pkg> = "<install dir>"
-#   i.e.
-#       SRCIPK_INSTALL_DIR:pn-u-boot = "board-support/u-boot-source"
-#
-#   Change source ipk architecture for a package
-#       SRCIPK_PACKAGE_ARCH:pn-<pkg> = "<arch>"
-#   i.e.
-#       SRCIPK_PACKAGE_ARCH:pn-u-boot = "${MACHINE_ARCH}"
-#===============================================================================
-
-# Enable the creation of source ipks
-INHERIT += "sourceipk"
-
-# Disable including README and recipe files in sourceipks for SDK builds.
-SRCIPK_INCLUDE_EXTRAFILES = "0"
-
-# Set source ipk packages and install directories
-CREATE_SRCIPK:pn-ti-tisdk-licenses ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-tisdk-licenses ?= "docs/licenses"
-
-CREATE_SRCIPK:pn-matrix-gui ?= "1"
-SRCIPK_INSTALL_DIR:pn-matrix-gui ?= "example-applications/${PN}-${PV}"
-
-CREATE_SRCIPK:pn-ti-crypto-examples ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-crypto-examples ?= "example-applications/${PN}-${PV}"
-
-CREATE_SRCIPK:pn-qml-carinfo ?= "1"
-SRCIPK_INSTALL_DIR:pn-qml-carinfo ?= "example-applications/${PN}-${PV}"
-
-CREATE_SRCIPK:pn-quick-playground ?= "1"
-SRCIPK_INSTALL_DIR:pn-quick-playground ?= "example-applications/${PN}-${PV}"
-
-CREATE_SRCIPK:pn-qt-catalog ?= "1"
-SRCIPK_INSTALL_DIR:pn-qt-catalog ?= "example-applications/${PN}-${PV}"
-
-CREATE_SRCIPK:pn-qt-patientcare ?= "1"
-SRCIPK_INSTALL_DIR:pn-qt-patientcare ?= "example-applications/${PN}-${PV}"
-
-CREATE_SRCIPK:pn-qt-tstat ?= "1"
-SRCIPK_INSTALL_DIR:pn-qt-tstat ?= "example-applications/${PN}-${PV}"
-
-CREATE_SRCIPK:pn-dual-camera-demo ?= "1"
-SRCIPK_INSTALL_DIR:pn-dual-camera-demo ?= "example-applications/${PN}-${PV}"
-
-CREATE_SRCIPK:pn-evse-hmi ?= "1"
-SRCIPK_INSTALL_DIR:pn-evse-hmi ?= "example-applications/${PN}-${PV}"
-
-CREATE_SRCIPK:pn-protection-relays-hmi ?= "1"
-SRCIPK_INSTALL_DIR:pn-protection-relays-hmi ?= "example-applications/${PN}-${PV}"
-
-CREATE_SRCIPK:pn-mmwavegesture-hmi ?= "1"
-SRCIPK_INSTALL_DIR:pn-mmwavegesture-hmi ?= "example-applications/${PN}-${PV}"
-
-CREATE_SRCIPK:pn-pdm-anomaly-detection ?= "1"
-SRCIPK_INSTALL_DIR:pn-pdm-anomaly-detection ?= "example-applications/${PN}-${PV}"
-
-CREATE_SRCIPK:pn-tiovx-app-host ?= "1"
-SRCIPK_INSTALL_DIR:pn-tiovx-app-host ?= "example-applications/${PN}-${PV}"
-
-CREATE_SRCIPK:pn-image-gallery ?= "1"
-SRCIPK_INSTALL_DIR:pn-image-gallery ?= "example-applications/${PN}"
-
-CREATE_SRCIPK:pn-matrix-gui-browser ?= "1"
-SRCIPK_INSTALL_DIR:pn-matrix-gui-browser ?= "example-applications/${PN}-${PV}"
-
-CREATE_SRCIPK:pn-refresh-screen ?= "1"
-SRCIPK_INSTALL_DIR:pn-refresh-screen ?= "example-applications/${PN}-${PV}"
-
-CREATE_SRCIPK:pn-am-sysinfo ?= "1"
-SRCIPK_INSTALL_DIR:pn-am-sysinfo ?= "example-applications/${PN}-${PV}"
-
-CREATE_SRCIPK:pn-oprofile-example ?= "1"
-SRCIPK_INSTALL_DIR:pn-oprofile-example ?= "example-applications/${PN}"
-
-CREATE_SRCIPK:pn-arm-benchmarks ?= "1"
-SRCIPK_INSTALL_DIR:pn-arm-benchmarks ?= "example-applications/${PN}-${PV}"
-
-CREATE_SRCIPK:pn-omapconf ?= "1"
-SRCIPK_INSTALL_DIR:pn-omapconf ?= "example-applications/${PN}-${PV}"
-
-CREATE_SRCIPK:pn-ti-pru-sw-examples ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-pru-sw-examples ?= "example-applications/pru-${PV}"
-
-CREATE_SRCIPK:pn-ti-ocf-crypto-module ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-ocf-crypto-module ?= "board-support/extra-drivers/${PN}-${PV}"
-
-CREATE_SRCIPK:pn-ti-compat-wireless-wl18xx ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-compat-wireless-wl18xx ?= "board-support/extra-drivers/${PN}-${PV}"
-
-CREATE_SRCIPK:pn-wl18xx-fw ?= "1"
-SRCIPK_INSTALL_DIR:pn-wl18xx-fw ?= "board-support/extra-drivers/${PN}-${PV}"
-
-CREATE_SRCIPK:pn-wl1271-wlan-cli ?= "1"
-SRCIPK_INSTALL_DIR:pn-wl1271-wlan-cli ?= "example-applications/wlan"
-
-CREATE_SRCIPK:pn-av-examples ?= "1"
-SRCIPK_INSTALL_DIR:pn-av-examples ?= "example-applications/av-examples-${PV}"
-
-CREATE_SRCIPK:pn-u-boot ?= "1"
-SRCIPK_INSTALL_DIR:pn-u-boot ?= "board-support/u-boot-${PV}"
-
-CREATE_SRCIPK:pn-u-boot-ti-staging ?= "1"
-SRCIPK_INSTALL_DIR:pn-u-boot-ti-staging ?= "board-support/u-boot-${PV}${UBOOT_LOCALVERSION}"
-SRCIPK_PRESERVE_GIT:pn-u-boot-ti-staging ?= "true"
-
-CREATE_SRCIPK:pn-u-boot-dra7xx ?= "1"
-SRCIPK_INSTALL_DIR:pn-u-boot-dra7xx ?= "board-support/u-boot-${PV}-${PR}"
-
-CREATE_SRCIPK:pn-trusted-firmware-a ?= "1"
-SRCIPK_INSTALL_DIR:pn-trusted-firmware-a ?= "board-support/${PN}-${PV}"
-SRCIPK_PRESERVE_GIT:pn-trusted-firmware-a ?= "true"
-
-CREATE_SRCIPK:pn-linux-ti-staging ?= "1"
-SRCIPK_INSTALL_DIR:pn-linux-ti-staging ?= "board-support/linux-${PV}${KERNEL_LOCALVERSION}"
-SRCIPK_PRESERVE_GIT:pn-linux-ti-staging ?= "true"
-SRCIPK_SHALLOW_CLONE:pn-linux-ti-staging ?= "true"
-
-CREATE_SRCIPK:pn-linux-ti-staging-rt ?= "1"
-SRCIPK_INSTALL_DIR:pn-linux-ti-staging-rt ?= "board-support/linux-rt-${PV}${KERNEL_LOCALVERSION}"
-SRCIPK_PRESERVE_GIT:pn-linux-ti-staging-rt ?= "true"
-SRCIPK_SHALLOW_CLONE:pn-linux-ti-staging-rt ?= "true"
-
-CREATE_SRCIPK:pn-linux-ti-staging-systest ?= "1"
-SRCIPK_INSTALL_DIR:pn-linux-ti-staging-systest ?= "board-support/linux-systest-${PV}${KERNEL_LOCALVERSION}"
-SRCIPK_PRESERVE_GIT:pn-linux-ti-staging-systest ?= "true"
-SRCIPK_SHALLOW_CLONE:pn-linux-ti-staging-systest ?= "true"
-
-CREATE_SRCIPK:pn-sitara-linux-ti-staging ?= "1"
-SRCIPK_INSTALL_DIR:pn-sitara-linux-ti-staging ?= "board-support/linux-${PV}${KERNEL_LOCALVERSION}"
-SRCIPK_PRESERVE_GIT:pn-sitara-linux-ti-staging ?= "true"
-SRCIPK_SHALLOW_CLONE:pn-sitara-linux-ti-staging ?= "true"
-SRCIPK_SHALLOW_DEPTH:pn-sitara-linux-ti-staging ?= "400"
-
-CREATE_SRCIPK:pn-linux-am335x-psp ?= "1"
-SRCIPK_INSTALL_DIR:pn-linux-am335x-psp ?= "board-support/linux-${KVER}"
-
-CREATE_SRCIPK:pn-linux-omap ?= "1"
-SRCIPK_INSTALL_DIR:pn-linux-omap ?= "board-support/linux-${PV}-${PR}"
-
-CREATE_SRCIPK:pn-linux ?= "1"
-SRCIPK_INSTALL_DIR:pn-linux ?= "board-support/linux-${PV}"
-
-CREATE_SRCIPK:pn-linux-omap4 ?= "1"
-SRCIPK_INSTALL_DIR:pn-linux-omap4 ?= "board-support/linux-${PV}"
-
-CREATE_SRCIPK:pn-cryptodev-module ?= "1"
-SRCIPK_INSTALL_DIR:pn-cryptodev-module ?= "board-support/extra-drivers/cryptodev-module-${PV}"
-SRCIPK_PRESERVE_GIT:pn-cryptodev-module ?= "true"
-
-CREATE_SRCIPK:pn-cmem-mod ?= "1"
-SRCIPK_INSTALL_DIR:pn-cmem-mod ?= "board-support/extra-drivers/${PN}-${PV}"
-
-CREATE_SRCIPK:pn-debugss-module-drv ?= "1"
-SRCIPK_INSTALL_DIR:pn-debugss-module-drv ?= "board-support/extra-drivers/${PN}-${PV}"
-
-CREATE_SRCIPK:pn-gdbserverproxy-module-drv ?= "1"
-SRCIPK_INSTALL_DIR:pn-gdbserverproxy-module-drv ?= "board-support/extra-drivers/${PN}-${PV}"
-
-CREATE_SRCIPK:pn-ti-sgx-ddk-km ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-sgx-ddk-km ?= "board-support/extra-drivers/${PN}-${PV}"
-
-CREATE_SRCIPK:pn-ti-img-rogue-driver ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-img-rogue-driver ?= "board-support/extra-drivers/${PN}-${PV}"
-SRCIPK_PRESERVE_GIT:pn-ti-img-rogue-driver ?= "true"
-
-CREATE_SRCIPK:pn-ti-gc320-driver ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-gc320-driver ?= "board-support/extra-drivers/${PN}-${PV}"
-
-CREATE_SRCIPK:pn-ti-linux-driver-examples ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-linux-driver-examples ?= "example-applications/linux-driver-examples-${PV}"
-
-CREATE_SRCIPK:pn-ti-linux-driver-examples-omapl ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-linux-driver-examples-omapl ?= "example-applications/linux-driver-examples-${PV}"
-
-CREATE_SRCIPK:pn-ti-framework-components ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-framework-components ?= "component-sources/framework_components_${PV}"
-
-CREATE_SRCIPK:pn-ti-codec-engine ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-codec-engine ?= "component-sources/codec_engine_${PV}"
-
-CREATE_SRCIPK:pn-ti-linuxutils ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-linuxutils ?= "component-sources/linuxutils_${PV}"
-
-CREATE_SRCIPK:pn-ti-xdctools ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-xdctools ?= "component-sources/xdctools_${PV}"
-
-CREATE_SRCIPK:pn-ti-dmai ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-dmai ?= "dmai_${PV}"
-
-CREATE_SRCIPK:pn-ti-xdais ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-xdais ?= "component-sources/xdais_${PV}"
-
-CREATE_SRCIPK:pn-ti-local-power-manager ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-local-power-manager ?= "local-power-manager_${PV}"
-
-CREATE_SRCIPK:pn-ti-codecs-dm355 ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-codecs-dm355 ?= "codecs-dm355_${PV}"
-
-CREATE_SRCIPK:pn-ti-dvsdk-demos ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-dvsdk-demos ?= "dvsdk-demos_${PV}"
-
-CREATE_SRCIPK:pn-ti-dvtb ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-dvtb ?= "dvtb_${PV}"
-
-CREATE_SRCIPK:pn-ti-codecs-dm365 ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-codecs-dm365 ?= "codecs-dm365_${PV}"
-
-CREATE_SRCIPK:pn-ti-dm365mm-module ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-dm365mm-module ?= "dm365mm-module_${PV}"
-
-CREATE_SRCIPK:pn-ti-codecs-dm6446 ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-codecs-dm6446 ?= "codecs-dm6446_${PV}"
-
-CREATE_SRCIPK:pn-ti-codecs-dm6467 ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-codecs-dm6467 ?= "codecs-dm6467_${PV}"
-
-CREATE_SRCIPK:pn-ti-codecs-omapl137 ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-codecs-omapl137 ?= "codecs-omapl137_${PV}"
-
-CREATE_SRCIPK:pn-ti-codecs-omapl138 ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-codecs-omapl138 ?= "codecs-omapl138_${PV}"
-
-CREATE_SRCIPK:pn-ti-cgt6x ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-cgt6x ?= "dsp-devkit/cgt6x_${PV}"
-
-CREATE_SRCIPK:pn-ti-cgt470 ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-cgt470 ?= "media-controller-devkit/cgt470_${PV}"
-
-CREATE_SRCIPK:pn-ti-dspbios ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-dspbios ?= "dspbios_${PV}"
-
-CREATE_SRCIPK:pn-ti-sysbios ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-sysbios ?= "component-sources/bios_${PV}"
-
-CREATE_SRCIPK:pn-ti-biosutils ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-biosutils ?= "biosutils_${PV}"
-
-CREATE_SRCIPK:pn-ti-dsplink ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-dsplink ?= "dsplink_${PV}"
-
-CREATE_SRCIPK:pn-ti-syslink ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-syslink ?= "component-sources/syslink_${PV}"
-
-CREATE_SRCIPK:pn-ti-edma3lld ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-edma3lld ?= "component-sources/edma3lld_${PV}"
-
-CREATE_SRCIPK:pn-ti-c6accel ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-c6accel ?= "component-sources/c6accel_${PV}"
-
-CREATE_SRCIPK:pn-ti-biospsp ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-biospsp ?= "biospsp_${PV}"
-
-CREATE_SRCIPK:pn-ti-audio-soc-example ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-audio-soc-example ?= "audio-soc-example_${PV}"
-
-CREATE_SRCIPK:pn-ti-c6run ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-c6run ?= "component-sources/c6run_${PV}"
-
-CREATE_SRCIPK:pn-ti-osal ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-osal ?= "component-sources/osal_${PV}"
-
-CREATE_SRCIPK:pn-ti-ipc ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-ipc ?= "component-sources/ipc_${PV}"
-
-CREATE_SRCIPK:pn-ti-dsp-benchmark ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-dsp-benchmark ?= "example-applications/dsp-benchmark_${PV}"
-
-CREATE_SRCIPK:pn-gstreamer-ti ?= "1"
-SRCIPK_INSTALL_DIR:pn-gstreamer-ti ?= "gstreamer-ti_${PV}"
-
-CREATE_SRCIPK:pn-ti-omx ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-omx ?= "component-sources/omx_${PV}"
-
-CREATE_SRCIPK:pn-ti-uia ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-uia ?= "component-sources/uia_${PV}"
-
-CREATE_SRCIPK:pn-ti-media-controller-utils ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-media-controller-utils ?= "board-support/media-controller-utils_${PV}"
-
-CREATE_SRCIPK:pn-ti-firmware-dm816x ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-firmware-dm816x ?= "board-support/prebuilt-images/dm816x-firmware_${PV}"
-
-CREATE_SRCIPK:pn-ti-firmware-dm814x ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-firmware-dm814x ?= "board-support/prebuilt-images/dm814x-firmware_${PV}"
-
-CREATE_SRCIPK:pn-ti-slog ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-slog ?= "component-sources/slog_${PV}"
-
-CREATE_SRCIPK:pn-ti-c674x-aaclcdec ?= "1"
-SRCIPK_INSTALL_DIR:pn-ti-c674x-aaclcdec ?= "component-sources/c674x-aaclcdec_${PV}"
-
-CREATE_SRCIPK:pn-oe-layersetup ?= "1"
-SRCIPK_INSTALL_DIR:pn-oe-layersetup ?= "bin/oe-layersetup"
-
-CREATE_SRCIPK:pn-opencl-examples ?= "1"
-SRCIPK_INSTALL_DIR:pn-opencl-examples ?= "example-applications/${PN}-${PV}"
-
-CREATE_SRCIPK:pn-openmpacc-examples ?= "1"
-SRCIPK_INSTALL_DIR:pn-openmpacc-examples ?= "example-applications/${PN}-${PV}"
-
-CREATE_SRCIPK:pn-tidl-examples ?= "1"
-SRCIPK_INSTALL_DIR:pn-tidl-examples ?= "example-applications/${PN}-${PV}"
-SRCIPK_SRC_DIR:pn-tidl-examples ?= "${S}/examples"
-
-CREATE_SRCIPK:pn-qt-opencv-opencl-opengl-multithreaded ?= "1"
-SRCIPK_INSTALL_DIR:pn-qt-opencv-opencl-opengl-multithreaded ?= "example-applications/${PN}-${PV}"
-
-CREATE_SRCIPK:pn-libarch-examples ?= "1"
-SRCIPK_INSTALL_DIR:pn-libarch-examples ?= "example-applications/${PN}-${PV}"
-
-CREATE_SRCIPK:pn-linalg-examples ?= "1"
-SRCIPK_INSTALL_DIR:pn-linalg-examples ?= "example-applications/${PN}-${PV}"
-SRCIPK_SRC_DIR:pn-linalg-examples ?= "${EXAMPLES_ROOT}"
-
-CREATE_SRCIPK:pn-barcode-roi ?= "1"
-SRCIPK_INSTALL_DIR:pn-barcode-roi ?= "example-applications/${PN}-${PV}"
-
-CREATE_SRCIPK:pn-boot-monitor ?= "1"
-SRCIPK_INSTALL_DIR:pn-boot-monitor ?= "board-support/${PN}-${PV}"
-
-CREATE_SRCIPK:pn-hplib-mod ?= "1"
-SRCIPK_INSTALL_DIR:pn-hplib-mod ?= "board-support/extra-drivers/${PN}-${PV}"
-
-CREATE_SRCIPK:pn-uio-module-drv ?= "1"
-SRCIPK_INSTALL_DIR:pn-uio-module-drv ?= "board-support/extra-drivers/${PN}-${PV}"
-
-CREATE_SRCIPK:pn-pru-icss ?= "1"
-SRCIPK_INSTALL_DIR:pn-pru-icss ?= "example-applications/${PN}-${PV}"
-
-CREATE_SRCIPK:pn-dsplib-c66x ?= "1"
-SRCIPK_INSTALL_DIR:pn-dsplib-c66x ?= "component-sources/dsplib_c66x_${PV}"
-
-CREATE_SRCIPK:pn-mathlib-c66x ?= "1"
-SRCIPK_INSTALL_DIR:pn-mathlib-c66x ?= "component-sources/mathlib_c66x_${PV}"
-
-CREATE_SRCIPK:pn-imglib-c66x ?= "1"
-SRCIPK_INSTALL_DIR:pn-imglib-c66x ?= "component-sources/imglib_c66x_${PV}"
-
-CREATE_SRCIPK:pn-vlib-c66x ?= "1"
-SRCIPK_INSTALL_DIR:pn-vlib-c66x ?= "component-sources/vlib_c66x_${PV}"
-
-CREATE_SRCIPK:pn-big-data-ipc-demo-linux ?= "1"
-SRCIPK_INSTALL_DIR:pn-big-data-ipc-demo-linux ?= "example-applications/${PN}-${PV}"
diff --git a/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc b/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc
index 3c31ba18..90b5ccef 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc
+++ b/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc
@@ -33,13 +33,5 @@  TISDK_TOOLCHAIN = "${@bb.utils.contains('MACHINE_FEATURES','gpu','meta-toolchain
 TOOLCHAIN_SUFFIX = "${@bb.utils.contains('MACHINE_FEATURES','gpu','-tisdk','-tisdk-server',d)}"
 
 IMAGE_INSTALL = "\
-    packagegroup-arago-tisdk-addons-sdk-host \
-    ${@['','packagegroup-arago-tisdk-opencl-sdk-host'][oe.utils.all_distro_features(d, 'opencl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \
-    packagegroup-arago-tisdk-crypto-sdk-host \
-    ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-graphics-sdk-host','',d)} \
-    packagegroup-arago-tisdk-matrix-sdk-host \
-    packagegroup-arago-tisdk-multimedia-sdk-host \
-    ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-hmi-sdk-host','',d)} \
-    packagegroup-arago-tisdk-amsdk-sdk-host${ARAGO_KERNEL_SUFFIX} \
-    ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-qte-sdk-host','',d)} \
+    packagegroup-arago-tisdk-amsdk-sdk-host \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb
deleted file mode 100644
index d79d2756..00000000
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons-sdk-host.bb
+++ /dev/null
@@ -1,104 +0,0 @@ 
-DESCRIPTION = "Task to install sources for additional utilities/demos for SDKs"
-LICENSE = "MIT"
-PR = "r37"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-inherit packagegroup
-
-UTILS = " \
-    am-sysinfo-source \
-    arm-benchmarks-source \
-    oprofile-example-source \
-"
-
-# ti-pru-sw-edma-driver is currently broken
-# Add pru and profibus sources for omapl138 devices
-#UTILS:append:omapl138 = " \
-#    ti-pru-sw-examples-source \
-#"
-
-UTILS:append:omap-a15 = " \
-    omapconf-source \
-    pru-icss-source \
-"
-
-UTILS:append:ti33x = " \
-    omapconf-source \
-    pru-icss-source \
-"
-
-UTILS:append:ti43x = " \
-    pru-icss-source \
-"
-
-UTILS:append:k3 = " \
-    ti-sci-fw-source \
-    trusted-firmware-a-source \
-"
-
-UTILS:append:j721e-evm = " \
-    pru-icss-source \
-"
-
-UTILS:append:j721e-hs-evm = " \
-    pru-icss-source \
-"
-
-UTILS:append:am65xx = " \
-    pru-icss-source \
-"
-
-UTILS:append:am64xx = " \
-    pru-icss-source \
-"
-
-EXTRA_LIBS = ""
-
-EXTRA_LIBS:append:omap-a15 = " \
-    cmem-mod-source \
-    uio-module-drv-source \
-    big-data-ipc-demo-linux-source \
-"
-
-#EXTRA_LIBS:append:dra7xx = " \
-#    debugss-module-drv-source \
-#    gdbserverproxy-module-drv-source \
-#"
-
-EXTRA_LIBS:append:ti33x = " \
-    uio-module-drv-source \
-"
-
-EXTRA_LIBS:append:ti43x = " \
-    cmem-mod-source \
-    uio-module-drv-source \
-"
-
-PDM_ANOMALY_PKG_SRC = "\
-    ${@bb.utils.contains('MACHINE_FEATURES', 'gpu', 'pdm-anomaly-detection-source', '', d)} \
-"
-
-EXTRA_PACKAGES = ""
-
-EXTRA_PACKAGES:append:omap-a15 = " \
-    ${PDM_ANOMALY_PKG_SRC} \
-"
-
-EXTRA_PACKAGES:append:ti33x = " \
-    ${PDM_ANOMALY_PKG_SRC} \
-"
-
-EXTRA_PACKAGES:append:ti43x = " \
-    ${PDM_ANOMALY_PKG_SRC} \
-"
-
-EXTRA_PACKAGES:append:am65xx = " \
-    ${PDM_ANOMALY_PKG_SRC} \
-"
-
-RDEPENDS:${PN} = "\
-    ${UTILS} \
-    ${EXTRA_LIBS} \
-    ${EXTRA_PACKAGES} \
-"
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-amsdk-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-amsdk-sdk-host.bb
index 2870d7ed..1a43d0ef 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-amsdk-sdk-host.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-amsdk-sdk-host.bb
@@ -1,20 +1,11 @@ 
 DESCRIPTION = "Task to install additional scripts and applications into the SDK"
 LICENSE = "MIT"
-PR = "r29"
-
-PN = "packagegroup-arago-tisdk-amsdk-sdk-host${ARAGO_KERNEL_SUFFIX}"
+PR = "r30"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 inherit packagegroup
 
-# Choose the kernel and u-boot recipe sources to use
-UBOOT_SRC = "${PREFERRED_PROVIDER_virtual/bootloader}-source"
-KERNEL_SRC = "${PREFERRED_PROVIDER_virtual/kernel}-source"
-
-KERNEL_SHADOW_CLONE := "${PREFERRED_PROVIDER_virtual/kernel}"
-KERNEL_SHADOW_CLONE_ENABLED := "${SRCIPK_SHALLOW_CLONE:pn-${KERNEL_SHADOW_CLONE}}"
-
 EXTRA_FILES = ""
 EXTRA_FILES:ti43x = "tisdk-uenv"
 EXTRA_FILES:omap-a15 = "tisdk-readme tisdk-uenv"
@@ -23,8 +14,5 @@  EXTRA_FILES:k3 = "tisdk-readme tisdk-uenv"
 RDEPENDS:${PN} = "\
     ti-tisdk-setup \
     ${EXTRA_FILES} \
-    ${UBOOT_SRC} \
-    ${KERNEL_SRC} \
-    ${@oe.utils.conditional('KERNEL_SHADOW_CLONE_ENABLED','true','unshallow-repositories','',d)} \
     tisdk-install \
 "
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto-sdk-host.bb
deleted file mode 100644
index 2dad8bd7..00000000
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto-sdk-host.bb
+++ /dev/null
@@ -1,18 +0,0 @@ 
-DESCRIPTION = "Task to install crypto sources in SDK"
-LICENSE = "MIT"
-PR = "r11"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-inherit packagegroup
-
-CRYPTO_RDEPENDS = ""
-
-CRYPTO_RDEPENDS:append:ti33x = " cryptodev-module-source"
-CRYPTO_RDEPENDS:append:ti43x = " cryptodev-module-source"
-CRYPTO_RDEPENDS:append:dra7xx = " cryptodev-module-source"
-CRYPTO_RDEPENDS:append:k3 = " cryptodev-module-source"
-
-RDEPENDS:${PN} = "\
-    ${CRYPTO_RDEPENDS} \
-"
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics-sdk-host.bb
deleted file mode 100644
index 01ccd7d5..00000000
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics-sdk-host.bb
+++ /dev/null
@@ -1,14 +0,0 @@ 
-SUMMARY = "Task to install graphics sources in SDK"
-LICENSE = "MIT"
-PR = "r8"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-inherit packagegroup features_check
-
-REQUIRED_MACHINE_FEATURES = "gpu"
-
-RDEPENDS:${PN} = "\
-    ${PREFERRED_PROVIDER_virtual/gpudriver}-source \
-    ${@bb.utils.contains('MACHINE_FEATURES', 'gc320', 'ti-gc320-driver-source', '', d)} \
-"
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-hmi-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-hmi-sdk-host.bb
deleted file mode 100644
index 2cd7ae6b..00000000
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-hmi-sdk-host.bb
+++ /dev/null
@@ -1,37 +0,0 @@ 
-SUMMARY = "Task to add HMI related sources into the SDK"
-LICENSE = "MIT"
-PR = "r1"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-inherit packagegroup features_check
-
-REQUIRED_MACHINE_FEATURES = "gpu"
-
-HMI = ""
-
-HMI:append:ti43x = " \
-    evse-hmi-source \
-    mmwavegesture-hmi-source \
-"
-
-HMI:append:ti33x = " \
-    evse-hmi-source \
-    protection-relays-hmi-source \
-    mmwavegesture-hmi-source \
-"
-
-
-HMI:append:omap-a15 = " \
-    evse-hmi-source \
-    mmwavegesture-hmi-source \
-"
-
-HMI:append:am65xx = " \
-    evse-hmi-source \
-    mmwavegesture-hmi-source \
-"
-
-RDEPENDS:${PN} = "\
-    ${HMI} \
-"
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix-sdk-host.bb
deleted file mode 100644
index c32966bb..00000000
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix-sdk-host.bb
+++ /dev/null
@@ -1,17 +0,0 @@ 
-DESCRIPTION = "Task to install Matrix v2 and associated applications sources in the SDK"
-LICENSE = "MIT"
-PR = "r7"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-inherit packagegroup
-
-MATRIX_GUI = " \
-    matrix-gui-browser-source \
-    refresh-screen-source \
-"
-
-RDEPENDS:${PN} = "\
-    matrix-gui-source \
-    ${@bb.utils.contains('MACHINE_FEATURES','gpu',"${MATRIX_GUI}",'',d)} \
-"
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb
deleted file mode 100644
index d377f500..00000000
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb
+++ /dev/null
@@ -1,41 +0,0 @@ 
-SUMMARY = "Task to add multimedia related sources into the SDK"
-LICENSE = "MIT"
-PR = "r15"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-inherit packagegroup
-
-BARCODE_PKG = ""
-#BARCODE_PKG = " \
-#    ${@['','barcode-roi-source'][oe.utils.all_distro_features(d, 'opencv', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \
-#"
-
-DUAL_CAMERA_PKG = "${@bb.utils.contains('MACHINE_FEATURES', 'gpu', 'dual-camera-demo-source', '', d)}"
-IMAGE_GALLERY_PKG = "${@bb.utils.contains('MACHINE_FEATURES', 'gpu','image-gallery-source', '', d)}"
-
-MULTIMEDIA = ""
-
-MULTIMEDIA:append:ti33x = " ${BARCODE_PKG}"
-
-MULTIMEDIA:append:ti43x = " \
-    ${DUAL_CAMERA_PKG} \
-    ${IMAGE_GALLERY_PKG} \
-    ${BARCODE_PKG} \
-"
-
-MULTIMEDIA:append:omap-a15 = " \
-    ${DUAL_CAMERA_PKG} \
-    ${IMAGE_GALLERY_PKG} \
-    ${BARCODE_PKG} \
-"
-
-MULTIMEDIA:append:am65xx = " ${BARCODE_PKG}"
-
-#MULTIMEDIA:append:dra7xx = " \
-#    ${@['','qt-opencv-opencl-opengl-multithreaded-source'][oe.utils.all_distro_features(d, 'opencv opencl opengl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'gpu dsp', True, False, d)]} \
-#"
-
-RDEPENDS:${PN} = "\
-    ${MULTIMEDIA} \
-"
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl-sdk-host.bb
deleted file mode 100644
index ee5bb610..00000000
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl-sdk-host.bb
+++ /dev/null
@@ -1,22 +0,0 @@ 
-DESCRIPTION = "Task to install sources for OpenCL/MP apps and demos"
-LICENSE = "MIT"
-PR = "r1"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-inherit packagegroup features_check
-
-REQUIRED_DISTRO_FEATURES = "opencl"
-
-UTILS = " \
-    opencl-examples-source \
-    ${@oe.utils.all_distro_features(d, 'openmp', 'openmpacc-examples-source')} \
-"
-
-UTILS:append:dra7xx = " \
-    ${@oe.utils.all_distro_features(d, 'openmp', 'linalg-examples-source')} \
-"
-
-RDEPENDS:${PN} = "\
-    ${UTILS} \
-"
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte-sdk-host.bb
deleted file mode 100644
index 538ec80a..00000000
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte-sdk-host.bb
+++ /dev/null
@@ -1,11 +0,0 @@ 
-DESCRIPTION = "Task to add Qt embedded related sources into the sdk"
-LICENSE = "MIT"
-PR = "r8"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-inherit packagegroup
-
-RDEPENDS:${PN} = "\
-    qt-tstat-source \
-"
diff --git a/meta-arago-distro/recipes-kernel/linux/copy-defconfig.inc b/meta-arago-distro/recipes-kernel/linux/copy-defconfig.inc
deleted file mode 100644
index 4347a88a..00000000
--- a/meta-arago-distro/recipes-kernel/linux/copy-defconfig.inc
+++ /dev/null
@@ -1,22 +0,0 @@ 
-CONFIG_NAME ?= "tisdk_${MACHINE}${ARAGO_KERNEL_SUFFIX}_defconfig"
-
-# Copy the configuration file used during the SDK build in Arago to
-# the kernel sources to be packaged into the sourceipk.  Then call
-# the function to build the sourceipk again.  This is done as a
-# do_compile:prepend so that we can pick up any changes to the
-# defconfig thay may have been done by the sanitizer code.
-do_configure:append() {
-    cp ${B}/.config ${S}/arch/${ARCH}/configs/${CONFIG_NAME}
-
-    # Remove defconfig generated by defconfig_builder to avoid confusion. This
-    # may not match the config used in the build due to KERNEL_CONFIG_FRAGMENTS.
-    config=`cat ${WORKDIR}/defconfig | grep use-tisdk-config | cut -d= -f2`
-    if [ -n "$config" ]
-    then
-        rm ${S}/arch/${ARCH}/configs/${config}_defconfig
-    fi
-}
-
-# Move create_srcipk task so that the release defconfig is included.
-deltask do_create_srcipk
-addtask create_srcipk after do_configure before do_compile
diff --git a/meta-arago-distro/recipes-kernel/linux/linux-ti-staging-rt_%.bbappend b/meta-arago-distro/recipes-kernel/linux/linux-ti-staging-rt_%.bbappend
index 402362c2..df55594e 100644
--- a/meta-arago-distro/recipes-kernel/linux/linux-ti-staging-rt_%.bbappend
+++ b/meta-arago-distro/recipes-kernel/linux/linux-ti-staging-rt_%.bbappend
@@ -2,7 +2,6 @@  MACHINE_KERNEL_PR:append = ".arago1"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-require copy-defconfig.inc
 require docker.inc
 
 ALLOW_EMPTY:kernel-devicetree = "1"
diff --git a/meta-arago-distro/recipes-kernel/linux/linux-ti-staging-systest_%.bbappend b/meta-arago-distro/recipes-kernel/linux/linux-ti-staging-systest_%.bbappend
index 402362c2..df55594e 100644
--- a/meta-arago-distro/recipes-kernel/linux/linux-ti-staging-systest_%.bbappend
+++ b/meta-arago-distro/recipes-kernel/linux/linux-ti-staging-systest_%.bbappend
@@ -2,7 +2,6 @@  MACHINE_KERNEL_PR:append = ".arago1"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-require copy-defconfig.inc
 require docker.inc
 
 ALLOW_EMPTY:kernel-devicetree = "1"
diff --git a/meta-arago-distro/recipes-kernel/linux/linux-ti-staging_%.bbappend b/meta-arago-distro/recipes-kernel/linux/linux-ti-staging_%.bbappend
index f4fac19a..031a8b05 100644
--- a/meta-arago-distro/recipes-kernel/linux/linux-ti-staging_%.bbappend
+++ b/meta-arago-distro/recipes-kernel/linux/linux-ti-staging_%.bbappend
@@ -2,7 +2,6 @@  MACHINE_KERNEL_PR:append = ".arago5"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-require copy-defconfig.inc
 require docker.inc
 
 ALLOW_EMPTY:kernel-devicetree = "1"