From patchwork Sun Apr 10 15:30:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Gotthard X-Patchwork-Id: 6502 X-Patchwork-Delegate: akuster808@gmail.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 16449C4707A for ; Mon, 11 Apr 2022 17:17:58 +0000 (UTC) Received: from APC01-PSA-obe.outbound.protection.outlook.com (APC01-PSA-obe.outbound.protection.outlook.com [40.107.255.81]) by mx.groups.io with SMTP id smtpd.web11.18594.1649604661569337479 for ; Sun, 10 Apr 2022 08:31:08 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@advantech.cz header.s=selector1 header.b=AHoDziFU; spf=pass (domain: advantech.cz, ip: 40.107.255.81, mailfrom: petr.gotthard@advantech.cz) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YR7bXtre9QPJ5MfBrbP+JALOwCSMoSuE/kAxM8acf/OL5BbGIi9lWtabHqv4tO0xBxXfR3AQZcsoe7Jlmk28CNEWeb9vPj7ZrUFuZG69qAlupOmNSVDu05wCaX4w8+2rHiniWKJ7wgimX49Jah8tBjusWkPp/+xTkhytwi3RYbvscqlK/EFsjmgrIEVSkaB4ZRZPcn2duZ64Z7GR8uR8ziixdp+Tv4shR5doDQmQjvhYYCHUxNk0jYX5QF/gvbffh1ZHWRl6kfRy0G60RAUbPd1+hEmX7//Sp+f0SiM8R5eYr2Yp32g+itNDog3yBRZY37v5AON5YjHVHW/iGsUkIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=jSMz6Ta42D+LNq8kznpv9gpfKTz5XDRr1Y9/txh2/hk=; b=e0l8663TUpazHpZycbkKSAT6fQJSLCHSf7PzUITRGBABsukF2F2MQS8Zbrp3dDZCBj7yI6aqnbCLIj733IEahOF7f8TRIP4A16Axgmntii7CwXedlMym9vUVVq+6f65d/FkUPmPt1PGeIrja1oYAH+EbiMamXYzFtOtkbIyonRuuP3gr1brZ/VWwGPHnggBFKQDvScyB+BQUuh8BEFym0iYKFGG15HRrTZDPAPrSI1AdXEp9k33CviFzKJUNcDR8P0sLsak+06SthQA+JnEt+8hHYaPdRtxYMa+zVAps+uQRiB2uFkJQsRFUw7A1AgP63Z+s3vYoeiGTb+hE7o2KXQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=advantech.cz; dmarc=pass action=none header.from=advantech.cz; dkim=pass header.d=advantech.cz; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=advantech.cz; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jSMz6Ta42D+LNq8kznpv9gpfKTz5XDRr1Y9/txh2/hk=; b=AHoDziFU/1QtFc9eL872DmFH03X/6wyfs/zL+WgChi24VYp46IAcQapla78LGbrk3WcflbFz4E+1grtXfqYzMeCRFwJNlaOK9zkCxoRpZxGRTsaioLAfqNZGsu2hOIM/wUiO7mjgLrv3+9+GCRdhccodtqWkN5TcyLeRMCl3g1+ERI7+IR+MiZOGmcLTvK3CH1k1iOHm/UWjpufakUn9VYFggQZiu1D/AeUT88duz2zJaAxM5vu4xr4ltedAcHqR2hKmXlRpuFoLs5iZVVLwBISw6Omy47RcpOc2nk2JUnDfc2afYhsHOhvjrdwQ70MfPQdJhPAyhpcVkdZpo27ZMw== Received: from TY2PR02MB3678.apcprd02.prod.outlook.com (2603:1096:404:b7::12) by SEYPR02MB5965.apcprd02.prod.outlook.com (2603:1096:101:84::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.29; Sun, 10 Apr 2022 15:30:57 +0000 Received: from TY2PR02MB3678.apcprd02.prod.outlook.com ([fe80::b46d:269f:591f:7eff]) by TY2PR02MB3678.apcprd02.prod.outlook.com ([fe80::b46d:269f:591f:7eff%6]) with mapi id 15.20.5144.029; Sun, 10 Apr 2022 15:30:57 +0000 From: Petr Gotthard To: "yocto@lists.yoctoproject.org" Subject: [meta-security][PATCH 3/6] tpm2-tss: update to 3.2.0 Thread-Topic: [meta-security][PATCH 3/6] tpm2-tss: update to 3.2.0 Thread-Index: AdhM7LhlELqS0woLRRWi/Vp5FPJMHg== Date: Sun, 10 Apr 2022 15:30:57 +0000 Message-ID: Accept-Language: en-US Content-Language: cs-CZ X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=advantech.cz; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 3be97f4c-1d89-4a08-1b93-08da1b071bf9 x-ms-traffictypediagnostic: SEYPR02MB5965:EE_ x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: e16RuwNQiiLsJ9DDvXIML0tBgYwd2Jl3X8RdS04IbUq5HFiiY15JsWqBn+RpcYw2BeBsU+I3PyueeJf5Yp+vp9owvE17Y3I1NUMCbNQjtRvAvpWfN7YCPh10MRoFKg2x5wKUU3Psdm3Al+RBZvmLFulBR05OnGbBT4jPPwhuQfVGkHOzTix2ORk5D8+ES8y0v4oOYP62dOnPJ9cZxLLFtH1RyGSWDUvhxuQS4v8Xfs72cfQw9NhvNBeQs422vCbsF91HHfhdHjxaKvFRMLxfVek47Ke5N+TSyul54hKZ2OM5zQdS92gGTUinjcrpE1cLUMBbkdkqcR7jLS/8q59EauFlNnTuzvNYrGmzUgc2zcu4yjfRhliWAh4KTbZptcyJkpFgNcoXTj6rz79dSYAdP/p5y7PtzFMgx/8Tx2MOdYmcTksG5JeVREOUTgQWUZ2k1D0ziOui2g55ibNN55M4UOMqOSsM+ZlROaEyQrFIKxVx43JwqZ6Srct8HxJZ5tcqMejrpSdPXUdLywXfTJ9Rvl+2XXP0RPy5RidWgrh6WdkkM6nmtNwfX4amvQRNc5pJVzaCgB5aYO2+oxFGIAYPKTwRDTqnD1Lked4R8oqLDdRP0BqTtYTgyQYyWJfRolCwoeZ0PHg377Iky+rypSwKV1vlYI8fn/XDq5NBnbKrKdKqF+5yleDS6zg5u8ntbqWXgXqiEb672zv5TmS0sStItjHPNrgfHUFJf3WVxiae4Gb1Mckoh57GSdXnZe7YuLX4TO+vrAE1wheen1DTeEjtreoa6Yo7CpOhThsWA96cdtlVgDhC9GpRo4C55AamDow6 x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TY2PR02MB3678.apcprd02.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(4636009)(366004)(186003)(83380400001)(86362001)(26005)(52536014)(8936002)(9686003)(7696005)(6506007)(508600001)(2906002)(55016003)(5660300002)(966005)(8676002)(38070700005)(71200400001)(15650500001)(33656002)(66946007)(66446008)(76116006)(30864003)(122000001)(38100700002)(44832011)(316002)(66476007)(66556008)(64756008)(84970400001)(6916009)(2004002);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?Fz7qUakLi0phHPqeu/L/4S0YAfme?= =?utf-8?q?RXYjLyifkOdR3uwQiw5M3I9aM0lhevtvXsr/NWa+utqtNjD/Bp64oVMe1EH/wkQ1p?= =?utf-8?q?YFDktCXAbl5+kuLcg1CEmtbOn/6hQbjYbbEF//AHZpUBEHegVFTu7HAnX3uCtD5ZP?= =?utf-8?q?pwf3whagz8ZKDpf/Vo4zYo7C8GdDT+FQQaWmakEs8auN9YVg+FzfxWzdg9q1uGrhn?= =?utf-8?q?ImjVhGiu1+I3vWC3FPtixSoVWu45dVeBXOb41i2rmUraNL7C4IUJrJ2ZUg4Y2m4w4?= =?utf-8?q?cNSEEQtxrouC+B0Nhq9USx13S6bapsbwRrnHurLbrLUk8OPsnEluyHvwHr9cfjJpp?= =?utf-8?q?eHXcWLJ47E+K+v4jTfwLKHqmEk3nAiX8LDqRLVpyr3j1+LnmxLw5VYnH4Ng7NK3Iz?= =?utf-8?q?WoE9DzEzLMrag8wa7zLEjCdOyI1N4qja8b6LyHcXQI3Fw0b5JTNP/JpNq5Zts3l5w?= =?utf-8?q?RN1y5hj8khkLC2evDkUnvJwFmPSvz7AgSAureauZL5k5MjIFAXEr2RywkdiZVry2Y?= =?utf-8?q?pRN+wJLxJuCctOLj3YMJfALIN3PT8wgE2jeXXz/Azn2yH67DVFdAgCpVKqdJdFO2T?= =?utf-8?q?aV/IGjpB4fZ1WgSqAq0l/gMIpBqutAoF8v5QAcPKxVbvwnwYX18VCbVv8hE56ZTwf?= =?utf-8?q?e6Oni4D4HcN7xIjkzsHAku2PMd5vcvQTZEpjdRoSb3tLzoLosPqJsRJF+Z0AqoIdq?= =?utf-8?q?m/DKgWyEUSa0T+otD5WFQ/R45C46hL/SfYOuEE4ivjOphxX1AJYqcg7p9P3+g1+CZ?= =?utf-8?q?BLegIcvtWjVBKwvDE67Bqwu5XWk/8DdSLi+5LCzWaqXV+BOwU/wJwiqbi/c3jsXdJ?= =?utf-8?q?urbte7h2JfthSKsDEIO7DzGC/edXXDChoDhMK7urKOpucr4yKqX5F2+0H6id4hlXf?= =?utf-8?q?nzAjXpuRUYp3eronhq9zKQKS4IT9Ai6fpWufT2VqYOT6q0Pplw1fZSYqJFVix+3c+?= =?utf-8?q?WYET6pSz3p9ePM4ilDKfo97DoQvqu2qm9ONiM5V+3Fs8rQaXgBNj2wBX2aIIyjwab?= =?utf-8?q?BNa0ax6JArGPgzUUZKEWM+ksC9NqEuE1JSWMpUFjSUXE2HxU2lcNB5z5Gj3ElapYM?= =?utf-8?q?Kc0oWuVVvbmQXkxliXl/cQZorwNO4iAgGJ/fIZTf1SsxRusF6+jhEUK2M3c1oSRvo?= =?utf-8?q?SFbFfChVHMKraIrQfTlhSz6a6VO5cGjwJVJn8aYhSYx4IDR/422SLPpf/QCENkjN6?= =?utf-8?q?qC3drneXe0McQd+lUIThjcY9VVWYkUaGrgD6npIO2bz3ff2D5r2xPSDBDnzxHx4kE?= =?utf-8?q?0ph2GYPtAtOixx1E8B8LN0jNurDHHmp+0utLV/CzOYDGrQSXrZvgJ/OlvAkz8BSLj?= =?utf-8?q?b8Ob0pYFs+W01b3WYqCQ8IfNjNXABCkAtHp2JNyNpE0bSIe3GLHR4kCqhRIpTZHlP?= =?utf-8?q?tGS7BZUIvi/15wuSiSIW65EFJXAS7LcdedAva8XW3+mPReUjFjtZKiooP4YTVdnA9?= =?utf-8?q?Fazk/U9BhbWidlLiAex4mKywnGJekNrW4aCRXbSfA6GmN4kBWwWGPgyYsJ+IFXXI4?= =?utf-8?q?oWpCeO4+Ua0ejf6auHluS9AfqJVrKrvzUCRkVpNIFoxn+XD0dFCHmLMGSR1Lm2daA?= =?utf-8?q?TXAstLhxKJOsFPaKaWCv0umQkDrpBqS8Utl+68ETWw7i6ReKYJXGLM7/cHF0q8PtI?= =?utf-8?q?cNToh++6gnz2wBWy5Cj/as2B98d5k7+DbqFl+xG79qWhWyZ/Bw+J8=3D?= MIME-Version: 1.0 X-OriginatorOrg: advantech.cz X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: TY2PR02MB3678.apcprd02.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3be97f4c-1d89-4a08-1b93-08da1b071bf9 X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Apr 2022 15:30:57.3909 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a77d40d9-dcba-4dda-b571-5f18e6da853f X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: cDx1H7RsbJELpjim0X5F0hxiBvaxuBABKoepqaalHTpM3whRJmGXH+WX+QsYBB7JIqaTuAl/osBVkINpOTent7+67RDlKg1jQuSEJ3U25jo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEYPR02MB5965 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 11 Apr 2022 17:17:58 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/56706 This deletes the patches that were unused for a long time, updates the tpm2-tss package and introduces a fix to the version number problem that got introduced with the 3.2.0 version. Signed-off-by: Petr Gotthard --- .../tpm2-tss/tpm2-tss/ax_pthread.m4 | 332 ------------------ .../tpm2-tss/fix_musl_select_include.patch | 31 -- .../tpm2-tss/tpm2-tss/fixup_hosttools.patch | 29 +- .../{tpm2-tss_3.1.0.bb => tpm2-tss_3.2.0.bb} | 7 +- 4 files changed, 22 insertions(+), 377 deletions(-) delete mode 100644 meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/ax_pthread.m4 delete mode 100644 meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/fix_musl_select_include.patch rename meta-tpm/recipes-tpm2/tpm2-tss/{tpm2-tss_3.1.0.bb => tpm2-tss_3.2.0.bb} (91%) -- 2.25.1 diff --git a/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/ax_pthread.m4 b/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/ax_pthread.m4 deleted file mode 100644 index d383ad5..0000000 --- a/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/ax_pthread.m4 +++ /dev/null @@ -1,332 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_pthread.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) -# -# DESCRIPTION -# -# This macro figures out how to build C programs using POSIX threads. It -# sets the PTHREAD_LIBS output variable to the threads library and linker -# flags, and the PTHREAD_CFLAGS output variable to any special C compiler -# flags that are needed. (The user can also force certain compiler -# flags/libs to be tested by setting these environment variables.) -# -# Also sets PTHREAD_CC to any special C compiler that is needed for -# multi-threaded programs (defaults to the value of CC otherwise). (This -# is necessary on AIX to use the special cc_r compiler alias.) -# -# NOTE: You are assumed to not only compile your program with these flags, -# but also link it with them as well. e.g. you should link with -# $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS -# -# If you are only building threads programs, you may wish to use these -# variables in your default LIBS, CFLAGS, and CC: -# -# LIBS="$PTHREAD_LIBS $LIBS" -# CFLAGS="$CFLAGS $PTHREAD_CFLAGS" -# CC="$PTHREAD_CC" -# -# In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant -# has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name -# (e.g. PTHREAD_CREATE_UNDETACHED on AIX). -# -# Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the -# PTHREAD_PRIO_INHERIT symbol is defined when compiling with -# PTHREAD_CFLAGS. -# -# ACTION-IF-FOUND is a list of shell commands to run if a threads library -# is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it -# is not found. If ACTION-IF-FOUND is not specified, the default action -# will define HAVE_PTHREAD. -# -# Please let the authors know if this macro fails on any platform, or if -# you have any other suggestions or comments. This macro was based on work -# by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help -# from M. Frigo), as well as ac_pthread and hb_pthread macros posted by -# Alejandro Forero Cuervo to the autoconf macro repository. We are also -# grateful for the helpful feedback of numerous users. -# -# Updated for Autoconf 2.68 by Daniel Richard G. -# -# LICENSE -# -# Copyright (c) 2008 Steven G. Johnson -# Copyright (c) 2011 Daniel Richard G. -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see . -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -#serial 21 - -AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD]) -AC_DEFUN([AX_PTHREAD], [ -AC_REQUIRE([AC_CANONICAL_HOST]) -AC_LANG_PUSH([C]) -ax_pthread_ok=no - -# We used to check for pthread.h first, but this fails if pthread.h -# requires special compiler flags (e.g. on True64 or Sequent). -# It gets checked for in the link test anyway. - -# First of all, check if the user has set any of the PTHREAD_LIBS, -# etcetera environment variables, and if threads linking works using -# them: -if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS]) - AC_TRY_LINK_FUNC([pthread_join], [ax_pthread_ok=yes]) - AC_MSG_RESULT([$ax_pthread_ok]) - if test x"$ax_pthread_ok" = xno; then - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" - fi - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" -fi - -# We must check for the threads library under a number of different -# names; the ordering is very important because some systems -# (e.g. DEC) have both -lpthread and -lpthreads, where one of the -# libraries is broken (non-POSIX). - -# Create a list of thread flags to try. Items starting with a "-" are -# C compiler flags, and other items are library names, except for "none" -# which indicates that we try without any flags at all, and "pthread-config" -# which is a program returning the flags for the Pth emulation library. - -ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" - -# The ordering *is* (sometimes) important. Some notes on the -# individual items follow: - -# pthreads: AIX (must check this before -lpthread) -# none: in case threads are in libc; should be tried before -Kthread and -# other compiler flags to prevent continual compiler warnings -# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) -# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) -# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) -# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) -# -pthreads: Solaris/gcc -# -mthreads: Mingw32/gcc, Lynx/gcc -# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it -# doesn't hurt to check since this sometimes defines pthreads too; -# also defines -D_REENTRANT) -# ... -mt is also the pthreads flag for HP/aCC -# pthread: Linux, etcetera -# --thread-safe: KAI C++ -# pthread-config: use pthread-config program (for GNU Pth library) - -case ${host_os} in - solaris*) - - # On Solaris (at least, for some versions), libc contains stubbed - # (non-functional) versions of the pthreads routines, so link-based - # tests will erroneously succeed. (We need to link with -pthreads/-mt/ - # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather - # a function called by this macro, so we could check for that, but - # who knows whether they'll stub that too in a future libc.) So, - # we'll just look for -pthreads and -lpthread first: - - ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags" - ;; - - darwin*) - ax_pthread_flags="-pthread $ax_pthread_flags" - ;; -esac - -# Clang doesn't consider unrecognized options an error unless we specify -# -Werror. We throw in some extra Clang-specific options to ensure that -# this doesn't happen for GCC, which also accepts -Werror. - -AC_MSG_CHECKING([if compiler needs -Werror to reject unknown flags]) -save_CFLAGS="$CFLAGS" -ax_pthread_extra_flags="-Werror" -CFLAGS="$CFLAGS $ax_pthread_extra_flags -Wunknown-warning-option -Wsizeof-array-argument" -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([int foo(void);],[foo()])], - [AC_MSG_RESULT([yes])], - [ax_pthread_extra_flags= - AC_MSG_RESULT([no])]) -CFLAGS="$save_CFLAGS" - -if test x"$ax_pthread_ok" = xno; then -for flag in $ax_pthread_flags; do - - case $flag in - none) - AC_MSG_CHECKING([whether pthreads work without any flags]) - ;; - - -*) - AC_MSG_CHECKING([whether pthreads work with $flag]) - PTHREAD_CFLAGS="$flag" - ;; - - pthread-config) - AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no]) - if test x"$ax_pthread_config" = xno; then continue; fi - PTHREAD_CFLAGS="`pthread-config --cflags`" - PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" - ;; - - *) - AC_MSG_CHECKING([for the pthreads library -l$flag]) - PTHREAD_LIBS="-l$flag" - ;; - esac - - save_LIBS="$LIBS" - save_CFLAGS="$CFLAGS" - LIBS="$PTHREAD_LIBS $LIBS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS $ax_pthread_extra_flags" - - # Check for various functions. We must include pthread.h, - # since some functions may be macros. (On the Sequent, we - # need a special flag -Kthread to make this header compile.) - # We check for pthread_join because it is in -lpthread on IRIX - # while pthread_create is in libc. We check for pthread_attr_init - # due to DEC craziness with -lpthreads. We check for - # pthread_cleanup_push because it is one of the few pthread - # functions on Solaris that doesn't have a non-functional libc stub. - # We try pthread_create on general principles. - AC_LINK_IFELSE([AC_LANG_PROGRAM([#include - static void routine(void *a) { a = 0; } - static void *start_routine(void *a) { return a; }], - [pthread_t th; pthread_attr_t attr; - pthread_create(&th, 0, start_routine, 0); - pthread_join(th, 0); - pthread_attr_init(&attr); - pthread_cleanup_push(routine, 0); - pthread_cleanup_pop(0) /* ; */])], - [ax_pthread_ok=yes], - []) - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - AC_MSG_RESULT([$ax_pthread_ok]) - if test "x$ax_pthread_ok" = xyes; then - break; - fi - - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" -done -fi - -# Various other checks: -if test "x$ax_pthread_ok" = xyes; then - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - - # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. - AC_MSG_CHECKING([for joinable pthread attribute]) - attr_name=unknown - for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do - AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], - [int attr = $attr; return attr /* ; */])], - [attr_name=$attr; break], - []) - done - AC_MSG_RESULT([$attr_name]) - if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then - AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE], [$attr_name], - [Define to necessary symbol if this constant - uses a non-standard name on your system.]) - fi - - AC_MSG_CHECKING([if more special flags are required for pthreads]) - flag=no - case ${host_os} in - aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";; - osf* | hpux*) flag="-D_REENTRANT";; - solaris*) - if test "$GCC" = "yes"; then - flag="-D_REENTRANT" - else - # TODO: What about Clang on Solaris? - flag="-mt -D_REENTRANT" - fi - ;; - esac - AC_MSG_RESULT([$flag]) - if test "x$flag" != xno; then - PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" - fi - - AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT], - [ax_cv_PTHREAD_PRIO_INHERIT], [ - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], - [[int i = PTHREAD_PRIO_INHERIT;]])], - [ax_cv_PTHREAD_PRIO_INHERIT=yes], - [ax_cv_PTHREAD_PRIO_INHERIT=no]) - ]) - AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"], - [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])]) - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - # More AIX lossage: compile with *_r variant - if test "x$GCC" != xyes; then - case $host_os in - aix*) - AS_CASE(["x/$CC"], - [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6], - [#handle absolute path differently from PATH based program lookup - AS_CASE(["x$CC"], - [x/*], - [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])], - [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])]) - ;; - esac - fi -fi - -test -n "$PTHREAD_CC" || PTHREAD_CC="$CC" - -AC_SUBST([PTHREAD_LIBS]) -AC_SUBST([PTHREAD_CFLAGS]) -AC_SUBST([PTHREAD_CC]) - -# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: -if test x"$ax_pthread_ok" = xyes; then - ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1]) - : -else - ax_pthread_ok=no - $2 -fi -AC_LANG_POP -])dnl AX_PTHREAD diff --git a/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/fix_musl_select_include.patch b/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/fix_musl_select_include.patch deleted file mode 100644 index ecaca6e..0000000 --- a/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/fix_musl_select_include.patch +++ /dev/null @@ -1,31 +0,0 @@ -This fixes musl build issue do to missing FD_* defines. -Add sys/select.h - -Upstream-Status: Pending - -Signed-off-by: Armin Kuster - -Index: TPM2.0-TSS/tcti/tcti_socket.cpp -=================================================================== ---- TPM2.0-TSS.orig/tcti/tcti_socket.cpp -+++ TPM2.0-TSS/tcti/tcti_socket.cpp -@@ -28,6 +28,7 @@ - #include - #include // Needed for _wtoi - -+#include "sys/select.h" - #include - #include - #include "sysapi_util.h" -Index: TPM2.0-TSS/resourcemgr/resourcemgr.c -=================================================================== ---- TPM2.0-TSS.orig/resourcemgr/resourcemgr.c -+++ TPM2.0-TSS/resourcemgr/resourcemgr.c -@@ -28,6 +28,7 @@ - #include - #include // Needed for _wtoi - -+#include "sys/select.h" - #include - #include - #include diff --git a/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/fixup_hosttools.patch b/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/fixup_hosttools.patch index b5579e1..450698f 100644 --- a/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/fixup_hosttools.patch +++ b/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss/fixup_hosttools.patch @@ -5,22 +5,25 @@ Not appropriate for cross build env. Upstream-Status: OE [inappropriate] Signed-off-by: Armin Kuster -Index: tpm2-tss-3.1.0/configure.ac +Index: tpm2-tss-3.2.0/configure.ac =================================================================== ---- tpm2-tss-3.1.0.orig/configure.ac -+++ tpm2-tss-3.1.0/configure.ac -@@ -471,14 +471,6 @@ AM_CONDITIONAL(SYSD_SYSUSERS, test "x$sy +--- tpm2-tss-3.2.0.orig/configure.ac ++++ tpm2-tss-3.2.0/configure.ac +@@ -488,17 +488,6 @@ AC_CHECK_PROG(systemd_tmpfiles, systemd-tmpfiles, yes) AM_CONDITIONAL(SYSD_TMPFILES, test "x$systemd_tmpfiles" = "xyes") - # Check all tools used by make install --AS_IF([test "$HOSTOS" = "Linux"], -- [ERROR_IF_NO_PROG([groupadd]) -- ERROR_IF_NO_PROG([useradd]) -- ERROR_IF_NO_PROG([id]) -- ERROR_IF_NO_PROG([chown]) -- ERROR_IF_NO_PROG([chmod]) -- ERROR_IF_NO_PROG([mkdir]) -- ERROR_IF_NO_PROG([setfacl])]) +-# Check all tools used by make install +-AS_IF([test "$HOSTOS" = "Linux"], +- [ AC_CHECK_PROG(useradd, useradd, yes) +- AC_CHECK_PROG(groupadd, groupadd, yes) +- AC_CHECK_PROG(adduser, adduser, yes) +- AC_CHECK_PROG(addgroup, addgroup, yes) +- AS_IF([test "x$addgroup" != "xyes" && test "x$groupadd" != "xyes" ], +- [AC_MSG_ERROR([addgroup or groupadd are needed.])]) +- AS_IF([test "x$adduser" != "xyes" && test "x$useradd" != "xyes" ], +- [AC_MSG_ERROR([adduser or useradd are needed.])])]) +- AC_SUBST([PATH]) + dnl --------- Doxy Gen ----------------------- diff --git a/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_3.1.0.bb b/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_3.2.0.bb similarity index 91% rename from meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_3.1.0.bb rename to meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_3.2.0.bb index ddcfb58..8440bb9 100644 --- a/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_3.1.0.bb +++ b/meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_3.2.0.bb @@ -10,7 +10,7 @@ SRC_URI = "https://github.com/tpm2-software/${BPN}/releases/download/${PV}/${BPN file://fixup_hosttools.patch \ " -SRC_URI[sha256sum] = "8900a6603f74310b749b65f23c3461cde6e2a23a5f61058b21004c25f9cf19e8" +SRC_URI[sha256sum] = "48305e4144dcf6d10f3b25b7bccf0189fd2d1186feafd8cd68c6b17ecf0d7912" inherit autotools pkgconfig systemd useradd @@ -26,6 +26,11 @@ USERADD_PACKAGES = "${PN}" GROUPADD_PARAM:${PN} = "--system tss" USERADD_PARAM:${PN} = "--system -M -d /var/lib/tpm -s /bin/false -g tss tss" +do_configure:prepend() { + # do not extract the version number from git + sed -i -e 's/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/' ${S}/configure.ac +} + do_install:append() { # Remove /run as it is created on startup rm -rf ${D}/run