pkggrps: clean up tpm package declarations

The TPM-related packages have been declared independently in the base
packagegroup, where we should just use the ``-ni-tpm`` packagegroup
instead. But we have to remove the dependency on the OE upstream
``packagegroup-security-tpm2`` since it includes python dependencies and
init services that we do not want in the initramfs images.

Also, remove crypsetup from the extras feed declaration, since it is
already built in the core feed.

Signed-off-by: Alex Stewart <alex.stewart@emerson.com>

Author: Alex Stewart

recipes-core/packagegroups/packagefeed-ni-extra.bb

@@ -365,7 +365,6 @@ RDEPENDS:${PN} += "\
 	ccid \
 	ckermit \
 	cpufrequtils \
-	cryptsetup \
 	daemonize \
 	daemontools \
 	dfu-util \

recipes-core/packagegroups/packagegroup-ni-base.bb

@@ -97,17 +97,14 @@ RDEPENDS:${PN} += "\
 
 RDEPENDS:${PN}:append:x64 = "\
 	packagegroup-kernel-modules-essential \
-	clevis \
-	cryptsetup \
+	packagegroup-ni-tpm \
 	dmidecode \
 	e2fsprogs \
 	e2fsprogs-mke2fs \
 	efibootmgr \
 	efivar \
-	libtss2-tcti-device \
 	ni-device-encryption \
 	pstore-save \
-	tpm2-tools \
 "
 
 RDEPENDS:${PN}:append:xilinx-zynq = "\

recipes-core/packagegroups/packagegroup-ni-tpm.bb

@@ -10,7 +10,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 inherit packagegroup
 
 RDEPENDS:${PN} = "\
-	packagegroup-security-tpm2 \
 	clevis \
 	cryptsetup \
 	libtss2-tcti-device \