diff options
3 files changed, 0 insertions, 51 deletions
diff --git a/meta-tpm/dynamic-layers/meta-networking/recipes-support/strongswan/files/0001-xfrmi-Only-build-if-libcharon-is-built.patch b/meta-tpm/dynamic-layers/meta-networking/recipes-support/strongswan/files/0001-xfrmi-Only-build-if-libcharon-is-built.patch deleted file mode 100644 index 8250282..0000000 --- a/meta-tpm/dynamic-layers/meta-networking/recipes-support/strongswan/files/0001-xfrmi-Only-build-if-libcharon-is-built.patch +++ /dev/null @@ -1,38 +0,0 @@ -From db772305c6baa01f6c6750be74733e4bfc1d6106 Mon Sep 17 00:00:00 2001 -From: Tobias Brunner <tobias@strongswan.org> -Date: Tue, 14 Apr 2020 10:44:19 +0200 -Subject: [PATCH] xfrmi: Only build if libcharon is built - -The kernel-netlink plugin is only built if libcharon is. - -Closes strongswan/strongswan#167. - -Upstream-Status: Backport -Signed-off-by: Armin Kuster <akuster808@gmail.com> - ---- - src/Makefile.am | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -Index: strongswan-5.8.4/src/Makefile.am -=================================================================== ---- strongswan-5.8.4.orig/src/Makefile.am -+++ strongswan-5.8.4/src/Makefile.am -@@ -42,6 +42,9 @@ endif - - if USE_LIBCHARON - SUBDIRS += libcharon -+if USE_KERNEL_NETLINK -+ SUBDIRS += xfrmi -+endif - endif - - if USE_FILE_CONFIG -@@ -143,7 +146,3 @@ endif - if USE_TPM - SUBDIRS += tpm_extendpcr - endif -- --if USE_KERNEL_NETLINK -- SUBDIRS += xfrmi --endif diff --git a/meta-tpm/dynamic-layers/meta-networking/recipes-support/strongswan/strongswan-tpm.inc b/meta-tpm/dynamic-layers/meta-networking/recipes-support/strongswan/strongswan-tpm.inc deleted file mode 100644 index 497474f..0000000 --- a/meta-tpm/dynamic-layers/meta-networking/recipes-support/strongswan/strongswan-tpm.inc +++ /dev/null @@ -1,12 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" - -DEPENDS = "libtspi" - -SRC_URI:append = " file://0001-xfrmi-Only-build-if-libcharon-is-built.patch" - -PACKAGECONFIG += "aikgen tpm" - -PACKAGECONFIG[tpm] = "--enable-tpm,--disable-tpm,," -PACKAGECONFIG[aikgen] = "--enable-aikgen,--disable-aikgen,," - -EXTRA_OECONF += "--with-linux-headers=${STAGING_KERNEL_DIR}" diff --git a/meta-tpm/dynamic-layers/meta-networking/recipes-support/strongswan/strongswan_5.%.bbappend b/meta-tpm/dynamic-layers/meta-networking/recipes-support/strongswan/strongswan_5.%.bbappend deleted file mode 100644 index 34757bb..0000000 --- a/meta-tpm/dynamic-layers/meta-networking/recipes-support/strongswan/strongswan_5.%.bbappend +++ /dev/null @@ -1 +0,0 @@ -require ${@bb.utils.contains('DISTRO_FEATURES', 'tpm', 'strongswan-tpm.inc', '', d)} |