From patchwork Wed Aug 24 06:34:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 11817 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 DA00DC00140 for ; Wed, 24 Aug 2022 06:34:50 +0000 (UTC) Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by mx.groups.io with SMTP id smtpd.web08.7999.1661322886659056700 for ; Tue, 23 Aug 2022 23:34:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=GRNytPm9; spf=pass (domain: gmail.com, ip: 209.85.215.176, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f176.google.com with SMTP id r22so14204524pgm.5 for ; Tue, 23 Aug 2022 23:34:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc; bh=oOlAMStPYIVVRqbKULYeqyW2dnAXWeQjex9qY0kpq5g=; b=GRNytPm9DGphf5XeT4JthyoDhzTu6NvC1bD3VUpbkQuVTG9s7W3Zd52pMT1IbiVmxT IeAhBsjLF40ZKjdG6PNjqJSiSB2339PI9gpKibM8cfTgv8S+8XGOngc1TfkGTK5PezAu FfGo1dwu2I9vJtwfI+CoAtrVT0Fg9FSyS89vJ8tnQI2PbAmq6NCCLr+vNkNDppuCFj+8 JatM0q2aIWN295bQp5TIPZIwxCGPNx2vQlPwOUqbuH/6Gb5TeW1t28gqvIxQwd1VF3Q+ Fw1EBwcrcxLdHnjj5vVa5kE/64PHMr2a/tcxiPkaAcsewUBcPVq6UDSEnZuCB6Lt8TDm kYFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc; bh=oOlAMStPYIVVRqbKULYeqyW2dnAXWeQjex9qY0kpq5g=; b=P7LZWQrtN3qAN51rRY9YI16UCZArIQQoCdZkIzbVTca0chlbUBjD8FPQMQpeSONJ/q G8l4pe6jNMGEtRHbI0XWaCyIszOnHLoALy00It1RGxQqmmVcqW6gMP0P6rRpdJ9rUPvx FTCBv5bc8S8DJmDwI75jv0fIUFbdVg8AlZ1Wl52TumUsSpNQsOXlbQohDJpSuMIWPVdp 8a/Xasvd2nxKAM2ymy5oZ2NrEIsF9GkOf+wxMqgL9LB51PzJHqDnadBz+7ANgXyJ18PJ 4Q41GQ65JtY/bWESN8/k59ujFo6uGf6ZxNYAPlvlJG7LwqWPDZ6uta1p6mYzOr3ArCFf C55A== X-Gm-Message-State: ACgBeo3go7wHAiLoKxm+YsuZmI1rve3c04YX4PF9TCKXCX6x5yhBJP3D Xz7+EOnRsOGRzevKQL7ssWBt70I8U+NY9w== X-Google-Smtp-Source: AA6agR6y5rmpLR9KmG5R5/bCcM4YY71TpLWnZFMHddKGndXwQ6YlIN7d7kKooS/W/TIweCyT+nmaZw== X-Received: by 2002:a05:6a00:1507:b0:536:fb3e:7e75 with SMTP id q7-20020a056a00150700b00536fb3e7e75mr6120742pfu.44.1661322885726; Tue, 23 Aug 2022 23:34:45 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::6b6a]) by smtp.gmail.com with ESMTPSA id s24-20020a639258000000b0042a3d9a1275sm8384957pgn.16.2022.08.23.23.34.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Aug 2022 23:34:45 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj Subject: [PATCH 1/7] xinetd: Pass missing -D_GNU_SOURCE Date: Tue, 23 Aug 2022 23:34:37 -0700 Message-Id: <20220824063443.1774094-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.2 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 ; Wed, 24 Aug 2022 06:34:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169775 We do not get proper function definitions otherwise e.g. fcvt() Signed-off-by: Khem Raj --- meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb b/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb index 62ee70d244..897417314d 100644 --- a/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb +++ b/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb @@ -30,6 +30,8 @@ INITSCRIPT_PARAMS = "defaults" PACKAGECONFIG ??= "tcp-wrappers" PACKAGECONFIG[tcp-wrappers] = "--with-libwrap,,tcp-wrappers" +CFLAGS += "-D_GNU_SOURCE" + CONFFILES:${PN} = "${sysconfdir}/xinetd.conf" do_install:append() { From patchwork Wed Aug 24 06:34:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 11818 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 E8144C38145 for ; Wed, 24 Aug 2022 06:34:50 +0000 (UTC) Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by mx.groups.io with SMTP id smtpd.web09.8102.1661322887453628816 for ; Tue, 23 Aug 2022 23:34:47 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=muY7hMMt; spf=pass (domain: gmail.com, ip: 209.85.215.182, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f182.google.com with SMTP id s206so14211430pgs.3 for ; Tue, 23 Aug 2022 23:34:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=3/nwFDNTNYbe/TO67FbW9O5jssExbog+/GBYceNt/qA=; b=muY7hMMtmcZnytCz2OxyA9QG9YkG95uypFXX01na+cEItwIBBWkdNIL1tWJ5mqN+tA u36C4/avadpKioT1pQP+SqrCEiNjt/8njshH+W/SPSTt47C/6V6qmreXVLyrbrLmn5cp 2Dn/JRPY7cl3yL56JZRnO4rCJpj69NUUke73JDy88rjOb2YMcVwUncjQL+PoPoHX/ytQ PggGI/BLQSlGfLAgoZJWOCTi0gNR2jseW4IbITCQ8oq9EifVidPATmjKCgphtqu6mouE Ld4c6ns1jEImCeJ5T5EI4hNyn1IiIUoySz44+8Z/JGxsnenaP4ziA1cexRL0hIXrLP9d cWwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=3/nwFDNTNYbe/TO67FbW9O5jssExbog+/GBYceNt/qA=; b=Ciu6qyMZ93S2xnyX3NzNGGEXmWDKpBM9zGNfEeWIu2f0/kn+Kr/8LFBorchofsE/bY fGlzi7ds9mFmT2y5pmik4zHo081apdxn123+/pUT0hYGF6UIbp1Bt922P523Fid/fgrw T1sqQTTeTSYQJKukyv++e3PUqEHo8rFIYXReztPAIEp6Qatz6uWYRzMNwIG+MmJFlB/q HBecaXdWvHpPbsHxejsWu7MEl62gGyzJyESJQzcbztnh8mJoytafRyLw6nSGW0xF9a5x ZKGTwrDJyAcK7z4iiVDzjiIM22vvHo5G7fRK1Kdmfvy4CU85K3Hzp20iljNnbxGD3t0S LBBg== X-Gm-Message-State: ACgBeo3ovEMhbmlXubVSvL930cwI1/IOoIzC+cphWppW+R4WlYd4+6bT Yu0ywMetsthYvMOgdo/ldofJaNcsRxLRng== X-Google-Smtp-Source: AA6agR4owwI1lWk3sReTHLbtQaVObEU3oHFyD4SD0uKhlPnoXNLR2oSFTA52uNTXL2mF+P/92uDAdg== X-Received: by 2002:a63:f49:0:b0:42a:fdfa:ed5d with SMTP id 9-20020a630f49000000b0042afdfaed5dmr3967666pgp.297.1661322886572; Tue, 23 Aug 2022 23:34:46 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::6b6a]) by smtp.gmail.com with ESMTPSA id s24-20020a639258000000b0042a3d9a1275sm8384957pgn.16.2022.08.23.23.34.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Aug 2022 23:34:46 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj Subject: [PATCH 2/7] watchdog: Include needed system header for function decls Date: Tue, 23 Aug 2022 23:34:38 -0700 Message-Id: <20220824063443.1774094-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220824063443.1774094-1-raj.khem@gmail.com> References: <20220824063443.1774094-1-raj.khem@gmail.com> 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 ; Wed, 24 Aug 2022 06:34:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169776 These headers are needed on musl too. Signed-off-by: Khem Raj --- ...guard-sys-quota.h-sys-swap.h-and-sys.patch | 37 +++++++++++++++++++ .../watchdog/watchdog_5.16.bb | 1 + 2 files changed, 38 insertions(+) create mode 100644 meta/recipes-extended/watchdog/watchdog/0001-shutdown-Do-not-guard-sys-quota.h-sys-swap.h-and-sys.patch diff --git a/meta/recipes-extended/watchdog/watchdog/0001-shutdown-Do-not-guard-sys-quota.h-sys-swap.h-and-sys.patch b/meta/recipes-extended/watchdog/watchdog/0001-shutdown-Do-not-guard-sys-quota.h-sys-swap.h-and-sys.patch new file mode 100644 index 0000000000..8c419e1d11 --- /dev/null +++ b/meta/recipes-extended/watchdog/watchdog/0001-shutdown-Do-not-guard-sys-quota.h-sys-swap.h-and-sys.patch @@ -0,0 +1,37 @@ +From ca1d379fa13c4055d42d2ff3a647b4397768efcd Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 23 Aug 2022 19:23:26 -0700 +Subject: [PATCH] shutdown: Do not guard sys/quota.h sys/swap.h and + sys/reboot.h with __GLIBC__ + +These headers are provided by uclibc/musl/glibc and bionic so we can +assume they are not needed to be glibc specific includes. This also +ensures that we get proper declaration of reboot() API + +Upstream-Status: Submitted [https://sourceforge.net/p/watchdog/patches/12/] +Signed-off-by: Khem Raj +--- + src/shutdown.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/src/shutdown.c b/src/shutdown.c +index 1d9a857..6aea0d0 100644 +--- a/src/shutdown.c ++++ b/src/shutdown.c +@@ -29,13 +29,9 @@ + #include "extern.h" + #include "ext2_mnt.h" + +-#if defined __GLIBC__ + #include + #include + #include +-#else /* __GLIBC__ */ +-#include +-#endif /* __GLIBC__ */ + + #include + +-- +2.37.2 + diff --git a/meta/recipes-extended/watchdog/watchdog_5.16.bb b/meta/recipes-extended/watchdog/watchdog_5.16.bb index 1163846ed8..26fcc10487 100644 --- a/meta/recipes-extended/watchdog/watchdog_5.16.bb +++ b/meta/recipes-extended/watchdog/watchdog_5.16.bb @@ -13,6 +13,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/watchdog/watchdog-${PV}.tar.gz \ file://watchdog.init \ file://wd_keepalive.init \ file://0001-wd_keepalive.service-use-run-instead-of-var-run.patch \ + file://0001-shutdown-Do-not-guard-sys-quota.h-sys-swap.h-and-sys.patch \ " SRC_URI[md5sum] = "1b4f51cabc64d1bee2fce7cdd626831f" From patchwork Wed Aug 24 06:34:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 11820 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 E7998C32793 for ; Wed, 24 Aug 2022 06:34:50 +0000 (UTC) Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by mx.groups.io with SMTP id smtpd.web08.8000.1661322888464519731 for ; Tue, 23 Aug 2022 23:34:48 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=ZEvqkYkH; spf=pass (domain: gmail.com, ip: 209.85.210.176, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f176.google.com with SMTP id f17so9439906pfk.11 for ; Tue, 23 Aug 2022 23:34:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=v0eUe7lXvl1mIXs8/GPY8/f3P2kflu24/qTht67js0k=; b=ZEvqkYkHBW0nw74LMiOyy6l6Wvj0B3jaTQ+Cyb+p1upphoGXldfc+egkymxkrYr+gW ySrqTg1NTQ/yZ4nMoveRATgaBVuzWE1/EotvVNJ0aPPm+hQpUahtbJOvkYEMZcRFtccN xRQIRZnkA7rLhV5lVJcIuBwJECuupiyT6Z4JCbCg5hwKJu+uMrKJu1DSSrI+QizRJnH7 tqxjCBJeTvlxz8NXVGNQo3pFAcwYAOvv3iW3AtW44FSSonNz/qGlahFKjWtSVrjOO4TP PKmrjfkzaX6gRpvz0vAme0Chdhl4U1vUXTT+vy5ZtptAkPvE4omn4+L9Px/7uey2cLCi 986A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=v0eUe7lXvl1mIXs8/GPY8/f3P2kflu24/qTht67js0k=; b=RXLCSMB6l5+lzsCwH8nlNCuVx0xNvU0mYC4ZufQEw1MWlh+ORchXGhiQsB9HU8Rq6l wabhdT8//9Y/Mco0dtf6C86S/truRjzqi/mBiJSSKt5qXqIok/OV4r1kVGWGn3qdb8k2 eafRDFKRCr4wpv9jTqOyVNGPxcncA/4CQ0n6oTetxGYKB/RrGPK92SOdhx99vH90uZlV HTz0pXko3FuDcnEOdWPZuIaTeTs5qcMVQBgjCXWQSBGHa5BvOtEJhdUdC3/vkC8klwnp JrloCW582EOAqnJU1gDq7lgxIKWtqFvJxkFf/TMqjB3184kQ/WZ3p7QW/lXa1P3uPT92 00xw== X-Gm-Message-State: ACgBeo0j8IcZ/k0ttsj6C+aG8XYLCiQQ7P3xHCGxi1HhnaME05DVCYjA dl6+SxQvuYcy3JvR5yyQq7Oykrua4OFGYw== X-Google-Smtp-Source: AA6agR6dRk69282PBbqs0dm2DKVltm/bCkVs9woB794hCqbG30MegaFe+2XCjq2HkqrakDNL8YxeOQ== X-Received: by 2002:a65:6e46:0:b0:42a:2c7e:4232 with SMTP id be6-20020a656e46000000b0042a2c7e4232mr21249627pgb.611.1661322887536; Tue, 23 Aug 2022 23:34:47 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::6b6a]) by smtp.gmail.com with ESMTPSA id s24-20020a639258000000b0042a3d9a1275sm8384957pgn.16.2022.08.23.23.34.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Aug 2022 23:34:47 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj Subject: [PATCH 3/7] libcgroup: Use GNU strerror_r only when its available Date: Tue, 23 Aug 2022 23:34:39 -0700 Message-Id: <20220824063443.1774094-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220824063443.1774094-1-raj.khem@gmail.com> References: <20220824063443.1774094-1-raj.khem@gmail.com> 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 ; Wed, 24 Aug 2022 06:34:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169777 This patch ensures that a fallback to use XSI compliant strerror_r when GNU extention is not implemented, which fixes the case when building with musl Signed-off-by: Khem Raj --- ...pi-Use-GNU-strerror_r-when-available.patch | 55 +++++++++++++++++++ .../recipes-core/libcgroup/libcgroup_3.0.0.bb | 4 +- 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/libcgroup/libcgroup/0001-api-Use-GNU-strerror_r-when-available.patch diff --git a/meta/recipes-core/libcgroup/libcgroup/0001-api-Use-GNU-strerror_r-when-available.patch b/meta/recipes-core/libcgroup/libcgroup/0001-api-Use-GNU-strerror_r-when-available.patch new file mode 100644 index 0000000000..96321d2970 --- /dev/null +++ b/meta/recipes-core/libcgroup/libcgroup/0001-api-Use-GNU-strerror_r-when-available.patch @@ -0,0 +1,55 @@ +From d190c0c548b3219b75e4c399aa89186e77bbe270 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 23 Aug 2022 20:03:09 -0700 +Subject: [PATCH] api: Use GNU strerror_r when available + +GNU strerror_r is only available in glibc, musl impelents the XSI +version which is slightly different, therefore check if GNU version is +available before using it, otherwise use the XSI compliant version. + +Upstream-Status: Submitted [https://github.com/libcgroup/libcgroup/pull/236] +Signed-off-by: Khem Raj +--- + configure.ac | 5 +++++ + src/api.c | 8 ++++++-- + 2 files changed, 11 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index b68c655..831866d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -183,6 +183,11 @@ AC_FUNC_REALLOC + AC_FUNC_STAT + AC_CHECK_FUNCS([getmntent hasmntopt memset mkdir rmdir strdup]) + ++orig_CFLAGS="$CFLAGS" ++CFLAGS="$CFLAGS -D_GNU_SOURCE" ++AC_FUNC_STRERROR_R ++CFLAGS="$orig_CFLAGS" ++ + AC_SEARCH_LIBS( + [fts_open], + [fts], +diff --git a/src/api.c b/src/api.c +index 5c6de11..06aa1d6 100644 +--- a/src/api.c ++++ b/src/api.c +@@ -4571,9 +4571,13 @@ const char *cgroup_strerror(int code) + { + int idx = code % ECGROUPNOTCOMPILED; + +- if (code == ECGOTHER) ++ if (code == ECGOTHER) { ++#ifdef STRERROR_R_CHAR_P + return strerror_r(cgroup_get_last_errno(), errtext, MAXLEN); +- ++#else ++ return strerror_r(cgroup_get_last_errno(), errtext, sizeof (errtext)) ? "unknown error" : errtext; ++#endif ++ } + if (idx >= sizeof(cgroup_strerror_codes)/sizeof(cgroup_strerror_codes[0])) + return "Invalid error code"; + +-- +2.37.2 + diff --git a/meta/recipes-core/libcgroup/libcgroup_3.0.0.bb b/meta/recipes-core/libcgroup/libcgroup_3.0.0.bb index efd887844d..f3e841246f 100644 --- a/meta/recipes-core/libcgroup/libcgroup_3.0.0.bb +++ b/meta/recipes-core/libcgroup/libcgroup_3.0.0.bb @@ -11,7 +11,9 @@ inherit autotools pkgconfig DEPENDS = "bison-native flex-native" -SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v3.0/${BP}.tar.gz" +SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v3.0/${BP}.tar.gz \ + file://0001-api-Use-GNU-strerror_r-when-available.patch \ +" SRC_URI[sha256sum] = "8d284d896fca1c981b55850e92acd3ad9648a69227c028dda7ae3402af878edd" UPSTREAM_CHECK_URI = "https://github.com/libcgroup/libcgroup/releases/" From patchwork Wed Aug 24 06:34:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 11816 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 DAC44C3F6B0 for ; Wed, 24 Aug 2022 06:34:50 +0000 (UTC) Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by mx.groups.io with SMTP id smtpd.web09.8103.1661322889414247703 for ; Tue, 23 Aug 2022 23:34:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=REkwhlLK; spf=pass (domain: gmail.com, ip: 209.85.215.180, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f180.google.com with SMTP id f4so12360995pgc.12 for ; Tue, 23 Aug 2022 23:34:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=LkznSWhRXPe+OCc2AUBGuI2SYD2GhtmfV2D7Q5ZKvjM=; b=REkwhlLK/+K/u16e/fbWuuLYwmpVKgEepI1i5RcQXuLNTA4Mdu7Az0FjpI5QalQA3g vL868gjlxDG/nOxxOw9qpVOBclGGqpS59wTQFQ4gF3cWwU2nE/KIvTK4P5+n0ztE1cxE j1jDXMHnqhqOScmmDoPDsVYF7fPZDt7+yolZvSNfwJaqTkRrabSCy+RFn6CPvGpxJKyE djdT8RJu3j04iYvE+pepS9YCJljWEM6GIZELHuisLlETL8qLfPCR3S/2J8FBEM55JyHI VnunUPVPpiMu3PRHKNwGERJdFB3GK+S57ThW2cqKUM1autbX+QGPH93iMYUmLtquNttL CzNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=LkznSWhRXPe+OCc2AUBGuI2SYD2GhtmfV2D7Q5ZKvjM=; b=NK1UcxIDFD1/+4CV1YU0YbTyoBp1BGaFNm0zreuNnVs6TWhR7NOMaoAfnn8a63Rolo juxAyRZD6Bhse6BTLbuQlWknLrytAMNhkL2jS7EsYjsMahpI8Iug+C58XaDJeuAakgZp f+xaiOx82BxDuVI0SvqBWvBQFabj4XAMnSmRcJHfoW7L4GaXnVDLOOUASnHgf8nOy2il LT6Atcnik9/NVx6TNRWY7uI+iM4mia7DIhSP+2T3BXrMmsP4e1ZxQuqnC6ZhjeC5MKTu a8ja1mq8/dR4OqWSZwpgJSRqL5R6/b3DBMrFL+TjSMIzq0zMxvBIVqLxl2ADl8q+55LU LxoQ== X-Gm-Message-State: ACgBeo2rCM5kfK6tKSIZ23odS2O/v9PyTfxB6Rniozs86E2fHvdz6TQG +gS8XmQUeI0yTXxQ8OUH5IQ44MPx+oSImA== X-Google-Smtp-Source: AA6agR7n0/D3UN0BoeL2HapaLzAEUHc3ZKDZSw6GGPXwVqB1J0zh/dJIkQbgJOZQtZTdWG5VmUNV9A== X-Received: by 2002:a63:6942:0:b0:41c:9261:54fd with SMTP id e63-20020a636942000000b0041c926154fdmr23606551pgc.34.1661322888516; Tue, 23 Aug 2022 23:34:48 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::6b6a]) by smtp.gmail.com with ESMTPSA id s24-20020a639258000000b0042a3d9a1275sm8384957pgn.16.2022.08.23.23.34.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Aug 2022 23:34:48 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj Subject: [PATCH 4/7] enable _XOPEN_SOURCE on musl for wchar usage in curses Date: Tue, 23 Aug 2022 23:34:40 -0700 Message-Id: <20220824063443.1774094-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220824063443.1774094-1-raj.khem@gmail.com> References: <20220824063443.1774094-1-raj.khem@gmail.com> 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 ; Wed, 24 Aug 2022 06:34:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169778 This is defined for glibc automatically with _GNU_SOURCE but not for musl Signed-off-by: Khem Raj --- meta/recipes-support/pinentry/pinentry_1.2.0.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-support/pinentry/pinentry_1.2.0.bb b/meta/recipes-support/pinentry/pinentry_1.2.0.bb index 169cac8965..e6cc71a547 100644 --- a/meta/recipes-support/pinentry/pinentry_1.2.0.bb +++ b/meta/recipes-support/pinentry/pinentry_1.2.0.bb @@ -32,5 +32,8 @@ PACKAGECONFIG[secret] = "--enable-libsecret, --disable-libsecret, libsecret" EXTRA_OECONF = " \ --disable-rpath \ " +EXTRA_OECONF:append:libc-musl = " \ + ac_cv_should_define__xopen_source=yes \ +" BBCLASSEXTEND = "native nativesdk" From patchwork Wed Aug 24 06:34:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 11819 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 DBFE5C48BE4 for ; Wed, 24 Aug 2022 06:34:50 +0000 (UTC) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mx.groups.io with SMTP id smtpd.web11.8066.1661322890239191409 for ; Tue, 23 Aug 2022 23:34:50 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=isHrqvPo; spf=pass (domain: gmail.com, ip: 209.85.216.50, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f50.google.com with SMTP id x14-20020a17090a8a8e00b001fb61a71d99so596760pjn.2 for ; Tue, 23 Aug 2022 23:34:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=m0m4BoNGCgEl/I9DQ3OpR8zfsrjfaqg6G6rlcBFEUjg=; b=isHrqvPoEQgkm5GpdlfTYM9srfhWbeUVsoH01NbHv9BGZCjEWomy9JzNdpC2WwDB0U p50axF22qVN4fWclsJe6IlYEJuew+sO1vbcMmRyURYnGSQjCFVZ0JoTxkdm01aQBBG6L gFQ2IQ8sLjWA7+eWSgyGIMloVVgudTiZfo2CvL4UZKxh93fWPWHa8WPGj8d//Z/lOWDP NFgAUPJmRPtrR1MfdoE/ucz2pbSwnbhNb0EUbocewpsSAO95BGC/bq2lQJ8sPT3ULqM4 SKaNjuUnLJKJn6n3aFsFJYVKgs0VR0nkqnnmwhHFVRD0oOdzYoUr/hcJlq/+cKw9rUxD pUCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=m0m4BoNGCgEl/I9DQ3OpR8zfsrjfaqg6G6rlcBFEUjg=; b=TdWs5KIld/S8Ch/zpELxZJGM2V727jUOMgHGrC0GCZETCsxnB4Ui6iSLW/n+wwtN5T z/5wzZ7LPmgKeEtxBvjLuhxgW6kLnaZBAxu0IlUo+MZpKbALerd1HSOLI+CzL1KHCCkN bitSViWaatz0l2uvhbmTQtDfcjqfL3IdjkPKN0vOxsWfsExVGMx8iVuGcMfKYfBQ88cV oXi80OpkEJ17+w8OsdXjPBzLFybh4IVgsIXUTewtiJbTyY7z49uy/SHTJfnHCkAZKyrT b9QvUo/OSGyT0b9WwMcSksliG/Lx9X8815dpBBQHV95sZBHP5Pzljt94nX7lnOLmUjlJ q5tQ== X-Gm-Message-State: ACgBeo2Ncq7i5xjrSqVmXeqWXReO7J280G3MqwLHbdJyUpd0CrFz1p6B uplen2HSz0eqL6wy6LICLRbLgheUnAx+7A== X-Google-Smtp-Source: AA6agR4uoQxKero4/KMj0N4yus/waaOPiXGJEVbFuTXW8CszUvebxiEialvgMGgZ1GqRxRU0iXX+cA== X-Received: by 2002:a17:902:a60f:b0:172:e476:fde with SMTP id u15-20020a170902a60f00b00172e4760fdemr13712346plq.104.1661322889334; Tue, 23 Aug 2022 23:34:49 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::6b6a]) by smtp.gmail.com with ESMTPSA id s24-20020a639258000000b0042a3d9a1275sm8384957pgn.16.2022.08.23.23.34.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Aug 2022 23:34:48 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj Subject: [PATCH 5/7] apr: Use correct strerror_r implementation based on libc type Date: Tue, 23 Aug 2022 23:34:41 -0700 Message-Id: <20220824063443.1774094-5-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220824063443.1774094-1-raj.khem@gmail.com> References: <20220824063443.1774094-1-raj.khem@gmail.com> 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 ; Wed, 24 Aug 2022 06:34:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169779 musl does not implement GNU extention of strerror_r but XSI compliant version, therefore add it via a packageconfig to set right variables during configure to cache the value. configure detection logic depends on runtime test which will always be wrong on cross compiles therefore backport a patch to make it possible to cache the needed configure variable. Signed-off-by: Khem Raj --- ...CHE_CHECK-for-strerror_r-return-type.patch | 52 +++++++++++++++++++ meta/recipes-support/apr/apr_1.7.0.bb | 4 ++ 2 files changed, 56 insertions(+) create mode 100644 meta/recipes-support/apr/apr/0001-add-AC_CACHE_CHECK-for-strerror_r-return-type.patch diff --git a/meta/recipes-support/apr/apr/0001-add-AC_CACHE_CHECK-for-strerror_r-return-type.patch b/meta/recipes-support/apr/apr/0001-add-AC_CACHE_CHECK-for-strerror_r-return-type.patch new file mode 100644 index 0000000000..d0a9bd9129 --- /dev/null +++ b/meta/recipes-support/apr/apr/0001-add-AC_CACHE_CHECK-for-strerror_r-return-type.patch @@ -0,0 +1,52 @@ +From 8ca3c3306f1a149e51a3be6a4b1e47e9aee88262 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 23 Aug 2022 22:42:03 -0700 +Subject: [PATCH] add AC_CACHE_CHECK for strerror_r return type + +APR's configure script uses AC_TRY_RUN to detect whether the return type +of strerror_r is int. When cross-compiling this defaults to no. + +This commit adds an AC_CACHE_CHECK so users who cross-compile APR may +influence the outcome with a configure variable. + +Upstream-Status: Backport [https://svn.apache.org/viewvc?view=revision&revision=1875065] +Signed-off-by: Khem Raj +--- + build/apr_common.m4 | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) + +diff --git a/build/apr_common.m4 b/build/apr_common.m4 +index cbf2a4c..42e75cf 100644 +--- a/build/apr_common.m4 ++++ b/build/apr_common.m4 +@@ -525,8 +525,9 @@ dnl string. + dnl + dnl + AC_DEFUN([APR_CHECK_STRERROR_R_RC], [ +-AC_MSG_CHECKING(for type of return code from strerror_r) +-AC_TRY_RUN([ ++AC_CACHE_CHECK([whether return code from strerror_r has type int], ++[ac_cv_strerror_r_rc_int], ++[AC_TRY_RUN([ + #include + #include + #include +@@ -542,14 +543,10 @@ main() + }], [ + ac_cv_strerror_r_rc_int=yes ], [ + ac_cv_strerror_r_rc_int=no ], [ +- ac_cv_strerror_r_rc_int=no ] ) ++ ac_cv_strerror_r_rc_int=no ] ) ] ) + if test "x$ac_cv_strerror_r_rc_int" = xyes; then + AC_DEFINE(STRERROR_R_RC_INT, 1, [Define if strerror returns int]) +- msg="int" +-else +- msg="pointer" + fi +-AC_MSG_RESULT([$msg]) + ] ) + + dnl +-- +2.37.2 + diff --git a/meta/recipes-support/apr/apr_1.7.0.bb b/meta/recipes-support/apr/apr_1.7.0.bb index 9c826d4380..07bf61545e 100644 --- a/meta/recipes-support/apr/apr_1.7.0.bb +++ b/meta/recipes-support/apr/apr_1.7.0.bb @@ -24,6 +24,7 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ file://libtoolize_check.patch \ file://0001-Add-option-to-disable-timed-dependant-tests.patch \ file://autoconf270.patch \ + file://0001-add-AC_CACHE_CHECK-for-strerror_r-return-type.patch \ file://CVE-2021-35940.patch \ " @@ -44,9 +45,12 @@ CACHED_CONFIGUREVARS += "ac_cv_header_netinet_sctp_h=no ac_cv_header_netinet_sct CACHED_CONFIGUREVARS += "ac_cv_sizeof_struct_iovec=yes" CACHED_CONFIGUREVARS += "ac_cv_file__dev_zero=yes" +CACHED_CONFIGUREVARS:append:libc-musl = " ac_cv_strerror_r_rc_int=yes" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" +PACKAGECONFIG:append:libc-musl = " xsi-strerror" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," PACKAGECONFIG[timed-tests] = "--enable-timed-tests,--disable-timed-tests," +PACKAGECONFIG[xsi-strerror] = "ac_cv_strerror_r_rc_int=yes,ac_cv_strerror_r_rc_int=no," do_configure:prepend() { # Avoid absolute paths for grep since it causes failures From patchwork Wed Aug 24 06:34:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 11821 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 B7417C00140 for ; Wed, 24 Aug 2022 06:35:00 +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.web10.8022.1661322891188698988 for ; Tue, 23 Aug 2022 23:34:51 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=pK7WN6rQ; spf=pass (domain: gmail.com, ip: 209.85.215.175, mailfrom: raj.khem@gmail.com) Received: by mail-pg1-f175.google.com with SMTP id w13so9121363pgq.7 for ; Tue, 23 Aug 2022 23:34:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=ZssukcpYhmA5+w/Pfdf7IqK9yP1BzO1s3i+w0bdaJAE=; b=pK7WN6rQghYQ/uheLG4rQRlI5B1oC9z8IM+xud8XLZDRc0woT4Oe+eV6pQttJa6m8F YouwhxrArgaERrSbANU1+NUeoD6ozph7lC5jh5cn0b96XAbX22XmM3edpjfaWEy/ftrb UKKzjQUIEIXYILgRB6L3FAFgB/tbKRF0SqHy0vP4pWke88JzMvdmwDTO9YQy2GWWRdbS V39olazDC8zfI4KB5Bwci5cBbon2KG55IcOF7RGr39dxeUTiBEe7j55sz5zecjngapge EoUubLmZaMsubFxBfM/Rrga2qyQZv3us0twbcDf9ho6gRskzhiyemxB1HPuIwYjPlCBi +MZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=ZssukcpYhmA5+w/Pfdf7IqK9yP1BzO1s3i+w0bdaJAE=; b=QHeJo2tVtgcGNcvkuebctSzsU3Ru5B0Ivscot3J/VzzhFjm3ja8jjCtM27XjREfIlC FWqDoObvgryjxv9Km3dwDDEdQeZ/yRJodSke8PcSF4womlY+XF63LiLESBCsgV8sptGb YruJ1PLdudjxysTpquMT+dhF9Cd53MNvOZ2KCpFlKAK5EIg6WpWF1FZVYgKB0jWop+2Z HBU/x7Js9mx+7Pb2wnw4l+zG7HEQ/amNjpQkBr84WktQdkR6zeFL+2nA31QGSlkFCkSc 4VwFN6ZBtOrzqaw4DX8q3FnI9Tm99pk0wl1KMorXFnFDH4tuT6QKuYuoTPL4+yU//P/z EBzQ== X-Gm-Message-State: ACgBeo1x/iVzvBGcwORNmGDTWe2cWzZLxoYn57UVxSmb+ufchB7CAh4s +VJvS7KYq41U9mbfDSdwiMVRkFsgpv67yQ== X-Google-Smtp-Source: AA6agR7elB/y43r7fV+qu3Arwg97vUEkxztbqKMUhZiplTqfB0ax0zl49UGx2Jo+a3X/KARoiKASnw== X-Received: by 2002:a63:cf44:0:b0:42a:277:1cb8 with SMTP id b4-20020a63cf44000000b0042a02771cb8mr23139684pgj.198.1661322890297; Tue, 23 Aug 2022 23:34:50 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::6b6a]) by smtp.gmail.com with ESMTPSA id s24-20020a639258000000b0042a3d9a1275sm8384957pgn.16.2022.08.23.23.34.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Aug 2022 23:34:49 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj Subject: [PATCH 6/7] gcr: Define _GNU_SOURCE Date: Tue, 23 Aug 2022 23:34:42 -0700 Message-Id: <20220824063443.1774094-6-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220824063443.1774094-1-raj.khem@gmail.com> References: <20220824063443.1774094-1-raj.khem@gmail.com> 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 ; Wed, 24 Aug 2022 06:35:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169780 This ensures that definitions of functions e.g. getpass() are correctly sourced from system headers, since it depends on feature test macros Signed-off-by: Khem Raj --- meta/recipes-gnome/gcr/gcr_3.40.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-gnome/gcr/gcr_3.40.0.bb b/meta/recipes-gnome/gcr/gcr_3.40.0.bb index 0c2af42f06..917be5938b 100644 --- a/meta/recipes-gnome/gcr/gcr_3.40.0.bb +++ b/meta/recipes-gnome/gcr/gcr_3.40.0.bb @@ -13,6 +13,8 @@ DEPENDS = "p11-kit glib-2.0 libgcrypt gnupg-native \ CACHED_CONFIGUREVARS += "ac_cv_path_GPG='gpg2'" +CFLAGS += "-D_GNU_SOURCE" + GNOMEBASEBUILDCLASS = "meson" GTKDOC_MESON_OPTION = "gtk_doc" inherit gnomebase gtk-icon-cache gtk-doc features_check upstream-version-is-even vala gobject-introspection gettext mime mime-xdg From patchwork Wed Aug 24 06:34:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 11822 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 CCB66C32793 for ; Wed, 24 Aug 2022 06:35:00 +0000 (UTC) Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by mx.groups.io with SMTP id smtpd.web10.8023.1661322891973119247 for ; Tue, 23 Aug 2022 23:34:52 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=BVRfg3KT; spf=pass (domain: gmail.com, ip: 209.85.216.46, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f46.google.com with SMTP id m15so8071990pjj.3 for ; Tue, 23 Aug 2022 23:34:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=vy2thfHtHcGoF6hr3KuubRsFhhw6adCmAm/PtEJGlR0=; b=BVRfg3KTpJgEEVBnf1wuV0Npijk8/hjLOy/dfY/jWzjUctaZYTfvT4b2e9ZqQydHtc vl7WgGR8koEHKA5O07FWYk4BZZ+AXx0ahRNe2gIF78t9A+E0ZiVZWGYg1IO559BP/FTy dLfdimHC30qEhV0HggC/EwktSpI3TDa3nTD8ooU3pTwVEgK3rIzsaJIBzJXW4c1jReaY GsZx/aqruxO+MKdJ/P45NnP0vQSYhZVVrCIPStIBX8LIeAUer1hvLQv7Mcs5ExVmbdfN IEn2kAo4OCFPAZF+DNfSnDdlzN74Sqci2hbgZ6g+wn+CmKvoq25p3ikt5nsN3SsDSfQb IZSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=vy2thfHtHcGoF6hr3KuubRsFhhw6adCmAm/PtEJGlR0=; b=YHV5Rju2yG8oDJXrDTJAY9xzL6QUIB1HI/UN91aVCGNAdDIOmDfxbsszZMu9Zb1bJl 65avjIPkeMovsxuMCSZWo2+EO5I2ZYH0AjbJO8lNJ06vPzR95RkeGMnefkEu4TGeJMQ9 MOjiHZDNmJohvKeo/yvf1Oz5eoFBDcl+XbZrOS2CUzi84IUJXUjPSTa76GelsURQU9Yb B7EBco4046Lg1f+z6k15sRBa3Fe6D0CLe7Ov9/LaTcR1zGczWFc0IJhXnLB52HTFCww1 zRkduNZXFo5jzxxaBSmDz9/rzj9GwMCw0HukVbMBIPucluW94TywkoL/cDDGf0U0Jmk9 P1rw== X-Gm-Message-State: ACgBeo1JU6T5uI3xba9IL9BdAdNbX3Et4/f2ibCGnIb0SCpa5O15q47C SPqmcihyLUemioACmTcDo5uRBFrVjAJhCw== X-Google-Smtp-Source: AA6agR7at3Gcf+i9LqR0ogx9GfxCxxlbcWI+/G6LmFdEj+mRZ/CsJeMO5loJdAH0Li8sr25J+eoHWw== X-Received: by 2002:a17:902:e848:b0:172:dda3:780f with SMTP id t8-20020a170902e84800b00172dda3780fmr15718159plg.66.1661322891159; Tue, 23 Aug 2022 23:34:51 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::6b6a]) by smtp.gmail.com with ESMTPSA id s24-20020a639258000000b0042a3d9a1275sm8384957pgn.16.2022.08.23.23.34.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Aug 2022 23:34:50 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Khem Raj Subject: [PATCH 7/7] ltp: Adjust types to match create_fifo_thread return Date: Tue, 23 Aug 2022 23:34:43 -0700 Message-Id: <20220824063443.1774094-7-raj.khem@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220824063443.1774094-1-raj.khem@gmail.com> References: <20220824063443.1774094-1-raj.khem@gmail.com> 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 ; Wed, 24 Aug 2022 06:35:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169781 Fixes build on musl Signed-off-by: Khem Raj --- ...nt-instead-of-pthread_t-for-thread-I.patch | 36 +++++++++++++++++++ meta/recipes-extended/ltp/ltp_20220527.bb | 1 + 2 files changed, 37 insertions(+) create mode 100644 meta/recipes-extended/ltp/ltp/0001-rt-migrate-Use-int-instead-of-pthread_t-for-thread-I.patch diff --git a/meta/recipes-extended/ltp/ltp/0001-rt-migrate-Use-int-instead-of-pthread_t-for-thread-I.patch b/meta/recipes-extended/ltp/ltp/0001-rt-migrate-Use-int-instead-of-pthread_t-for-thread-I.patch new file mode 100644 index 0000000000..e49f53a9e2 --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/0001-rt-migrate-Use-int-instead-of-pthread_t-for-thread-I.patch @@ -0,0 +1,36 @@ +From 11e503344c36c1c7df3e455d81736dc4a5b43775 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 23 Aug 2022 23:20:53 -0700 +Subject: [PATCH] rt-migrate: Use int instead of pthread_t for thread IDs + +pthread_t is opaque, but create_fifo_thread() returns integer therefore +on musl where thread_t is not integer, this fails to compile e.g. + +| rt-migrate.c:450:14: error: incompatible integer to pointer conversion assigning to 'pthread_t' (aka 'struct __pthread *') from 'int' [-Wint-conversion] +| threads[i] = create_fifo_thread(start_task, (void *)i, +| ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Align the types used to fix the problems. + +Upstream-Status: Submitted [https://lists.linux.it/pipermail/ltp/2022-August/030239.html] +Signed-off-by: Khem Raj +--- + testcases/realtime/func/rt-migrate/rt-migrate.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/testcases/realtime/func/rt-migrate/rt-migrate.c b/testcases/realtime/func/rt-migrate/rt-migrate.c +index 3e6c82a2fb..97ab604c7f 100644 +--- a/testcases/realtime/func/rt-migrate/rt-migrate.c ++++ b/testcases/realtime/func/rt-migrate/rt-migrate.c +@@ -394,7 +394,7 @@ static void stop_log(int sig) + + int main(int argc, char **argv) + { +- pthread_t *threads; ++ int *threads; + long i; + int ret; + struct timespec intv; +-- +2.37.2 + diff --git a/meta/recipes-extended/ltp/ltp_20220527.bb b/meta/recipes-extended/ltp/ltp_20220527.bb index a547298828..09c7250608 100644 --- a/meta/recipes-extended/ltp/ltp_20220527.bb +++ b/meta/recipes-extended/ltp/ltp_20220527.bb @@ -39,6 +39,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git;branch=master;protocol=ht file://0001-memcg-functional-Fix-usage-of-PAGESIZE-from-memcg_li.patch \ file://0001-lapi-pidfd-adding-pidfd-header-file.patch \ file://0001-lapi-fsmount-resolve-conflict-in-different-header-fi.patch \ + file://0001-rt-migrate-Use-int-instead-of-pthread_t-for-thread-I.patch \ " S = "${WORKDIR}/git"