diff options
| author | Armin Kuster <akuster808@gmail.com> | 2021-12-27 08:36:12 -0800 |
|---|---|---|
| committer | Armin Kuster <akuster808@gmail.com> | 2021-12-27 11:47:56 -0800 |
| commit | c20b35b5279988fb244d4de5ba5a049404ad440e (patch) | |
| tree | d2ac35102df39a7fca8bf2bc411a96d2b7c2ddb3 | |
| parent | d6f8b795a81f417cb4f64facb0990d26819abbdb (diff) | |
| download | meta-security-c20b35b5279988fb244d4de5ba5a049404ad440e.tar.gz | |
meta-tpm: drop strongswan bbappends
Signed-off-by: Armin Kuster <akuster808@gmail.com>
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 @@ | |||
| 1 | From db772305c6baa01f6c6750be74733e4bfc1d6106 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Tobias Brunner <tobias@strongswan.org> | ||
| 3 | Date: Tue, 14 Apr 2020 10:44:19 +0200 | ||
| 4 | Subject: [PATCH] xfrmi: Only build if libcharon is built | ||
| 5 | |||
| 6 | The kernel-netlink plugin is only built if libcharon is. | ||
| 7 | |||
| 8 | Closes strongswan/strongswan#167. | ||
| 9 | |||
| 10 | Upstream-Status: Backport | ||
| 11 | Signed-off-by: Armin Kuster <akuster808@gmail.com> | ||
| 12 | |||
| 13 | --- | ||
| 14 | src/Makefile.am | 7 +++---- | ||
| 15 | 1 file changed, 3 insertions(+), 4 deletions(-) | ||
| 16 | |||
| 17 | Index: strongswan-5.8.4/src/Makefile.am | ||
| 18 | =================================================================== | ||
| 19 | --- strongswan-5.8.4.orig/src/Makefile.am | ||
| 20 | +++ strongswan-5.8.4/src/Makefile.am | ||
| 21 | @@ -42,6 +42,9 @@ endif | ||
| 22 | |||
| 23 | if USE_LIBCHARON | ||
| 24 | SUBDIRS += libcharon | ||
| 25 | +if USE_KERNEL_NETLINK | ||
| 26 | + SUBDIRS += xfrmi | ||
| 27 | +endif | ||
| 28 | endif | ||
| 29 | |||
| 30 | if USE_FILE_CONFIG | ||
| 31 | @@ -143,7 +146,3 @@ endif | ||
| 32 | if USE_TPM | ||
| 33 | SUBDIRS += tpm_extendpcr | ||
| 34 | endif | ||
| 35 | - | ||
| 36 | -if USE_KERNEL_NETLINK | ||
| 37 | - SUBDIRS += xfrmi | ||
| 38 | -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 @@ | |||
| 1 | FILESEXTRAPATHS:prepend := "${THISDIR}/files:" | ||
| 2 | |||
| 3 | DEPENDS = "libtspi" | ||
| 4 | |||
| 5 | SRC_URI:append = " file://0001-xfrmi-Only-build-if-libcharon-is-built.patch" | ||
| 6 | |||
| 7 | PACKAGECONFIG += "aikgen tpm" | ||
| 8 | |||
| 9 | PACKAGECONFIG[tpm] = "--enable-tpm,--disable-tpm,," | ||
| 10 | PACKAGECONFIG[aikgen] = "--enable-aikgen,--disable-aikgen,," | ||
| 11 | |||
| 12 | 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 @@ | |||
| 1 | require ${@bb.utils.contains('DISTRO_FEATURES', 'tpm', 'strongswan-tpm.inc', '', d)} | ||
