mirror of
https://git.yoctoproject.org/meta-security
synced 2026-05-06 04:41:06 +00:00
meta-tpm: drop strongswan bbappends
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
@@ -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
|
||||
@@ -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}"
|
||||
@@ -1 +0,0 @@
|
||||
require ${@bb.utils.contains('DISTRO_FEATURES', 'tpm', 'strongswan-tpm.inc', '', d)}
|
||||
Reference in New Issue
Block a user