From patchwork Tue Nov 30 22:56:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 1286 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 4DA58C433EF for ; Tue, 30 Nov 2021 22:57:02 +0000 (UTC) Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by mx.groups.io with SMTP id smtpd.web09.84606.1638313021658846513 for ; Tue, 30 Nov 2021 14:57:01 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=hwG0Sszm; spf=pass (domain: gmail.com, ip: 209.85.210.174, mailfrom: akuster808@gmail.com) Received: by mail-pf1-f174.google.com with SMTP id x5so22230563pfr.0 for ; Tue, 30 Nov 2021 14:57:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=3mbZdWdr5JC7SPgjlOEiZfN5Cx8KErQVuYW98qr2QZI=; b=hwG0SszmWt6oivTf0TqYhtcLk/FcEI6Dfda4pvKr4+gr+b+dlLKYSvT1MB3qSsb25l h1XrwobRsU/WnXXyorBTOhNIi1cDFTbq92UulyqqVL91ourXd+g9dTNpj5o0Ro82qHB7 ne/zpQmbh+yCGcy3xuZir+BMbLIbLZrJXwfl+7Ve5CFdr87ySiQmNQdxBcz85sVkOi4B GKd38Ac0tGYXTe/IsdEvS0M5YJ2xkQdmoJsiGgV3x5OS/x5OfwoWi1AqPsPBorWcTKNa XkPx4JQ0qKdcr+NwLUEMsywmUBYBG2aUN3YeXcpHu6Pj+2hzqDB4QBgk/21pAl32onl3 pRYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3mbZdWdr5JC7SPgjlOEiZfN5Cx8KErQVuYW98qr2QZI=; b=h6lh8pGn/qO3AIKBhxGnmUHUjwG+4AeEHKaZeK63rwI3D6AA05m9bIu8ItG+ulVioz 7bRtvBC2dkgjjMpgckeZmZCIuNHPjkv9EKj5MiknWFYob+NSuNHpxqlSl0a747vUE9sV miLNfbXu4Ogf06ysiOVnUHGnJW5Zq78ug/HqxjICR9uzGsnpjGaCj4x4bg6RSNt3myXm QkSVZJKVSEAGIYrmewmWseF+95skSuXMkKp9CNai5vDAvjD42BrFDXzHQNgtV6gxOTns wFQD/DtUwXQIpu65ak1mqHFLAn/VsvpuSJkhvH4t9vQyRYQebdbLbh0+oY1t2TH2RCDQ YPIQ== X-Gm-Message-State: AOAM533frm61MqMi/D5WQKz0c5XOXIcuF4/gnJ4ZUIa9vJn/QYC+l7lI EY3HATZOzag1t+nDAfuzsGquTwUAoP4= X-Google-Smtp-Source: ABdhPJxbiVHnNsf1lUHw0GsSUh/FvgNZZxWYwkd4R7AG7u778x7pNpXaPUKM3X7df4csrB6lzGEkvQ== X-Received: by 2002:a05:6a00:22c2:b0:4a0:2526:e728 with SMTP id f2-20020a056a0022c200b004a02526e728mr1992497pfj.1.1638313021029; Tue, 30 Nov 2021 14:57:01 -0800 (PST) Received: from keaua.hsd1.ca.comcast.net ([2601:202:4180:a5c0:7839:c9c5:3df1:81ad]) by smtp.gmail.com with ESMTPSA id p16sm23373028pfh.97.2021.11.30.14.57.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 14:57:00 -0800 (PST) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Subject: [hardknott 3/6] Use old override syntax Date: Tue, 30 Nov 2021 14:56:52 -0800 Message-Id: <93befa6cf5599979ebe14ded6e1829963faa367c.1638312940.git.akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 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 ; Tue, 30 Nov 2021 22:57:02 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94156 From: Otto Esko - can-utils and dstat recipes were using the colon override syntax introduced in honister - revert back to underline override notation Signed-off-by: Otto Esko Signed-off-by: Armin Kuster --- meta-oe/recipes-extended/socketcan/can-utils_git.bb | 2 +- meta-oe/recipes-support/dstat/dstat_0.7.4.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-extended/socketcan/can-utils_git.bb b/meta-oe/recipes-extended/socketcan/can-utils_git.bb index 95086ad211..06c3182dba 100644 --- a/meta-oe/recipes-extended/socketcan/can-utils_git.bb +++ b/meta-oe/recipes-extended/socketcan/can-utils_git.bb @@ -48,5 +48,5 @@ ALTERNATIVE_LINK_NAME[cansequence] = "${bindir}/cansequence" # busybox ip fails to configure can interfaces, so we need iproute2 to do so. # See details in http://www.armadeus.com/wiki/index.php?title=CAN_bus_Linux_driver. -RRECOMMENDS:${PN} += "iproute2" +RRECOMMENDS_${PN} += "iproute2" diff --git a/meta-oe/recipes-support/dstat/dstat_0.7.4.bb b/meta-oe/recipes-support/dstat/dstat_0.7.4.bb index bc73f639bd..18c3cdf82c 100644 --- a/meta-oe/recipes-support/dstat/dstat_0.7.4.bb +++ b/meta-oe/recipes-support/dstat/dstat_0.7.4.bb @@ -21,4 +21,4 @@ do_install() { oe_runmake 'DESTDIR=${D}' install } -RDEPENDS:${PN} += "python3-core python3-misc python3-resource python3-shell python3-six python3-unixadmin" +RDEPENDS_${PN} += "python3-core python3-misc python3-resource python3-shell python3-six python3-unixadmin" From patchwork Tue Nov 30 22:56:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 1287 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 4FB30C4332F for ; Tue, 30 Nov 2021 22:57:03 +0000 (UTC) Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by mx.groups.io with SMTP id smtpd.web10.84746.1638313022935458025 for ; Tue, 30 Nov 2021 14:57:03 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=gMg/Alr1; spf=pass (domain: gmail.com, ip: 209.85.215.170, mailfrom: akuster808@gmail.com) Received: by mail-pg1-f170.google.com with SMTP id r138so21411110pgr.13 for ; Tue, 30 Nov 2021 14:57:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=CkYknpvA2V5QG30+UVPm2JaFp7fr5xBaLjGz+GNRw5M=; b=gMg/Alr1M6pNItqXa8r2LeeqbxN4Soc86EROInI46EKXHC9qzGgFjnYSbFpL3JM1zC IuSUeyTj/CfeUtmLdFGkFf1+egWKx9CFv3Avdu0eAmzepaWM7a/fcV+2PQI57XygsjET ZjVSoiUIMRW/bVkLae3kZbIGeM5PQN5O1LMJKH7n+dbjOMmTZHw5jGIXtQ6eDgyjQGQ7 /WiPwXAx2hJ0EWnlSVzuBZYrpGdA3CjDv5Bso/J9sTFZakjgNKJVEmkD7dS8JfToMmAM a3qUU0yfCi48ThqipBV1ZD93CRU5o0v9AEjTycrlMd06fyB/+vAVEPM1+ExHK13O5R4b abcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CkYknpvA2V5QG30+UVPm2JaFp7fr5xBaLjGz+GNRw5M=; b=bCrHG9ArRT4kvzSZtZLOJehwPv8y3oToo9bKbWXbWDPKFE/100R9ttfzZL/SW1/f9u htZVsMU+w7/BQ9aRHJ+TWOIePJj96cVl+dVrXVCKUNrEsuSHMy4E4c5Y0veChXxDZCe2 DtHlK1gi4uU364LuDcijmeCVF0LIne7WIwvCNj0jTFKf56QkVVMdB0u/Gi01ClpZ28rL suWyDJMR1M6hqSB6j//MtPg0yoWSq0f5fU7J1LZjj2sRlqyfI+FxYjgZTisqJDiV8AOp CroKW0qUd6Rf3dWktTz/0XBTiCVWpRM26XOqFTULu7JDHvF4WuAuwBzDCWRG76zi0yUI e90w== X-Gm-Message-State: AOAM531xCQ3bQtWM3jqc03PRKIS7Rc4QXOG/NuFkiWeuYFDECoBIa9s8 muMwOe0MTSTw+8ZZBD+jxUdAxbPZdFY= X-Google-Smtp-Source: ABdhPJw7eSRE0wt+zq76PP7XwXBb7T7t+nyRjwhTEK1/Qmsecy7QyjeA6B2GeAoiD6b6p8ZoDwJ2FQ== X-Received: by 2002:a62:7ec4:0:b0:4a3:219b:7008 with SMTP id z187-20020a627ec4000000b004a3219b7008mr2013364pfc.3.1638313021882; Tue, 30 Nov 2021 14:57:01 -0800 (PST) Received: from keaua.hsd1.ca.comcast.net ([2601:202:4180:a5c0:7839:c9c5:3df1:81ad]) by smtp.gmail.com with ESMTPSA id p16sm23373028pfh.97.2021.11.30.14.57.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 14:57:01 -0800 (PST) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Subject: [hardknott 4/6] postgresql: fix CVE-2021-23214,CVE-2021-23222 Date: Tue, 30 Nov 2021 14:56:53 -0800 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 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 ; Tue, 30 Nov 2021 22:57:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94157 From: Changqing Li Signed-off-by: Changqing Li Signed-off-by: Armin Kuster --- .../postgresql/files/CVE-2021-23214.patch | 116 ++++++++++++++++ .../postgresql/files/CVE-2021-23222.patch | 131 ++++++++++++++++++ .../recipes-dbs/postgresql/postgresql_13.4.bb | 2 + 3 files changed, 249 insertions(+) create mode 100644 meta-oe/recipes-dbs/postgresql/files/CVE-2021-23214.patch create mode 100644 meta-oe/recipes-dbs/postgresql/files/CVE-2021-23222.patch diff --git a/meta-oe/recipes-dbs/postgresql/files/CVE-2021-23214.patch b/meta-oe/recipes-dbs/postgresql/files/CVE-2021-23214.patch new file mode 100644 index 0000000000..58bf810626 --- /dev/null +++ b/meta-oe/recipes-dbs/postgresql/files/CVE-2021-23214.patch @@ -0,0 +1,116 @@ +From 24c2b9e42edb6d2f4ef2cead3b0aa1d6196adfce Mon Sep 17 00:00:00 2001 +From: Tom Lane +Date: Mon, 8 Nov 2021 11:01:43 -0500 +Subject: [PATCH 2/2] Reject extraneous data after SSL or GSS encryption + handshake. + +The server collects up to a bufferload of data whenever it reads data +from the client socket. When SSL or GSS encryption is requested +during startup, any additional data received with the initial +request message remained in the buffer, and would be treated as +already-decrypted data once the encryption handshake completed. +Thus, a man-in-the-middle with the ability to inject data into the +TCP connection could stuff some cleartext data into the start of +a supposedly encryption-protected database session. + +This could be abused to send faked SQL commands to the server, +although that would only work if the server did not demand any +authentication data. (However, a server relying on SSL certificate +authentication might well not do so.) + +To fix, throw a protocol-violation error if the internal buffer +is not empty after the encryption handshake. + +Our thanks to Jacob Champion for reporting this problem. + +Security: CVE-2021-23214 + +Upstream-Status: Backport[https://github.com/postgres/postgres/commit/28e24125541545483093819efae9bca603441951] +CVE: CVE-2021-23214 + +Signed-off-by: Changqing Li + +--- + src/backend/libpq/pqcomm.c | 11 +++++++++++ + src/backend/postmaster/postmaster.c | 23 ++++++++++++++++++++++- + src/include/libpq/libpq.h | 1 + + 3 files changed, 34 insertions(+), 1 deletion(-) + +diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c +index ee2cd86..4dd1c02 100644 +--- a/src/backend/libpq/pqcomm.c ++++ b/src/backend/libpq/pqcomm.c +@@ -1183,6 +1183,17 @@ pq_getstring(StringInfo s) + } + } + ++/* ------------------------------- ++ * pq_buffer_has_data - is any buffered data available to read? ++ * ++ * This will *not* attempt to read more data. ++ * -------------------------------- ++ */ ++bool ++pq_buffer_has_data(void) ++{ ++ return (PqRecvPointer < PqRecvLength); ++} + + /* -------------------------------- + * pq_startmsgread - begin reading a message from the client. +diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c +index 5775fc0..1fcc3f8 100644 +--- a/src/backend/postmaster/postmaster.c ++++ b/src/backend/postmaster/postmaster.c +@@ -2049,6 +2049,17 @@ retry1: + return STATUS_ERROR; + #endif + ++ /* ++ * At this point we should have no data already buffered. If we do, ++ * it was received before we performed the SSL handshake, so it wasn't ++ * encrypted and indeed may have been injected by a man-in-the-middle. ++ * We report this case to the client. ++ */ ++ if (pq_buffer_has_data()) ++ ereport(FATAL, ++ (errcode(ERRCODE_PROTOCOL_VIOLATION), ++ errmsg("received unencrypted data after SSL request"), ++ errdetail("This could be either a client-software bug or evidence of an attempted man-in-the-middle attack."))); + /* + * regular startup packet, cancel, etc packet should follow, but not + * another SSL negotiation request, and a GSS request should only +@@ -2080,7 +2091,17 @@ retry1: + if (GSSok == 'G' && secure_open_gssapi(port) == -1) + return STATUS_ERROR; + #endif +- ++ /* ++ * At this point we should have no data already buffered. If we do, ++ * it was received before we performed the GSS handshake, so it wasn't ++ * encrypted and indeed may have been injected by a man-in-the-middle. ++ * We report this case to the client. ++ */ ++ if (pq_buffer_has_data()) ++ ereport(FATAL, ++ (errcode(ERRCODE_PROTOCOL_VIOLATION), ++ errmsg("received unencrypted data after GSSAPI encryption request"), ++ errdetail("This could be either a client-software bug or evidence of an attempted man-in-the-middle attack."))); + /* + * regular startup packet, cancel, etc packet should follow, but not + * another GSS negotiation request, and an SSL request should only +diff --git a/src/include/libpq/libpq.h b/src/include/libpq/libpq.h +index b115247..9969692 100644 +--- a/src/include/libpq/libpq.h ++++ b/src/include/libpq/libpq.h +@@ -73,6 +73,7 @@ extern int pq_getbyte(void); + extern int pq_peekbyte(void); + extern int pq_getbyte_if_available(unsigned char *c); + extern int pq_putbytes(const char *s, size_t len); ++extern bool pq_buffer_has_data(void); + + /* + * prototypes for functions in be-secure.c +-- +2.17.1 + diff --git a/meta-oe/recipes-dbs/postgresql/files/CVE-2021-23222.patch b/meta-oe/recipes-dbs/postgresql/files/CVE-2021-23222.patch new file mode 100644 index 0000000000..42b78539b4 --- /dev/null +++ b/meta-oe/recipes-dbs/postgresql/files/CVE-2021-23222.patch @@ -0,0 +1,131 @@ +From 79125ead2a6a234086844bb42f06d49603fe6ca0 Mon Sep 17 00:00:00 2001 +From: Tom Lane +Date: Mon, 8 Nov 2021 11:14:56 -0500 +Subject: [PATCH 1/2] libpq: reject extraneous data after SSL or GSS encryption + handshake. + +libpq collects up to a bufferload of data whenever it reads data from +the socket. When SSL or GSS encryption is requested during startup, +any additional data received with the server's yes-or-no reply +remained in the buffer, and would be treated as already-decrypted data +once the encryption handshake completed. Thus, a man-in-the-middle +with the ability to inject data into the TCP connection could stuff +some cleartext data into the start of a supposedly encryption-protected +database session. + +This could probably be abused to inject faked responses to the +client's first few queries, although other details of libpq's behavior +make that harder than it sounds. A different line of attack is to +exfiltrate the client's password, or other sensitive data that might +be sent early in the session. That has been shown to be possible with +a server vulnerable to CVE-2021-23214. + +To fix, throw a protocol-violation error if the internal buffer +is not empty after the encryption handshake. + +Our thanks to Jacob Champion for reporting this problem. + +Security: CVE-2021-23222 + +Upstream-Status: Backport[https://github.com/postgres/postgres/commit/160c0258802d10b0600d7671b1bbea55d8e17d45] +CVE: CVE-2021-23222 + +Signed-off-by: Changqing Li +--- + doc/src/sgml/protocol.sgml | 28 ++++++++++++++++++++++++++++ + src/interfaces/libpq/fe-connect.c | 26 ++++++++++++++++++++++++++ + 2 files changed, 54 insertions(+) + +diff --git a/doc/src/sgml/protocol.sgml b/doc/src/sgml/protocol.sgml +index e26619e1b5..b692648fca 100644 +--- a/doc/src/sgml/protocol.sgml ++++ b/doc/src/sgml/protocol.sgml +@@ -1471,6 +1471,20 @@ SELCT 1/0; + and proceed without requesting SSL. + + ++ ++ When SSL encryption can be performed, the server ++ is expected to send only the single S byte and then ++ wait for the frontend to initiate an SSL handshake. ++ If additional bytes are available to read at this point, it likely ++ means that a man-in-the-middle is attempting to perform a ++ buffer-stuffing attack ++ (CVE-2021-23222). ++ Frontends should be coded either to read exactly one byte from the ++ socket before turning the socket over to their SSL library, or to ++ treat it as a protocol violation if they find they have read additional ++ bytes. ++ ++ + + An initial SSLRequest can also be used in a connection that is being + opened to send a CancelRequest message. +@@ -1532,6 +1546,20 @@ SELCT 1/0; + encryption. + + ++ ++ When GSSAPI encryption can be performed, the server ++ is expected to send only the single G byte and then ++ wait for the frontend to initiate a GSSAPI handshake. ++ If additional bytes are available to read at this point, it likely ++ means that a man-in-the-middle is attempting to perform a ++ buffer-stuffing attack ++ (CVE-2021-23222). ++ Frontends should be coded either to read exactly one byte from the ++ socket before turning the socket over to their GSSAPI library, or to ++ treat it as a protocol violation if they find they have read additional ++ bytes. ++ ++ + + An initial GSSENCRequest can also be used in a connection that is being + opened to send a CancelRequest message. +diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c +index f80f4e98d8..57aee95183 100644 +--- a/src/interfaces/libpq/fe-connect.c ++++ b/src/interfaces/libpq/fe-connect.c +@@ -3076,6 +3076,19 @@ keep_going: /* We will come back to here until there is + pollres = pqsecure_open_client(conn); + if (pollres == PGRES_POLLING_OK) + { ++ /* ++ * At this point we should have no data already buffered. ++ * If we do, it was received before we performed the SSL ++ * handshake, so it wasn't encrypted and indeed may have ++ * been injected by a man-in-the-middle. ++ */ ++ if (conn->inCursor != conn->inEnd) ++ { ++ appendPQExpBufferStr(&conn->errorMessage, ++ libpq_gettext("received unencrypted data after SSL response\n")); ++ goto error_return; ++ } ++ + /* SSL handshake done, ready to send startup packet */ + conn->status = CONNECTION_MADE; + return PGRES_POLLING_WRITING; +@@ -3175,6 +3188,19 @@ keep_going: /* We will come back to here until there is + pollres = pqsecure_open_gss(conn); + if (pollres == PGRES_POLLING_OK) + { ++ /* ++ * At this point we should have no data already buffered. ++ * If we do, it was received before we performed the GSS ++ * handshake, so it wasn't encrypted and indeed may have ++ * been injected by a man-in-the-middle. ++ */ ++ if (conn->inCursor != conn->inEnd) ++ { ++ appendPQExpBufferStr(&conn->errorMessage, ++ libpq_gettext("received unencrypted data after GSSAPI encryption response\n")); ++ goto error_return; ++ } ++ + /* All set for startup packet */ + conn->status = CONNECTION_MADE; + return PGRES_POLLING_WRITING; +-- +2.17.1 + diff --git a/meta-oe/recipes-dbs/postgresql/postgresql_13.4.bb b/meta-oe/recipes-dbs/postgresql/postgresql_13.4.bb index f63d23dbef..2ed0fa49bb 100644 --- a/meta-oe/recipes-dbs/postgresql/postgresql_13.4.bb +++ b/meta-oe/recipes-dbs/postgresql/postgresql_13.4.bb @@ -7,6 +7,8 @@ SRC_URI += "\ file://0001-Add-support-for-RISC-V.patch \ file://0001-Improve-reproducibility.patch \ file://0001-configure.in-bypass-autoconf-2.69-version-check.patch \ + file://CVE-2021-23214.patch \ + file://CVE-2021-23222.patch \ " SRC_URI[sha256sum] = "ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd" From patchwork Tue Nov 30 22:56:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 1289 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 52787C43217 for ; Tue, 30 Nov 2021 22:57:04 +0000 (UTC) Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by mx.groups.io with SMTP id smtpd.web09.84608.1638313023312985304 for ; Tue, 30 Nov 2021 14:57:03 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=h9XH1ArF; spf=pass (domain: gmail.com, ip: 209.85.215.175, mailfrom: akuster808@gmail.com) Received: by mail-pg1-f175.google.com with SMTP id l190so21461272pge.7 for ; Tue, 30 Nov 2021 14:57:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=YP78CEfWzsb0nbJ7fnrYC+7tki+q8bCu4KgvUHimG7M=; b=h9XH1ArFuLXZ2HRaiAOZJyrCZmd298vQ488eXOse2mC0ZCifibOaTCpK24bfJyDFZD WKRG4iHBOdapUj4tFhtM/Oc2To4UJngb9OxBl7jPJKGdpk/1Hojp9n5rDOjUHke1VSIs RL1xj8/2d9Df6FVqYP44CF6RA00R8gNha7jjczyfYcin8OVSRNy262YCnX/qxFN+kX6/ lrK4UinbReceHW+YMVQ/kBo9zJGIeRR9k/WOyAEacGhTb82axlqU/u8fyQUMp4fSydRc 9mr4gLTEOWQ1S+JaZlzR0MA8AZdRMjzuoK6Q3qTBl5OcSdvQ2WqiPTgQxQiGKUQZ7Na2 O9ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YP78CEfWzsb0nbJ7fnrYC+7tki+q8bCu4KgvUHimG7M=; b=Y1b4WOZvW6o5xYLBTAm/+X6ejVkyU9tR2fRuYrEoKIG+3TIm8C4rLpS2TMoAX1Cpxu 5ae7TwXVyD7O4nztixWfWA2msP8ATzrax0Wdw3jFRBShwRKK0xVQFHg1HG1kGXAdbjSi aY5T9oa9kGJfrTXxkioFoDN+xeOlSt3KSwiyDScPz7KwHF3Uw04Gt4p/xfiTe91jDBYV c0oN6YNht/tRrM01ZBkgVdlB9f4GNEKnRmmaKF+x1V0e4C8sePj3ZiEWp+IfglYtY4m+ 74JI+prawOms2SADjBdGUysqU/UsBk5+qreCinn/FmYZiR0tXLiRtpP/o2k4e52Rqxp9 KkuQ== X-Gm-Message-State: AOAM531MxbWYuytSpQxSg9p0JJlKwWCQB86hAUcjIlGFW0rBL2CGw+qt /18MzTPDi4HN7XZC+5Rmyk5Fws3fW2A= X-Google-Smtp-Source: ABdhPJx6/5hquP91E8xLrRzB1LLU3+sczt/JzcOOz8s82IF3S5Zsy2GvSTVPuHp/2C6ztivLOMHxJw== X-Received: by 2002:aa7:93ce:0:b0:4a8:19fc:f024 with SMTP id y14-20020aa793ce000000b004a819fcf024mr2131609pff.10.1638313022568; Tue, 30 Nov 2021 14:57:02 -0800 (PST) Received: from keaua.hsd1.ca.comcast.net ([2601:202:4180:a5c0:7839:c9c5:3df1:81ad]) by smtp.gmail.com with ESMTPSA id p16sm23373028pfh.97.2021.11.30.14.57.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 14:57:02 -0800 (PST) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Subject: [hardknott 5/6] sdbus-c++: don't fetch googletest during do_configure Date: Tue, 30 Nov 2021 14:56:54 -0800 Message-Id: <42d05b0f38f9b454df522fbe415217b42a47a816.1638312940.git.akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 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 ; Tue, 30 Nov 2021 22:57:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94159 From: Martin Jansa * with PTEST_ENABLED it enables with-tests PACKAGECONFIG which instead of using system googletest gmock, tries to fetch googletest from github and fails because branch was recently renamed from master to main | -- Found PkgConfig: /OE/tmp-glibc/work/qemux86-oe-linux/sdbus-c++/0.8.3-r0/recipe-sysroot-native/usr/bin/pkg-config (found version "0.29.2") | -- Checking for module 'libsystemd>=236' | -- Found libsystemd, version 249 | -- Building with tests | Fetching googletest... | [1/9] Creating directories for 'googletest-populate' | [1/9] Performing download step (git clone) for 'googletest-populate' | Cloning into 'googletest-src'... | fatal: invalid reference: master | CMake Error at googletest-subbuild/googletest-populate-prefix/tmp/googletest-populate-gitclone.cmake:40 (message): | Failed to checkout tag: 'master' | | | FAILED: googletest-populate-prefix/src/googletest-populate-stamp/googletest-populate-download | cd /OE/tmp-glibc/work/qemux86-oe-linux/sdbus-c++/0.8.3-r0/build/_deps && /OE/tmp-glibc/work/qemux86-oe-linux/sdbus-c++/0.8.3-r0/recipe-sysroot-native/usr/bin/cmake -P /OE/tmp-glibc/work/qemux86-oe-linux/sdbus-c++/0.8.3-r0/build/_deps/googletest-subbuild/googletest-populate-prefix/tmp/googletest-populate-gitclone.cmake && /OE/tmp-glibc/work/qemux86-oe-linux/sdbus-c++/0.8.3-r0/recipe-sysroot-native/usr/bin/cmake -E touch /OE/tmp-glibc/work/qemux86-oe-linux/sdbus-c++/0.8.3-r0/build/_deps/googletest-subbuild/googletest-populate-prefix/src/googletest-populate-stamp/googletest-populate-download | ninja: build stopped: subcommand failed. | | CMake Error at /OE/tmp-glibc/work/qemux86-oe-linux/sdbus-c++/0.8.3-r0/recipe-sysroot-native/usr/share/cmake-3.19/Modules/FetchContent.cmake:989 (message): | Build step for googletest failed: 1 | Call Stack (most recent call first): | /OE/tmp-glibc/work/qemux86-oe-linux/sdbus-c++/0.8.3-r0/recipe-sysroot-native/usr/share/cmake-3.19/Modules/FetchContent.cmake:1118:EVAL:2 (__FetchContent_directPopulate) | /OE/tmp-glibc/work/qemux86-oe-linux/sdbus-c++/0.8.3-r0/recipe-sysroot-native/usr/share/cmake-3.19/Modules/FetchContent.cmake:1118 (cmake_language) | tests/CMakeLists.txt:17 (FetchContent_Populate) | | | -- Configuring incomplete, errors occurred! * unfortunately this backported patch fixes the fetching failure, because it uses release-${GOOGLETEST_VERSION} tag instead of now non-existent master branch, but is not enough to prevent fetching from github during do_configure: -- Building with tests -- Could NOT find GTest (missing: GTest_DIR) -- Checking for module 'gmock>=1.10.0' -- No package 'gmock' found Fetching googletest... we also need to add googletest dependency to with-tests PACKAGECONFIG was fixed in meta-oe/master with the upgrade to 1.0.0: https://github.com/openembedded/meta-openembedded/commit/b26b66e5da92718b4e99a57fbfaaef9e751c3cfe#diff-48a847e7323703994fd2ce0fcb731ff860fa955a77cdfe39d71a9cc84a042c06L15 then it's ok and not fetching: -- Building with tests -- Looking for pthread.h -- Looking for pthread.h - found Signed-off-by: Martin Jansa Signed-off-by: Armin Kuster --- ...d-googletest-in-the-system-before-do.patch | 96 +++++++++++++++++++ .../recipes-core/sdbus-c++/sdbus-c++_0.8.3.bb | 9 +- 2 files changed, 102 insertions(+), 3 deletions(-) create mode 100644 meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.3/0001-Try-to-first-find-googletest-in-the-system-before-do.patch diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.3/0001-Try-to-first-find-googletest-in-the-system-before-do.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.3/0001-Try-to-first-find-googletest-in-the-system-before-do.patch new file mode 100644 index 0000000000..89cb593e60 --- /dev/null +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-0.8.3/0001-Try-to-first-find-googletest-in-the-system-before-do.patch @@ -0,0 +1,96 @@ +From b073e1c2b9a8138da83300f598b9a56fc9762b4b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Stanislav=20Angelovi=C4=8D?= +Date: Mon, 16 Nov 2020 17:05:36 +0100 +Subject: [PATCH] Try to first find googletest in the system before downloading + it (#125) + +Upstream-Status: Backport [d6fdaca] +Signed-off-by: Martin Jansa + +--- + tests/CMakeLists.txt | 62 ++++++++++++++++++++++++++++---------------- + 1 file changed, 40 insertions(+), 22 deletions(-) + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 97f7c1a..7ecc327 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -2,26 +2,44 @@ + # DOWNLOAD AND BUILD OF GOOGLETEST + #------------------------------- + +-include(FetchContent) +- +-message("Fetching googletest...") +-FetchContent_Declare(googletest +- GIT_REPOSITORY https://github.com/google/googletest.git +- GIT_TAG master +- GIT_SHALLOW 1 +- UPDATE_COMMAND "") +- +-#FetchContent_MakeAvailable(googletest) # Not available in CMake 3.13 :-( Let's do it manually: +-FetchContent_GetProperties(googletest) +-if(NOT googletest_POPULATED) +- FetchContent_Populate(googletest) +- set(gtest_force_shared_crt ON CACHE INTERNAL "" FORCE) +- set(BUILD_GMOCK ON CACHE INTERNAL "" FORCE) +- set(INSTALL_GTEST OFF CACHE INTERNAL "" FORCE) +- set(BUILD_SHARED_LIBS_BAK ${BUILD_SHARED_LIBS}) +- set(BUILD_SHARED_LIBS OFF) +- add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR}) +- set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_BAK}) ++set(GOOGLETEST_VERSION 1.10.0 CACHE STRING "Version of gmock to use") ++set(GOOGLETEST_GIT_REPO "https://github.com/google/googletest.git" CACHE STRING "A git repo to clone and build googletest from if gmock is not found in the system") ++ ++find_package(GTest ${GOOGLETEST_VERSION} CONFIG) ++if (NOT TARGET GTest::gmock) ++ # Try pkg-config if GTest was not found through CMake config ++ find_package(PkgConfig) ++ if (PkgConfig_FOUND) ++ pkg_check_modules(GMock IMPORTED_TARGET GLOBAL gmock>=${GOOGLETEST_VERSION}) ++ if(TARGET PkgConfig::GMock) ++ add_library(GTest::gmock ALIAS PkgConfig::GMock) ++ endif() ++ endif() ++ # GTest was not found in the system, build it on our own ++ if (NOT TARGET GTest::gmock) ++ include(FetchContent) ++ ++ message("Fetching googletest...") ++ FetchContent_Declare(googletest ++ GIT_REPOSITORY ${GOOGLETEST_GIT_REPO} ++ GIT_TAG release-${GOOGLETEST_VERSION} ++ GIT_SHALLOW 1 ++ UPDATE_COMMAND "") ++ ++ #FetchContent_MakeAvailable(googletest) # Not available in CMake 3.13 :-( Let's do it manually: ++ FetchContent_GetProperties(googletest) ++ if(NOT googletest_POPULATED) ++ FetchContent_Populate(googletest) ++ set(gtest_force_shared_crt ON CACHE INTERNAL "" FORCE) ++ set(BUILD_GMOCK ON CACHE INTERNAL "" FORCE) ++ set(INSTALL_GTEST OFF CACHE INTERNAL "" FORCE) ++ set(BUILD_SHARED_LIBS_BAK ${BUILD_SHARED_LIBS}) ++ set(BUILD_SHARED_LIBS OFF) ++ add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR}) ++ set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_BAK}) ++ add_library(GTest::gmock ALIAS gmock) ++ endif() ++ endif() + endif() + + #------------------------------- +@@ -87,11 +105,11 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}) + + add_executable(sdbus-c++-unit-tests ${UNITTESTS_SRCS}) + target_compile_definitions(sdbus-c++-unit-tests PRIVATE LIBSYSTEMD_VERSION=${LIBSYSTEMD_VERSION}) +-target_link_libraries(sdbus-c++-unit-tests sdbus-c++-objlib gmock gmock_main) ++target_link_libraries(sdbus-c++-unit-tests sdbus-c++-objlib GTest::gmock) + + add_executable(sdbus-c++-integration-tests ${INTEGRATIONTESTS_SRCS}) + target_compile_definitions(sdbus-c++-integration-tests PRIVATE LIBSYSTEMD_VERSION=${LIBSYSTEMD_VERSION}) +-target_link_libraries(sdbus-c++-integration-tests sdbus-c++ gmock gmock_main) ++target_link_libraries(sdbus-c++-integration-tests sdbus-c++ GTest::gmock) + + # Manual performance and stress tests + option(ENABLE_PERF_TESTS "Build and install manual performance tests (default OFF)" OFF) diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.8.3.bb b/meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.8.3.bb index 98829765c2..a8bf43c874 100644 --- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.8.3.bb +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.8.3.bb @@ -12,13 +12,16 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'with-exte ${@bb.utils.contains('PTEST_ENABLED', '1', 'with-tests', '', d)}" PACKAGECONFIG[with-builtin-libsystemd] = ",,sdbus-c++-libsystemd,libcap" PACKAGECONFIG[with-external-libsystemd] = ",,systemd,libsystemd" -PACKAGECONFIG[with-tests] = "-DBUILD_TESTS=ON -DTESTS_INSTALL_PATH=${libdir}/${BPN}/tests,-DBUILD_TESTS=OFF" +PACKAGECONFIG[with-tests] = "-DBUILD_TESTS=ON -DTESTS_INSTALL_PATH=${libdir}/${BPN}/tests,-DBUILD_TESTS=OFF,googletest gmock" DEPENDS += "expat" SRCREV = "6e8e5aadb674cccea5bdd55141db5dad887fbacd" -SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master" -SRC_URI += "file://run-ptest" + +SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master \ + file://0001-Try-to-first-find-googletest-in-the-system-before-do.patch \ + file://run-ptest \ +" EXTRA_OECMAKE = "-DBUILD_CODE_GEN=ON \ -DBUILD_DOC=ON \ From patchwork Tue Nov 30 22:56:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 1288 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 4A298C433F5 for ; Tue, 30 Nov 2021 22:57:05 +0000 (UTC) Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by mx.groups.io with SMTP id smtpd.web09.84609.1638313024220808687 for ; Tue, 30 Nov 2021 14:57:04 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=kNz0Iq1T; spf=pass (domain: gmail.com, ip: 209.85.216.45, mailfrom: akuster808@gmail.com) Received: by mail-pj1-f45.google.com with SMTP id y14-20020a17090a2b4e00b001a5824f4918so19442437pjc.4 for ; Tue, 30 Nov 2021 14:57:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=GBm3Wmvv29XeJ+XVAAWfPBeGR6giZ1L7yd7q02wfPCE=; b=kNz0Iq1TcFYJmecs6DGG1vowo8PAp+TgIF6tf3tSkZtBnzvUoXKrkBMCgMgA3IaIkm ZOSaM8SBUMbkglFqoRB9no7wR5i76ETN5NWWVvDajXfGG1GMFElrQM7VF632KE/yQ9yR CJ5awZn8Ux4IrNB1IayYzv5vYyAmXLOFSENkmFcrDrL0GsKdZaJjVyRLTEf5upS+Y2Bt sGW0c96Te8Xm+xiQx3bMBT/QOGR4RV5bwpCIIL/7mM7QVlDPVvFmo3OEQywJ8jdAGq61 7OfzlVwoOl2WocZJu8UPMfnRdQZf5k+EUhdMUMNhRjOedMr5FGJQjTKyK5My9G06/za5 2gZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GBm3Wmvv29XeJ+XVAAWfPBeGR6giZ1L7yd7q02wfPCE=; b=1OUuKRJrppn1deXUjG18OXbJgzYyI+3ik910GM5KPlJUbcUiFgQx5vYyVDe9umvVBT 1N3kWz4wgiTCCzfPMH5cPg9+feVoaxH8DPbP6MuXA1ueCAoLGbA3NTaLWs1ekmrI265w GJ6i1L3yV+84M5roFVjQdDg2tNo0sL2mk/iO1/muxLIdXqNx7/yhWHWGW4Z3gcSJrvTf Kpr+ZP95K9wjDRS+5CJvFd4QQBy1pIk7bDwzBlMrvoySBHd9uwLwiYrqugjmIA0UCmJA FO6ECnMl73P8Vq8PhCVp3nSjVEJPVuInLF3n1AJ8EtM+meszOMKWbYI67On8aE/9dohv N14A== X-Gm-Message-State: AOAM533xeJkC0n5JjxEeJV9aL4V3MG4T4A2ICRerGp8V3WzIqSGL7iYn OBLps4ZjGttCeXNA31DODIA1EEeIGRM= X-Google-Smtp-Source: ABdhPJwnTqKjgt66VQ/WygzjszooYqSsj++s1ju5jrpSiP8oBq2MJrMsBEXkRGpSZza0/azMxqE6GA== X-Received: by 2002:a17:90a:c58f:: with SMTP id l15mr2512164pjt.75.1638313023539; Tue, 30 Nov 2021 14:57:03 -0800 (PST) Received: from keaua.hsd1.ca.comcast.net ([2601:202:4180:a5c0:7839:c9c5:3df1:81ad]) by smtp.gmail.com with ESMTPSA id p16sm23373028pfh.97.2021.11.30.14.57.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 14:57:03 -0800 (PST) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Subject: [hardknott 6/6] sdbus-c++-libsystemd: Avoid hard dependency on rsync Date: Tue, 30 Nov 2021 14:56:55 -0800 Message-Id: <4932616b69b957e3a876541a579b79cb3f83306f.1638312940.git.akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 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 ; Tue, 30 Nov 2021 22:57:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94160 From: Khem Raj Signed-off-by: Khem Raj (cherry picked from commit dcb8ab6169bd93440137bbd4703171987ecd3a15) [Fixup for hardknott context] Signed-off-by: Armin Kuster --- ...d25119a495009ea62f79e5daec34cc464628.patch | 53 +++++++++++++++++++ .../sdbus-c++/sdbus-c++-libsystemd_243.bb | 7 +-- 2 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/7c5fd25119a495009ea62f79e5daec34cc464628.patch diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/7c5fd25119a495009ea62f79e5daec34cc464628.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/7c5fd25119a495009ea62f79e5daec34cc464628.patch new file mode 100644 index 0000000000..ae449791f1 --- /dev/null +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd-243/7c5fd25119a495009ea62f79e5daec34cc464628.patch @@ -0,0 +1,53 @@ +From 7c5fd25119a495009ea62f79e5daec34cc464628 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Mon, 12 Apr 2021 14:03:32 +0200 +Subject: [PATCH] meson: do not fail if rsync is not installed with meson + 0.57.2 + +https://github.com/mesonbuild/meson/issues/8641 + +Our CI started to fail. Even if the change is reverted in meson, +we need a quick workaround here. + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin +--- + man/meson.build | 25 ++++++++++++++----------- + 1 file changed, 14 insertions(+), 11 deletions(-) + +diff --git a/man/meson.build b/man/meson.build +index 3cae8446cda..f9c4b83dc81 100644 +--- a/man/meson.build ++++ b/man/meson.build +@@ -184,17 +184,20 @@ html = custom_target( + depends : html_pages, + command : ['echo']) + +-run_target( +- 'doc-sync', +- depends : man_pages + html_pages, +- command : ['rsync', '-rlv', +- '--delete-excluded', +- '--include=man', +- '--include=*.html', +- '--exclude=*', +- '--omit-dir-times', +- meson.current_build_dir(), +- get_option('www-target')]) ++rsync = find_program('rsync', required : false) ++if rsync.found() ++ run_target( ++ 'doc-sync', ++ depends : man_pages + html_pages, ++ command : [rsync, '-rlv', ++ '--delete-excluded', ++ '--include=man', ++ '--include=*.html', ++ '--exclude=*', ++ '--omit-dir-times', ++ meson.current_build_dir(), ++ get_option('www-target')]) ++endif + + ############################################################ + diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb index c52024130e..59d6f352c8 100644 --- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb @@ -12,9 +12,10 @@ DEPENDS += "gperf-native gettext-native util-linux libcap" SRCREV = "efb536d0cbe2e58f80e501d19999928c75e08f6a" SRCBRANCH = "v243-stable" -SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH}" - -SRC_URI += "file://static-libsystemd-pkgconfig.patch" +SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH} \ + file://static-libsystemd-pkgconfig.patch \ + file://7c5fd25119a495009ea62f79e5daec34cc464628.patch \ + " # patches needed by musl SRC_URI_append_libc-musl = " ${SRC_URI_MUSL}"